remove the need to fetch the whole sourcecode repo for 4 static files; instead fetch them via https

- update josm.conf.d with more detailed comments

3 files changed, 29 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 311dbc572606..81f42f32f1ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = josm-stable
 	pkgdesc = An editor for OpenStreetMap written in Java. Stable releases
 	pkgver = 22.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://josm.openstreetmap.de/
 	changelog = josm-stable.changelog
 	arch = any
 	license = GPL
-	makedepends = subversion
 	depends = hicolor-icon-theme
 	depends = java-runtime>=11
 	depends = ttf-font
@@ -17,9 +16,15 @@ pkgbase = josm-stable
 	backup = etc/conf.d/josm
 	source = https://josm.openstreetmap.de/download/josm-snapshot-18583.jar
 	source = josm.conf.d
-	source = josm::svn+https://josm.openstreetmap.de/svn/trunk#revision=18583
+	source = https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
+	source = https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/man/man1/josm.1
+	source = https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
+	source = https://josm.openstreetmap.de/export/18583/josm/trunk/native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg
 	b2sums = 1f661090db02278a05f457093ac6ff8aff060c00ead6347e283892e114ea7bf5c0a96279dd645cf97cbb45a3bf8f8919b5523cc847f52b703b19c4bfa909f463
-	b2sums = 368a8116c9b2be9906bc76fc5a51c20321137747ddf463ae029a235ec75c1a420f477dc53bce38fd0a68c2f6fdb05dae2f700cf0e65e464f17e28e3439a3d7cf
-	b2sums = SKIP
+	b2sums = 6ab22295febf20e8124da5f224d28722210345b33a091b948dd02e1897ab7767cdf6b65ee42bf777f3d52dfb88e14b7af9a013ee60e6949964618bb33416b6ee
+	b2sums = d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7
+	b2sums = 095c9a52e8efaf90a41d322c89cee6828ff05a20999a864f438e1b8c101382588e58f455f8339235493a27a16326b9114add69aeab9709e9bf8a28d1ce5594d5
+	b2sums = 59eafa8c80f4ab55406ff909851fceacdd9c6f956017ead50bb3ee47c4d439f4e1e35406823a00f1654178244aec26be1f0de7703ea00cdda6d40cbf0b0d9235
+	b2sums = b0ec92c4e97500d5461200f698fbfccc53c275169c25db3139a4c97826fffa96ec6104d21ab9a16d4221b98725faea09e6a2b7d99ed48a782becab6dd9de8d4f
 
 pkgname = josm-stable
diff --git a/PKGBUILD b/PKGBUILD
index b758d39382c0..f919777a9ee0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=josm-stable
 _name=josm
 _app_id="org.openstreetmap.${_name}"
 pkgver=22.10
-pkgrel=1
+pkgrel=2
 _commit_id=18583
 pkgdesc="An editor for OpenStreetMap written in Java. Stable releases"
 arch=('any')
@@ -15,16 +15,22 @@ license=('GPL')
 depends=('hicolor-icon-theme' 'java-runtime>=11' 'ttf-font' 'sh')
 conflicts=('josm')
 provides=('josm')
-makedepends=('subversion')
+makedepends=()
 changelog=$pkgname.changelog
 backup=('etc/conf.d/josm')
-source=(https://josm.openstreetmap.de/download/${_name}-snapshot-${_commit_id}.jar
+source=("https://josm.openstreetmap.de/download/${_name}-snapshot-${_commit_id}.jar"
         ${_name}.conf.d
-        ${_name}::svn+https://josm.openstreetmap.de/svn/trunk#revision=${_commit_id})
+        "https://josm.openstreetmap.de/export/${_commit_id}/josm/trunk/native/linux/tested/usr/share/applications/${_app_id}.desktop"
+        "https://josm.openstreetmap.de/export/${_commit_id}/josm/trunk/native/linux/tested/usr/share/man/man1/${_name}.1"
+        "https://josm.openstreetmap.de/export/${_commit_id}/josm/trunk/native/linux/tested/usr/share/metainfo/${_app_id}.appdata.xml"
+        "https://josm.openstreetmap.de/export/${_commit_id}/josm/trunk/native/linux/tested/usr/share/icons/hicolor/scalable/apps/${_app_id}.svg")
 noextract=(${_name}-snapshot-${_commit_id}.jar)
 b2sums=('1f661090db02278a05f457093ac6ff8aff060c00ead6347e283892e114ea7bf5c0a96279dd645cf97cbb45a3bf8f8919b5523cc847f52b703b19c4bfa909f463'
-        '368a8116c9b2be9906bc76fc5a51c20321137747ddf463ae029a235ec75c1a420f477dc53bce38fd0a68c2f6fdb05dae2f700cf0e65e464f17e28e3439a3d7cf'
-        'SKIP')
+        '6ab22295febf20e8124da5f224d28722210345b33a091b948dd02e1897ab7767cdf6b65ee42bf777f3d52dfb88e14b7af9a013ee60e6949964618bb33416b6ee'
+        'd3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7'
+        '095c9a52e8efaf90a41d322c89cee6828ff05a20999a864f438e1b8c101382588e58f455f8339235493a27a16326b9114add69aeab9709e9bf8a28d1ce5594d5'
+        '59eafa8c80f4ab55406ff909851fceacdd9c6f956017ead50bb3ee47c4d439f4e1e35406823a00f1654178244aec26be1f0de7703ea00cdda6d40cbf0b0d9235'
+        'b0ec92c4e97500d5461200f698fbfccc53c275169c25db3139a4c97826fffa96ec6104d21ab9a16d4221b98725faea09e6a2b7d99ed48a782becab6dd9de8d4f')
 
 package() {
   cd "${srcdir}"
@@ -32,13 +38,13 @@ package() {
   install -Dm644 ${_name}-snapshot-${_commit_id}.jar "${pkgdir}"/usr/share/java/${_name}/${_name}.jar
 
 #.desktop and icon file
-  install -Dm644 ${_name}/native/linux/tested/usr/share/applications/${_app_id}.desktop \
+  install -Dm644 ${_app_id}.desktop \
         "${pkgdir}"/usr/share/applications/${_app_id}.desktop
-  install -Dm644 ${_name}/native/linux/tested/usr/share/man/man1/${_name}.1 \
+  install -Dm644 ${_name}.1 \
         "${pkgdir}"/usr/share/man/man1/${_name}.1
-  install -Dm644 ${_name}/native/linux/tested/usr/share/metainfo/${_app_id}.appdata.xml \
+  install -Dm644 ${_app_id}.appdata.xml \
         "${pkgdir}"/usr/share/metainfo/${_app_id}.appdata.xml
-  install -Dm644 ${_name}/native/linux/tested/usr/share/icons/hicolor/scalable/apps/${_app_id}.svg \
+  install -Dm644 ${_app_id}.svg \
         "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/${_app_id}.svg
 
   for _icon in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
diff --git a/josm.conf.d b/josm.conf.d
index c67ba8abbd69..abeed0c09dde 100644
--- a/josm.conf.d
+++ b/josm.conf.d
@@ -1,7 +1,8 @@
 #
 # Parameters for JOSM editor
 #
-#JOSM_ARGS="-Xmx800M"
+# You may want to extend the memory for josm with something like this as additional parameters
+# -Xmx800M
 
-#FS#72953 https://bugs.archlinux.org/task/72953
+#Required by josm-developers for some functionality, see https://bugs.archlinux.org/task/72953
 JOSM_ARGS="--add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED"