games/domination: New-style icons.

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

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

4 files changed, 27 insertions, 9 deletions

diff --git a/games/domination/doinst.sh b/games/domination/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/domination/doinst.sh
+++ b/games/domination/doinst.sh
@@ -1,3 +1,9 @@
 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/domination/domination.SlackBuild b/games/domination/domination.SlackBuild
index d4e392a15e..743309faa3 100644
--- a/games/domination/domination.SlackBuild
+++ b/games/domination/domination.SlackBuild
@@ -9,6 +9,7 @@
 # See README_SBo.txt for more info on this script (I wrote too many
 # comments, moved them to a separate file).
 
+# 20211021 bkw: BUILD=2, new-style icons.
 # 20210310 bkw: updated for v1.2.3.
 # 20200928 bkw: updated for v1.2.2.
 # 20200307 bkw: updated fov v1.2.1.
@@ -19,14 +20,11 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=domination
 VERSION=${VERSION:-1.2.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-# 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
@@ -59,20 +57,34 @@ sed -i 's,\r,,' *.txt
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 
+mkdir -p $PKG/usr/share/icons/hicolor/16x16/apps
+mv resources/icon.png $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png
+
 # Everything else goes in the game dir. share/ is OK as there's no
 # native binaries.
 mkdir -p $PKG/usr/share/games/$PRGNAM
 mv * $PKG/usr/share/games/$PRGNAM
 
+# not sure the copy in resources/ is even used, but keep it.
+ln -s ../../../icons/hicolor/16x16/apps/$PRGNAM.png \
+      $PKG/usr/share/games/$PRGNAM/resources/icon.png
+
 # Wrapper scripts.
 mkdir -p $PKG/usr/games
 install -m0755 $CWD/$PRGNAM.sh $PKG/usr/games/$PRGNAM
 ln -s $PRGNAM $PKG/usr/games/$PRGNAM-swing
 
-# resources/icon.png is only 16x16. Use 128x128 icon instead, extracted
-# from the OSX app bundle with icns2png.
+# resources/icon.png is only 16x16. Use 128x128 icon for the larger
+# sizes, extracted from the OSX app bundle with icns2png.
+for px in 32 48 64 128; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size $CWD/$PRGNAM.png $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 written for this SlackBuild.
 APPDIR=$PKG/usr/share/applications
diff --git a/games/domination/domination.desktop b/games/domination/domination.desktop
index b6966b1b0a..2188409f54 100644
--- a/games/domination/domination.desktop
+++ b/games/domination/domination.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Domination
-Exec=domination
+Exec=/usr/games/domination
 Icon=domination
 Type=Application
 Terminal=false
diff --git a/games/domination/domination.info b/games/domination/domination.info
index ea806b13d4..88b1b78015 100644
--- a/games/domination/domination.info
+++ b/games/domination/domination.info
@@ -1,7 +1,7 @@
 PRGNAM="domination"
 VERSION="1.2.3"
 HOMEPAGE="http://domination.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/domination/Domination/1.2.3/Domination_1.2.3.zip"
+DOWNLOAD="https://downloads.sourceforge.net/project/domination/Domination/1.2.3/Domination_1.2.3.zip"
 MD5SUM="5a29abcc8f6fe5c6da574bb00cb61e2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""