1 files changed, 33 insertions, 20 deletions
diff --git a/games/d1x-rebirth/d1x-rebirth.SlackBuild b/games/d1x-rebirth/d1x-rebirth.SlackBuild
index 346d5588ec..f9b3e8f86c 100644
--- a/games/d1x-rebirth/d1x-rebirth.SlackBuild
+++ b/games/d1x-rebirth/d1x-rebirth.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for d1x-rebirth
 
@@ -23,10 +23,18 @@
 # 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=d1x-rebirth
-VERSION=${VERSION:-0.58.1}
+SRCNAM=dxx-rebirth
+VERSION=${VERSION:-20220130_7258b7f}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +44,11 @@ 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}
@@ -60,32 +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 {} \+
+
+# 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 ~/.d1x-rebirth...
 scons CXXFLAGS="$SLKCFLAGS" \
-      CFLAGS="$SLKCFLAGS" \
       prefix=/usr \
-      sharepath=/usr/share/games/d1x-rebirth
+      sharepath=/usr/share/$PRGNAM \
+      d1x=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 d1x-rebirth.xpm $PKG/usr/share/pixmaps
-mkdir -p $PKG/usr/share/applications/
-mv d1x-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
@@ -93,7 +106,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 # d1x.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 d1x.ini \
+  d1x-rebirth/{CHANGELOG.txt,RELEASE-NOTES.txt,d1x.ini} README.md COPYING* GPL* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -102,4 +115,4 @@ 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}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE