neovim: Update to latest git master

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 182e2ddb965be8d7e5694f4e35b55432794d1eba..5cf06938652d455b86a59659ceefbd33b75fb07f 100644 (file)
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,10 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"

-local _COMMIT=34c3f03013375817d3d089e685793290eded553a
-TERMUX_PKG_VERSION=0.2.1~20170504
+local _COMMIT=1b2acb8d958c1c8e2f382c2de9c98586801fd9fe
+TERMUX_PKG_VERSION=0.2.1~20170603

 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip

-TERMUX_PKG_SHA256=ea281cf88fba41de3ebf41ecb8974ef1c589a210710c02731d8a841327b672c6
-TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
+TERMUX_PKG_SHA256=a66f9fbd2d39863d8a4ed8b621e8ba3fce5b9c9f44630c226b9070cf18dc09bc
+TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil, liblua"

 TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="


@@ -15,6 +15,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit
 -DPKG_CONFIG_EXECUTABLE=`which pkg-config`
 -DXGETTEXT_PRG=`which xgettext`
 -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit
 -DPKG_CONFIG_EXECUTABLE=`which pkg-config`
 -DXGETTEXT_PRG=`which xgettext`

+-DPREFER_LUA=ON
+-DLUA_INCLUDE_DIR=$TERMUX_PREFIX/include

 "
 TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"
 
 "
 TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"
 


@@ -24,10 +26,10 @@ termux_step_host_build () {
        mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
        cd $TERMUX_PKG_HOSTBUILD_DIR/deps
        cmake $TERMUX_PKG_SRCDIR/third-party
        mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
        cd $TERMUX_PKG_HOSTBUILD_DIR/deps
        cmake $TERMUX_PKG_SRCDIR/third-party

-       make
+       make -j 1

 
        cd $TERMUX_PKG_SRCDIR
 
        cd $TERMUX_PKG_SRCDIR

-       make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH=$TERMUX_PKG_HOSTBUILD_DIR" install
+       make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$TERMUX_PKG_HOSTBUILD_DIR" install

        make distclean
        rm -Rf build/
 }
        make distclean
        rm -Rf build/
 }

diff --git a/packages/neovim/runtime-autoload-man.vim.patch b/packages/neovim/runtime-autoload-man.vim.patch
index b72e1231e520ef63e4414887c89df8fd44e6de3e..e61772db6e98cb88698c0e5cff65c356c43d03b8 100644 (file)
--- a/packages/neovim/runtime-autoload-man.vim.patch
+++ b/packages/neovim/runtime-autoload-man.vim.patch
@@ -1,23 +1,23 @@
-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 @@
+diff -u -r ../neovim-1b2acb8d958c1c8e2f382c2de9c98586801fd9fe/runtime/autoload/man.vim ./runtime/autoload/man.vim
+--- ../neovim-1b2acb8d958c1c8e2f382c2de9c98586801fd9fe/runtime/autoload/man.vim        2017-06-03 21:00:05.000000000 +0200
++++ ./runtime/autoload/man.vim 2017-06-05 01:15:56.254306768 +0200
+@@ -148,7 +148,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
    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

--  return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man', a:path])
-+  return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'mandoc', a:path])
+-  let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man']
++  let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'mandoc']
+   return s:system(cmd + (s:localfile_arg ? ['-l', a:path] : [a:path]))

  endfunction
  
  endfunction
  

- function! s:put_page(page) abort
-@@ -156,7 +156,9 @@
+@@ -213,7 +213,9 @@

  
  function! s:get_path(sect, name) abort
    if empty(a:sect)
  
  function! s:get_path(sect, name) abort
    if empty(a:sect)

--    return s:system(['man', s:man_find_arg, a:name])
+-    return s:system(['man', s:find_arg, a:name])

 +    " Take the first one if multiple lines returned, such as when
 +    " both man1p/test.1p and man1/test.1 exists.
 +    " 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"
++    return split(s:system(['man', s:find_arg, a:name]), "\n")[0] . "\n"

    endif
    " '-s' flag handles:
    "   - tokens like 'printf(echo)'
    endif
    " '-s' flag handles:
    "   - tokens like 'printf(echo)'