vim: Update, remove local patch accepted upstream

63de19e805
This commit is contained in:
Fredrik Fornwall 2016-12-09 21:13:35 -05:00
parent 15f034041a
commit 327e882330
4 changed files with 2 additions and 30 deletions

@ -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.0124
TERMUX_PKG_VERSION=8.0.0130
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"

@ -1,14 +0,0 @@
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

@ -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.0124
TERMUX_PKG_VERSION=8.0.0130
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"

@ -1,14 +0,0 @@
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