games/skulltag: New-style icons.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

9 files changed, 27 insertions, 16 deletions

diff --git a/games/skulltag/doinst.sh b/games/skulltag/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/games/skulltag/doinst.sh
+++ b/games/skulltag/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/skulltag/icons/128.png b/games/skulltag/icons/128.png
new file mode 100644
index 0000000000..ed9d03c167
--- /dev/null
+++ b/games/skulltag/icons/128.png
diff --git a/games/skulltag/icons/16.png b/games/skulltag/icons/16.png
new file mode 100644
index 0000000000..b039e44ec1
--- /dev/null
+++ b/games/skulltag/icons/16.png
diff --git a/games/skulltag/icons/32.png b/games/skulltag/icons/32.png
new file mode 100644
index 0000000000..d909ef293e
--- /dev/null
+++ b/games/skulltag/icons/32.png
diff --git a/games/skulltag/icons/48.png b/games/skulltag/icons/48.png
new file mode 100644
index 0000000000..ff6b198ef6
--- /dev/null
+++ b/games/skulltag/icons/48.png
diff --git a/games/skulltag/icons/64.png b/games/skulltag/icons/64.png
new file mode 100644
index 0000000000..30bcf7acb0
--- /dev/null
+++ b/games/skulltag/icons/64.png
diff --git a/games/skulltag/skulltag.SlackBuild b/games/skulltag/skulltag.SlackBuild
index f2a47453fe..f7adcb1df6 100644
--- a/games/skulltag/skulltag.SlackBuild
+++ b/games/skulltag/skulltag.SlackBuild
@@ -6,11 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211024 bkw: BUILD=3, binaries in /usr/games, new-style icons
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=skulltag
 VERSION=${VERSION:-098d}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -22,9 +24,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
@@ -76,15 +75,12 @@ cd $PRGNAM-$VERSION
 tar xvf $BASE
 tar xvf $GAME
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 mkdir -p \
   $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM \
-  $PKG/usr/bin \
+  $PKG/usr/games \
   $PKG/usr/share/$PRGNAM \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
@@ -106,9 +102,9 @@ install -m0755 \
   fmodapi*/api/lib*/libfmodex$LIBDIRSUFFIX-*.so \
   $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
 
-sed "s,@LIB@,lib$LIBDIRSUFFIX,g" < $CWD/$PRGNAM.sh > $PKG/usr/bin/$PRGNAM
-chmod 755 $PKG/usr/bin/$PRGNAM
-ln -s $PRGNAM $PKG/usr/bin/$PRGNAM-server
+sed "s,@LIB@,lib$LIBDIRSUFFIX,g" < $CWD/$PRGNAM.sh > $PKG/usr/games/$PRGNAM
+chmod 755 $PKG/usr/games/$PRGNAM
+ln -s $PRGNAM $PKG/usr/games/$PRGNAM-server
 
 # The included ini file changes the following program defaults:
 
@@ -142,9 +138,19 @@ cat $CWD/$PRGNAM.ini > $PKG/usr/share/$PRGNAM/$PRGNAM.ini.default
 # the wiki, so let's give the user the URL.
 cat $CWD/README_docs.txt > $PKG/usr/doc/$PRGNAM-$VERSION/README_docs.txt
 
-# PNG icon converted from a GIF on skulltag.com
+# 20211024 bkw: icons extracted from the OSX installer:
+# http://www.skulltag.com/download/files/release/st-v098d_macosx.dmg
+# and a couple were made by resizing 128.png.
+for i in $CWD/icons/*.png; do
+  px=$( basename $i | cut -d. -f1 )
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $i > $dir/$PRGNAM.png
+done
+
 mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # .desktop is a modified copy of zdoom.desktop
 mkdir -p $PKG/usr/share/applications
diff --git a/games/skulltag/skulltag.desktop b/games/skulltag/skulltag.desktop
index 3fc4ee6597..ea7777e530 100644
--- a/games/skulltag/skulltag.desktop
+++ b/games/skulltag/skulltag.desktop
@@ -3,6 +3,6 @@ Type=Application
 Name=SkullTag
 GenericName=Enhanced Doom Engine
 Icon=skulltag
-Exec=skulltag %F
+Exec=/usr/games/skulltag %F
 Terminal=false
 Categories=Game;ActionGame;
diff --git a/games/skulltag/skulltag.png b/games/skulltag/skulltag.png
deleted file mode 100644
index 8a556a2512..0000000000
--- a/games/skulltag/skulltag.png
+++ /dev/null