Fabio Castelli pushed to branch main at Arch Linux / Packaging / Packages / josm
Commits:
31945cff by Fabio Castelli (Muflone) at 2024-11-01T18:12:36+01:00
upgpkg: 19253-1
- - - - -
4 changed files:
- .SRCINFO
- PKGBUILD
- josm.changelog
- + remove_javafx.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = josm
pkgdesc = An editor for OpenStreetMap written in Java
- pkgver = 19207
+ pkgver = 19253
pkgrel = 1
url = https://josm.openstreetmap.de/
changelog = josm.changelog
@@ -12,13 +12,15 @@ pkgbase = josm
depends = java-runtime>=11
depends = libxtst
depends = ttf-font
- noextract = josm-snapshot-19207.jar
+ noextract = josm-snapshot-19253.jar
backup = etc/conf.d/josm
- source = https://josm.openstreetmap.de/download/josm-snapshot-19207.jar
+ source = https://josm.openstreetmap.de/download/josm-snapshot-19253.jar
source = josm.conf.d
- source =
josm::svn+https://josm.openstreetmap.de/svn/trunk#revision=19207
- sha512sums =
7de9b9f4a70cd3b4788254d4b1ab979df311362671d47ec53d8abf5324b32ecb8577ffc1b7619d51df8f8e901cbd4710bfa25e01cba3d8495fd741e53a7966af
+ source =
josm::svn+https://josm.openstreetmap.de/svn/trunk#revision=19253
+ source = remove_javafx.patch
+ sha512sums =
36d40422080cf6f14db53623796ce73d6c61f956916493021f2002146f8f254781caa3fd48c905f1f78b0baff63b51c6566620c2e5627f505e15b1a794dfc1f7
sha512sums =
d69e681a679378915f980ebafe204c548e0d76778962e4aa33afe8f83a1e6fe4438c7729a92634e02b195349a52a388f8933959c6b81c01ecc602d061ff7c8df
sha512sums = SKIP
+ sha512sums =
18e675fe998d01181c606eb414a72e55a4ded6ac3e4d89058ed654690e5b8821654ccaae2a6987003601ec918e62e91584e89b3b8a429ab0dfd92ab19fd9c4b4
pkgname = josm
=====================================
PKGBUILD
=====================================
@@ -1,8 +1,9 @@
# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org>
+# Contributor: Muflone http://www.muflone.com/contacts/english/
# Contributor: Michele Schäuble <mschaeu...@swissonline.ch>
pkgname=josm
-pkgver=19207
+pkgver=19253
pkgrel=1
pkgdesc="An editor for OpenStreetMap written in Java"
arch=('any')
@@ -14,11 +15,13 @@ changelog=$pkgname.changelog
backup=('etc/conf.d/josm')
source=(https://josm.openstreetmap.de/download/$pkgname-snapshot-$pkgver.jar
$pkgname.conf.d
- $pkgname::svn+https://josm.openstreetmap.de/svn/trunk#revision=$pkgver)
+ $pkgname::svn+https://josm.openstreetmap.de/svn/trunk#revision=$pkgver
+ remove_javafx.patch)
noextract=($pkgname-snapshot-$pkgver.jar)
-sha512sums=('7de9b9f4a70cd3b4788254d4b1ab979df311362671d47ec53d8abf5324b32ecb8577ffc1b7619d51df8f8e901cbd4710bfa25e01cba3d8495fd741e53a7966af'
+sha512sums=('36d40422080cf6f14db53623796ce73d6c61f956916493021f2002146f8f254781caa3fd48c905f1f78b0baff63b51c6566620c2e5627f505e15b1a794dfc1f7'
'd69e681a679378915f980ebafe204c548e0d76778962e4aa33afe8f83a1e6fe4438c7729a92634e02b195349a52a388f8933959c6b81c01ecc602d061ff7c8df'
- 'SKIP')
+ 'SKIP'
+
'18e675fe998d01181c606eb414a72e55a4ded6ac3e4d89058ed654690e5b8821654ccaae2a6987003601ec918e62e91584e89b3b8a429ab0dfd92ab19fd9c4b4')
package() {
cd "${srcdir}"
@@ -46,14 +49,10 @@ package() {
# Load our custom josm config at /etc/conf.d/josm (will append this to line
4 of the start script)
sed -i '4 a[ -f /etc/conf.d/josm ] && . /etc/conf.d/josm'
"${pkgdir}/usr/bin/josm"
+ # Remove JavaFX modules references not provided anymore by modern JVMs
+ patch -N -p1 --no-backup-if-mismatch "${pkgdir}/usr/bin/josm"
"${srcdir}/remove_javafx.patch"
+
# Add arch env vars to top of josm script
# We do this to have a sane default in case the config file gets deleted.
sed -i '4 aJOSM_PATH="/usr/share/java/josm/josm.jar"'
"${pkgdir}/usr/bin/josm"
-
- # This is a hack -- Arch puts the JavaFX modules in with the rest of the JVM
- # modules, but the JVM doesn't automatically load them.
- # Otherwise, we could remove the module-path for JAVAFX_HOME in the start
- # script.
- # sed -i 's/--module-path ${JAVAFX_HOME} //' "${pkgdir}/usr/bin/josm"
- sed -i '5 aJAVAFX_HOME="$(shopt -s nullglob && echo
/usr/lib/jvm/default-runtime/lib/javafx*.jar | tr " " ":")"'
"${pkgdir}/usr/bin/josm"
}
=====================================
josm.changelog
=====================================
@@ -1,3 +1,7 @@
+2024-11-11 Muflone <mufl...@archlinux.org>-
+ * josm 19253-1
+ * Issue#3 - Module javafx.web not found on launch
+
2024-09-10 Jaroslav Lichtblau <svetlemo...@archlinux.org>-
* josm 19207-1
=====================================
remove_javafx.patch
=====================================
@@ -0,0 +1,10 @@
+--- josm-19253.sh.orig 2024-11-01 17:48:34.926807291 +0100
++++ josm-19253.sh 2024-11-01 17:49:56.926936346 +0100
+@@ -89,7 +89,6 @@
+ 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"
+ 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"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/commit/31945cffaf9258f2d7b84b2afa82971b81bbf31d
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/commit/31945cffaf9258f2d7b84b2afa82971b81bbf31d
You're receiving this email because of your account on gitlab.archlinux.org.
