1 files changed, 22 insertions, 22 deletions
diff --git a/games/d2x-rebirth/d2x-rebirth.SlackBuild b/games/d2x-rebirth/d2x-rebirth.SlackBuild
index d0d89ee7e3..1145e2fe58 100644
--- a/games/d2x-rebirth/d2x-rebirth.SlackBuild
+++ b/games/d2x-rebirth/d2x-rebirth.SlackBuild
@@ -23,10 +23,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220321 bkw: Modified by SlackBuilds.org: fix 32-bit build.
+# TODO: the executable needs to go in /usr/games, and the .desktop
+# needs absolute paths to the icon and executable.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=d2x-rebirth
-VERSION=${VERSION:-0.58.1}
+SRCNAM=dxx-rebirth
+VERSION=${VERSION:-20230520_695e8b9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -39,9 +44,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -70,35 +72,33 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_v${VERSION}-src
-tar xvf $CWD/${PRGNAM}_v${VERSION}-src.tar.gz
-cd ${PRGNAM}_v${VERSION}-src
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+cd $SRCNAM-$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 \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
-# Patch for the newer physfs
-patch -p1 < $CWD/libphysfs-3.0.1.patch
+# 20220321 bkw: I hate scons, and I hate people who use -Werror and
+# don't give a sane way to disable it. I especially hate them if they
+# write code that triggers warnings... 32-bit builds were failing
+# because of this.
+sed -i -e "s,'-W','-Wno-'," -e "s,'-Werror=','-Wno-error='," SConstruct
 
 # 'sharepath' is for the game-content data files, they can
 #  also perhaps more conveniently go in ~/.d2x-rebirth...
 scons CXXFLAGS="$SLKCFLAGS" \
-      CFLAGS="$SLKCFLAGS" \
       prefix=/usr \
-      sharepath=/usr/share/games/d2x-rebirth
+      sharepath=/usr/share/$PRGNAM \
+      d2x=1
 
 # DESTDIR does not work so we do it manually:
-mkdir -p $PKG/usr/bin
-mv $PRGNAM $PKG/usr/bin
-
-# It is a commandline program but perhaps somebody will use these:
-mkdir -p $PKG/usr/share/pixmaps
-mv d2x-rebirth.xpm $PKG/usr/share/pixmaps
-mkdir -p $PKG/usr/share/applications/
-mv d2x-rebirth.desktop $PKG/usr/share/applications/
+install -D -m 0755 build/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
+install -D -m 0644 $PRGNAM/$PRGNAM.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
+install -D -m 0644 $PRGNAM/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
 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
@@ -106,7 +106,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 # d2x.ini is a handy list of commandline options...
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGELOG.txt COPYING.txt INSTALL.txt README.txt RELEASE-NOTES.txt d2x.ini \
+  d2x-rebirth/{CHANGELOG.txt,RELEASE-NOTES.txt,d2x.ini} README.md COPYING* GPL* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild