From 718a1a4866b1d3b8b42484ef6cb46a60b38a8f97 Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Date: Wed, 22 May 2024 18:21:30 -0600
Subject: [PATCH 1/6] Update quickjs to 2024.01.13

---
 package/quickjs/package | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/quickjs/package b/package/quickjs/package
index 78467226b..b417e7776 100644
--- a/package/quickjs/package
+++ b/package/quickjs/package
@@ -5,19 +5,19 @@
 pkgnames=(quickjs)
 pkgdesc="A small and embeddable Javascript engine"
 url=https://bellard.org/quickjs/
-pkgver=2020.11.08-2
+pkgver=2024.01.13-1
 section="devel"
-timestamp=2020-11-08T13:44Z
+timestamp=2024-01-13T00:00Z
 maintainer="khanhas <xuankhanh963@gmail.com>"
 license=MIT
 
 image=base:v2.1
 source=(
-    https://bellard.org/quickjs/quickjs-2020-11-08.tar.xz
+    https://bellard.org/quickjs/quickjs-2024-01-13.tar.xz
     quickjs.patch
 )
 sha256sums=(
-    2e9d63dab390a95ed365238f21d8e9069187f7ed195782027f0ab311bb64187b
+    3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03
     SKIP
 )
 

From 606aafc8e5c70f687031474658ef90c48a5b7a8f Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Date: Wed, 22 May 2024 18:24:52 -0600
Subject: [PATCH 2/6] Remove patch from package

---
 package/quickjs/package | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package/quickjs/package b/package/quickjs/package
index b417e7776..a58c46206 100644
--- a/package/quickjs/package
+++ b/package/quickjs/package
@@ -14,15 +14,12 @@ license=MIT
 image=base:v2.1
 source=(
     https://bellard.org/quickjs/quickjs-2024-01-13.tar.xz
-    quickjs.patch
 )
 sha256sums=(
     3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03
-    SKIP
 )
 
 build() {
-    patch -u Makefile -i quickjs.patch
     make qjs.arm
 }
 

From 406eb009e825140b804a3a7de3c9b6df40563dea Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Date: Wed, 22 May 2024 18:25:12 -0600
Subject: [PATCH 3/6] Delete package/quickjs/quickjs.patch

---
 package/quickjs/quickjs.patch | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 package/quickjs/quickjs.patch

diff --git a/package/quickjs/quickjs.patch b/package/quickjs/quickjs.patch
deleted file mode 100644
index 250c666b5..000000000
--- a/package/quickjs/quickjs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile	2020-11-08 23:21:09.000000000 +1000
-+++ Makefile.new	2021-02-10 14:36:08.954392400 +1000
-@@ -60,8 +60,8 @@
-   endif
-   EXE=.exe
- else
--  CROSS_PREFIX=
--  EXE=
-+  CROSS_PREFIX=$(CROSS_COMPILE)
-+  EXE=.arm
- endif
- ifdef CONFIG_CLANG
-   HOST_CC=clang

From b3ab792da3de92ba128a4b6c7497e6a1d80fd7a9 Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <nathaniel.vandiepen@gmail.com>
Date: Thu, 23 May 2024 17:24:31 -0600
Subject: [PATCH 4/6] Fix quickjs compile

---
 package/quickjs/package | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/quickjs/package b/package/quickjs/package
index a58c46206..f2c8a24be 100644
--- a/package/quickjs/package
+++ b/package/quickjs/package
@@ -20,11 +20,10 @@ sha256sums=(
 )
 
 build() {
-    make qjs.arm
+    make CROSS_PREFIX=$CROSS_COMPILE qjs
 }
 
 package() {
     install -d "$pkgdir"/opt/bin
-    install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs.arm
-    mv "$pkgdir"/opt/bin/qjs.arm "$pkgdir"/opt/bin/qjs
+    install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs
 }

From 43e47eada2fe7b22495111f1da44d3ac55393e18 Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <nathaniel.vandiepen@gmail.com>
Date: Thu, 23 May 2024 19:17:25 -0600
Subject: [PATCH 5/6] Add qjscalc symlink

---
 package/quickjs/package | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/quickjs/package b/package/quickjs/package
index f2c8a24be..a549d96aa 100644
--- a/package/quickjs/package
+++ b/package/quickjs/package
@@ -11,7 +11,7 @@ timestamp=2024-01-13T00:00Z
 maintainer="khanhas <xuankhanh963@gmail.com>"
 license=MIT
 
-image=base:v2.1
+image=base:v3.1
 source=(
     https://bellard.org/quickjs/quickjs-2024-01-13.tar.xz
 )
@@ -20,10 +20,11 @@ sha256sums=(
 )
 
 build() {
-    make CROSS_PREFIX=$CROSS_COMPILE qjs
+    make CROSS_PREFIX=$CROSS_COMPILE qjs qjscalc
 }
 
 package() {
     install -d "$pkgdir"/opt/bin
     install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs
+    ln -s qjs "$pkgdir"/opt/bin/qjscalc
 }

From dd60d8207721f1c88f4e6e2e14f86bf503b71247 Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <nathaniel.vandiepen@gmail.com>
Date: Thu, 23 May 2024 19:30:57 -0600
Subject: [PATCH 6/6] Fix lint error

---
 package/quickjs/package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/quickjs/package b/package/quickjs/package
index a549d96aa..ef41e2092 100644
--- a/package/quickjs/package
+++ b/package/quickjs/package
@@ -20,7 +20,7 @@ sha256sums=(
 )
 
 build() {
-    make CROSS_PREFIX=$CROSS_COMPILE qjs qjscalc
+    make CROSS_PREFIX="$CROSS_COMPILE" qjs qjscalc
 }
 
 package() {