Bas Couwenberg pushed to branch bookworm-backports at Debian GIS Project / josm
Commits: 5ee36b35 by Bas Couwenberg at 2025-06-01T18:38:38+02:00 Add patch to not use openjfx unconditionally. (closes: #1107106) - - - - - ebb4bbee by Bas Couwenberg at 2025-06-01T18:38:59+02:00 Set distribution to unstable. - - - - - b0690ce4 by Bas Couwenberg at 2025-06-12T08:29:49+02:00 Merge tag 'debian/0.0.svn19369+dfsg-2' into bookworm-backports releasing package josm version 0.0.svn19369+dfsg-2 - - - - - 28f89502 by Bas Couwenberg at 2025-06-12T08:29:54+02:00 Rebuild for bookworm-backports. - - - - - 3 changed files: - debian/changelog - + debian/patches/openjfx.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,16 @@ +josm (0.0.svn19369+dfsg-2~bpo12+1) bookworm-backports; urgency=medium + + * Rebuild for bookworm-backports. + + -- Bas Couwenberg <[email protected]> Thu, 12 Jun 2025 08:29:52 +0200 + +josm (0.0.svn19369+dfsg-2) unstable; urgency=medium + + * Add patch to not use openjfx unconditionally. + (closes: #1107106) + + -- Bas Couwenberg <[email protected]> Sun, 01 Jun 2025 18:38:40 +0200 + josm (0.0.svn19369+dfsg-1~bpo12+1) bookworm-backports; urgency=medium * Rebuild for bookworm-backports. ===================================== 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 +@@ -89,7 +89,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 +@@ -89,7 +89,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/089d7b80d0b850f93802f8447b438b06fcb4c014...28f895029d3efd1711d5365151434ab1363a965e -- View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/089d7b80d0b850f93802f8447b438b06fcb4c014...28f895029d3efd1711d5365151434ab1363a965e 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
