vim: Update from 8.0.0675 to 8.0.0704

Also tidy up formatting a bit.
This commit is contained in:
Fredrik Fornwall 2017-07-09 20:41:25 +02:00
parent 2ec126810c
commit 657776d94c
2 changed files with 58 additions and 14 deletions

View File

@ -3,21 +3,45 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/
TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python" TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python"
# Vim 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README # Vim 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README
TERMUX_PKG_VERSION=8.0.0675 TERMUX_PKG_VERSION=8.0.0704
TERMUX_PKG_SHA256=96f21a36541ee8d03c87594c84789b82d1a2c7b42639b6ce79f505871ff72f21 TERMUX_PKG_SHA256=6f0fd9603ff329b334698e50228fed9f8356f2cca1ced013251fe51264c9c398
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_FOLDERNAME=vim-${TERMUX_PKG_VERSION} TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_tgent=zero vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no vim_cv_memmove_handles_overlap=yes" vim_cv_getcwd_broken=no
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-tlib=ncursesw --enable-multibyte --without-x --enable-gui=no --disable-darwin --with-features=huge" vim_cv_memmove_handles_overlap=yes
vim_cv_stat_ignores_slash=no
vim_cv_terminfo=yes
vim_cv_tgent=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_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" TERMUX_PKG_CONFFILES="share/vim/vimrc"
# vim-python: # vim-python:
TERMUX_PKG_CONFLICTS="vim" 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+="
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vi_cv_path_python3_pfx=$TERMUX_PREFIX vi_cv_var_python3_version=3.6" 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" TERMUX_PKG_DESCRIPTION+=" - with python support"
termux_step_pre_configure() { termux_step_pre_configure() {
CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.6m" CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.6m"

View File

@ -3,15 +3,35 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/
TERMUX_PKG_DEPENDS="ncurses, vim-runtime" TERMUX_PKG_DEPENDS="ncurses, vim-runtime"
# Vim 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README # Vim 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README
TERMUX_PKG_VERSION=8.0.0675 TERMUX_PKG_VERSION=8.0.0704
TERMUX_PKG_SHA256=96f21a36541ee8d03c87594c84789b82d1a2c7b42639b6ce79f505871ff72f21 TERMUX_PKG_SHA256=6f0fd9603ff329b334698e50228fed9f8356f2cca1ced013251fe51264c9c398
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_FOLDERNAME=vim-${TERMUX_PKG_VERSION} TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_tgent=zero vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no vim_cv_memmove_handles_overlap=yes" vim_cv_getcwd_broken=no
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-tlib=ncursesw --enable-multibyte --without-x --enable-gui=no --disable-darwin --with-features=huge" vim_cv_memmove_handles_overlap=yes
vim_cv_stat_ignores_slash=no
vim_cv_terminfo=yes
vim_cv_tgent=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_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" TERMUX_PKG_CONFFILES="share/vim/vimrc"
TERMUX_PKG_CONFLICTS="vim-python" TERMUX_PKG_CONFLICTS="vim-python"