[Git][debian-gis-team/josm][master] 2 commits: Add patch to not use openjfx unconditionally. (closes: #1107106)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master 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.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/openjfx.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+josm (0.0.svn19369+dfsg-2) unstable; urgency=medium
+
+  * Add patch to not use openjfx unconditionally.
+    (closes: #1107106)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 01 Jun 2025 18:38:40 +0200
+
 josm (0.0.svn19369+dfsg-1) unstable; urgency=medium
 
   * New tested snapshot.


=====================================
debian/patches/openjfx.patch
=====================================
@@ -0,0 +1,35 @@
+Description: Don't use openjfx unconditionally.
+Author: Bas Couwenberg <sebastic at debian.org>
+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/90f2f721a9a125317127fb4ec30e7700f66238c5...ebb4bbee6c46146c29d20eb547a57c613960e29e

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/90f2f721a9a125317127fb4ec30e7700f66238c5...ebb4bbee6c46146c29d20eb547a57c613960e29e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250601/b477a7ee/attachment-0001.htm>