4 files changed, 31 insertions, 18 deletions
diff --git a/graphics/SweetHome3D/README b/graphics/SweetHome3D/README
index 534b996abfa07..c550edef573b1 100644
--- a/graphics/SweetHome3D/README
+++ b/graphics/SweetHome3D/README
@@ -1,3 +1,12 @@
 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
diff --git a/graphics/SweetHome3D/SweetHome3D.SlackBuild b/graphics/SweetHome3D/SweetHome3D.SlackBuild
index 0b80a199da2a7..690b3873b4f99 100644
--- a/graphics/SweetHome3D/SweetHome3D.SlackBuild
+++ b/graphics/SweetHome3D/SweetHome3D.SlackBuild
@@ -30,11 +30,13 @@
 # 1.3   28-APR-2015 version update
 # 1.4   20-MAR-2016 version update
 # 1.5   29-JAN-2017 version update
+# 2.0   04-JAN-2017 version update, script bug fixes, nvidia 3d error workaround
 
 PRGNAM=SweetHome3D
-VERSION=${VERSION:-5.3}
+VERSION=${VERSION:-5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+NVIDIA=${NVIDIA:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -73,34 +75,36 @@ 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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
-cp -a SweetHome3D $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\"/jre1.6.0_45/bin/java,/usr/lib${LIBDIRSUFFIX}/java/bin/java,g" \
-  -e "s,\"\$PROGRAM_DIR\"/jre1.6.0_45/lib,/usr/lib${LIBDIRSUFFIX}/java/jre/lib,g" \
+  -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"
 
 mkdir -p $PKG/usr/share/$PRGNAM
 cp -a lib/* $PKG/usr/share/$PRGNAM
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat $CWD/SweetHome3D.desktop > $PKG/usr/share/applications/SweetHome3D.desktop
-cat $CWD/SweetHome3D.png > $PKG/usr/share/pixmaps/SweetHome3D.png
+cat SweetHome3DIcon.png > $PKG/usr/share/pixmaps/SweetHome3D.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING.TXT LICENSE.TXT THIRDPARTY-LICENSE-*.TXT THIRDPARTY-LICENSE-JMF.HTML \
-  $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 f3b71c08a0e36..1b9f92074de68 100644
--- a/graphics/SweetHome3D/SweetHome3D.info
+++ b/graphics/SweetHome3D/SweetHome3D.info
@@ -1,10 +1,10 @@
 PRGNAM="SweetHome3D"
-VERSION="5.3"
+VERSION="5.4"
 HOMEPAGE="http://www.sweethome3d.com/"
-DOWNLOAD="http://downloads.sourceforge.net/project/sweethome3d/SweetHome3D/SweetHome3D-5.3/SweetHome3D-5.3-linux-x86.tgz"
-MD5SUM="9f2a5c3b64b62a06cbbf9f3c10cfe93e"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/project/sweethome3d/SweetHome3D/SweetHome3D-5.3/SweetHome3D-5.3-linux-x64.tgz"
-MD5SUM_x86_64="ceadfc72d57e984c0cfedb31a99bab09"
+DOWNLOAD="http://downloads.sourceforge.net/project/sweethome3d/SweetHome3D/SweetHome3D-5.4/SweetHome3D-5.4-linux-x86.tgz"
+MD5SUM="064df2124478d8e766a9691fc143e70c"
+DOWNLOAD_x86_64="http://downloads.sourceforge.net/project/sweethome3d/SweetHome3D/SweetHome3D-5.4/SweetHome3D-5.4-linux-x64.tgz"
+MD5SUM_x86_64="da3a14b1071de7f32b68a6bcc19d30fa"
 REQUIRES="jdk"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/graphics/SweetHome3D/SweetHome3D.png b/graphics/SweetHome3D/SweetHome3D.png
deleted file mode 100644
index 46ee087f0a034..0000000000000
--- a/graphics/SweetHome3D/SweetHome3D.png
+++ /dev/null