NicoHood pushed to branch main at Arch Linux / Packaging / Packages / josm
Commits: 44e344b6 by NicoHood at 2023-10-15T09:06:39+02:00 Fix package startup issue - - - - - 96b39755 by NicoHood at 2023-10-15T09:08:07+02:00 upgpkg: 18721-2: Fix startup error - - - - - 2 changed files: - + .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -0,0 +1,25 @@ +pkgbase = josm + pkgdesc = An editor for OpenStreetMap written in Java + pkgver = 18721 + pkgrel = 2 + url = https://josm.openstreetmap.de/ + changelog = josm.changelog + arch = any + license = GPL + makedepends = subversion + depends = desktop-file-utils + depends = hicolor-icon-theme + depends = java-runtime>=11 + depends = libxtst + depends = ttf-font + optdepends = java-openjfx>=11: For some optional plugins + noextract = josm-snapshot-18721.jar + backup = etc/conf.d/josm + source = https://josm.openstreetmap.de/download/josm-snapshot-18721.jar + source = josm.conf.d + source = josm::svn+https://josm.openstreetmap.de/svn/trunk#revision=18721 + sha256sums = 9dcea2b686e50333f4eb8c534c5f2af7dd138915f7fb37f9ba4f9e9d2f82e49a + sha256sums = 67005ab4f4095ac012380995b3c544b27ad1c914fa6ebf6714d33a6e42a1096b + sha256sums = SKIP + +pkgname = josm ===================================== PKGBUILD ===================================== @@ -3,12 +3,13 @@ pkgname=josm pkgver=18721 -pkgrel=1 +pkgrel=2 pkgdesc="An editor for OpenStreetMap written in Java" arch=('any') url="https://josm.openstreetmap.de/"; license=('GPL') depends=('desktop-file-utils' 'hicolor-icon-theme' 'java-runtime>=11' 'libxtst' 'ttf-font') +optdepends=('java-openjfx>=11: For some optional plugins') makedepends=('subversion') changelog=$pkgname.changelog backup=('etc/conf.d/josm') @@ -40,18 +41,20 @@ package() { "${pkgdir}"/usr/share/icons/hicolor/${_icon}x${_icon}/apps/org.openstreetmap.josm.png done - install -Dm644 "${srcdir}"/$pkgname.conf.d "${pkgdir}"/etc/conf.d/$pkgname install -Dm755 "${pkgname}/native/linux/tested/usr/bin/josm" "${pkgdir}/usr/bin/josm" install -Dm644 "${pkgname}/native/linux/tested/etc/default/josm" "${pkgdir}/etc/default/josm" - # 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" + # 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" - # TODO this does not yet work correct, we need to discuss if it is needed. https://bugs.archlinux.org/task/72953 - #sed -i '5 aJAVAFX_HOME="$(ls /usr/lib/jvm/default-runtime/lib/javafx*.jar | tr "\n" ":" | sed '"'"'s/.$//'"'"')"' "${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" + + install -Dm755 "${pkgname}/native/linux/tested/usr/bin/josm" "${pkgdir}"/usr/bin/josm + install -Dm644 "${srcdir}"/$pkgname.conf.d "${pkgdir}"/etc/conf.d/$pkgname } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/compare/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d...96b39755a81f80d09833fcae03fd623bfea7a4fb -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/compare/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d...96b39755a81f80d09833fcae03fd623bfea7a4fb You're receiving this email because of your account on gitlab.archlinux.org.
