diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh index cd5620e48..43463f3c2 100644 --- a/packages/neovim/build.sh +++ b/packages/neovim/build.sh @@ -1,13 +1,14 @@ TERMUX_PKG_HOMEPAGE=https://neovim.io/ TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)" -_COMMIT=a062cd4ce58ba9aca6fdce443b014c9c0949ecde -TERMUX_PKG_VERSION=0.2.0.201701162318 +_COMMIT=25427ae892ccbb537a718c8abfbd4c79d9f94091 +TERMUX_PKG_VERSION=0.2.0.201701251425 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil" TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT" TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DENABLE_JEMALLOC=OFF -DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit" +TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim" termux_step_host_build () { termux_setup_cmake @@ -23,10 +24,6 @@ termux_step_host_build () { rm -Rf build/ } -termux_step_pre_configure () { - TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG" -} - termux_step_post_make_install () { local _CONFIG_DIR=$TERMUX_PREFIX/share/nvim mkdir -p $_CONFIG_DIR diff --git a/packages/neovim/runtime-autoload-provider-clipboard.vim.patch b/packages/neovim/runtime-autoload-provider-clipboard.vim.patch index e234ae2b6..f451651d1 100644 --- a/packages/neovim/runtime-autoload-provider-clipboard.vim.patch +++ b/packages/neovim/runtime-autoload-provider-clipboard.vim.patch @@ -1,10 +1,10 @@ -diff -u -r ../neovim-a062cd4ce58ba9aca6fdce443b014c9c0949ecde/runtime/autoload/provider/clipboard.vim ./runtime/autoload/provider/clipboard.vim ---- ../neovim-a062cd4ce58ba9aca6fdce443b014c9c0949ecde/runtime/autoload/provider/clipboard.vim 2017-01-16 23:18:19.000000000 +0100 -+++ ./runtime/autoload/provider/clipboard.vim 2017-01-17 10:14:57.997439109 +0100 -@@ -78,6 +78,12 @@ +diff -u -r ../neovim-25427ae892ccbb537a718c8abfbd4c79d9f94091/runtime/autoload/provider/clipboard.vim ./runtime/autoload/provider/clipboard.vim +--- ../neovim-25427ae892ccbb537a718c8abfbd4c79d9f94091/runtime/autoload/provider/clipboard.vim 2017-01-24 14:25:50.000000000 +0100 ++++ ./runtime/autoload/provider/clipboard.vim 2017-01-25 16:08:31.967989258 +0100 +@@ -84,6 +84,12 @@ let s:copy['*'] = s:copy['+'] let s:paste['*'] = s:paste['+'] - return 'doitclient' + return 'win32yank' + elseif executable('termux-clipboard-set') + let s:copy['+'] = 'termux-clipboard-set' + let s:paste['+'] = 'termux-clipboard-get' @@ -12,5 +12,5 @@ diff -u -r ../neovim-a062cd4ce58ba9aca6fdce443b014c9c0949ecde/runtime/autoload/p + let s:paste['*'] = s:paste['+'] + return 'termux-clipboard' endif - + let s:err = 'clipboard: No clipboard tool available. See :help clipboard'