Explicitely depend on jdk21-openjdk for building and default to jdk21-openjdk directory to run maptool.

3 files changed, 12 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78531982cbbc..fa97c7243515 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,15 +8,15 @@ pkgbase = maptool
 	license = AGPL3
 	makedepends = git
 	makedepends = dpkg
-	makedepends = java-environment=21
+	makedepends = jdk21-openjdk
 	makedepends = gradle
 	makedepends = xdg-utils
 	makedepends = rpm-tools
-	depends = java-runtime=21
-	depends = java-openjfx=21
 	source = git+https://github.com/RPTools/maptool.git#tag=1.14.3
 	source = maptool.sh
-	sha256sums = SKIP
-	sha256sums = 746ab40aa2226355f33135eb748bdc4c5653c8239574683b508510e0a0becf0a
+	sha256sums = 6c7ba98ffb42566e26f802f7dc59b46352ce08a44749fa397f540d240a711c33
+	sha256sums = c1b1977801cfd84514359f405b5cb3fbeb56b1466d8cabc2ab87c41f79a590f9
 
 pkgname = maptool
+	depends = java-runtime=21
+	depends = java-openjfx=21
diff --git a/PKGBUILD b/PKGBUILD
index a1fd656749db..c7ac5b5286b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,13 @@ pkgdesc="An open source virtual tabletop program"
 arch=('x86_64')
 url='https://rptools.net/tools/maptool'
 license=('AGPL3')
-depends=('java-runtime=21' 'java-openjfx=21')
-makedepends=('git' 'dpkg' 'java-environment=21' 'gradle' 'xdg-utils' 'rpm-tools')
-optdepends=()
+depends=()
+makedepends=('git' 'dpkg' 'jdk21-openjdk' 'gradle' 'xdg-utils' 'rpm-tools')
 source=(
 	"git+https://github.com/RPTools/${pkgname}.git#tag=${pkgver}"
 	"${pkgname}.sh")
-sha256sums=('SKIP'
-            '746ab40aa2226355f33135eb748bdc4c5653c8239574683b508510e0a0becf0a')
+sha256sums=('6c7ba98ffb42566e26f802f7dc59b46352ce08a44749fa397f540d240a711c33'
+            'c1b1977801cfd84514359f405b5cb3fbeb56b1466d8cabc2ab87c41f79a590f9')
 install="${pkgname}.install"
 
 _prefix="opt/$pkgname"
@@ -42,6 +41,8 @@ check() {
 }
 
 package() {
+	depends+=('java-runtime=21' 'java-openjfx=21')
+	
 	cd "${pkgdir}"
 	
 	dpkg-deb -x "${srcdir}/${pkgname}/releases/"*.deb .
diff --git a/maptool.sh b/maptool.sh
index a578e046808f..3d50617ef56d 100644
--- a/maptool.sh
+++ b/maptool.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-MAP_TOOL_JAVA="${MAP_TOOL_JAVA:-/usr/lib/jvm/default-runtime}"
+MAP_TOOL_JAVA="${MAP_TOOL_JAVA:-/usr/lib/jvm/java-21-openjdk}"
 JAVAFX_PATH="${JAVAFX_PATH:-$MAP_TOOL_JAVA/lib}"
 
 _javajx_classes="$(ls -U1 "$JAVAFX_PATH/javafx"*.jar | tr '\n' ':')"