4 files changed, 42 insertions, 67 deletions
diff --git a/graphics/SweetHome3D/README b/graphics/SweetHome3D/README
index c550edef57..534b996abf 100644
--- a/graphics/SweetHome3D/README
+++ b/graphics/SweetHome3D/README
@@ -1,12 +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.
-
-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 b/graphics/SweetHome3D/SweetHome3D
new file mode 100644
index 0000000000..45d3b6fdd3
--- /dev/null
+++ b/graphics/SweetHome3D/SweetHome3D
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/SweetHome3D/SweetHome3D
diff --git a/graphics/SweetHome3D/SweetHome3D.SlackBuild b/graphics/SweetHome3D/SweetHome3D.SlackBuild
index 0a7e238c25..ea6486cb35 100644
--- a/graphics/SweetHome3D/SweetHome3D.SlackBuild
+++ b/graphics/SweetHome3D/SweetHome3D.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for SweetHome3D
 
 # Copyright 2011 by Giovanne Castro, Campinas, Sao Paulo, Brazil <giovannefc@ig.com.br>
-# Copyright 2012-2018 by Edward Koenig, Vancouver, Washington, USA <kingbeowulf@gmail.com>
+# Copyright 2012-2018 by Edward Koenig, Vancouver, Washington, USA <kingbeowulf@linuxgalaxy.org>
+# Copyright 2023-2024 Jeremy Hansen <jebrhansen+SBo@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,24 +23,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
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=SweetHome3D
-VERSION=${VERSION:-6.1.2}
+VERSION=${VERSION:-7.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-NVIDIA=${NVIDIA:-no}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -49,70 +40,61 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   TARGET="x86"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   TARGET="x86"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   TARGET="x64"
-  LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  echo "$ARCH is unsupported."
+  exit 1
 fi
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
+
+mkdir -p $PKG/opt
+cd $PKG/opt
 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 {} \;
+ln -s $PRGNAM-$VERSION $PRGNAM
 
-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
+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
 
-# 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"
+# Make ELF libraries/binaries executable to prevent sbopkglint failure
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs chmod +x 2> /dev/null || true
 
-mkdir -p $PKG/usr/share/$PRGNAM
-cp -a lib/* $PKG/usr/share/$PRGNAM
+mkdir -p $PKG/usr/bin
+install -D -m 755 $CWD/$PRGNAM $PKG/usr/bin/$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
+mkdir -p $PKG/usr/share/applications
+cat $CWD/SweetHome3D.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-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
+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
-cp -a *.TXT THIRDPARTY-LICENSE-JMF.HTML $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
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+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 b2c556c792..990e48b998 100644
--- a/graphics/SweetHome3D/SweetHome3D.info
+++ b/graphics/SweetHome3D/SweetHome3D.info
@@ -1,10 +1,10 @@
 PRGNAM="SweetHome3D"
-VERSION="6.1.2"
+VERSION="7.3"
 HOMEPAGE="http://www.sweethome3d.com/"
-DOWNLOAD="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.1.2/SweetHome3D-6.1.2-linux-x86.tgz"
-MD5SUM="afde31a885534d4ec7690f7a5c375ad8"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-6.1.2/SweetHome3D-6.1.2-linux-x64.tgz"
-MD5SUM_x86_64="297ed2ee1a0351c0bdc5ea56642c0b20"
-REQUIRES="jdk"
-MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+DOWNLOAD="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-7.3/SweetHome3D-7.3-linux-x86.tgz"
+MD5SUM="0e2defe57d4414f2832517092f743bc3"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-7.3/SweetHome3D-7.3-linux-x64.tgz"
+MD5SUM_x86_64="432dfd359bb57e86d6d4583d037af0ed"
+REQUIRES="zulu-openjdk8"
+MAINTAINER="Jeremy Hansen"
+EMAIL="jebrhansen+SBo@gmail.com"