From 9a498b63cb2883e19abd9fc87fb0e7868a695b03 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 4 Jan 2016 21:08:49 -0500 Subject: [PATCH] vim: Update to latest patch --- packages/vim-python/build.sh | 2 +- packages/vim-python/os_unix.h.patch | 20 ++++++++++---------- packages/vim/build.sh | 2 +- packages/vim/os_unix.h.patch | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh index 61be5d78..a8f4b681 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.979 +TERMUX_PKG_VERSION=7.4.1049 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/os_unix.h.patch b/packages/vim-python/os_unix.h.patch index a8b95184..e0576a7b 100644 --- a/packages/vim-python/os_unix.h.patch +++ b/packages/vim-python/os_unix.h.patch @@ -1,12 +1,12 @@ -diff -u -r ../cache/vim-hg/src/os_unix.h ./src/os_unix.h ---- ../cache/vim-hg/src/os_unix.h 2014-12-29 03:45:05.856110254 -0500 -+++ ./src/os_unix.h 2015-01-01 15:57:52.364319949 -0500 -@@ -399,7 +399,7 @@ - # ifdef VMS - # define DFLT_DIR "./,sys$login:,tmp:" - # else --# define DFLT_DIR ".,~/tmp,/var/tmp,/tmp" /* default for 'directory' */ -+# define DFLT_DIR ".,~/tmp,@TERMUX_PREFIX@/var/tmp,@TERMUX_PREFIX@/tmp" /* default for 'directory' */ - # endif +diff -u -r ../vim-7.4.1049/src/os_unix.h ./src/os_unix.h +--- ../vim-7.4.1049/src/os_unix.h 2016-01-04 06:45:29.000000000 -0500 ++++ ./src/os_unix.h 2016-01-04 11:23:21.698790120 -0500 +@@ -368,7 +368,7 @@ + # ifdef VMS + # define DFLT_DIR "./,sys$login:,tmp:" + # else +-# define DFLT_DIR ".,~/tmp,/var/tmp,/tmp" /* default for 'directory' */ ++# define DFLT_DIR ".,~/tmp,@TERMUX_PREFIX@/var/tmp,@TERMUX_PREFIX@/tmp" /* default for 'directory' */ # endif #endif + diff --git a/packages/vim/build.sh b/packages/vim/build.sh index 7216985f..803f4853 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.979 +TERMUX_PKG_VERSION=7.4.1049 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/os_unix.h.patch b/packages/vim/os_unix.h.patch index a8b95184..e0576a7b 100644 --- a/packages/vim/os_unix.h.patch +++ b/packages/vim/os_unix.h.patch @@ -1,12 +1,12 @@ -diff -u -r ../cache/vim-hg/src/os_unix.h ./src/os_unix.h ---- ../cache/vim-hg/src/os_unix.h 2014-12-29 03:45:05.856110254 -0500 -+++ ./src/os_unix.h 2015-01-01 15:57:52.364319949 -0500 -@@ -399,7 +399,7 @@ - # ifdef VMS - # define DFLT_DIR "./,sys$login:,tmp:" - # else --# define DFLT_DIR ".,~/tmp,/var/tmp,/tmp" /* default for 'directory' */ -+# define DFLT_DIR ".,~/tmp,@TERMUX_PREFIX@/var/tmp,@TERMUX_PREFIX@/tmp" /* default for 'directory' */ - # endif +diff -u -r ../vim-7.4.1049/src/os_unix.h ./src/os_unix.h +--- ../vim-7.4.1049/src/os_unix.h 2016-01-04 06:45:29.000000000 -0500 ++++ ./src/os_unix.h 2016-01-04 11:23:21.698790120 -0500 +@@ -368,7 +368,7 @@ + # ifdef VMS + # define DFLT_DIR "./,sys$login:,tmp:" + # else +-# define DFLT_DIR ".,~/tmp,/var/tmp,/tmp" /* default for 'directory' */ ++# define DFLT_DIR ".,~/tmp,@TERMUX_PREFIX@/var/tmp,@TERMUX_PREFIX@/tmp" /* default for 'directory' */ # endif #endif + -- 2.11.0