updpkg(main/neovim): update to 8.0.0
neovim-nightly has already been 8.0.0 for a while, and has apparently built without issues. I was not able to build it without first updating libvterm and adding lua-{lpeg,mpack} to docker image though.
This commit is contained in:
parent
22e571fe99
commit
a4f4cb4e8b
|
@ -2,19 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://neovim.io/
|
|||
TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
|
||||
TERMUX_PKG_LICENSE="Apache-2.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION="0.7.2"
|
||||
TERMUX_PKG_VERSION="0.8.0"
|
||||
TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/v${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=ccab8ca02a0c292de9ea14b39f84f90b635a69282de38a6b4ccc8565bc65d096
|
||||
TERMUX_PKG_SHA256=505e3dfb71e2f73495c737c034a416911c260c0ba9fd2092c6be296655be4d18
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter"
|
||||
TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm (>= 1:0.3-0), libtermkey, libluajit, libunibilium, libtreesitter"
|
||||
TERMUX_PKG_HOSTBUILD=true
|
||||
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
-DENABLE_JEMALLOC=OFF
|
||||
-DGETTEXT_MSGFMT_EXECUTABLE=$(command -v msgfmt)
|
||||
-DGETTEXT_MSGMERGE_EXECUTABLE=$(command -v msgmerge)
|
||||
-DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf
|
||||
-DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit
|
||||
-DPKG_CONFIG_EXECUTABLE=$(command -v pkg-config)
|
||||
-DXGETTEXT_PRG=$(command -v xgettext)
|
||||
-DLUAJIT_INCLUDE_DIR=$TERMUX_PREFIX/include/luajit-2.1
|
||||
|
@ -40,13 +38,6 @@ termux_step_host_build() {
|
|||
chmod +x "$TERMUX_ORIGINAL_CMAKE"
|
||||
export TERMUX_ORIGINAL_CMAKE="$TERMUX_ORIGINAL_CMAKE.orig"
|
||||
|
||||
mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
|
||||
cd $TERMUX_PKG_HOSTBUILD_DIR/deps
|
||||
cmake $TERMUX_PKG_SRCDIR/third-party
|
||||
|
||||
make -j 1 ||
|
||||
(_patch_luv $TERMUX_PKG_HOSTBUILD_DIR/deps && make -j 1)
|
||||
|
||||
cd $TERMUX_PKG_SRCDIR
|
||||
|
||||
make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$TERMUX_PKG_HOSTBUILD_DIR -DUSE_BUNDLED_LUAROCKS=ON" install ||
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
diff -u -r ../neovim-0851057a8deaa1197bd0af22babb62c1146d836c/runtime/autoload/man.vim ./runtime/autoload/man.vim
|
||||
--- ../neovim-0851057a8deaa1197bd0af22babb62c1146d836c/runtime/autoload/man.vim 2018-02-04 12:54:30.000000000 +0000
|
||||
+++ ./runtime/autoload/man.vim 2018-02-05 00:48:37.422608665 +0000
|
||||
@@ -149,7 +149,7 @@
|
||||
" Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db).
|
||||
" http://comments.gmane.org/gmane.editors.vim.devel/29085
|
||||
" Set MAN_KEEP_FORMATTING so Debian man doesn't discard backspaces.
|
||||
- let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'MAN_KEEP_FORMATTING=1', 'man']
|
||||
+ let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'MAN_KEEP_FORMATTING=1', 'mandoc']
|
||||
return s:system(cmd + (s:localfile_arg ? ['-l', a:path] : [a:path]))
|
||||
endfunction
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
diff -u -r ../neovim-master/src/nvim/os/stdpaths.c ./src/nvim/os/stdpaths.c
|
||||
--- ../neovim-master/src/nvim/os/stdpaths.c 2015-11-01 16:16:38.000000000 -0500
|
||||
+++ ./src/nvim/os/stdpaths.c 2015-11-02 14:12:12.770172673 -0500
|
||||
@@ -34,8 +34,8 @@
|
||||
[kXDGDataHome] = "~/.local/share",
|
||||
--- ./src/nvim/os/stdpaths.c.orig 2022-09-30 19:19:51.775645300 +0000
|
||||
+++ ./src/nvim/os/stdpaths.c 2022-09-30 19:20:49.755422449 +0000
|
||||
@@ -51,8 +51,8 @@
|
||||
[kXDGCacheHome] = "~/.cache",
|
||||
[kXDGRuntimeDir] = NULL,
|
||||
[kXDGStateHome] = "~/.local/state",
|
||||
[kXDGRuntimeDir] = NULL, // Decided by vim_mktempdir().
|
||||
- [kXDGConfigDirs] = "/etc/xdg/",
|
||||
- [kXDGDataDirs] = "/usr/local/share/:/usr/share/",
|
||||
+ [kXDGConfigDirs] = "@TERMUX_PREFIX@/etc/xdg/",
|
||||
|
|
|
@ -108,6 +108,10 @@ PACKAGES+=" lua5.3"
|
|||
# Used bt host build of package mariadb.
|
||||
PACKAGES+=" libncurses5-dev"
|
||||
|
||||
# Needed to build neovim >= 8.0.0
|
||||
PACKAGES+=" lua-lpeg"
|
||||
PACKAGES+=" lua-mpack"
|
||||
|
||||
# Needed by packages mkvtoolnix and ruby.
|
||||
PACKAGES+=" ruby"
|
||||
|
||||
|
|
Loading…
Reference in New Issue