From f3462325952e1fd445eebcefb687de9555f1a7bd Mon Sep 17 00:00:00 2001
From: Yaksh Bariya <yakshbari4@gmail.com>
Date: Thu, 6 Oct 2022 07:23:40 +0530
Subject: [PATCH] apply changes requested by @licy183

---
 .../neovim-nightly/revert-libvterm-0.3.patch  | 53 -------------------
 packages/neovim/build.sh                      |  7 +++
 packages/neovim/runtime-lua-man.lua.patch     | 11 ++++
 3 files changed, 18 insertions(+), 53 deletions(-)
 delete mode 100644 packages/neovim-nightly/revert-libvterm-0.3.patch
 create mode 100644 packages/neovim/runtime-lua-man.lua.patch

diff --git a/packages/neovim-nightly/revert-libvterm-0.3.patch b/packages/neovim-nightly/revert-libvterm-0.3.patch
deleted file mode 100644
index 158fc995ea..0000000000
--- a/packages/neovim-nightly/revert-libvterm-0.3.patch
+++ /dev/null
@@ -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
diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 12775aa89c..f9d523d5c5 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -38,6 +38,13 @@ 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/cmake.deps
+
+	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 ||
diff --git a/packages/neovim/runtime-lua-man.lua.patch b/packages/neovim/runtime-lua-man.lua.patch
new file mode 100644
index 0000000000..7d07f81c37
--- /dev/null
+++ b/packages/neovim/runtime-lua-man.lua.patch
@@ -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