From 16351779da18d96a2117adb2de56dacf61b09fac Mon Sep 17 00:00:00 2001
From: Aditya Alok <dev.aditya.alok@gmail.com>
Date: Thu, 31 Mar 2022 14:51:34 +0530
Subject: [PATCH] feat(helix): enable auto-update and update to 23.03

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
---
 packages/helix/build.sh                      | 16 +++++++-------
 packages/helix/libc++_shared-not-found.patch | 11 ++++++++++
 packages/helix/shared-lib.patch              | 23 --------------------
 3 files changed, 19 insertions(+), 31 deletions(-)
 create mode 100644 packages/helix/libc++_shared-not-found.patch
 delete mode 100644 packages/helix/shared-lib.patch

diff --git a/packages/helix/build.sh b/packages/helix/build.sh
index 2666ed267..67c35a489 100644
--- a/packages/helix/build.sh
+++ b/packages/helix/build.sh
@@ -1,17 +1,16 @@
 TERMUX_PKG_HOMEPAGE="https://helix-editor.com/"
 TERMUX_PKG_DESCRIPTION="A post-modern modal text editor written in rust"
 TERMUX_PKG_LICENSE="MPL-2.0"
-TERMUX_PKG_MAINTAINER="MrAdityaAlok <dev.aditya.alok@gmail.com>"
-TERMUX_PKG_VERSION=0.6.0
+TERMUX_PKG_MAINTAINER="Aditya Alok <dev.aditya.alok@gmail.com>"
+TERMUX_PKG_VERSION="22.03"
 TERMUX_PKG_SRCURL="https://github.com/helix-editor/helix.git"
-TERMUX_PKG_GIT_BRANCH="v$TERMUX_PKG_VERSION"
+TERMUX_PKG_GIT_BRANCH="$TERMUX_PKG_VERSION"
 TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_AUTO_UPDATE=true
 
 termux_step_make_install() {
 	termux_setup_rust
 
-	sed -i "s%\@TERMUX_CC\@%${CC}%g" ./helix-syntax/build.rs
-
 	cargo build --jobs "${TERMUX_MAKE_PROCESSES}" --target "${CARGO_TARGET_NAME}" --release
 
 	cat >"hx" <<-EOF
@@ -21,9 +20,10 @@ termux_step_make_install() {
 		exec ${TERMUX_PREFIX}/lib/helix/hx "\$@"
 	EOF
 	install -Dm744 ./hx "${TERMUX_PREFIX}/bin/hx"
-
 	install -Dm744 -t "${TERMUX_PREFIX}"/lib/helix target/"${CARGO_TARGET_NAME}"/release/hx
-	install -Dm644 -t "${TERMUX_PREFIX}"/lib/helix languages.toml
 
-	cp -r runtime "${TERMUX_PREFIX}/lib/helix"
+	install -Dm644 -t "${TERMUX_PREFIX}"/lib/helix/runtime ./runtime/tutor.txt
+	cp -r ./runtime/{queries,themes} "${TERMUX_PREFIX}"/lib/helix/runtime
+	find ./runtime/grammars -maxdepth 1 -type f -name "*.so" \
+		-exec install -Dm744 -t "${TERMUX_PREFIX}"/lib/helix/runtime/grammars {} \;
 }
diff --git a/packages/helix/libc++_shared-not-found.patch b/packages/helix/libc++_shared-not-found.patch
new file mode 100644
index 000000000..89d51d516
--- /dev/null
+++ b/packages/helix/libc++_shared-not-found.patch
@@ -0,0 +1,11 @@
+--- a/helix-loader/src/grammar.rs	2022-03-31 12:52:29.105571523 +0530
++++ b/helix-loader/src/grammar.rs	2022-03-31 13:06:19.215571207 +0530
+@@ -319,6 +319,8 @@
+     } else {
+         command
+             .arg("-shared")
++            .arg("-L@TERMUX_PREFIX@/lib")
++            .arg("-Wl,-rpath=@TERMUX_PREFIX@/lib")
+             .arg("-fPIC")
+             .arg("-fno-exceptions")
+             .arg("-g")
diff --git a/packages/helix/shared-lib.patch b/packages/helix/shared-lib.patch
deleted file mode 100644
index bacb6b6f2..000000000
--- a/packages/helix/shared-lib.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- helix/helix-syntax/build.rs	2021-08-19 21:14:05.097999871 +0530
-+++ helix-patch/helix-syntax/build.rs	2021-08-19 23:43:08.417999841 +0530
-@@ -67,7 +67,7 @@
-     let mut config = cc::Build::new();
-     config.cpp(true).opt_level(2).cargo_metadata(false);
-     let compiler = config.get_compiler();
--    let mut command = Command::new(compiler.path());
-+    let mut command = Command::new("@TERMUX_CC@");
-     command.current_dir(src_path);
-     for (key, value) in compiler.env() {
-         command.env(key, value);
-@@ -89,6 +89,11 @@
-     } else {
-         command
-             .arg("-shared")
-+            .arg("-L@TERMUX_PREFIX/lib")
-+            .arg("-Wl,-rpath=@TERMUX_PREFIX@/lib")
-+            .arg("-lc++")
-+            .arg("-lm")
-+            .arg("-lc++_shared")
-             .arg("-fPIC")
-             .arg("-fno-exceptions")
-             .arg("-g")