summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordetiam2024-03-18 18:08:58 +0800
committerdetiam2024-03-18 18:08:58 +0800
commit53fd78eb10296f97130c66515d75e3405aeeb336 (patch)
treea4617dbff45f38898bdac85318df12f662a4e09a
parent86c1dc690156166ba860497111f177644f80205d (diff)
downloadaur-53fd78eb10296f97130c66515d75e3405aeeb336.tar.gz
update 3.5.6
-rw-r--r--.SRCINFO10
-rw-r--r--0001-Target-Java-17.patch4
-rw-r--r--0002-Cleanup.patch14
-rw-r--r--PKGBUILD14
4 files changed, 21 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0572287f5a2e..65981b9eedd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = hmcl-java-run
pkgdesc = An unofficial build of HMCL that use aur/archlinux-java-run to select java version with javaFX (with aur/hmcl-new changes)
- pkgver = 3.5.5.237
+ pkgver = 3.5.6
pkgrel = 1
url = https://github.com/HMCL-dev/HMCL
arch = any
@@ -13,11 +13,11 @@ pkgbase = hmcl-java-run
depends = archlinux-java-run
provides = hmcl
conflicts = hmcl
- source = HMCL-v3.5.5.237.tar.gz::https://github.com/HMCL-dev/HMCL/archive/v3.5.5.237.tar.gz
+ source = HMCL-release-3.5.6.tar.gz::https://github.com/HMCL-dev/HMCL/archive/refs/tags/release-3.5.6.tar.gz
source = 0001-Target-Java-17.patch
source = 0002-Cleanup.patch
- sha256sums = 910e4128f846636552f34640e05fe5b4e2e1e00213a93aecf6ac253ba9c1aaee
- sha256sums = c395ad622cf81a07d5738f6c20b845b51c900fd1aa0e9b87fd8ea415b8fac646
- sha256sums = f723aebb63bd414bdd86e41c9795686fa0b409ddb339b5bc953b3c9097a76b02
+ sha256sums = bba9b7d8fa15970043b990a60f5f977aa93e70c0d1e265e4fc409c8efd4533b5
+ sha256sums = f98f716e544c74a6f1ab116a1aab2ae1c857f88b9999d009491333fa562cb2d5
+ sha256sums = 3afebafe4739a92416a6543e7441638df8e8f299058cd76009e136d6b57670d8
pkgname = hmcl-java-run
diff --git a/0001-Target-Java-17.patch b/0001-Target-Java-17.patch
index 6e7d0b838b8e..053cda31e1ac 100644
--- a/0001-Target-Java-17.patch
+++ b/0001-Target-Java-17.patch
@@ -1,4 +1,4 @@
-From ed929feb233b3f3e6f5e4fcbcfc5ee9e71668530 Mon Sep 17 00:00:00 2001
+From fb0a80080ae5d2bec8d714e4ed4c6a3a9f90994e 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
@@ -24,5 +24,5 @@ index deccd9e5c..7c421c91a 100644
options.encoding = "UTF-8"
}
--
-2.43.2
+2.44.0
diff --git a/0002-Cleanup.patch b/0002-Cleanup.patch
index 2062ec93b9c3..ab9aa20d5efe 100644
--- a/0002-Cleanup.patch
+++ b/0002-Cleanup.patch
@@ -1,4 +1,4 @@
-From 7ef492c2c96f0a621cb201c3befa4a59be5b28c5 Mon Sep 17 00:00:00 2001
+From 6a10db3d678b8e4aa93e2556c24be0db124bc5fd 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
@@ -188,10 +188,10 @@ index f18b19685..000000000
- private static final String APP_KEY = "";
-}
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
-index 5a4fe371d..399625b11 100644
+index 9975f47d2..b9a5753ad 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
-@@ -386,15 +386,6 @@ public final class Controllers {
+@@ -385,15 +385,6 @@ public final class Controllers {
public static void onHyperlinkAction(String href) {
if (href.startsWith("hmcl://")) {
@@ -208,7 +208,7 @@ index 5a4fe371d..399625b11 100644
FXUtils.openLink(href);
}
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java
-index cb8936947..8f4b2b880 100644
+index a3f85c619..098536408 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java
@@ -28,7 +28,6 @@ import javafx.scene.layout.StackPane;
@@ -217,9 +217,9 @@ index cb8936947..8f4b2b880 100644
import org.jackhuang.hmcl.countly.CrashReport;
-import org.jackhuang.hmcl.upgrade.UpdateChecker;
- import static org.jackhuang.hmcl.ui.FXUtils.newBuiltinImage;
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-@@ -42,8 +41,6 @@ public class CrashWindow extends Stage {
+
+@@ -41,8 +40,6 @@ public class CrashWindow extends Stage {
Label lblCrash = new Label();
if (report.getThrowable() instanceof InternalError)
lblCrash.setText(i18n("launcher.crash.java_internal_error"));
@@ -2054,5 +2054,5 @@ index 984cdfd79..7fd482fca 100644
}
}
--
-2.43.2
+2.44.0
diff --git a/PKGBUILD b/PKGBUILD
index 0b8058ae0af8..e1e397798277 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
pkgname=hmcl-java-run
_pkgname=HMCL
-_ver=3.5.5
-_build=237
-_pkgver=$_ver.$_build
+_ver=3.5
+_build=6
+_pkgver=release-$_ver.$_build
_java_version=17
_jar_path="/usr/share/java/$pkgname.jar"
pkgver=$_ver.$_build
@@ -20,12 +20,12 @@ depends=("java-runtime>=$_java_version" "java-openjfx>=$_java_version" 'hicolor-
makedepends=("java-environment>=$_java_version" 'gradle')
provides=('hmcl')
conflicts=('hmcl')
-source=("${_pkgname}-v${_pkgver}.tar.gz::${url}/archive/v${_pkgver}.tar.gz"
+source=("${_pkgname}-${_pkgver}.tar.gz::${url}/archive/refs/tags/${_pkgver}.tar.gz"
"0001-Target-Java-$_java_version.patch"
"0002-Cleanup.patch")
-sha256sums=('910e4128f846636552f34640e05fe5b4e2e1e00213a93aecf6ac253ba9c1aaee'
- 'c395ad622cf81a07d5738f6c20b845b51c900fd1aa0e9b87fd8ea415b8fac646'
- 'f723aebb63bd414bdd86e41c9795686fa0b409ddb339b5bc953b3c9097a76b02')
+sha256sums=('bba9b7d8fa15970043b990a60f5f977aa93e70c0d1e265e4fc409c8efd4533b5'
+ 'f98f716e544c74a6f1ab116a1aab2ae1c857f88b9999d009491333fa562cb2d5'
+ '3afebafe4739a92416a6543e7441638df8e8f299058cd76009e136d6b57670d8')
prepare() {
for patch in "${source[@]}"; do