mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2026-01-05 02:21:12 +00:00
apply changes requested by @licy183
This commit is contained in:
termux-pacman-bot
@@ -6,6 +6,7 @@ TERMUX_PKG_MAINTAINER="Aditya Alok <alok@termux.org>"
|
||||
# "0.8.0-dev-698-g1ef84547a" < "0.8.0-dev-nightly-10-g1a07044c1", we need to bump
|
||||
# the epoch of the package version.
|
||||
TERMUX_PKG_VERSION="1:0.9.0-dev-25-g759259e8a"
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL="https://github.com/neovim/neovim/archive/nightly.tar.gz"
|
||||
TERMUX_PKG_SHA256=7329f3c12f8c4657d7f623bc49cbcb7458d1a7765924e7acd3c963c01b397f31
|
||||
TERMUX_PKG_DEPENDS="libiconv, libuv, luv, libmsgpack, libandroid-support, libvterm, libtermkey, libluajit, libunibilium, libtreesitter"
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
From 440568c208908115a2c64f816b28639b4139c695 Mon Sep 17 00:00:00 2001
|
||||
From: Chongyun Lee <45286352+licy183@users.noreply.github.com>
|
||||
Date: Fri, 30 Sep 2022 17:11:11 +0800
|
||||
Subject: [PATCH] Revert "build(deps): require libvterm version 0.3"
|
||||
|
||||
As for now, we maintain two packages `neovim` and `neovim-nightly`.
|
||||
The former needs `libvterm-0.1.3` but the latter needs `libvterm-0.3`.
|
||||
In commit 6917a2e569e9f7306a9858f1aeeb32dd1c3ece4e, `neovim-nightly`
|
||||
dropped the support for `libvterm-0.1.3`, which will break the building.
|
||||
|
||||
This reverts commit 6917a2e569e9f7306a9858f1aeeb32dd1c3ece4e.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/nvim/terminal.c | 4 ++++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 76526d6cc..034c349c9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -502,7 +502,7 @@ if(FEAT_TUI)
|
||||
include_directories(SYSTEM ${LIBTERMKEY_INCLUDE_DIRS})
|
||||
endif()
|
||||
|
||||
-find_package(LIBVTERM 0.3 REQUIRED)
|
||||
+find_package(LIBVTERM 0.1 REQUIRED)
|
||||
include_directories(SYSTEM ${LIBVTERM_INCLUDE_DIRS})
|
||||
|
||||
option(CLANG_ASAN_UBSAN "Enable Clang address & undefined behavior sanitizer for nvim binary." OFF)
|
||||
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
|
||||
index c52586fea..8ec51438f 100644
|
||||
--- a/src/nvim/terminal.c
|
||||
+++ b/src/nvim/terminal.c
|
||||
@@ -908,6 +908,7 @@ static int term_settermprop(VTermProp prop, VTermValue *val, void *data)
|
||||
|
||||
case VTERM_PROP_TITLE: {
|
||||
buf_T *buf = handle_get_buffer(term->buf_handle);
|
||||
+#if VTERM_VERSION_MAJOR > 0 || (VTERM_VERSION_MAJOR == 0 && VTERM_VERSION_MINOR >= 2)
|
||||
VTermStringFragment frag = val->string;
|
||||
|
||||
if (frag.initial && frag.final) {
|
||||
@@ -932,6 +933,9 @@ static int term_settermprop(VTermProp prop, VTermValue *val, void *data)
|
||||
xfree(term->title);
|
||||
term->title = NULL;
|
||||
}
|
||||
+#else
|
||||
+ buf_set_term_title(buf, val->string, strlen(val->string));
|
||||
+#endif
|
||||
break;
|
||||
}
|
||||
|
||||
--
|
||||
2.37.3
|
||||
@@ -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
|
||||
@@ -42,10 +40,10 @@ termux_step_host_build() {
|
||||
|
||||
mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
|
||||
cd $TERMUX_PKG_HOSTBUILD_DIR/deps
|
||||
cmake $TERMUX_PKG_SRCDIR/third-party
|
||||
cmake $TERMUX_PKG_SRCDIR/cmake.deps
|
||||
|
||||
make -j 1 ||
|
||||
(_patch_luv $TERMUX_PKG_HOSTBUILD_DIR/deps && make -j 1)
|
||||
make -j 1 \
|
||||
|| (_patch_luv $TERMUX_PKG_HOSTBUILD_DIR/deps && make -j 1)
|
||||
|
||||
cd $TERMUX_PKG_SRCDIR
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
11
packages/neovim/runtime-lua-man.lua.patch
Normal file
11
packages/neovim/runtime-lua-man.lua.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/runtime/lua/man.lua
|
||||
+++ b/runtime/lua/man.lua
|
||||
@@ -438,7 +438,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.
|
||||
- local cmd = { 'env', 'MANPAGER=cat', 'MANWIDTH=' .. manwidth, 'MAN_KEEP_FORMATTING=1', 'man' }
|
||||
+ local cmd = { 'env', 'MANPAGER=cat', 'MANWIDTH=' .. manwidth, 'MAN_KEEP_FORMATTING=1', 'mandoc' }
|
||||
if localfile_arg then
|
||||
cmd[#cmd + 1] = '-l'
|
||||
end
|
||||
@@ -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/",
|
||||
|
||||
Reference in New Issue
Block a user