vim: Update from 8.0.1850 to 8.1.0050

This commit is contained in:
Fredrik Fornwall 2018-06-13 01:10:51 +02:00
parent f00ccbaa3a
commit 0d4e7d81e0
3 changed files with 19 additions and 19 deletions

View File

@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="Vi IMproved - enhanced vi editor"
TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python" TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python"
# vim should only be updated every 50 releases on multiples of 50. # 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. # Update both vim and vim-python to the same version in one PR.
TERMUX_PKG_VERSION=8.0.1850 TERMUX_PKG_VERSION=8.1.0050
TERMUX_PKG_SHA256=0d10ee1c45bc52897cd6abf15accd97688487f0d8b20155f4a6430f299d20a32 TERMUX_PKG_SHA256=1b2081a19347ec13703facd1f662e5f2c58d870a217bf3f8d34f8b777bab984b
TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
vim_cv_getcwd_broken=no vim_cv_getcwd_broken=no
@ -27,9 +27,9 @@ bin/rvim
bin/ex bin/ex
share/man/man1/evim.1 share/man/man1/evim.1
share/icons share/icons
share/vim/vim80/spell/en.ascii* share/vim/vim81/spell/en.ascii*
share/vim/vim80/print share/vim/vim81/print
share/vim/vim80/tools share/vim/vim81/tools
" "
TERMUX_PKG_CONFFILES="share/vim/vimrc" TERMUX_PKG_CONFFILES="share/vim/vimrc"
@ -42,8 +42,8 @@ vi_cv_var_python3_version=3.6
--with-python3-config-dir=$TERMUX_PREFIX/lib/python3.6/config-3.6m/ --with-python3-config-dir=$TERMUX_PREFIX/lib/python3.6/config-3.6m/
" "
TERMUX_PKG_DESCRIPTION+=" - with python support" TERMUX_PKG_DESCRIPTION+=" - with python support"
# Remove share/vim/vim80 which is in vim-runtime built as a subpackage of vim: # Remove share/vim/vim81 which is in vim-runtime built as a subpackage of vim:
TERMUX_PKG_RM_AFTER_INSTALL+=" share/vim/vim80" TERMUX_PKG_RM_AFTER_INSTALL+=" share/vim/vim81"
termux_step_pre_configure() { termux_step_pre_configure() {
CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.6m" CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.6m"
} }
@ -60,9 +60,9 @@ termux_step_post_make_install () {
cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc
# Remove most tutor files: # Remove most tutor files:
cp $TERMUX_PREFIX/share/vim/vim80/tutor/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PKG_TMPDIR/ cp $TERMUX_PREFIX/share/vim/vim81/tutor/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PKG_TMPDIR/
rm -f $TERMUX_PREFIX/share/vim/vim80/tutor/* rm -f $TERMUX_PREFIX/share/vim/vim81/tutor/*
cp $TERMUX_PKG_TMPDIR/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PREFIX/share/vim/vim80/tutor/ cp $TERMUX_PKG_TMPDIR/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PREFIX/share/vim/vim81/tutor/
cd $TERMUX_PREFIX/bin cd $TERMUX_PREFIX/bin
ln -f -s vim vi ln -f -s vim vi

View File

@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="Vi IMproved - enhanced vi editor"
TERMUX_PKG_DEPENDS="ncurses, vim-runtime" TERMUX_PKG_DEPENDS="ncurses, vim-runtime"
# vim should only be updated every 50 releases on multiples of 50. # 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. # Update both vim and vim-python to the same version in one PR.
TERMUX_PKG_VERSION=8.0.1850 TERMUX_PKG_VERSION=8.1.0050
TERMUX_PKG_SHA256=0d10ee1c45bc52897cd6abf15accd97688487f0d8b20155f4a6430f299d20a32 TERMUX_PKG_SHA256=1b2081a19347ec13703facd1f662e5f2c58d870a217bf3f8d34f8b777bab984b
TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
vim_cv_getcwd_broken=no vim_cv_getcwd_broken=no
@ -27,9 +27,9 @@ bin/rvim
bin/ex bin/ex
share/man/man1/evim.1 share/man/man1/evim.1
share/icons share/icons
share/vim/vim80/spell/en.ascii* share/vim/vim81/spell/en.ascii*
share/vim/vim80/print share/vim/vim81/print
share/vim/vim80/tools share/vim/vim81/tools
" "
TERMUX_PKG_CONFFILES="share/vim/vimrc" TERMUX_PKG_CONFFILES="share/vim/vimrc"
@ -47,9 +47,9 @@ termux_step_post_make_install () {
cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc
# Remove most tutor files: # Remove most tutor files:
cp $TERMUX_PREFIX/share/vim/vim80/tutor/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PKG_TMPDIR/ cp $TERMUX_PREFIX/share/vim/vim81/tutor/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PKG_TMPDIR/
rm -f $TERMUX_PREFIX/share/vim/vim80/tutor/* rm -f $TERMUX_PREFIX/share/vim/vim81/tutor/*
cp $TERMUX_PKG_TMPDIR/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PREFIX/share/vim/vim80/tutor/ cp $TERMUX_PKG_TMPDIR/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PREFIX/share/vim/vim81/tutor/
cd $TERMUX_PREFIX/bin cd $TERMUX_PREFIX/bin
ln -f -s vim vi ln -f -s vim vi

View File

@ -1,3 +1,3 @@
TERMUX_SUBPKG_INCLUDE="share/vim/vim80" TERMUX_SUBPKG_INCLUDE="share/vim/vim81"
TERMUX_SUBPKG_DESCRIPTION="Vi IMproved - Runtime files" TERMUX_SUBPKG_DESCRIPTION="Vi IMproved - Runtime files"
TERMUX_SUBPKG_PLATFORM_INDEPENDENT=yes TERMUX_SUBPKG_PLATFORM_INDEPENDENT=yes