summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Stieler2023-03-16 21:11:51 +0100
committerHauke Stieler2023-03-16 21:11:51 +0100
commitf522e854e246e7fcebfac758d27d664ab89c52fd (patch)
tree6db10f2cf29179f112202b35bcd5fa2aacff44ae
parent7035166d696f4a1ccb22274e039f40e268e2cab8 (diff)
downloadaur-f522e854e246e7fcebfac758d27d664ab89c52fd.tar.gz
Update josm.conf.d and .SRCINFO
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD4
-rw-r--r--josm.conf.d6
3 files changed, 11 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a3e4621d0bf..746ee018ade8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = josm-latest
pkgdesc = An editor for OpenStreetMap written in Java
pkgver = 18693
- pkgrel = 1
+ pkgrel = 2
url = https://josm.openstreetmap.de/
arch = any
license = GPL
@@ -11,6 +11,9 @@ pkgbase = josm-latest
depends = java-runtime>=11
depends = libxtst
depends = ttf-font
+ conflicts = josm
+ conflicts = josm-stable
+ conflicts = josm-svn
noextract = josm-latest.jar
backup = etc/conf.d/josm
source = https://josm.openstreetmap.de/download/josm-latest.jar
@@ -18,7 +21,7 @@ pkgbase = josm-latest
source = josm.sh
source = josm::svn+https://josm.openstreetmap.de/svn/trunk#revision=18693
sha256sums = 6a16f16cf12a01e0e43f40b25b4528ff3123ed860bb68a09dd8babd20f114698
- sha256sums = 58ce8f552990b290449f2d67572c3e2773d0314cbdbcb659d3c54cd60b472147
+ sha256sums = 16bbb378a4e4d02c8ea321f3a3a65ad74007bc439720f44c597432a66d0d1646
sha256sums = a30c4824de1570af66e9df2bcbab777b9efea80914a07de498fcfac58789731e
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index aaa943ea5297..a4863d92bafe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=josm-latest
pkgver=18693
-pkgrel=1
+pkgrel=2
pkgdesc="An editor for OpenStreetMap written in Java"
arch=('any')
url="https://josm.openstreetmap.de/"
@@ -23,7 +23,7 @@ source=(https://josm.openstreetmap.de/download/josm-latest.jar
josm::svn+https://josm.openstreetmap.de/svn/trunk#revision=$pkgver)
noextract=(josm-latest.jar)
sha256sums=('6a16f16cf12a01e0e43f40b25b4528ff3123ed860bb68a09dd8babd20f114698'
- '58ce8f552990b290449f2d67572c3e2773d0314cbdbcb659d3c54cd60b472147'
+ '16bbb378a4e4d02c8ea321f3a3a65ad74007bc439720f44c597432a66d0d1646'
'a30c4824de1570af66e9df2bcbab777b9efea80914a07de498fcfac58789731e'
'SKIP')
diff --git a/josm.conf.d b/josm.conf.d
index 520fe800df0a..1b15beb2023a 100644
--- a/josm.conf.d
+++ b/josm.conf.d
@@ -1,2 +1,4 @@
-# set memory limit, e.g. "-Xmx1024M" for 1024 MB
-#JOSM_ARGS="-Xmx1024M"
+# Parameters for JOSM editor
+
+#FS#72953 https://bugs.archlinux.org/task/72953
+JOSM_ARGS="--add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED"