Add archlinux-java-run as a dependency

4 files changed, 15 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbfd155fb732..ecefb24455da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = blockmap-git
 	pkgdesc = Minecraft map viewer/renderer
 	pkgver = 2.0.0.r6.a900ba5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Minecraft-Technik-Wiki/BlockMap
 	arch = any
 	license = MIT
@@ -9,14 +9,15 @@ pkgbase = blockmap-git
 	makedepends = git
 	depends = java-runtime>=12
 	depends = hicolor-icon-theme
+	depends = archlinux-java-run
 	depends = sh
 	source = blockmap-git::git+https://github.com/Minecraft-Technik-Wiki/BlockMap
 	source = blockmap.sh
 	source = blockmap-gui.sh
 	source = BlockMap.desktop
 	sha512sums = SKIP
-	sha512sums = 1665632cde2c12a74584986e95426263e40ccd9e866151869d6fe101f46e8d44b0db666ab7a38407491c27a0dbe9a2a1352da416193486fdbd77519e3498a33c
-	sha512sums = 99510cb7bc43e8a13b49df00012c9d579c0ecf1348c0ff34c9a1ca51e1be46d5bf78d3d5a87c23b77a1b477d93f492c0daa230f0bcf749495361a1882b0ccfba
+	sha512sums = 12f074b279ae23d65ff4d4800592c6dcbfd7708cfb164a78f2c0aa3693776e167e9e43606eaf819d503cc5ec9ae016e48d0e3adc7c4755cf413ea6f810345971
+	sha512sums = 23697d4722300f5ecf9b229f468c4f4fa65f83319df329148d74e66a34ed4f57fdbcd429e91853f898fb2692bdc8ba8a74e0b4776713b59b81b963a0bb1d580a
 	sha512sums = ae3d4a6ef7593ba7744dd3e08f2fa6ffe96fd2ec670722bf42710c6a77d2223321c09cafb003adc36924dc997756650caf110a3145ee598ee3f27b56610091f5
 
 pkgname = blockmap-git
diff --git a/PKGBUILD b/PKGBUILD
index 84b687557eb0..c4b8b83f4eff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: piegames <aur@piegames.de>
 pkgname=blockmap-git
 pkgver=2.0.0.r6.a900ba5
-pkgrel=1
+pkgrel=2
 pkgdesc="Minecraft map viewer/renderer"
 arch=('any')
 url="https://github.com/Minecraft-Technik-Wiki/BlockMap"
 license=('MIT')
-depends=('java-runtime>=12' 'hicolor-icon-theme' 'sh')
+depends=('java-runtime>=12' 'hicolor-icon-theme' 'archlinux-java-run' 'sh')
 makedepends=('java-environment>=12' 'git')
 source=("${pkgname}"::'git+https://github.com/Minecraft-Technik-Wiki/BlockMap'
 		"blockmap.sh"
 		"blockmap-gui.sh"
 		"BlockMap.desktop")
 sha512sums=('SKIP'
-            '1665632cde2c12a74584986e95426263e40ccd9e866151869d6fe101f46e8d44b0db666ab7a38407491c27a0dbe9a2a1352da416193486fdbd77519e3498a33c'
-            '99510cb7bc43e8a13b49df00012c9d579c0ecf1348c0ff34c9a1ca51e1be46d5bf78d3d5a87c23b77a1b477d93f492c0daa230f0bcf749495361a1882b0ccfba'
+            '12f074b279ae23d65ff4d4800592c6dcbfd7708cfb164a78f2c0aa3693776e167e9e43606eaf819d503cc5ec9ae016e48d0e3adc7c4755cf413ea6f810345971'
+            '23697d4722300f5ecf9b229f468c4f4fa65f83319df329148d74e66a34ed4f57fdbcd429e91853f898fb2692bdc8ba8a74e0b4776713b59b81b963a0bb1d580a'
             'ae3d4a6ef7593ba7744dd3e08f2fa6ffe96fd2ec670722bf42710c6a77d2223321c09cafb003adc36924dc997756650caf110a3145ee598ee3f27b56610091f5')
 
 pkgver() {
@@ -24,6 +24,11 @@ pkgver() {
 
 build() {
 	cd "$srcdir/${pkgname}"
+	
+	# Taken from the JabRef AUR package
+	export JAVA_HOME=$(archlinux-java-run -a 13 -f jdk -j)
+	echo "Using JDK from $JAVA_HOME to build JabRef."
+	
 	# This *must* be in separate commands
 	./gradlew clean
 	./gradlew generateData
diff --git a/blockmap-gui.sh b/blockmap-gui.sh
index 68f6a4fd6035..dffcd239456b 100755
--- a/blockmap-gui.sh
+++ b/blockmap-gui.sh
@@ -2,4 +2,4 @@
 for name in /usr/share/java/blockmap/*.jar ; do
   CP=$CP:$name
 done
-exec /usr/bin/java -cp $CP de.piegames.blockmap.gui.standalone.GuiMainLauncher "$@"
+archlinux-java-run -a 13 -- -cp $CP de.piegames.blockmap.gui.standalone.GuiMainLauncher "$@"
diff --git a/blockmap.sh b/blockmap.sh
index e54a727dd687..0929b5771daf 100755
--- a/blockmap.sh
+++ b/blockmap.sh
@@ -2,4 +2,4 @@
 for name in /usr/share/java/blockmap/*.jar ; do
   CP=$CP:$name
 done
-exec /usr/bin/java -cp $CP de.piegames.blockmap.standalone.CommandLineMain "$@"
+archlinux-java-run -a 13 -- -cp $CP de.piegames.blockmap.standalone.CommandLineMain "$@"