vim-gtk: Update to 8.2.4650

This commit is contained in:
Tee KOBAYASHI 2022-04-07 19:46:15 +09:00 committed by Yaksh Bariya
parent 10a2e564a7
commit c26d36eb33
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
6 changed files with 41 additions and 15 deletions

View File

@ -4,10 +4,9 @@ TERMUX_PKG_LICENSE="VIM License"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
# vim should only be updated every 50 releases on multiples of 50. # vim should only be updated every 50 releases on multiples of 50.
TERMUX_PKG_VERSION=8.2.3700 TERMUX_PKG_VERSION=8.2.4650
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=c6ec0fbfc1493c4538050cc154c6285441ad4a5ebc424ab6cad33df0eac89ba9 TERMUX_PKG_SHA256=f91b3bddaeb538a7a2cc3325cbc80bd1b0009a92407b3a8cb29f7618498fa950
TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo, libcanberra, libice, libiconv, liblua53, libsm, libx11, libxpm, libxt, ncurses, pango, python" TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo, libcanberra, libice, libiconv, liblua53, libsm, libx11, libxpm, libxt, ncurses, pango, python"
TERMUX_PKG_CONFLICTS="vim, vim-python, vim-runtime" TERMUX_PKG_CONFLICTS="vim, vim-python, vim-runtime"

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

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

View File

@ -0,0 +1,11 @@
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5313,6 +5313,8 @@ f_has(typval_T *argvars, typval_T *rettv
#endif
},
{"ebcdic", 0 },
+ {"android", 1},
+ {"termux", 1},
{"fname_case",
#ifndef CASE_INSENSITIVE_FILENAME
1

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