games/kardsgt: Update for new qt4, fix icons.

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

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

3 files changed, 32 insertions, 11 deletions

diff --git a/games/kardsgt/doinst.sh b/games/kardsgt/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/kardsgt/doinst.sh
+++ b/games/kardsgt/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/kardsgt/kardsgt.SlackBuild b/games/kardsgt/kardsgt.SlackBuild
index 50148083d8..754f50f05b 100644
--- a/games/kardsgt/kardsgt.SlackBuild
+++ b/games/kardsgt/kardsgt.SlackBuild
@@ -6,11 +6,21 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20220124 bkw: BUILD=2.
+# - updated for new qt4 build.
+# - new-style icon.
+
+# In case anyone's wondering... I keep this outdated, unmaintained
+# piece of software around because I like to play Spades, and so far
+# I haven't found another open source Spades game that runs on Linux
+# (and not in a browser). Sooner or later, I'll port this to qt5,
+# and/or write my own replacement Spades game.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=kardsgt
 VERSION=${VERSION:-0.7.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -22,9 +32,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
@@ -50,6 +57,8 @@ fi
 
 set -e
 
+source /etc/profile.d/qt4.sh
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -57,11 +66,8 @@ rm -rf $PRGNAM-$VERSION
 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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -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 {} \+
 
 # fix paths in FILES section of man page. Also a couple typos.
 sed -i \
@@ -82,10 +88,19 @@ sed -i \
   '/<title/a<meta http-equiv="content-type" content="text/html;charset=utf-8" />' \
   src/doc/*.html
 
+# 20220124 bkw: icon is a weird size, 60x40. center it in a 64x64 PNG.
+# Include old-style icon in pixmaps/, if anything needs it.
+convert -background none -extent 64x64 -gravity center \
+  src/images/kardsgticon.png \
+  newicon.png
+mkdir -p $PKG/usr/share/pixmaps
+convert -resize 48x48 newicon.png $PKG/usr/share/pixmaps/$PRGNAM.png
+mv newicon.png src/images/kardsgticon.png
+
 qmake -after \
   target.path=/usr/games \
   man.path=/usr/man/man6 \
-  icons.path=/usr/share/pixmaps \
+  icons.path=/usr/share/icons/hicolor/64x64/apps/ \
   QMAKE_CXXFLAGS_RELEASE="$SLKCFLAGS"
 make -j1 release
 make -j1 -C src release-install INSTALL_ROOT=$PKG
diff --git a/games/kardsgt/kardsgt.desktop b/games/kardsgt/kardsgt.desktop
index baafd7a356..9fdc4595bd 100644
--- a/games/kardsgt/kardsgt.desktop
+++ b/games/kardsgt/kardsgt.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=KardsGT
 Comment=Full card game suite
-Exec=kardsgt
+Exec=/usr/games/kardsgt
 GenericName=Card game suite
 Icon=kardsgticon
 Type=Application