From 327e8823306c12438e008d92a89566b29f19a36c Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 9 Dec 2016 21:13:35 -0500 Subject: [PATCH] vim: Update, remove local patch accepted upstream https://github.com/vim/vim/commit/63de19e805a7df2b52ec0e705b6a668ecd8e1b64 --- 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, 2 insertions(+), 30 deletions(-) delete mode 100644 packages/vim-python/src-auto-configure.patch delete mode 100644 packages/vim/src-auto-configure.patch diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh index 5ecc5d6f..9a4f6fb4 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.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" diff --git a/packages/vim-python/src-auto-configure.patch b/packages/vim-python/src-auto-configure.patch deleted file mode 100644 index 58b613ce..00000000 --- a/packages/vim-python/src-auto-configure.patch +++ /dev/null @@ -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 diff --git a/packages/vim/build.sh b/packages/vim/build.sh index e65cfaeb..ca4b85c3 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.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" diff --git a/packages/vim/src-auto-configure.patch b/packages/vim/src-auto-configure.patch deleted file mode 100644 index 58b613ce..00000000 --- a/packages/vim/src-auto-configure.patch +++ /dev/null @@ -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 -- 2.11.0