X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/58f7a21c18b1948e17822d06ef1238c555dda374..295241d4043c55a41259b4846464e1668b2f6a5f:/packages/neovim/build.sh

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 2cadfd27..182e2ddb 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,15 +1,26 @@
 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
+local _COMMIT=34c3f03013375817d3d089e685793290eded553a
+TERMUX_PKG_VERSION=0.2.1~20170504
 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_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_EXTRA_CONFIGURE_ARGS="
+-DENABLE_JEMALLOC=OFF
+-DGETTEXT_MSGFMT_EXECUTABLE=`which msgfmt`
+-DGETTEXT_MSGMERGE_EXECUTABLE=`which msgmerge`
+-DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf
+-DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit
+-DPKG_CONFIG_EXECUTABLE=`which pkg-config`
+-DXGETTEXT_PRG=`which xgettext`
+"
+TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"
 
 termux_step_host_build () {
+	termux_setup_cmake
+
 	mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
 	cd $TERMUX_PKG_HOSTBUILD_DIR/deps
 	cmake $TERMUX_PKG_SRCDIR/third-party
@@ -21,10 +32,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