X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e56e8b8e9d47ec1c7fd73a432e6070f6b965c771..5e9a5af58c7baf47d2ef80647bc65c5a23e3fd7f:/packages/vim-python/build.sh

diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index 74aeb638..365ee55e 100755
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -1,18 +1,17 @@
-TERMUX_PKG_DESCRIPTION="Vi IMproved - enhanced vi editor"
 TERMUX_PKG_HOMEPAGE=http://www.vim.org/
+TERMUX_PKG_DESCRIPTION="Vi IMproved - enhanced vi editor"
 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.0979
-TERMUX_PKG_SHA256=fd9bb5a1b6b653ab4950b41cb19b2ea46dbed5d4bb8367f9b5a484bf83fc2a2c
+# vim should only be updated every 50 releases on multiples of 50.
+# Update both vim and vim-python to the same version in one PR.
+TERMUX_PKG_VERSION=8.0.1600
+TERMUX_PKG_SHA256=a81b475fe8a6044a39f5333ab1e48629979e3327cfbe8124783b65a3335c6caf
 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_getcwd_broken=no
 vim_cv_memmove_handles_overlap=yes
 vim_cv_stat_ignores_slash=no
 vim_cv_terminfo=yes
-vim_cv_tgent=zero
+vim_cv_tgetent=zero
 vim_cv_toupper_broken=no
 vim_cv_tty_group=world
 --enable-gui=no
@@ -20,7 +19,6 @@ vim_cv_tty_group=world
 --with-features=huge
 --without-x
 --with-tlib=ncursesw
---enable-terminal
 "
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_RM_AFTER_INSTALL="
@@ -44,6 +42,8 @@ vi_cv_var_python3_version=3.6
 --with-python3-config-dir=$TERMUX_PREFIX/lib/python3.6/config-3.6m/
 "
 TERMUX_PKG_DESCRIPTION+=" - with python support"
+# Remove share/vim/vim80 which is in vim-runtime built as a subpackage of vim:
+TERMUX_PKG_RM_AFTER_INSTALL+=" share/vim/vim80"
 termux_step_pre_configure() {
 	CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.6m"
 }