graphics/SweetHome3D: Updated for version 6.6.

This also removes the openjdk8 dep in favor of using a java
runtime bundled with the application itself. I know this is
not ideal, but it's the path of least resistance right now.

4 files changed, 18 insertions, 32 deletions

diff --git a/graphics/SweetHome3D/README b/graphics/SweetHome3D/README
index 7221e81b7466..534b996abfa0 100644
--- a/graphics/SweetHome3D/README
+++ b/graphics/SweetHome3D/README
@@ -1,5 +1,3 @@
 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.
-
-JDK is an alternate dependency.
diff --git a/graphics/SweetHome3D/SweetHome3D b/graphics/SweetHome3D/SweetHome3D
index 0318ac5c9bad..45d3b6fdd3a5 100644
--- a/graphics/SweetHome3D/SweetHome3D
+++ b/graphics/SweetHome3D/SweetHome3D
@@ -1,4 +1,2 @@
 #!/bin/sh
-
-# Run Sweet Home 3D
-exec /usr/lib64/java/bin/java -Xmx2g -jar /usr/share/SweetHome3D/SweetHome3D.jar
+exec /opt/SweetHome3D/SweetHome3D
diff --git a/graphics/SweetHome3D/SweetHome3D.SlackBuild b/graphics/SweetHome3D/SweetHome3D.SlackBuild
index d7a010ad6e70..29a0e39e319b 100644
--- a/graphics/SweetHome3D/SweetHome3D.SlackBuild
+++ b/graphics/SweetHome3D/SweetHome3D.SlackBuild
@@ -22,28 +22,14 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Changelog
-# 1.0   2012        New maintainer
-# 1.1   21-JUN-2013 updated copywrite notice; new version (thanks to rw)
-# 1.2   30-NOV-2014 new version.
-# 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
-# 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 version update, switch to .jar for openjdk compatibility
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=SweetHome3D
-VERSION=${VERSION:-6.3}
+VERSION=${VERSION:-6.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
-NVIDIA=${NVIDIA:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -83,26 +69,30 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
+
+mkdir -p $PKG/opt
+cd $PKG/opt
 rm -rf $PRGNAM-$VERSION
-chown -R root:root .
+tar xvf $CWD/$PRGNAM-$VERSION-linux-$TARGET.tgz
+ln -s $PRGNAM-$VERSION $PRGNAM
 
 mkdir -p $PKG/usr/bin
 install -D -m 755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
 
-mkdir -p $PKG/usr/share/$PRGNAM
-install -D -m 644 $CWD/$PRGNAM-$VERSION.jar $PKG/usr/share/$PRGNAM/$PRGNAM.jar
+mkdir -p $PKG/usr/share/applications
+cat $CWD/SweetHome3D.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-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/share/pixmaps
+cp $PKG/opt/$PRGNAM-$VERSION/SweetHome3DIcon.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mv $PKG/opt/$PRGNAM-$VERSION/*.TXT $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+chown -R root:root $PKG 
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/graphics/SweetHome3D/SweetHome3D.info b/graphics/SweetHome3D/SweetHome3D.info
index 8c636e9f9345..fdfcb5fbe5dd 100644
--- a/graphics/SweetHome3D/SweetHome3D.info
+++ b/graphics/SweetHome3D/SweetHome3D.info
@@ -1,10 +1,10 @@
 PRGNAM="SweetHome3D"
-VERSION="6.3"
+VERSION="6.6"
 HOMEPAGE="http://www.sweethome3d.com/"
-DOWNLOAD="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.3/SweetHome3D-6.3.jar"
-MD5SUM="4f461a8a5e9586537367e8bf75668fa6"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.6/SweetHome3D-6.6-linux-x86.tgz"
+MD5SUM="d66d9afbbcf2c8e8722e77c5090b1c4c"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.6/SweetHome3D-6.6-linux-x64.tgz"
+MD5SUM_x86_64="299be9d6ec9e6c2f939bfd88b200dc04"
 REQUIRES="openjdk8"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"