From 1b311e34826de9bd06eb296a15a10dea37f696bc Mon Sep 17 00:00:00 2001 From: "termux-actions[bot]" Date: Wed, 23 Feb 2022 13:38:54 +0000 Subject: [PATCH] packages/vim-python&&packages/vim --- packages/vim-python/build.sh | 4 ++-- .../runtime-autoload-context.vim.patch | 11 +++++++++++ packages/vim-python/runtime-syntax-sh.vim.patch | 17 +++++++++++++++++ packages/vim-python/src-evalfunc.c.patch | 6 ++---- packages/vim-python/src-if_cscope.c.patch | 12 ------------ packages/vim/build.sh | 5 ++--- packages/vim/runtime-autoload-context.vim.patch | 11 +++++++++++ packages/vim/runtime-syntax-sh.vim.patch | 17 +++++++++++++++++ packages/vim/src-evalfunc.c.patch | 6 ++---- packages/vim/src-if_cscope.c.patch | 12 ------------ 10 files changed, 64 insertions(+), 37 deletions(-) create mode 100644 packages/vim-python/runtime-autoload-context.vim.patch create mode 100644 packages/vim-python/runtime-syntax-sh.vim.patch delete mode 100644 packages/vim-python/src-if_cscope.c.patch create mode 100644 packages/vim/runtime-autoload-context.vim.patch create mode 100644 packages/vim/runtime-syntax-sh.vim.patch delete mode 100644 packages/vim/src-if_cscope.c.patch diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh index e53385bba2..08be290971 100644 --- a/packages/vim-python/build.sh +++ b/packages/vim-python/build.sh @@ -6,9 +6,9 @@ TERMUX_PKG_DEPENDS="libiconv, ncurses, vim-runtime, python" TERMUX_PKG_RECOMMENDS="diffutils" # vim should only be updated every 50 releases on multiples of 50. # Update both vim and vim-python to the same version in one PR. -TERMUX_PKG_VERSION=8.2.3800 +TERMUX_PKG_VERSION=8.2.4450 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=5580c31980558612e7a1f85d0d73402b3feacc8ff174a70554cd2d0a44cd2966 +TERMUX_PKG_SHA256=b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" vim_cv_getcwd_broken=no vim_cv_memmove_handles_overlap=yes diff --git a/packages/vim-python/runtime-autoload-context.vim.patch b/packages/vim-python/runtime-autoload-context.vim.patch new file mode 100644 index 0000000000..e8d3b26688 --- /dev/null +++ b/packages/vim-python/runtime-autoload-context.vim.patch @@ -0,0 +1,11 @@ +--- a/runtime/autoload/context.vim ++++ b/runtime/autoload/context.vim +@@ -17,7 +17,7 @@ + function! s:sh() + return has('win32') || has('win64') || has('win16') || has('win95') + \ ? ['cmd.exe', '/C'] +- \ : ['/bin/sh', '-c'] ++ \ : ['@TERMUX_PREFIX@/bin/sh', '-c'] + endfunction + + " For backward compatibility diff --git a/packages/vim-python/runtime-syntax-sh.vim.patch b/packages/vim-python/runtime-syntax-sh.vim.patch new file mode 100644 index 0000000000..0b127b625c --- /dev/null +++ b/packages/vim-python/runtime-syntax-sh.vim.patch @@ -0,0 +1,17 @@ +--- a/runtime/syntax/sh.vim ++++ b/runtime/syntax/sh.vim +@@ -25,10 +25,10 @@ + " the script itself does not specify which shell to use. FYI: /bin/sh is ambiguous. + " Assuming /bin/sh is executable, and if its a link, find out what it links to. + let s:shell = "" +- if executable("/bin/sh") +- let s:shell = resolve("/bin/sh") +- elseif executable("/usr/bin/sh") +- let s:shell = resolve("/usr/bin/sh") ++ if executable("@TERMUX_PREFIX@/bin/sh") ++ let s:shell = resolve("@TERMUX_PREFIX@/bin/sh") ++ elseif executable("/system/bin/sh") ++ let s:shell = resolve("/system/bin/sh") + endif + if s:shell =~ '\' + let b:is_kornshell= 1 diff --git a/packages/vim-python/src-evalfunc.c.patch b/packages/vim-python/src-evalfunc.c.patch index bb61083ee5..3824c7d559 100644 --- a/packages/vim-python/src-evalfunc.c.patch +++ b/packages/vim-python/src-evalfunc.c.patch @@ -1,11 +1,9 @@ -diff --git a/src/evalfunc.c b/src/evalfunc.c -index 16d9be3..cec0e4f 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c -@@ -4922,6 +4922,8 @@ f_has(typval_T *argvars, typval_T *rettv) - 0 +@@ -5313,6 +5313,8 @@ f_has(typval_T *argvars, typval_T *rettv #endif }, + {"ebcdic", 0 }, + {"android", 1}, + {"termux", 1}, {"fname_case", diff --git a/packages/vim-python/src-if_cscope.c.patch b/packages/vim-python/src-if_cscope.c.patch deleted file mode 100644 index 375ae96f2c..0000000000 --- a/packages/vim-python/src-if_cscope.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr vim-8.1.0050/src/if_cscope.c vim-8.1.0050.mod/src/if_cscope.c ---- vim-8.1.0050/src/if_cscope.c 2018-06-12 21:25:52.000000000 +0300 -+++ vim-8.1.0050.mod/src/if_cscope.c 2018-06-19 20:32:38.661663690 +0300 -@@ -962,7 +962,7 @@ - PERROR(_("cs_create_connection setpgid failed")); - # endif - # endif -- if (execl("/bin/sh", "sh", "-c", cmd, (char *)NULL) == -1) -+ if (execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, (char *)NULL) == -1) - PERROR(_("cs_create_connection exec failed")); - - exit(127); diff --git a/packages/vim/build.sh b/packages/vim/build.sh index c72deb9f03..993230218b 100644 --- a/packages/vim/build.sh +++ b/packages/vim/build.sh @@ -6,10 +6,9 @@ TERMUX_PKG_DEPENDS="libiconv, ncurses, vim-runtime" TERMUX_PKG_RECOMMENDS="diffutils" # vim should only be updated every 50 releases on multiples of 50. # Update both vim and vim-python to the same version in one PR. -TERMUX_PKG_VERSION=8.2.3800 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=8.2.4450 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=5580c31980558612e7a1f85d0d73402b3feacc8ff174a70554cd2d0a44cd2966 +TERMUX_PKG_SHA256=b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" vim_cv_getcwd_broken=no vim_cv_memmove_handles_overlap=yes diff --git a/packages/vim/runtime-autoload-context.vim.patch b/packages/vim/runtime-autoload-context.vim.patch new file mode 100644 index 0000000000..e8d3b26688 --- /dev/null +++ b/packages/vim/runtime-autoload-context.vim.patch @@ -0,0 +1,11 @@ +--- a/runtime/autoload/context.vim ++++ b/runtime/autoload/context.vim +@@ -17,7 +17,7 @@ + function! s:sh() + return has('win32') || has('win64') || has('win16') || has('win95') + \ ? ['cmd.exe', '/C'] +- \ : ['/bin/sh', '-c'] ++ \ : ['@TERMUX_PREFIX@/bin/sh', '-c'] + endfunction + + " For backward compatibility diff --git a/packages/vim/runtime-syntax-sh.vim.patch b/packages/vim/runtime-syntax-sh.vim.patch new file mode 100644 index 0000000000..0b127b625c --- /dev/null +++ b/packages/vim/runtime-syntax-sh.vim.patch @@ -0,0 +1,17 @@ +--- a/runtime/syntax/sh.vim ++++ b/runtime/syntax/sh.vim +@@ -25,10 +25,10 @@ + " the script itself does not specify which shell to use. FYI: /bin/sh is ambiguous. + " Assuming /bin/sh is executable, and if its a link, find out what it links to. + let s:shell = "" +- if executable("/bin/sh") +- let s:shell = resolve("/bin/sh") +- elseif executable("/usr/bin/sh") +- let s:shell = resolve("/usr/bin/sh") ++ if executable("@TERMUX_PREFIX@/bin/sh") ++ let s:shell = resolve("@TERMUX_PREFIX@/bin/sh") ++ elseif executable("/system/bin/sh") ++ let s:shell = resolve("/system/bin/sh") + endif + if s:shell =~ '\' + let b:is_kornshell= 1 diff --git a/packages/vim/src-evalfunc.c.patch b/packages/vim/src-evalfunc.c.patch index bb61083ee5..3824c7d559 100644 --- a/packages/vim/src-evalfunc.c.patch +++ b/packages/vim/src-evalfunc.c.patch @@ -1,11 +1,9 @@ -diff --git a/src/evalfunc.c b/src/evalfunc.c -index 16d9be3..cec0e4f 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c -@@ -4922,6 +4922,8 @@ f_has(typval_T *argvars, typval_T *rettv) - 0 +@@ -5313,6 +5313,8 @@ f_has(typval_T *argvars, typval_T *rettv #endif }, + {"ebcdic", 0 }, + {"android", 1}, + {"termux", 1}, {"fname_case", diff --git a/packages/vim/src-if_cscope.c.patch b/packages/vim/src-if_cscope.c.patch deleted file mode 100644 index 375ae96f2c..0000000000 --- a/packages/vim/src-if_cscope.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr vim-8.1.0050/src/if_cscope.c vim-8.1.0050.mod/src/if_cscope.c ---- vim-8.1.0050/src/if_cscope.c 2018-06-12 21:25:52.000000000 +0300 -+++ vim-8.1.0050.mod/src/if_cscope.c 2018-06-19 20:32:38.661663690 +0300 -@@ -962,7 +962,7 @@ - PERROR(_("cs_create_connection setpgid failed")); - # endif - # endif -- if (execl("/bin/sh", "sh", "-c", cmd, (char *)NULL) == -1) -+ if (execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, (char *)NULL) == -1) - PERROR(_("cs_create_connection exec failed")); - - exit(127);