termux_step_post_make_install () {
perl -p -i -e "s|\"/bin/|\"$TERMUX_PREFIX/bin/|" $TERMUX_PREFIX/bin/{libtool,libtoolize}
- perl -p -i -e "s|${_SPECSFLAG}||g" $TERMUX_PREFIX/bin/{libtool,libtoolize}
}
TERMUX_PKG_HOMEPAGE=https://neovim.io/
TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
-_COMMIT=c5f4b92ff93a40ec4e77b78d0576903e7a60eefd
-TERMUX_PKG_VERSION=0.2.0.201701012112
+_COMMIT=a062cd4ce58ba9aca6fdce443b014c9c0949ecde
+TERMUX_PKG_VERSION=0.2.0.201701162318
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"
-diff -u -r ../neovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd/runtime/autoload/man.vim ./runtime/autoload/man.vim
---- ../neovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd/runtime/autoload/man.vim 2017-01-01 15:12:33.000000000 -0500
-+++ ./runtime/autoload/man.vim 2017-01-01 18:56:40.067529143 -0500
-@@ -116,7 +116,7 @@
+diff -u -r ../neovim-a062cd4ce58ba9aca6fdce443b014c9c0949ecde/runtime/autoload/man.vim ./runtime/autoload/man.vim
+--- ../neovim-a062cd4ce58ba9aca6fdce443b014c9c0949ecde/runtime/autoload/man.vim 2017-01-16 23:18:19.000000000 +0100
++++ ./runtime/autoload/man.vim 2017-01-17 15:48:11.420879618 +0100
+@@ -117,7 +117,7 @@
+ let manwidth = empty($MANWIDTH) ? winwidth(0) : $MANWIDTH
" Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db).
" http://comments.gmane.org/gmane.editors.vim.devel/29085
- " Respect $MANWIDTH, or default to window width.
-- return s:system(['env', 'MANPAGER=cat', (empty($MANWIDTH) ? 'MANWIDTH='.winwidth(0) : ''), 'man', a:path])
-+ return s:system(['env', 'MANPAGER=cat', (empty($MANWIDTH) ? 'MANWIDTH='.winwidth(0) : ''), 'mandoc', a:path])
+- return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man', a:path])
++ return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'mandoc', a:path])
endfunction
function! s:put_page(page) abort
+@@ -156,7 +156,9 @@
+
+ function! s:get_path(sect, name) abort
+ if empty(a:sect)
+- return s:system(['man', s:man_find_arg, a:name])
++ " Take the first one if multiple lines returned, such as when
++ " both man1p/test.1p and man1/test.1 exists.
++ return split(s:system(['man', s:man_find_arg, a:name]), "\n")[0] . "\n"
+ endif
+ " '-s' flag handles:
+ " - tokens like 'printf(echo)'
-diff -u -r ../neovim-01f1028496bd1a402ad1b11c311291ec96335b70/runtime/autoload/provider/clipboard.vim ./runtime/autoload/provider/clipboard.vim
---- ../neovim-01f1028496bd1a402ad1b11c311291ec96335b70/runtime/autoload/provider/clipboard.vim 2016-11-04 14:04:54.419734130 -0500
-+++ ./runtime/autoload/provider/clipboard.vim 2016-11-04 14:07:45.039751132 -0500
-@@ -45,6 +45,12 @@
+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 @@
+ let s:copy['*'] = s:copy['+']
let s:paste['*'] = s:paste['+']
- let s:cache_enabled = 0
- return 'pbcopy'
+ return 'doitclient'
+ elseif executable('termux-clipboard-set')
+ let s:copy['+'] = 'termux-clipboard-set'
+ let s:paste['+'] = 'termux-clipboard-get'
+ let s:copy['*'] = s:copy['+']
+ let s:paste['*'] = s:paste['+']
+ return 'termux-clipboard'
- elseif exists('$DISPLAY') && executable('xsel')
- let s:copy['+'] = 'xsel --nodetach -i -b'
- let s:paste['+'] = 'xsel -o -b'
+ endif
+
+ let s:err = 'clipboard: No clipboard tool available. See :help clipboard'
perl -p -i -e 's/^.*CONFIG\["MKDIR_P"\].*$/ CONFIG["MKDIR_P"] = "mkdir -p"/' $RBCONFIG
perl -p -i -e 's/^.*CONFIG\["EGREP"\].*$/ CONFIG["EGREP"] = "grep -E"/' $RBCONFIG
perl -p -i -e 's/^.*CONFIG\["GREP"\].*$/ CONFIG["GREP"] = "grep"/' $RBCONFIG
-
- # Fix mention of $_SPECSFLAG in rbconfig:
- perl -p -i -e "s|${_SPECSFLAG}||g" $RBCONFIG
}
termux_step_post_massage () {