1 files changed, 5 insertions, 26 deletions
diff --git a/graphics/SweetHome3D/SweetHome3D.SlackBuild b/graphics/SweetHome3D/SweetHome3D.SlackBuild
index e261c39470..dee7336599 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