NicoHood pushed to branch main at Arch Linux / Packaging / Packages / josm
Commits:
f52febdc by NicoHood at 2023-10-15T09:30:57+02:00
Corrected previously wrong patch
- - - - -
024de0c2 by NicoHood at 2023-10-15T09:32:16+02:00
upgpkg: 18721-3: Corrected previously wrong patch
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = josm
pkgdesc = An editor for OpenStreetMap written in Java
pkgver = 18721
- pkgrel = 2
+ pkgrel = 3
url = https://josm.openstreetmap.de/
changelog = josm.changelog
arch = any
=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
pkgname=josm
pkgver=18721
-pkgrel=2
+pkgrel=3
pkgdesc="An editor for OpenStreetMap written in Java"
arch=('any')
url="https://josm.openstreetmap.de/";
@@ -41,9 +41,13 @@ 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"
@@ -54,7 +58,4 @@ package() {
# 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"
-
- 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/96b39755a81f80d09833fcae03fd623bfea7a4fb...024de0c277d24e985c712af2c1f47e2093294bb7
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/compare/96b39755a81f80d09833fcae03fd623bfea7a4fb...024de0c277d24e985c712af2c1f47e2093294bb7
You're receiving this email because of your account on gitlab.archlinux.org.
