Disable Pack200

5 files changed, 55 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50bc7febcec8..3bcd82517e4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,11 +16,13 @@ pkgbase = hmcl-new
 	source = hmcl-new-3.5.3.227.tar.gz::https://github.com/huanghongxun/HMCL/archive/refs/tags/v3.5.3.227.tar.gz
 	source = 0001-Target-java-17.patch
 	source = 0002-Cleanup.patch
+	source = 0003-Disable-Pack200.patch
 	sha256sums = b4e8aa0f349bb3f5dd15a31c5a13ac3e10e5a5bcd2f97cf390041924275e43ef
 	sha256sums = 9adb4243a5123ff82cb3678ebb3e889250d745973859d57ab5a14b2867b7cb04
 	sha256sums = 2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c
 	sha256sums = 6d0b1fa5d4a7cab1024e62c12ea6baf19197175e2d2d3af9b23099878057b92f
-	sha256sums = 6348216b7c7c9b4d44355d19e11ea6d27d7b1d48d3f0a43079ab929e70728448
-	sha256sums = 34b2d477abed1858dc36069fc4374510f9ef52632fd415e0a077f99240ee20e6
+	sha256sums = cbaf1534ea1f68fdecf6fdbe3fc8dd77db0f73277deb6847719f2c4cc694a498
+	sha256sums = 79084c5d3bd61639b0055b8dc07becc2f96b79178d0f7ce7eb7ba8a059cafbcc
+	sha256sums = 5df17a227e1cf79cd14145320bfd0fcc3646a65e9b24cf9c48d4c13e4f0e2fa5
 
 pkgname = hmcl-new
diff --git a/0001-Target-java-17.patch b/0001-Target-java-17.patch
index ef6879350318..72f55f0d89b5 100644
--- a/0001-Target-java-17.patch
+++ b/0001-Target-java-17.patch
@@ -1,7 +1,7 @@
-From dcfa33dbd0627171aa7cbe1fc51aa61f90883bda Mon Sep 17 00:00:00 2001
-From: skbeh <60107333+skbeh@users.noreply.github.com>
+From 6b9acc420e1898fc3c83e981e872fd084f7e9c4b Mon Sep 17 00:00:00 2001
+From: Aviana Cruz <gwencroft@proton.me>
 Date: Sun, 6 Nov 2022 13:28:59 +0800
-Subject: [PATCH 1/2] Target java 17
+Subject: [PATCH 1/3] Target java 17
 
 Signed-off-by: Aviana Cruz <gwencroft@proton.me>
 ---
diff --git a/0002-Cleanup.patch b/0002-Cleanup.patch
index 05a6db750e96..cb4af5704747 100644
--- a/0002-Cleanup.patch
+++ b/0002-Cleanup.patch
@@ -1,7 +1,7 @@
-From 4a52fdf4625a8c96042ba17ef6b922ba34dc59c0 Mon Sep 17 00:00:00 2001
+From f9c1f1b68c22d8fb62f6222c1b45a093db7b46a8 Mon Sep 17 00:00:00 2001
 From: Aviana Cruz <gwencroft@proton.me>
 Date: Sun, 6 Nov 2022 13:33:14 +0800
-Subject: [PATCH 2/2] Cleanup
+Subject: [PATCH 2/3] Cleanup
 
 Co-authored-by: zhaose <weiliang1503@outlook.com>
 Signed-off-by: Aviana Cruz <gwencroft@proton.me>
diff --git a/0003-Disable-Pack200.patch b/0003-Disable-Pack200.patch
new file mode 100644
index 000000000000..7b79ea901b71
--- /dev/null
+++ b/0003-Disable-Pack200.patch
@@ -0,0 +1,42 @@
+From f5ad1228a262f21a5bd813727cbf0810eeecf890 Mon Sep 17 00:00:00 2001
+From: Aviana Cruz <gwencroft@proton.me>
+Date: Wed, 23 Nov 2022 09:27:28 +0800
+Subject: [PATCH 3/3] Disable Pack200
+
+Signed-off-by: Aviana Cruz <gwencroft@proton.me>
+---
+ HMCL/build.gradle.kts | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/HMCL/build.gradle.kts b/HMCL/build.gradle.kts
+index 6f5c6e14..4a229e53 100644
+--- a/HMCL/build.gradle.kts
++++ b/HMCL/build.gradle.kts
+@@ -178,7 +178,6 @@ tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("sha
+     }
+ 
+     doLast {
+-        repack(jarPath) // see repack()
+         attachSignature(jarPath)
+         createChecksum(jarPath)
+     }
+@@ -225,15 +224,12 @@ tasks.processResources {
+     dependsOn(rootProject.tasks["generateOpenJFXDependencies"])
+ }
+ 
+-val packFile = File(jarPath.parentFile, jarPath.nameWithoutExtension + ".pack")
++val packFile = jarPath
+ 
+ val makePack = tasks.create("makePack") {
+     dependsOn(tasks.jar)
+ 
+     doLast {
+-        packFile.outputStream().use { out ->
+-            JarFile(jarPath).use { jarFile -> packer.pack(jarFile, out) }
+-        }
+         createChecksum(packFile)
+     }
+ }
+-- 
+2.38.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 46e3b3883167..b73ca62dff4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,13 +23,15 @@ source=('hmcl.desktop'
   "${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
   "0001-Target-java-17.patch"
   "0002-Cleanup.patch"
+  "0003-Disable-Pack200.patch"
 )
 sha256sums=('b4e8aa0f349bb3f5dd15a31c5a13ac3e10e5a5bcd2f97cf390041924275e43ef'
   '9adb4243a5123ff82cb3678ebb3e889250d745973859d57ab5a14b2867b7cb04'
   '2989a1b5301b8c7b9afdae5696c6a4e5246afa2d4f1f3d3dad5c192f036a9b4c'
   '6d0b1fa5d4a7cab1024e62c12ea6baf19197175e2d2d3af9b23099878057b92f'
-  '6348216b7c7c9b4d44355d19e11ea6d27d7b1d48d3f0a43079ab929e70728448'
-  '34b2d477abed1858dc36069fc4374510f9ef52632fd415e0a077f99240ee20e6')
+  'cbaf1534ea1f68fdecf6fdbe3fc8dd77db0f73277deb6847719f2c4cc694a498'
+  '79084c5d3bd61639b0055b8dc07becc2f96b79178d0f7ce7eb7ba8a059cafbcc'
+  '5df17a227e1cf79cd14145320bfd0fcc3646a65e9b24cf9c48d4c13e4f0e2fa5')
 
 prepare() {
   cd "$_pkgname-$pkgver"