From 68129b3c5d45ecf51ea9082378e5e7ed70117402 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 7 Dec 2016 22:04:28 -0500
Subject: [PATCH] vim: Patch to enable channel support

The vim configure script had a bug which caused the channel support
to be disabled. Patch this while awaiting a fix merged upstream.

Fixes #577.
---
 packages/vim-python/build.sh                 |  2 +-
 packages/vim-python/src-auto-configure.patch | 14 ++++++++++++++
 packages/vim/build.sh                        |  2 +-
 packages/vim/src-auto-configure.patch        | 14 ++++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 packages/vim-python/src-auto-configure.patch
 create mode 100644 packages/vim/src-auto-configure.patch

diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index fed1fbcb..5ecc5d6f 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 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README
-TERMUX_PKG_VERSION=8.0.0104
+TERMUX_PKG_VERSION=8.0.0124
 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-auto-configure.patch b/packages/vim-python/src-auto-configure.patch
new file mode 100644
index 00000000..58b613ce
--- /dev/null
+++ b/packages/vim-python/src-auto-configure.patch
@@ -0,0 +1,14 @@
+Submitted upstream at https://github.com/vim/vim/pull/1314
+
+diff -u -r ../vim-8.0.0104/src/auto/configure ./src/auto/configure
+--- ../vim-8.0.0104/src/auto/configure	2016-11-26 11:45:53.000000000 -0500
++++ ./src/auto/configure	2016-12-07 21:36:01.937616265 -0500
+@@ -7411,7 +7411,7 @@
+ 	/* Check bitfields */
+ 	struct nbbuf {
+ 	unsigned int  initDone:1;
+-	ushort signmaplen;
++	unsigned short signmaplen;
+ 	};
+ 
+ int
diff --git a/packages/vim/build.sh b/packages/vim/build.sh
index 07dc893e..e65cfaeb 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 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README
-TERMUX_PKG_VERSION=8.0.0104
+TERMUX_PKG_VERSION=8.0.0124
 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-auto-configure.patch b/packages/vim/src-auto-configure.patch
new file mode 100644
index 00000000..58b613ce
--- /dev/null
+++ b/packages/vim/src-auto-configure.patch
@@ -0,0 +1,14 @@
+Submitted upstream at https://github.com/vim/vim/pull/1314
+
+diff -u -r ../vim-8.0.0104/src/auto/configure ./src/auto/configure
+--- ../vim-8.0.0104/src/auto/configure	2016-11-26 11:45:53.000000000 -0500
++++ ./src/auto/configure	2016-12-07 21:36:01.937616265 -0500
+@@ -7411,7 +7411,7 @@
+ 	/* Check bitfields */
+ 	struct nbbuf {
+ 	unsigned int  initDone:1;
+-	ushort signmaplen;
++	unsigned short signmaplen;
+ 	};
+ 
+ int
-- 
2.11.0