Ticket #24339: openjfx.patch
| File openjfx.patch, 2.2 KB (added by , 12 months ago) |
|---|
-
native/linux/latest/usr/bin/josm-latest
Description: Don't use openjfx unconditionally. Author: Bas Couwenberg <sebastic@debian.org> Bug-Debian: https://bugs.debian.org/1107106
a b if [ "$JAVACMD" ]; then 91 91 JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}" 92 92 JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}" 93 93 if [[ "${JAVA_VERSION}" -ge 11 ]]; then 94 JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS" 94 if [[ -e "${JAVAFX_HOME}" ]]; then 95 JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS" 96 else 97 JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS" 98 fi 95 99 JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.security.action=ALL-UNNAMED" 96 100 JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" 97 101 JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" -
native/linux/tested/usr/bin/josm
a b if [ "$JAVACMD" ]; then 91 91 JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}" 92 92 JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}" 93 93 if [[ "${JAVA_VERSION}" -ge 11 ]]; then 94 JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS" 94 if [[ -e "${JAVAFX_HOME}" ]]; then 95 JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS" 96 else 97 JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS" 98 fi 95 99 JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.security.action=ALL-UNNAMED" 96 100 JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" 97 101 JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
