5 files changed, 15 insertions, 39 deletions
diff --git a/graphics/SweetHome3D/README b/graphics/SweetHome3D/README
index c550edef573b1..7221e81b7466d 100644
--- a/graphics/SweetHome3D/README
+++ b/graphics/SweetHome3D/README
@@ -2,11 +2,4 @@ Sweet Home 3D is a free interior design application
 that helps you draw the plan of your house, arrange
 furniture on it and visit the results in 3D.
 
-As a workaround for a java3d crash when using the
-Nvidia proprietary driver, try:
-
-NVIDIA=yes ./SweetHome3D.SlackBuild
-
-This will use an older version of java3D. Also, if
-SweetHome3D fails to run with OpenJDK, remove it and
-install the the official jdk on Slackbuilds.org
+JDK is an alternate dependency.
diff --git a/graphics/SweetHome3D/SweetHome3D b/graphics/SweetHome3D/SweetHome3D
new file mode 100644
index 0000000000000..0318ac5c9bad1
--- /dev/null
+++ b/graphics/SweetHome3D/SweetHome3D
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Run Sweet Home 3D
+exec /usr/lib64/java/bin/java -Xmx2g -jar /usr/share/SweetHome3D/SweetHome3D.jar
diff --git a/graphics/SweetHome3D/SweetHome3D.SlackBuild b/graphics/SweetHome3D/SweetHome3D.SlackBuild
index e261c394700d7..dee73365994aa 100644
--- a/graphics/SweetHome3D/SweetHome3D.SlackBuild
+++ b/graphics/SweetHome3D/SweetHome3D.SlackBuild
@@ -34,7 +34,7 @@
 # 2.1   06-JAN-2018 version update
 # 2.2   07-Aug-2018 version update
 # 2.3   24-Jun-2019 version update
-# 2.4	23-APR-2020 verionb update
+# 2.4	23-APR-2020 version update, switch to .jar for openjdk compatibility
 
 PRGNAM=SweetHome3D
 VERSION=${VERSION:-6.3}
@@ -75,40 +75,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-linux-$TARGET.tgz
-cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/bin
-if [ "${NVIDIA}" = "no" ]; then
-    cp -a SweetHome3D $PKG/usr/bin
-else
-    cp -a SweetHome3D-Java3D-1_5_2 $PKG/usr/bin/SweetHome3D
-fi
-
-# Set program location and use global java
-sed -i $PKG/usr/bin/SweetHome3D \
-  -e "s,\"\$PROGRAM_DIR\"/jre8/bin/java,/usr/lib${LIBDIRSUFFIX}/java/bin/java,g" \
-  -e "s,\"\$PROGRAM_DIR\"/jre8/lib,/usr/lib${LIBDIRSUFFIX}/java/jre/lib,g" \
-  -e "s,\"\$PROGRAM_DIR\"/lib,/usr/share/$PRGNAM,g"
+install -D -m 755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/share/$PRGNAM
-cp -a lib/* $PKG/usr/share/$PRGNAM
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+install -D -m 644 $CWD/$PRGNAM-$VERSION.jar $PKG/usr/share/$PRGNAM/$PRGNAM.jar
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/SweetHome3D.desktop > $PKG/usr/share/applications/SweetHome3D.desktop
-cat SweetHome3DIcon.png > $PKG/usr/share/pixmaps/SweetHome3D.png
+cp -a $CWD/SweetHome3D.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+cp -a $CWD/SweetHome3DIcon.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.TXT THIRDPARTY-LICENSE-JMF.HTML $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/SweetHome3D/SweetHome3D.info b/graphics/SweetHome3D/SweetHome3D.info
index c1bed72e0250d..8c636e9f9345f 100644
--- a/graphics/SweetHome3D/SweetHome3D.info
+++ b/graphics/SweetHome3D/SweetHome3D.info
@@ -1,10 +1,10 @@
 PRGNAM="SweetHome3D"
 VERSION="6.3"
 HOMEPAGE="http://www.sweethome3d.com/"
-DOWNLOAD="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.3/SweetHome3D-6.3-linux-x86.tgz"
-MD5SUM="ec33adcb1941d527bfed5da0c5c66262"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.3/SweetHome3D-6.3-linux-x64.tgz"
-MD5SUM_x86_64="b1ab9e6839637a7ee03144a7da85808c"
-REQUIRES="jdk"
+DOWNLOAD="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.3/SweetHome3D-6.3.jar"
+MD5SUM="4f461a8a5e9586537367e8bf75668fa6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="openjdk8"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/graphics/SweetHome3D/SweetHome3DIcon.png b/graphics/SweetHome3D/SweetHome3DIcon.png
new file mode 100644
index 0000000000000..7cb7a0e4cbff1
--- /dev/null
+++ b/graphics/SweetHome3D/SweetHome3DIcon.png