bump(main/vim,main/vim-python,x11/vim): 9.1.0700 (#21540)

and deduplicate patches using symlinks
termux · Sep 23, 2024 · 97fa0b4 · 97fa0b4
1 parent 2d0f533
commit 97fa0b4
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 456 deletions.
diff --git 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 all of vim, vim-python and vim-gtk to the same version in one PR.
-TERMUX_PKG_VERSION=9.1.0500
+TERMUX_PKG_VERSION=9.1.0700
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=d6009449df4e28e38b0da3bf5621a65037dec1ec53092f8f56cd1a27f3d91009
+TERMUX_PKG_SHA256=497dcbc529144d48ba0f4d26c62e37c483ee4a7a811213ee67b8ad248955b186
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 vim_cv_getcwd_broken=no

diff --git a/packages/vim-python/fix-writing-archive.patch b/packages/vim-python/fix-writing-archive.patch
diff --git a/packages/vim-python/fix-writing-archive.patch b/packages/vim-python/fix-writing-archive.patch
@@ -0,0 +1 @@
+../../packages/vim/fix-writing-archive.patch
diff --git a/packages/vim-python/option.c.patch b/packages/vim-python/option.c.patch
diff --git a/packages/vim-python/option.c.patch b/packages/vim-python/option.c.patch
@@ -0,0 +1 @@
+../../packages/vim/option.c.patch
diff --git a/packages/vim-python/runtime-syntax-sh.vim.patch b/packages/vim-python/runtime-syntax-sh.vim.patch
diff --git a/packages/vim-python/runtime-syntax-sh.vim.patch b/packages/vim-python/runtime-syntax-sh.vim.patch
@@ -0,0 +1 @@
+../../packages/vim/runtime-syntax-sh.vim.patch
diff --git a/packages/vim-python/src-auto-configure.patch b/packages/vim-python/src-auto-configure.patch
diff --git a/packages/vim-python/src-auto-configure.patch b/packages/vim-python/src-auto-configure.patch
@@ -0,0 +1 @@
+../../packages/vim/src-auto-configure.patch
diff --git a/packages/vim-python/src-evalfunc.c.patch b/packages/vim-python/src-evalfunc.c.patch
diff --git a/packages/vim-python/src-evalfunc.c.patch b/packages/vim-python/src-evalfunc.c.patch
@@ -0,0 +1 @@
+../../packages/vim/src-evalfunc.c.patch
diff --git a/packages/vim-python/src-os_unix.h.patch b/packages/vim-python/src-os_unix.h.patch
diff --git a/packages/vim-python/src-os_unix.h.patch b/packages/vim-python/src-os_unix.h.patch
@@ -0,0 +1 @@
+../../packages/vim/src-os_unix.h.patch
diff --git a/packages/vim-python/vimrc b/packages/vim-python/vimrc
diff --git a/packages/vim-python/vimrc b/packages/vim-python/vimrc
@@ -0,0 +1 @@
+../../packages/vim/vimrc
diff --git a/packages/vim-python/vimtutor.patch b/packages/vim-python/vimtutor.patch
diff --git a/packages/vim-python/vimtutor.patch b/packages/vim-python/vimtutor.patch
@@ -0,0 +1 @@
+../../packages/vim/vimtutor.patch
diff --git a/packages/vim-python/vterm_internal.h.patch b/packages/vim-python/vterm_internal.h.patch
diff --git a/packages/vim-python/vterm_internal.h.patch b/packages/vim-python/vterm_internal.h.patch
@@ -0,0 +1 @@
+../../packages/vim/vterm_internal.h.patch
diff --git a/packages/vim/build.sh b/packages/vim/build.sh
@@ -6,9 +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 all of vim, vim-python and vim-gtk to the same version in one PR.
-TERMUX_PKG_VERSION=9.1.0500
+TERMUX_PKG_VERSION=9.1.0700
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=d6009449df4e28e38b0da3bf5621a65037dec1ec53092f8f56cd1a27f3d91009
+TERMUX_PKG_SHA256=497dcbc529144d48ba0f4d26c62e37c483ee4a7a811213ee67b8ad248955b186
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 vim_cv_getcwd_broken=no

diff --git a/packages/vim/fix-writing-archive.patch b/packages/vim/fix-writing-archive.patch
@@ -1,7 +1,8 @@
-diff -uNr vim-9.1.0200.orig/runtime/autoload/tar.vim vim-9.1.0200/runtime/autoload/tar.vim
---- vim-9.1.0200.orig/runtime/autoload/tar.vim	2024-03-24 14:13:25.000000000 +0530
-+++ vim-9.1.0200/runtime/autoload/tar.vim	2024-03-24 14:31:18.802686254 +0530
-@@ -416,9 +416,6 @@
+diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
+index 9c4f16d7f..837c8cd1c 100644
+--- a/runtime/autoload/tar.vim
++++ b/runtime/autoload/tar.vim
+@@ -416,9 +416,6 @@ fun! tar#Write(fname)
    let curdir= getcwd()
    let tmpdir= tempname()
  "  call Decho("orig tempname<".tmpdir.">")
@@ -11,16 +12,17 @@ diff -uNr vim-9.1.0200.orig/runtime/autoload/tar.vim vim-9.1.0200/runtime/autolo
  "  call Decho("tmpdir<".tmpdir.">")
    call mkdir(tmpdir,"p")
 
-diff -uNr vim-9.1.0200.orig/runtime/autoload/zip.vim vim-9.1.0200/runtime/autoload/zip.vim
---- vim-9.1.0200.orig/runtime/autoload/zip.vim	2024-03-24 14:13:25.000000000 +0530
-+++ vim-9.1.0200/runtime/autoload/zip.vim	2024-03-24 14:30:48.618686253 +0530
-@@ -289,9 +289,6 @@
+diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
+index 4a53fc5f2..e2bd35064 100644
+--- a/runtime/autoload/zip.vim
++++ b/runtime/autoload/zip.vim
+@@ -249,9 +249,6 @@ fun! zip#Write(fname)
+
    let curdir= getcwd()
    let tmpdir= tempname()
- "  call Decho("orig tempname<".tmpdir.">")
 -  if tmpdir =~ '\.'
 -   let tmpdir= substitute(tmpdir,'\.[^.]*$','','e')
 -  endif
- "  call Decho("tmpdir<".tmpdir.">")
    call mkdir(tmpdir,"p")
 
+   " attempt to change to the indicated directory
diff --git a/x11-packages/vim-gtk/build.sh b/x11-packages/vim-gtk/build.sh
@@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="@termux"
 
 # vim should only be updated every 50 releases on multiples of 50.
 # Update all of vim, vim-python and vim-gtk to the same version in one PR.
-TERMUX_PKG_VERSION=9.1.0500
+TERMUX_PKG_VERSION=9.1.0700
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=d6009449df4e28e38b0da3bf5621a65037dec1ec53092f8f56cd1a27f3d91009
+TERMUX_PKG_SHA256=497dcbc529144d48ba0f4d26c62e37c483ee4a7a811213ee67b8ad248955b186
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo, libcanberra, libice, libiconv, liblua52, libsm, libx11, libxt, ncurses, pango, python"
 TERMUX_PKG_CONFLICTS="vim, vim-python, vim-runtime"

diff --git a/x11-packages/vim-gtk/fix-writing-archive.patch b/x11-packages/vim-gtk/fix-writing-archive.patch
diff --git a/x11-packages/vim-gtk/fix-writing-archive.patch b/x11-packages/vim-gtk/fix-writing-archive.patch
@@ -0,0 +1 @@
+../../packages/vim/fix-writing-archive.patch
diff --git a/x11-packages/vim-gtk/option.c.patch b/x11-packages/vim-gtk/option.c.patch
diff --git a/x11-packages/vim-gtk/option.c.patch b/x11-packages/vim-gtk/option.c.patch
@@ -0,0 +1 @@
+../../packages/vim/option.c.patch
diff --git a/x11-packages/vim-gtk/runtime-syntax-sh.vim.patch b/x11-packages/vim-gtk/runtime-syntax-sh.vim.patch
diff --git a/x11-packages/vim-gtk/runtime-syntax-sh.vim.patch b/x11-packages/vim-gtk/runtime-syntax-sh.vim.patch
@@ -0,0 +1 @@
+../../packages/vim/runtime-syntax-sh.vim.patch