From 9b4c5fc90f72858d5a87c5732f392faffe4e7d31 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 24 Jan 2016 17:30:00 -0500
Subject: [PATCH] vim: Update to latest patch

---
 packages/vim-python/build.sh              |  2 +-
 packages/vim-python/src-osdef1.h.in.patch | 15 +++++++++++++++
 packages/vim/build.sh                     |  2 +-
 packages/vim/src-osdef1.h.in.patch        | 15 +++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 packages/vim-python/src-osdef1.h.in.patch
 create mode 100644 packages/vim/src-osdef1.h.in.patch

diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index f280d8e8..2a37a707 100755
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python"
 
 # Vim 7.4 patches described at ftp://ftp.vim.org/pub/vim/patches/7.4/README
-TERMUX_PKG_VERSION=7.4.1147
+TERMUX_PKG_VERSION=7.4.1174
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
diff --git a/packages/vim-python/src-osdef1.h.in.patch b/packages/vim-python/src-osdef1.h.in.patch
new file mode 100644
index 00000000..416040c6
--- /dev/null
+++ b/packages/vim-python/src-osdef1.h.in.patch
@@ -0,0 +1,15 @@
+bzero() is a define in the NDK header files (but should probably
+not be used at all, bzero as deprecated and then removed in POSIX).
+
+diff -u -r ../vim-7.4.1174/src/osdef1.h.in ./src/osdef1.h.in
+--- ../vim-7.4.1174/src/osdef1.h.in	2016-01-24 16:17:03.000000000 -0500
++++ ./src/osdef1.h.in	2016-01-24 17:01:12.816949231 -0500
+@@ -70,8 +70,6 @@
+ #  endif
+ # endif
+ #endif
+-/* used inside of FD_ZERO macro: */
+-extern void	bzero(void *, size_t);
+ #ifdef HAVE_SETSID
+ extern pid_t	setsid(void);
+ #endif
diff --git a/packages/vim/build.sh b/packages/vim/build.sh
index 6629cf22..f557c5b2 100755
--- a/packages/vim/build.sh
+++ b/packages/vim/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime"
 
 # Vim 7.4 patches described at ftp://ftp.vim.org/pub/vim/patches/7.4/README
-TERMUX_PKG_VERSION=7.4.1147
+TERMUX_PKG_VERSION=7.4.1174
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
diff --git a/packages/vim/src-osdef1.h.in.patch b/packages/vim/src-osdef1.h.in.patch
new file mode 100644
index 00000000..416040c6
--- /dev/null
+++ b/packages/vim/src-osdef1.h.in.patch
@@ -0,0 +1,15 @@
+bzero() is a define in the NDK header files (but should probably
+not be used at all, bzero as deprecated and then removed in POSIX).
+
+diff -u -r ../vim-7.4.1174/src/osdef1.h.in ./src/osdef1.h.in
+--- ../vim-7.4.1174/src/osdef1.h.in	2016-01-24 16:17:03.000000000 -0500
++++ ./src/osdef1.h.in	2016-01-24 17:01:12.816949231 -0500
+@@ -70,8 +70,6 @@
+ #  endif
+ # endif
+ #endif
+-/* used inside of FD_ZERO macro: */
+-extern void	bzero(void *, size_t);
+ #ifdef HAVE_SETSID
+ extern pid_t	setsid(void);
+ #endif
-- 
2.11.0