From 17b1dff42b03a3780080e7f0529a1bbd46428b05 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Sun, 27 Feb 2022 02:23:56 +0900
Subject: [PATCH] vim: Undef `SIGTSTP` to workaround `Ctrl+Z` issue

---
 packages/vim-python/build.sh                   |  1 +
 packages/vim-python/src-os_unix.c.patch        | 13 +++++++++++++
 .../{os_unix.h.patch => src-os_unix.h.patch}   | 18 ++++++++++++++----
 packages/vim/build.sh                          |  1 +
 packages/vim/src-os_unix.c.patch               | 13 +++++++++++++
 .../{os_unix.h.patch => src-os_unix.h.patch}   | 18 ++++++++++++++----
 6 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 packages/vim-python/src-os_unix.c.patch
 rename packages/vim-python/{os_unix.h.patch => src-os_unix.h.patch} (53%)
 create mode 100644 packages/vim/src-os_unix.c.patch
 rename packages/vim/{os_unix.h.patch => src-os_unix.h.patch} (53%)

diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index 08be29097..d14d1fe9f 100644
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -7,6 +7,7 @@ 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=1
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/vim-python/src-os_unix.c.patch b/packages/vim-python/src-os_unix.c.patch
new file mode 100644
index 000000000..811a4c83d
--- /dev/null
+++ b/packages/vim-python/src-os_unix.c.patch
@@ -0,0 +1,13 @@
+--- a/src/os_unix.c
++++ b/src/os_unix.c
+@@ -157,9 +157,9 @@
+ #endif
+ #if defined(SIGTSTP)
+ static RETSIGTYPE sig_tstp SIGPROTOARG;
++#endif
+ // volatile because it is used in signal handler sig_tstp() and sigcont_handler().
+ static volatile sig_atomic_t in_mch_suspend = FALSE;
+-#endif
+ #if defined(SIGINT)
+ static RETSIGTYPE catch_sigint SIGPROTOARG;
+ #endif
diff --git a/packages/vim-python/os_unix.h.patch b/packages/vim-python/src-os_unix.h.patch
similarity index 53%
rename from packages/vim-python/os_unix.h.patch
rename to packages/vim-python/src-os_unix.h.patch
index f003e5fa5..0c7a9382c 100644
--- a/packages/vim-python/os_unix.h.patch
+++ b/packages/vim-python/src-os_unix.h.patch
@@ -1,7 +1,17 @@
-diff -uNr vim-8.2.0000/src/os_unix.h vim-8.2.0000.mod/src/os_unix.h
---- vim-8.2.0000/src/os_unix.h	2019-12-12 15:18:35.000000000 +0200
-+++ vim-8.2.0000.mod/src/os_unix.h	2019-12-20 19:27:51.141441414 +0200
-@@ -350,7 +350,7 @@
+--- a/src/os_unix.h
++++ b/src/os_unix.h
+@@ -138,6 +138,10 @@
+ 
+ #include <signal.h>
+ 
++#ifdef __ANDROID__
++#undef SIGTSTP
++#endif
++
+ #if defined(DIRSIZ) && !defined(MAXNAMLEN)
+ # define MAXNAMLEN DIRSIZ
+ #endif
+@@ -356,7 +360,7 @@
  # ifdef VMS
  #  define DFLT_DIR     "./,sys$login:,tmp:"
  # else
diff --git a/packages/vim/build.sh b/packages/vim/build.sh
index 993230218..ca4a32504 100644
--- a/packages/vim/build.sh
+++ b/packages/vim/build.sh
@@ -7,6 +7,7 @@ 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=1
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/vim/src-os_unix.c.patch b/packages/vim/src-os_unix.c.patch
new file mode 100644
index 000000000..811a4c83d
--- /dev/null
+++ b/packages/vim/src-os_unix.c.patch
@@ -0,0 +1,13 @@
+--- a/src/os_unix.c
++++ b/src/os_unix.c
+@@ -157,9 +157,9 @@
+ #endif
+ #if defined(SIGTSTP)
+ static RETSIGTYPE sig_tstp SIGPROTOARG;
++#endif
+ // volatile because it is used in signal handler sig_tstp() and sigcont_handler().
+ static volatile sig_atomic_t in_mch_suspend = FALSE;
+-#endif
+ #if defined(SIGINT)
+ static RETSIGTYPE catch_sigint SIGPROTOARG;
+ #endif
diff --git a/packages/vim/os_unix.h.patch b/packages/vim/src-os_unix.h.patch
similarity index 53%
rename from packages/vim/os_unix.h.patch
rename to packages/vim/src-os_unix.h.patch
index f003e5fa5..0c7a9382c 100644
--- a/packages/vim/os_unix.h.patch
+++ b/packages/vim/src-os_unix.h.patch
@@ -1,7 +1,17 @@
-diff -uNr vim-8.2.0000/src/os_unix.h vim-8.2.0000.mod/src/os_unix.h
---- vim-8.2.0000/src/os_unix.h	2019-12-12 15:18:35.000000000 +0200
-+++ vim-8.2.0000.mod/src/os_unix.h	2019-12-20 19:27:51.141441414 +0200
-@@ -350,7 +350,7 @@
+--- a/src/os_unix.h
++++ b/src/os_unix.h
+@@ -138,6 +138,10 @@
+ 
+ #include <signal.h>
+ 
++#ifdef __ANDROID__
++#undef SIGTSTP
++#endif
++
+ #if defined(DIRSIZ) && !defined(MAXNAMLEN)
+ # define MAXNAMLEN DIRSIZ
+ #endif
+@@ -356,7 +360,7 @@
  # ifdef VMS
  #  define DFLT_DIR     "./,sys$login:,tmp:"
  # else