X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c36f01b8e59807c16c8d25454ea9aa120585b1f8..7111d4980628a76f7ced29ec5903f6e86636ae6d:/packages/vim-python/build.sh

diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index dd5cd27a..1232fcb0 100755
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -1,24 +1,49 @@
-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.0304
+# 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.1750
+TERMUX_PKG_SHA256=b28981dcba775fd28ef01516b8bb35dd880f9db3b530a6ec620d45a61af40e31
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=105c777bc69fd054fa2f99afefd1915d3724f8ec766cffe1f589ccfcc67a088c
-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"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no vim_cv_memmove_handles_overlap=yes"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-tlib=ncursesw --enable-multibyte --without-x --enable-gui=no --disable-darwin --with-features=huge"
+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_tgetent=zero
+vim_cv_toupper_broken=no
+vim_cv_tty_group=world
+--enable-gui=no
+--enable-multibyte
+--with-features=huge
+--without-x
+--with-tlib=ncursesw
+"
 TERMUX_PKG_BUILD_IN_SRC="yes"
-TERMUX_PKG_RM_AFTER_INSTALL='bin/rview bin/rvim bin/ex share/man/man1/evim.1 share/icons share/vim/vim80/spell/en.ascii* share/vim/vim80/print share/vim/vim80/tools'
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/rview
+bin/rvim
+bin/ex
+share/man/man1/evim.1
+share/icons
+share/vim/vim80/spell/en.ascii*
+share/vim/vim80/print
+share/vim/vim80/tools
+"
 TERMUX_PKG_CONFFILES="share/vim/vimrc"
 
 # vim-python:
 TERMUX_PKG_CONFLICTS="vim"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-python3interp  --with-python3-config-dir=$TERMUX_PREFIX/lib/python3.6/config-3.6m/"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vi_cv_path_python3_pfx=$TERMUX_PREFIX vi_cv_var_python3_version=3.6"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
+vi_cv_path_python3_pfx=$TERMUX_PREFIX
+vi_cv_var_python3_version=3.6
+--enable-python3interp
+--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"
 }