Add required Java options

3 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20773b89c5b2..46cecf205269 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = josm-svn
 	pkgdesc = An editor for OpenStreetMap written in Java
-	pkgver = 16176
+	pkgver = 19018
 	pkgrel = 1
 	url = http://josm.openstreetmap.de/
 	arch = any
 	license = GPL
 	makedepends = apache-ant
-	makedepends = java-environment>=8
+	makedepends = java-environment>=11
 	makedepends = subversion
-	depends = java-runtime>=8
+	depends = java-runtime>=11
 	depends = libxtst
 	depends = ttf-font
 	provides = josm
@@ -18,8 +18,7 @@ pkgbase = josm-svn
 	source = josm.sh
 	source = josm.conf
 	sha256sums = SKIP
-	sha256sums = 04d12673ad6e00093123a474b9d85400fcbdd28ec1e8421ac33859cd2e69d134
+	sha256sums = 82caf9947a21c8c2860cac6bdda727fcb31887a875aebbc2c9ec36d529d7b4f7
 	sha256sums = 43ee660f17ee2205c0e0654e8d229db78535e4d28e1298f02ebb814ae433dfd1
 
 pkgname = josm-svn
-
diff --git a/PKGBUILD b/PKGBUILD
index cb11ab9ed08b..57fb8d154cfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Sven Karsten Greiner <sven@sammyshp.de>
 
 pkgname=josm-svn
-pkgver=16176
+pkgver=19018
 pkgrel=1
 pkgdesc="An editor for OpenStreetMap written in Java"
 arch=('any')
 url="http://josm.openstreetmap.de/"
 license=('GPL')
-depends=('java-runtime>=8' 'libxtst' 'ttf-font')
-makedepends=('apache-ant' 'java-environment>=8' 'subversion')
+depends=('java-runtime>=11' 'libxtst' 'ttf-font')
+makedepends=('apache-ant' 'java-environment>=11' 'subversion')
 provides=('josm')
 conflicts=('josm')
 backup=('etc/conf.d/josm')
@@ -16,7 +16,7 @@ source=("$pkgname::svn+https://josm.openstreetmap.de/svn/trunk"
         "josm.sh"
         "josm.conf")
 sha256sums=('SKIP'
-            '04d12673ad6e00093123a474b9d85400fcbdd28ec1e8421ac33859cd2e69d134'
+            '82caf9947a21c8c2860cac6bdda727fcb31887a875aebbc2c9ec36d529d7b4f7'
             '43ee660f17ee2205c0e0654e8d229db78535e4d28e1298f02ebb814ae433dfd1')
 
 pkgver() {
diff --git a/josm.sh b/josm.sh
index 4c6cfdc8cb7f..eed3819944fb 100755
--- a/josm.sh
+++ b/josm.sh
@@ -5,6 +5,11 @@ while true; do
     [ -f /etc/conf.d/josm ] && . /etc/conf.d/josm
     JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
 
+    # See https://josm.openstreetmap.de/ticket/23355
+    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"
+
     java $JAVA_OPTS -jar /usr/share/java/josm/josm.jar "$@"
     [ "z$?" != "z9" ] && break
 done