From ca321703027b503b5d2fd19c400dbbee59d19ae5 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 16 Sep 2022 10:54:42 +0200 Subject: [PATCH] app-editors/vim: Apply Flatcar modifications These are not Flatcar specific modifications per se. We just bump the version from 9.0.0099 to 9.0.0469 and drop a patch that was already applied upstream. --- .../coreos-overlay/app-editors/vim/Manifest | 2 +- ...-fix-create-timer-for-cros-compiling.patch | 28 ------------------- ...im-9.0.0099.ebuild => vim-9.0.0469.ebuild} | 1 - 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch rename sdk_container/src/third_party/coreos-overlay/app-editors/vim/{vim-9.0.0099.ebuild => vim-9.0.0469.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/Manifest b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/Manifest index e43ef7f437..0d678d63dc 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/Manifest @@ -1,2 +1,2 @@ -DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498 +DIST vim-9.0.0469.tar.gz 16851209 BLAKE2B 21c8dc3fb68163a9628833e550043de8d84df6afaf50e3a236e18d4766f25f5713e1595fcfb9e821c114cc409379c6a88eae3830112431d8dab7d58fecbc1ae5 SHA512 49f4b0f97745436b4720905a2ac5f16f6bed28a57411083f8b5cb903d5c908d53e626d5dc4f8d1d9d83bd2021281a9d423a2e811b75d4ad6d8bfbea22dc9cd8f DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942 diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch deleted file mode 100644 index 5247a80754..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bba26c9ed9d4ddc82afd0343f145dc9e14b91498 Mon Sep 17 00:00:00 2001 -From: Varsha Teratipally -Date: Tue, 2 Aug 2022 22:18:29 +0000 -Subject: [PATCH] Configure check for timer_create may give wrong error. -Give a warning instead of an error - -Partial solution from github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c - ---- - src/configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/configure.ac b/src/configure.ac -index e8522ec05..41f41dee3 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -3850,7 +3850,7 @@ static void set_flag(union sigval sv) {} - ])], - vim_cv_timer_create=yes, - vim_cv_timer_create=no), -- AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create') -+ AC_MSG_WARN(cross-compiling: please set 'vim_cv_timer_create') - )] - ) - --- - - diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-9.0.0099.ebuild b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-9.0.0469.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-9.0.0099.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-9.0.0469.ebuild index ac5d29c84a..1769b3cf44 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-9.0.0099.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-9.0.0469.ebuild @@ -79,7 +79,6 @@ src_prepare() { if [[ ${PV} != 9999* ]] ; then # Gentoo patches to fix runtime issues, cross-compile errors, etc eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches - eapply "${FILESDIR}"/vim-9.0-fix-create-timer-for-cros-compiling.patch fi # Fixup a script to use awk instead of nawk