[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1107109: marked as done (unblock: josm/0.0.svn19369+dfsg-2)

Your message dated Sun, 01 Jun 2025 17:25:03 +0000
with message-id <E1uLmQh-002K6t-32@respighi.debian.org>
and subject line unblock josm
has caused the Debian Bug report #1107109,
regarding unblock: josm/0.0.svn19369+dfsg-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1107109: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1107109
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: josm@packages.debian.org
Control: affects -1 + src:josm
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package josm

[ Reason ]
JOSM fails to start when openjdk is not installed.

[ Impact ]
Unusable program.

[ Tests ]
Manually tested the patched launcher on trixie/sid system.

[ Risks ]
Low, trivial changes to the launcher scripts.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
N/A

unblock josm/0.0.svn19369+dfsg-2

diff -Nru josm-0.0.svn19369+dfsg/debian/changelog josm-0.0.svn19369+dfsg/debian/changelog
--- josm-0.0.svn19369+dfsg/debian/changelog	2025-03-31 06:01:00.000000000 +0200
+++ josm-0.0.svn19369+dfsg/debian/changelog	2025-06-01 18:38:40.000000000 +0200
@@ -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@debian.org>  Sun, 01 Jun 2025 18:38:40 +0200
+
 josm (0.0.svn19369+dfsg-1) unstable; urgency=medium
 
   * New tested snapshot.
diff -Nru josm-0.0.svn19369+dfsg/debian/patches/openjfx.patch josm-0.0.svn19369+dfsg/debian/patches/openjfx.patch
--- josm-0.0.svn19369+dfsg/debian/patches/openjfx.patch	1970-01-01 01:00:00.000000000 +0100
+++ josm-0.0.svn19369+dfsg/debian/patches/openjfx.patch	2025-06-01 18:38:14.000000000 +0200
@@ -0,0 +1,35 @@
+Description: Don't use openjfx unconditionally.
+Author: Bas Couwenberg <sebastic@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"
diff -Nru josm-0.0.svn19369+dfsg/debian/patches/series josm-0.0.svn19369+dfsg/debian/patches/series
--- josm-0.0.svn19369+dfsg/debian/patches/series	2024-11-19 16:49:13.000000000 +0100
+++ josm-0.0.svn19369+dfsg/debian/patches/series	2025-06-01 18:37:42.000000000 +0200
@@ -4,3 +4,4 @@
 06-move_data_out_of_jar.patch
 07-use_system_fonts.patch
 08-use_noto_font.patch
+openjfx.patch

--- End Message ---
--- Begin Message --- 
Unblocked josm.

--- End Message ---
Reply to: