Bas Couwenberg pushed to branch experimental at Debian GIS Project / josm
Commits: e6e5f842 by Bas Couwenberg at 2025-06-01T18:29:35+02:00 Add patch to not use openjfx unconditionally. (closes: #1107106) - - - - - 145588b6 by Bas Couwenberg at 2025-06-01T18:29:47+02:00 Set distribution to experimental. - - - - - 3 changed files: - debian/changelog - + debian/patches/openjfx.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +josm (0.0.svn19396+dfsg-1~exp2) experimental; urgency=medium + + * Add patch to not use openjfx unconditionally. + (closes: #1107106) + + -- Bas Couwenberg <[email protected]> Sun, 01 Jun 2025 18:24:23 +0200 + josm (0.0.svn19396+dfsg-1~exp1) experimental; urgency=medium * New tested snapshot. ===================================== debian/patches/openjfx.patch ===================================== @@ -0,0 +1,35 @@ +Description: Don't use openjfx unconditionally. +Author: Bas Couwenberg <[email protected]> +Bug-Debian: https://bugs.debian.org/1107106 +Forwarded: https://josm.openstreetmap.de/ticket/24339 + +--- a/native/linux/latest/usr/bin/josm-latest ++++ b/native/linux/latest/usr/bin/josm-latest +@@ -91,7 +91,11 @@ if [ "$JAVACMD" ]; then + JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}" + JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}" + if [[ "${JAVA_VERSION}" -ge 11 ]]; then +- JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS" ++ if [[ -e "${JAVAFX_HOME}" ]]; then ++ JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS" ++ else ++ JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS" ++ fi + JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.security.action=ALL-UNNAMED" + JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" + JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" +--- a/native/linux/tested/usr/bin/josm ++++ b/native/linux/tested/usr/bin/josm +@@ -91,7 +91,11 @@ if [ "$JAVACMD" ]; then + JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}" + JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}" + if [[ "${JAVA_VERSION}" -ge 11 ]]; then +- JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS" ++ if [[ -e "${JAVAFX_HOME}" ]]; then ++ JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS" ++ else ++ JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS" ++ fi + JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.security.action=ALL-UNNAMED" + JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" + JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" ===================================== debian/patches/series ===================================== @@ -4,3 +4,4 @@ 06-move_data_out_of_jar.patch 07-use_system_fonts.patch 08-use_noto_font.patch +openjfx.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/74f199704a01f93675d8da76cd2e5151efb9ec0c...145588b6e93893c8a094fd994aedf2828cbca3b0 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/74f199704a01f93675d8da76cd2e5151efb9ec0c...145588b6e93893c8a094fd994aedf2828cbca3b0 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
