neovim: Update to build against latest master

This commit is contained in:
Fredrik Fornwall 2016-04-23 18:26:13 -04:00
parent 105ae12140
commit e275a95fbb
2 changed files with 12 additions and 11 deletions

View File

@ -1,6 +1,6 @@
TERMUX_PKG_HOMEPAGE=http://neovim.org/
TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
TERMUX_PKG_VERSION=0.0.`date "+%Y%m%d%H%M"`
TERMUX_PKG_VERSION=0.1.3.`date "+%Y%m%d%H%M"`
TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/master.zip
TERMUX_PKG_NO_SRC_CACHE=yes
TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libluajit, libvterm, libtermkey, libutil"
@ -16,7 +16,7 @@ termux_step_host_build () {
termux_step_configure () {
# Install dependencies on ubuntu:
# apt install lua-lpeg luarocks; luarocks install lpeg; luarocks install lua-MessagePack; luarocks install luabitop
# apt install lua-lpeg luarocks; luarocks install lpeg; luarocks install mpack; luarocks install luabitop
cd $TERMUX_PKG_BUILDDIR
cmake -G "Unix Makefiles" .. \
-DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \

View File

@ -1,14 +1,15 @@
--- ../neovim-master/runtime/autoload/provider/clipboard.vim 2016-02-17 20:56:48.362733600 -0600
+++ ./runtime/autoload/provider/clipboard.vim 2016-02-17 20:56:23.022486500 -0600
@@ -47,6 +47,11 @@
let s:paste['+'] = 'xclip -o -selection clipboard'
let s:copy['*'] = 'xclip -quiet -i -selection primary'
let s:paste['*'] = 'xclip -o -selection primary'
diff -u -r ../neovim-master/runtime/autoload/provider/clipboard.vim ./runtime/autoload/provider/clipboard.vim
--- ../neovim-master/runtime/autoload/provider/clipboard.vim 2016-04-23 15:32:43.000000000 -0400
+++ ./runtime/autoload/provider/clipboard.vim 2016-04-23 17:44:02.062815241 -0400
@@ -37,6 +37,11 @@
let s:copy['*'] = s:copy['+']
let s:paste['*'] = s:paste['+']
let s:cache_enabled = 0
+elseif executable('termux-clipboard-set')
+ let s:copy['+'] = 'termux-clipboard-set'
+ let s:paste['+'] = 'termux-clipboard-get'
+ let s:copy['*'] = 'termux-clipboard-set'
+ let s:paste['*'] = 'termux-clipboard-get'
else
echom 'clipboard: No clipboard tool available. See :help nvim-clipboard'
finish
elseif exists('$DISPLAY') && executable('xsel')
let s:copy['+'] = 'xsel --nodetach -i -b'
let s:paste['+'] = 'xsel -o -b'