From cfa9df4bd43b2a7c5cf8aadf706dd6897b4ae716 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Thu, 31 Mar 2022 18:37:16 +0900
Subject: [PATCH] vim{,-python}: Update to 8.2.4650

---
 packages/vim-python/build.sh                   |  5 ++---
 .../vim-patch-8.2.4480-fix-ctrl-z.patch        | 18 ------------------
 packages/vim/build.sh                          |  5 ++---
 .../vim/vim-patch-8.2.4480-fix-ctrl-z.patch    | 18 ------------------
 4 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 packages/vim-python/vim-patch-8.2.4480-fix-ctrl-z.patch
 delete mode 100644 packages/vim/vim-patch-8.2.4480-fix-ctrl-z.patch

diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index 69610bdf7..26da95640 100644
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -6,10 +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.4450
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=8.2.4650
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81
+TERMUX_PKG_SHA256=f91b3bddaeb538a7a2cc3325cbc80bd1b0009a92407b3a8cb29f7618498fa950
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 vim_cv_getcwd_broken=no
 vim_cv_memmove_handles_overlap=yes
diff --git a/packages/vim-python/vim-patch-8.2.4480-fix-ctrl-z.patch b/packages/vim-python/vim-patch-8.2.4480-fix-ctrl-z.patch
deleted file mode 100644
index bcb75dbb0..000000000
--- a/packages/vim-python/vim-patch-8.2.4480-fix-ctrl-z.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/vim/vim/commit/cbef12e60b2c5a4f026172ab9873deaab2e70cf2
-
-diff --git a/src/os_unix.c b/src/os_unix.c
-index d36eb46a2c47..58f8276fb595 100644
---- a/src/os_unix.c
-+++ b/src/os_unix.c
-@@ -887,8 +887,10 @@ sig_tstp SIGDEFARG(sigarg)
-     else
- 	got_tstp = TRUE;
- 
--    // this is not required on all systems, but it doesn't hurt anybody
-+#ifndef __ANDROID__
-+    // this is not required on all systems
-     signal(SIGTSTP, (RETSIGTYPE (*)())sig_tstp);
-+#endif
-     SIGRETURN;
- }
- #endif
diff --git a/packages/vim/build.sh b/packages/vim/build.sh
index 123196136..a71d3bc9b 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.4450
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=8.2.4650
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81
+TERMUX_PKG_SHA256=f91b3bddaeb538a7a2cc3325cbc80bd1b0009a92407b3a8cb29f7618498fa950
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 vim_cv_getcwd_broken=no
 vim_cv_memmove_handles_overlap=yes
diff --git a/packages/vim/vim-patch-8.2.4480-fix-ctrl-z.patch b/packages/vim/vim-patch-8.2.4480-fix-ctrl-z.patch
deleted file mode 100644
index bcb75dbb0..000000000
--- a/packages/vim/vim-patch-8.2.4480-fix-ctrl-z.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/vim/vim/commit/cbef12e60b2c5a4f026172ab9873deaab2e70cf2
-
-diff --git a/src/os_unix.c b/src/os_unix.c
-index d36eb46a2c47..58f8276fb595 100644
---- a/src/os_unix.c
-+++ b/src/os_unix.c
-@@ -887,8 +887,10 @@ sig_tstp SIGDEFARG(sigarg)
-     else
- 	got_tstp = TRUE;
- 
--    // this is not required on all systems, but it doesn't hurt anybody
-+#ifndef __ANDROID__
-+    // this is not required on all systems
-     signal(SIGTSTP, (RETSIGTYPE (*)())sig_tstp);
-+#endif
-     SIGRETURN;
- }
- #endif