From dc12925834e6c3fd6b1f6578b6c8f41085530690 Mon Sep 17 00:00:00 2001
From: Komo <71205197+mbekkomo@users.noreply.github.com>
Date: Fri, 1 Nov 2024 01:47:42 +0800
Subject: [PATCH] fix(main/luvi): fix incompatible bytecode error

---
 .../luvi/0001-skip-script-compiling.patch     | 28 ++++++++++++
 packages/luvi/build.sh                        | 43 ++++++++-----------
 2 files changed, 46 insertions(+), 25 deletions(-)
 create mode 100644 packages/luvi/0001-skip-script-compiling.patch

diff --git a/packages/luvi/0001-skip-script-compiling.patch b/packages/luvi/0001-skip-script-compiling.patch
new file mode 100644
index 00000000000000..bf993a16ab014d
--- /dev/null
+++ b/packages/luvi/0001-skip-script-compiling.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake/Modules/luac.lua b/cmake/Modules/luac.lua
+index 5b7747f..cc671f4 100644
+--- a/cmake/Modules/luac.lua
++++ b/cmake/Modules/luac.lua
+@@ -16,8 +16,21 @@ s
+ ]]
+ local src, gen = ...
+ 
+-local chunk = assert(loadfile(src, nil, '@'..src))
+-local bytecode = string.dump(chunk)
++local parser = require("dumbParser")
++
++local bytecode
++xpcall(function()
++   local tokens = assert(parser.tokenizeFile(src))
++   local ast = assert(parser.parse(tokens))
++   parser.minify(ast, true)
++   bytecode = assert(parser.toLua(ast))
++end, function(err)
++	 print(err)
++	 print("Skipped minifying")
++	 local f = assert(io.open(src, "r"))
++	 bytecode = f:read("*a")
++	 f:close()
++end)
+ 
+ local function basename(name)
+    return name:match("([^/\\]+)$")
diff --git a/packages/luvi/build.sh b/packages/luvi/build.sh
index c3f0342e3542d5..b75664f332952f 100644
--- a/packages/luvi/build.sh
+++ b/packages/luvi/build.sh
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://luvit.io
 TERMUX_PKG_DESCRIPTION="A project in-between luv and luvit."
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="Komo @cattokomo"
-TERMUX_PKG_VERSION=20240723
-_commit=4e92094134161601a841d2ff5c8b0759fcc743b1
+TERMUX_PKG_VERSION=20241009
+_commit=32b274bed2a291068eda6cf7a296328b86d682a9
 _version=2.14.0+g${_commit::7}
 TERMUX_PKG_GIT_BRANCH=master
 TERMUX_PKG_SRCURL=git+https://github.com/luvit/luvi.git
@@ -17,6 +17,16 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 	-DWithPCRE2=On
 	-DWithSharedPCRE2=On
 	-DWithLPEG=On
+	-DLIBLUV_INCLUDE_DIR=${TERMUX_PREFIX}/include/luv
+	-DLIBLUV_LIBRARIES=${TERMUX_PREFIX}/lib/libluv.so
+	-DLUAJIT_INCLUDE_DIR=${TERMUX_PREFIX}/include/luajit-2.1
+	-DLUAJIT_LIBRARIES=${TERMUX_PREFIX}/lib/libluajit.so
+	-DLIBUV_INCLUDE_DIR=${TERMUX_PREFIX}/include
+	-DLIBUV_LIBRARIES=${TERMUX_PREFIX}/lib/libuv.so
+	-DOPENSSL_INCLUDE_DIR=${TERMUX_PREFIX}/include
+	-DOPENSSL_LIBRARIES=${TERMUX_PREFIX}/lib
+	-DPCRE2_INCLUDE_DIR=${TERMUX_PREFIX}/include
+	-DPCRE2_LIBRARIES=${TERMUX_PREFIX}/lib
 "
 
 termux_step_post_get_source() {
@@ -24,29 +34,12 @@ termux_step_post_get_source() {
 }
 
 termux_step_pre_configure() {
-	declare include=${TERMUX_PREFIX}/include lib=${TERMUX_PREFIX}/lib
-	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
-		-DLIBLUV_INCLUDE_DIR=${TERMUX_PKG_SRCDIR}/deps/luv/src
-		-DLIBLUV_LIBRARIES=$lib/libluv.so
-		-DLUAJIT_INCLUDE_DIR=$include/luajit-2.1
-		-DLUAJIT_LIBRARIES=$lib/libluajit.so
-		-DLIBUV_INCLUDE_DIR=$include
-		-DLIBUV_LIBRARIES=$lib/libuv.so
-		-DOPENSSL_INCLUDE_DIR=$include
-		-DOPENSSL_LIBRARIES=$lib
-		-DPCRE2_INCLUDE_DIR=$include
-		-DPCRE2_LIBRARIES=$lib
-	"
-
-	case "${TERMUX_ARCH}" in
-	x86_64) TARGET_ARCH=x64 ;;
-	i686) TARGET_ARCH=x86 ;;
-	aarch64) TARGET_ARCH=arm64 ;;
-	arm) TARGET_ARCH=arm ;;
-	esac
-	export TARGET_ARCH
-
-	export LPEGLIB_DIR=deps/lpeg
+	local dlp_commit="7adf5b3" script_checksum="4b4412c4e93c3cebfc830c643a04b31108a12f10abf7489ab0a80077a1a1ccdb"
 
+	termux_download "https://github.com/ReFreezed/DumbLuaParser/raw/${dlp_commit}/dumbParser.lua" \
+		"${TERMUX_PKG_CACHEDIR}/dumbParser.lua" \
+		"${script_checksum}"
+	export LUA_PATH=";;${TERMUX_PKG_CACHEDIR}/?.lua"
+	
 	echo "$_version" >"${TERMUX_PKG_SRCDIR}/VERSION"
 }