4 files changed, 38 insertions, 17 deletions
diff --git a/games/waterCloset/README b/games/waterCloset/README
index 36816e0186..aeb2e48e38 100644
--- a/games/waterCloset/README
+++ b/games/waterCloset/README
@@ -3,9 +3,6 @@ game. Guide Walter Chambers through a series of stages as he attempts
 to return home from a bizarre world that he has become trapped in. 
 
 The program is GPL3 and the data is CC BY-NC-SA 3.0 with attribution
-Copyright 2019, PArallel REalities
-
-This is an SDL2 game which uses SDL2_image, SDL2_mixer and SDL2_TTF.
-All dependancies are available from slackbuilds.org.
+Copyright 2019, Parallel Realities
 
 This game was created by parallelrealities.co.uk
diff --git a/games/waterCloset/doinst.sh b/games/waterCloset/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/games/waterCloset/doinst.sh
+++ b/games/waterCloset/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/waterCloset/waterCloset.SlackBuild b/games/waterCloset/waterCloset.SlackBuild
index 01837f73c7..c97048f28b 100644
--- a/games/waterCloset/waterCloset.SlackBuild
+++ b/games/waterCloset/waterCloset.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for waterCloset
 
 # Written by Tim Dickson dickson.tim@googlemail.com
@@ -9,11 +9,21 @@
 # fix doc dir for slackware defaults.
 # 06/02/2020. version 1.0 first major "full" version.
 
+# 20220430 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - update icon cache in doinst.sh.
+# - make .desktop file validate.
+# Note to maintainer: consider putting the binary in /usr/games, since
+# this is a game...
+# 20220221 bkw: Modified by SlackBuilds.org: fix incorrect github URL.
+# 20220323 bkw: Modified by SlackBuilds.org: fix 32-bit build.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=waterCloset
-GITNAM=wc
 VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -23,7 +33,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}
@@ -47,20 +61,25 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.src.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 {} \+
+
+# 20220323 bkw: 32-bit needs this.
+sed -i 's,-Werror[^ ]*, ,g' makefile
+
+# 20220430 bkw: this didn't hurt anything, but it produces noise from
+# sbopkglint and it costs almost nothing to fix:
+sed -i '/^Encoding/d' icons/$PRGNAM.desktop
 
 make
 make install DESTDIR=$PKG
-
-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/bin/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -70,4 +89,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
diff --git a/games/waterCloset/waterCloset.info b/games/waterCloset/waterCloset.info
index d06025d9c8..1bf7943b7b 100644
--- a/games/waterCloset/waterCloset.info
+++ b/games/waterCloset/waterCloset.info
@@ -1,10 +1,10 @@
 PRGNAM="waterCloset"
 VERSION="1.0"
 HOMEPAGE="https://www.parallelrealities.co.uk/games/wc/"
-DOWNLOAD="https://github.com/stephenjsweeney/wc/archive/v1.0/waterCloset-1.0.src.tar.gz"
+DOWNLOAD="https://github.com/stephenjsweeney/waterCloset/archive/v1.0/waterCloset-1.0.tar.gz"
 MD5SUM="1f3d4a94145be98484ed25c060314c8c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2_image SDL2_mixer SDL2_ttf"
+REQUIRES=""
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"