games/blobwars: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

4 files changed, 42 insertions, 27 deletions

diff --git a/games/blobwars/README b/games/blobwars/README
index 72f9460e388c..ac35f38eaf93 100644
--- a/games/blobwars/README
+++ b/games/blobwars/README
@@ -1,13 +1,10 @@
-blobwars Metal Blob Solid episode 1 is a platform game in which you
-have to collect MIA's (missing in action) blobs scattered arround many
+blobwars (An SDL2 based platform game)
+
+Blob Wars: Metal Blob Solid Episode 1 is a platform game in which you
+have to collect MIA (missing in action) blobs scattered around many
 areas. There are other things to collect, keys to open doors, bosses
-at the end of different levels etc. You can also re-visit levels to
+at the end of different levels, etc. You can also re-visit levels to
 collect things you missed earlier.
 
-The program and data is GPL2 and the music is various licences. See the
-game doc readme for details.  The game depends on SDL2, SDL2_image,
-SDL2_mixer and SDL2_TTF.  All dependancies are available from
-slackbuilds.org.
-
 This game was originally created by parallelrealities.co.uk
 and now is produced by Perpendicular Dimensions
diff --git a/games/blobwars/blobwars.SlackBuild b/games/blobwars/blobwars.SlackBuild
index 476d700f5334..4d3f7b65b642 100644
--- a/games/blobwars/blobwars.SlackBuild
+++ b/games/blobwars/blobwars.SlackBuild
@@ -9,11 +9,16 @@
 # desktop icons etc. and mskefile includes DESTDIR support.
 # doc dir still gets fixed for slackware defaults.
 
+# 20220219 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build on Slackware 15.0.
+# - make .desktop file validate.
+# - update icon cache in doinst.sh.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=blobwars
 VERSION=${VERSION:-2.00}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -25,9 +30,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
@@ -61,9 +63,9 @@ 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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 #make new game default more child friendly
 sed -i 's/gore = 1/gore = 0/' src/CGame.cpp
@@ -71,13 +73,24 @@ sed -i 's/gore = 1/gore = 0/' src/CGame.cpp
 #fix hard-coded manual location
 sed -i "s_blobwars/man_blobwars-$VERSION/man_" data/titleWidgets
 
+# 20220219 bkw: no sane way to override on the make command like...
+sed -i 's, *-Werror,,' Makefile
+
+# 20220219 bkw: shut desktop-file-validate up.
+sed -i '/^Encoding/d' icons/$PRGNAM.desktop
+
 #doc dir fixed for slackware and help display bug.
 #note. the trailing / on the first make command is intentional.
-make USEPAK=1 CFLAGS="$SLKCFLAGS -Wno-error=format-truncation=" DOCDIR="/usr/doc/$PRGNAM-$VERSION/"
-make install USEPAK=1 DESTDIR=$PKG DOCDIR="/usr/doc/$PRGNAM-$VERSION"
+make \
+  USEPAK=1 \
+  CFLAGS="$SLKCFLAGS" \
+  DOCDIR="/usr/doc/$PRGNAM-$VERSION/"
+make install \
+  USEPAK=1 \
+  DESTDIR=$PKG \
+  DOCDIR="/usr/doc/$PRGNAM-$VERSION"
 
-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
+strip $PKG/usr/games/$PRGNAM
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/blobwars/doinst.sh b/games/blobwars/doinst.sh
index 4e8ba7071dea..3e5691a052b5 100644
--- a/games/blobwars/doinst.sh
+++ b/games/blobwars/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/blobwars/slack-desc b/games/blobwars/slack-desc
index 90bdbf5f70f0..a4fcea1d65df 100644
--- a/games/blobwars/slack-desc
+++ b/games/blobwars/slack-desc
@@ -8,12 +8,12 @@
         |-----handy-ruler------------------------------------------------------|
 blobwars: blobwars (An SDL2 based platform game)
 blobwars:
-blobwars: Since their world was invaded by an alien race, the Blobs have faced
-blobwars: a lifetime of war. But now they have a chance to win the war once
-blobwars: and for all.
-blobwars: In Blob Wars : Metal Blob Solid, you take on the role of a fearless
-blobwars: Blob agent, Bob. Bob's mission is to infiltrate the various enemy
-blobwars: bases around the Blobs' homeworld and rescue as many MIAs as
-blobwars: possible. But standing in his way are many vicious aliens, other
-blobwars: Blobs who have been assimilated and the evil alien leader, Galdov.
-blobwars: software originally by www.parallelrealities.co.uk
+blobwars: Blob Wars: Metal Blob Solid Episode 1 is a platform game in which you
+blobwars: have to collect MIA (missing in action) blobs scattered around many
+blobwars: areas. There are other things to collect, keys to open doors, bosses
+blobwars: at the end of different levels, etc. You can also re-visit levels to
+blobwars: collect things you missed earlier.
+blobwars:
+blobwars:
+blobwars:
+blobwars: