diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rwxr-xr-x | chunky-launcher.sh | 7 |
3 files changed, 15 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = chunky-launcher - pkgdesc = Launcher for Chuky, the Minecraft mapping and rendering tool + pkgdesc = Launcher for Chunky, the Minecraft mapping and rendering tool pkgver = 1.14.0 - pkgrel = 1 + pkgrel = 2 url = http://chunky.llbit.se/ arch = any license = GPL3 @@ -11,7 +11,7 @@ pkgbase = chunky-launcher source = chunky-launcher.sh source = chunky-launcher.desktop sha512sums = 2d319e1a13a6808b6978b82deba8eb371d4b9b01504c5bfdb3fcfa2218decaa6a07194bc054e00586ae136f702cfda4071788855917e06ed63435da4931d3788 - sha512sums = 7ce6f5937a1f844ddbc1db8fa1c219e2816cf244c56b68214f43a5d994198d3ff5cad2a844b1dda1aaa99984ec1adc4a9c8eb085dc3f8da6ce6c51bbe5bde4bd + sha512sums = 7aa12077ae7a8d02be5be263d01d350da3dc6755d9df8fd2b4ff64392e72fe9cd51bb4040367d13203a0f16aeeec607777795c61f31aaa4282c94ead3a7dbeb1 sha512sums = c5f78c60ad94d7f6c8b2ed334386a6731a5961f12a6b42de4518fcc23b367773dd6a5b0f46d35b0d6d3b2617052f0d32c5e7afc0befe7de43ae3d400d7530b53 pkgname = chunky-launcher @@ -3,18 +3,18 @@ pkgname=chunky-launcher pkgver=1.14.0 -pkgrel=1 -pkgdesc="Launcher for Chuky, the Minecraft mapping and rendering tool" +pkgrel=2 +pkgdesc="Launcher for Chunky, the Minecraft mapping and rendering tool" url="http://chunky.llbit.se/" arch=('any') license=('GPL3') depends=('java-runtime=17' 'java-openjfx=17') source=(ChunkyLauncher.jar::https://chunkyupdate.lemaik.de/ChunkyLauncher.jar - chunky-launcher.sh - chunky-launcher.desktop) +chunky-launcher.sh +chunky-launcher.desktop) sha512sums=('2d319e1a13a6808b6978b82deba8eb371d4b9b01504c5bfdb3fcfa2218decaa6a07194bc054e00586ae136f702cfda4071788855917e06ed63435da4931d3788' - '7ce6f5937a1f844ddbc1db8fa1c219e2816cf244c56b68214f43a5d994198d3ff5cad2a844b1dda1aaa99984ec1adc4a9c8eb085dc3f8da6ce6c51bbe5bde4bd' - 'c5f78c60ad94d7f6c8b2ed334386a6731a5961f12a6b42de4518fcc23b367773dd6a5b0f46d35b0d6d3b2617052f0d32c5e7afc0befe7de43ae3d400d7530b53') +'7aa12077ae7a8d02be5be263d01d350da3dc6755d9df8fd2b4ff64392e72fe9cd51bb4040367d13203a0f16aeeec607777795c61f31aaa4282c94ead3a7dbeb1' +'c5f78c60ad94d7f6c8b2ed334386a6731a5961f12a6b42de4518fcc23b367773dd6a5b0f46d35b0d6d3b2617052f0d32c5e7afc0befe7de43ae3d400d7530b53') build() { bsdtar -xf ChunkyLauncher.jar "*chunky-cfg.png" @@ -27,4 +27,3 @@ package() { install -Dm644 chunky-launcher.desktop "$pkgdir/usr/share/applications/chunky-launcher.desktop" install -Dm644 chunky-cfg.png "$pkgdir/usr/share/pixmaps/chunky.png" } - diff --git a/chunky-launcher.sh b/chunky-launcher.sh index 4792d7e398aa..b8511d82b887 100755 --- a/chunky-launcher.sh +++ b/chunky-launcher.sh @@ -1,6 +1,11 @@ #!/bin/sh JAVA_HOME=/usr/lib/jvm/java-17-openjdk -JFX_PATH=$JAVA_HOME/lib +# Different JFX providers install to different locations +if [ -d "/usr/lib/jvm/java-17-openjfx" ]; then + JFX_PATH="/usr/lib/jvm/java-17-openjfx/lib" +else + JFX_PATH=$JAVA_HOME/lib +fi # Solve incompatibilites with jrt.fs "$JAVA_HOME/bin/java" --module-path "$JFX_PATH/javafx.base.jar:$JFX_PATH/javafx.controls.jar:$JFX_PATH/javafx.graphics.jar:$JFX_PATH/javafx.fxml.jar" --add-modules=javafx.base,javafx.graphics,javafx.controls,javafx.fxml -jar /usr/share/java/chunky/ChunkyLauncher.jar --launcher --noRetryJavafx --javaOptions "--module-path $JFX_PATH/javafx.base.jar:$JFX_PATH/javafx.controls.jar:$JFX_PATH/javafx.graphics.jar:$JFX_PATH/javafx.fxml.jar --add-modules=javafx.base,javafx.graphics,javafx.controls,javafx.fxml" "$@" |