From 9a6c024b51e8ae69076c948204bddee0cfc002fc Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 5 Dec 2022 04:27:20 +0000 Subject: update patchset for vim 9.0.1000 - Rename 005_all_vim_7.1-ada-default-compiler.patch - Rename 006-vim-8.2.5066-crosscompile.patch - Rename 007-vim-8.2.0210-python3-shared-lib.patch - Add 008_all_vim-9.0.1000-perl-mode.patch Bug: https://bugs.gentoo.org/881385 Signed-off-by: Sam James --- 005_all_vim-7.1-ada-default-compiler.patch | 17 +++++++++++++++++ 005_all_vim_7.1-ada-default-compiler.patch | 17 ----------------- 006-vim-8.2.5066-crosscompile.patch | 21 --------------------- 006_all_vim-8.2.5066-crosscompile.patch | 21 +++++++++++++++++++++ 007-vim-8.2.0210-python3-shared-lib.patch | 16 ---------------- 007_all_vim-8.2.0210-python3-shared-lib.patch | 16 ++++++++++++++++ 008_all_vim-9.0.1000-perl-mode.patch | 15 +++++++++++++++ 7 files changed, 69 insertions(+), 54 deletions(-) create mode 100644 005_all_vim-7.1-ada-default-compiler.patch delete mode 100644 005_all_vim_7.1-ada-default-compiler.patch delete mode 100644 006-vim-8.2.5066-crosscompile.patch create mode 100644 006_all_vim-8.2.5066-crosscompile.patch delete mode 100644 007-vim-8.2.0210-python3-shared-lib.patch create mode 100644 007_all_vim-8.2.0210-python3-shared-lib.patch create mode 100644 008_all_vim-9.0.1000-perl-mode.patch diff --git a/005_all_vim-7.1-ada-default-compiler.patch b/005_all_vim-7.1-ada-default-compiler.patch new file mode 100644 index 0000000..3a3e78b --- /dev/null +++ b/005_all_vim-7.1-ada-default-compiler.patch @@ -0,0 +1,17 @@ +--- a/runtime/ftplugin/ada.vim ++++ b/runtime/ftplugin/ada.vim +@@ -126,9 +126,11 @@ + endif + endif + +-if ! exists("current_compiler") || +- \ current_compiler != g:ada_default_compiler +- execute "compiler " . g:ada_default_compiler ++if exists("g:ada_default_compiler") ++ if ! exists("current_compiler") || ++ \ current_compiler != g:ada_default_compiler ++ execute "compiler " . g:ada_default_compiler ++ endif + endif + + " Section: Folding {{{1 diff --git a/005_all_vim_7.1-ada-default-compiler.patch b/005_all_vim_7.1-ada-default-compiler.patch deleted file mode 100644 index 3a3e78b..0000000 --- a/005_all_vim_7.1-ada-default-compiler.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/runtime/ftplugin/ada.vim -+++ b/runtime/ftplugin/ada.vim -@@ -126,9 +126,11 @@ - endif - endif - --if ! exists("current_compiler") || -- \ current_compiler != g:ada_default_compiler -- execute "compiler " . g:ada_default_compiler -+if exists("g:ada_default_compiler") -+ if ! exists("current_compiler") || -+ \ current_compiler != g:ada_default_compiler -+ execute "compiler " . g:ada_default_compiler -+ endif - endif - - " Section: Folding {{{1 diff --git a/006-vim-8.2.5066-crosscompile.patch b/006-vim-8.2.5066-crosscompile.patch deleted file mode 100644 index 984c2af..0000000 --- a/006-vim-8.2.5066-crosscompile.patch +++ /dev/null @@ -1,21 +0,0 @@ -Skip failing configure checks during cross-compile builds (bug #473372). - ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -3443,7 +3443,7 @@ else - # include - #endif - int main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }])], -- res="OK", res="FAIL", res="FAIL") -+ res="OK", res="FAIL", res="OK") - if test "$res" = "OK"; then - break - fi -@@ -3514,7 +3514,7 @@ int main() - ],[ - vim_cv_tgetent=non-zero - ],[ -- AC_MSG_ERROR(failed to compile test program.) -+ vim_cv_tgent=zero - ]) - ]) diff --git a/006_all_vim-8.2.5066-crosscompile.patch b/006_all_vim-8.2.5066-crosscompile.patch new file mode 100644 index 0000000..984c2af --- /dev/null +++ b/006_all_vim-8.2.5066-crosscompile.patch @@ -0,0 +1,21 @@ +Skip failing configure checks during cross-compile builds (bug #473372). + +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -3443,7 +3443,7 @@ else + # include + #endif + int main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }])], +- res="OK", res="FAIL", res="FAIL") ++ res="OK", res="FAIL", res="OK") + if test "$res" = "OK"; then + break + fi +@@ -3514,7 +3514,7 @@ int main() + ],[ + vim_cv_tgetent=non-zero + ],[ +- AC_MSG_ERROR(failed to compile test program.) ++ vim_cv_tgent=zero + ]) + ]) diff --git a/007-vim-8.2.0210-python3-shared-lib.patch b/007-vim-8.2.0210-python3-shared-lib.patch deleted file mode 100644 index 84ec559..0000000 --- a/007-vim-8.2.0210-python3-shared-lib.patch +++ /dev/null @@ -1,16 +0,0 @@ -Drop python3 config dir from library search list to avoid linking against the -static library that may exist there (bug #669306). - -diff --git a/src/configure.ac b/src/configure.ac -index a098da82e..7aedd7bee 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -1496,7 +1496,7 @@ eof - dnl -- delete the lines from make about Entering/Leaving directory - eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" - rm -f -- "${tmp_mkf}" -- vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" -+ vi_cv_path_python3_plibs="-lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" - vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" - dnl remove -ltermcap, it can conflict with an earlier -lncurses - vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` diff --git a/007_all_vim-8.2.0210-python3-shared-lib.patch b/007_all_vim-8.2.0210-python3-shared-lib.patch new file mode 100644 index 0000000..84ec559 --- /dev/null +++ b/007_all_vim-8.2.0210-python3-shared-lib.patch @@ -0,0 +1,16 @@ +Drop python3 config dir from library search list to avoid linking against the +static library that may exist there (bug #669306). + +diff --git a/src/configure.ac b/src/configure.ac +index a098da82e..7aedd7bee 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -1496,7 +1496,7 @@ eof + dnl -- delete the lines from make about Entering/Leaving directory + eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" +- vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" ++ vi_cv_path_python3_plibs="-lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" + dnl remove -ltermcap, it can conflict with an earlier -lncurses + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` diff --git a/008_all_vim-9.0.1000-perl-mode.patch b/008_all_vim-9.0.1000-perl-mode.patch new file mode 100644 index 0000000..67920c5 --- /dev/null +++ b/008_all_vim-9.0.1000-perl-mode.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/881385 +https://github.com/vim-perl/vim-perl/issues/267#issuecomment-803380012 +https://github.com/vim-perl/vim-perl/commit/5bca9143767a5eef887bea5c6543a3f25961fc63 +2022-04-27 commit 5bca914 + +--- a/runtime/indent/perl.vim ++++ b/runtime/indent/perl.vim +@@ -133,6 +133,7 @@ function! GetPerlIndent() + \ || synid == "perlHereDoc" + \ || synid == "perlBraces" + \ || synid == "perlStatementIndirObj" ++ \ || synid == "perlSubDeclaration" + \ || synid =~ "^perlFiledescStatement" + \ || synid =~ '^perl\(Sub\|Block\|Package\)Fold' + let brace = strpart(line, bracepos, 1) -- cgit v1.2.3-65-gdbad