diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | maptool.sh | 11 |
3 files changed, 20 insertions, 19 deletions
@@ -1,22 +1,22 @@ pkgbase = maptool pkgdesc = An open source virtual tabletop program - pkgver = 1.13.2 - pkgrel = 3 + pkgver = 1.14.3 + pkgrel = 1 url = https://rptools.net/tools/maptool install = maptool.install arch = x86_64 license = AGPL3 makedepends = git makedepends = dpkg - makedepends = jdk17-openjdk - makedepends = gradle7 + makedepends = java-environment=21 + makedepends = gradle makedepends = xdg-utils makedepends = rpm-tools - depends = java-runtime=17 - depends = java-openjfx=17 - source = git+https://github.com/RPTools/maptool.git#tag=1.13.2 + 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 = 7b66ff895bf3e51bf297b8e5dc82c19ce91cbf1d0ddaab1af63317ab9ad800f1 + sha256sums = 746ab40aa2226355f33135eb748bdc4c5653c8239574683b508510e0a0becf0a pkgname = maptool @@ -3,24 +3,24 @@ pkgname=maptool _pkgname=MapTool -pkgver=1.13.2 -pkgrel=3 +pkgver=1.14.3 +pkgrel=1 pkgdesc="An open source virtual tabletop program" arch=('x86_64') url='https://rptools.net/tools/maptool' license=('AGPL3') -depends=('java-runtime=17' 'java-openjfx=17') -makedepends=('git' 'dpkg' 'jdk17-openjdk' 'gradle7' 'xdg-utils' 'rpm-tools') +depends=('java-runtime=21' 'java-openjfx=21') +makedepends=('git' 'dpkg' 'java-environment=21' 'gradle' 'xdg-utils' 'rpm-tools') optdepends=() source=( "git+https://github.com/RPTools/${pkgname}.git#tag=${pkgver}" "${pkgname}.sh") sha256sums=('SKIP' - '7b66ff895bf3e51bf297b8e5dc82c19ce91cbf1d0ddaab1af63317ab9ad800f1') + '746ab40aa2226355f33135eb748bdc4c5653c8239574683b508510e0a0becf0a') install="${pkgname}.install" _prefix="opt/$pkgname" -_java_home='/usr/lib/jvm/java-17-openjdk' +_java_home='/usr/lib/jvm/java-21-openjdk' prepare() { cd "${pkgname}" diff --git a/maptool.sh b/maptool.sh index 6f993432179e..a578e046808f 100644 --- a/maptool.sh +++ b/maptool.sh @@ -1,18 +1,19 @@ #!/usr/bin/env sh -MAP_TOOL_JAVA="${MAP_TOOL_JAVA:-/usr/lib/jvm/java-17-openjdk}" +MAP_TOOL_JAVA="${MAP_TOOL_JAVA:-/usr/lib/jvm/default-runtime}" JAVAFX_PATH="${JAVAFX_PATH:-$MAP_TOOL_JAVA/lib}" -CLASSPATH="/usr/share/java/maptool/*:$JAVAFX_PATH/javafx.base.jar:$JAVAFX_PATH/javafx.controls.jar:$JAVAFX_PATH/javafx.fxml.jar:$JAVAFX_PATH/javafx.graphics.jar:$JAVAFX_PATH/javafx.media.jar:$JAVAFX_PATH/javafx.swing.jar:$JAVAFX_PATH/javafx-swt.jar:$JAVAFX_PATH/javafx.web.jar" -DEFAULT_JVM_OPTS='"-Xss8M" "-Dsun.java2d.d3d=false" "-Dsentry.environment=production" "-Dfile.encoding=UTF-8" "-Dpolyglot.engine.WarnInterpreterOnly=false" "-DMAPTOOL_DATADIR=.maptool-rptools" "-XX:+ShowCodeDetailsInExceptionMessages" "--add-opens=java.desktop/java.awt=ALL-UNNAMED" "--add-opens=java.desktop/java.awt.geom=ALL-UNNAMED" "--add-opens=java.desktop/sun.awt.geom=ALL-UNNAMED" "--add-opens=java.base/java.util=ALL-UNNAMED" "--add-opens=java.desktop/javax.swing=ALL-UNNAMED" "--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED"' +_javajx_classes="$(ls -U1 "$JAVAFX_PATH/javafx"*.jar | tr '\n' ':')" +_classpath="/usr/share/java/maptool/*:$_javajx_classes" +_default_jvm_opts='-Xmx768m -Xms32m -Xss8M "-Dsun.java2d.d3d=false" "-Djava.util.Arrays.useLegacyMergeSort=true" "-Dsentry.environment=production" "-Dfile.encoding=UTF-8" "-Dpolyglot.engine.WarnInterpreterOnly=false" "-DMAPTOOL_DATADIR=.maptool-rptools" "-XX:+ShowCodeDetailsInExceptionMessages" "--add-opens=java.desktop/java.awt=ALL-UNNAMED" "--add-opens=java.desktop/java.awt.geom=ALL-UNNAMED" "--add-opens=java.desktop/sun.awt.geom=ALL-UNNAMED" "--add-opens=java.base/java.util=ALL-UNNAMED" "--add-opens=javafx.web/javafx.scene.web=ALL-UNNAMED" "--add-opens=javafx.web/com.sun.webkit=ALL-UNNAMED" "--add-opens=javafx.web/com.sun.webkit.dom=ALL-UNNAMED" "--add-opens=java.desktop/javax.swing=ALL-UNNAMED" "--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED" "--add-opens=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED"' set -- \ - -classpath "$CLASSPATH" \ + -classpath "$_classpath" \ 'net.rptools.maptool.client.LaunchInstructions' \ "$@" eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $MAP_TOOL_OPTS" | + printf '%s\n' "$_default_jvm_opts $JAVA_OPTS $MAP_TOOL_OPTS" | xargs -n1 | sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | tr '\n' ' ' |