sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vim{,-python}: Update to 8.2.4450

Browse Source
This commit is contained in:
Tee KOBAYASHI 2022-02-23 20:35:00 +09:00 committed by buttaface
parent d47458fa9d
commit f6e0a7a8e3
10 changed files with 64 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/vim-python/build.sh
View File

@ -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

11
packages/vim-python/runtime-autoload-context.vim.patch Normal file
View File

@ -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

17
packages/vim-python/runtime-syntax-sh.vim.patch Normal file
View File

@ -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 =~ '\<ksh\>'
let b:is_kornshell= 1

6
packages/vim-python/src-evalfunc.c.patch
View File

@ -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",

12
packages/vim-python/src-if_cscope.c.patch
View File

@ -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);

5
packages/vim/build.sh
View File

@ -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

11
packages/vim/runtime-autoload-context.vim.patch Normal file
View File

@ -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

17
packages/vim/runtime-syntax-sh.vim.patch Normal file
View File

@ -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 =~ '\<ksh\>'
let b:is_kornshell= 1

6
packages/vim/src-evalfunc.c.patch
View File

@ -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",

12
packages/vim/src-if_cscope.c.patch
View File

@ -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);