[arch-commits] Commit in sweethome3d/trunk (PKGBUILD sweethome3d.sh)

[Fabio Castelli via arch-commits]

    Date: Saturday, July 31, 2021 @ 19:01:28
  Author: muflone
Revision: 991303

upgpkg: sweethome3d 6.6-1

Modified:
  sweethome3d/trunk/PKGBUILD
  sweethome3d/trunk/sweethome3d.sh

----------------+
 PKGBUILD       |    4 ++--
 sweethome3d.sh |   14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2021-07-31 19:01:18 UTC (rev 991302)
+++ PKGBUILD    2021-07-31 19:01:28 UTC (rev 991303)
@@ -12,7 +12,7 @@
 arch=('x86_64')
 url="http://www.sweethome3d.com/";
 license=('GPL' 'custom')
-depends=('java-runtime>=11' 'shared-mime-info' 'desktop-file-utils' 'libxext' 
'libgl' 'libxrender' 'libnsl')
+depends=('java-runtime>=8' 'shared-mime-info' 'desktop-file-utils' 'libxext' 
'libgl' 'libxrender' 'libnsl')
 makedepends=('ant' 'strip-nondeterminism')
 
source=("SweetHome3D-${pkgver}-src.zip"::"https://downloads.sourceforge.net/${pkgname}/SweetHome3D-${pkgver}-src.zip";
         "${pkgname}.sh"
@@ -19,7 +19,7 @@
         "${pkgname}.desktop"
         "${pkgname}.xml")
 sha256sums=('0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b'
-            '6ab8b6cc3859f2c68acbc21370bd37466d93ea39d3b5896e0c2fc3d598ee883e'
+            '71abd705684d373a19bc434ca5dc42072faf6e1716b9f0a6005bae122326bfa9'
             '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e'
             'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5')
 install="${pkgname}.install"

Modified: sweethome3d.sh
===================================================================
--- sweethome3d.sh      2021-07-31 19:01:18 UTC (rev 991302)
+++ sweethome3d.sh      2021-07-31 19:01:28 UTC (rev 991303)
@@ -2,7 +2,7 @@
 
 APP_CLASSPATH=""
 JAVA_EXEC=""
-JAVA_OPTS="${JAVA_OPTS} -Xmx1024m --illegal-access=permit"
+JAVA_OPTS="${JAVA_OPTS} -Xmx1024m"
 
 if [ -n "${JAVA_HOME}" ]
 then
@@ -21,6 +21,18 @@
   exit 1
 fi
 
+# Find Java version
+JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | head -1 | cut -d' ' -f 3 | tr -d 
'"')"
+
+# Fix for Java 16 compatibility
+# https://bugs.archlinux.org/task/71255
+# https://sourceforge.net/p/sweethome3d/bugs/1021/
+if [ $(vercmp "${JAVA_VERSION}" "11") -gt 0 ]
+then
+  # Add illegal-access=permit argument
+  JAVA_OPTS="${JAVA_OPTS} --illegal-access=permit"
+fi
+
 # Build classpath
 
APP_CLASSPATH="SweetHome3D.jar:Furniture.jar:Textures.jar:Examples.jar:Help.jar:iText-2.1.7.jar:freehep-vectorgraphics-svg-2.1.1b.jar:sunflow-0.07.3i.jar:jmf.jar:batik-svgpathparser-1.7.jar:jeksparser-calculator.jar:jnlp.jar"
 if [ "${SWEETHOME3D_JAVA3D}" = "1.6" ]