games/icebreaker: New-style icons.

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

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

5 files changed, 41 insertions, 26 deletions

diff --git a/games/icebreaker/README b/games/icebreaker/README
index a75d5cb95e03..6b85aa885eae 100644
--- a/games/icebreaker/README
+++ b/games/icebreaker/README
@@ -1,4 +1,8 @@
-icebreaker - A Jezzball-like game for Linux, with a penguin theme
+icebreaker (jezzball-like game for Linux, with a penguin theme)
+
+So, uh, there's a bunch of penguins on an iceberg in Antarctica. You
+have been selected to catch them so they can be shipped to Finland,
+where they are essential to a secret plot for world domination.
 
 The binary is installed setgid games: not a serious security risk, but
 something to be aware of, if you're paranoid.
diff --git a/games/icebreaker/doinst.sh b/games/icebreaker/doinst.sh
index 3857649f506a..11813c310171 100644
--- a/games/icebreaker/doinst.sh
+++ b/games/icebreaker/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
 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/icebreaker/icebreaker.SlackBuild b/games/icebreaker/icebreaker.SlackBuild
index 9d5fa6758668..0962874f0e5d 100644
--- a/games/icebreaker/icebreaker.SlackBuild
+++ b/games/icebreaker/icebreaker.SlackBuild
@@ -10,11 +10,17 @@
 # Development on this game stopped in 2002, so there will never be a 2.0
 # release. If anyone finds bugs in 1.9.7, let me know.
 
+# 20211019 bkw: BUILD=3
+# - move high score file to /var/games/icebreaker, to match other
+#   games on SBo.
+# - include README.themes in doc dir.
+# - new-style icons.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=icebreaker
 VERSION=${VERSION:-1.9.7}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -26,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
@@ -61,40 +64,42 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
 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 {} \+
 
 make \
-	prefix=/usr \
-	mandir=/usr/man \
-	highscoredir=/var/state/$PRGNAM \
-	OPTIMIZE="$SLKCFLAGS"
+  prefix=/usr \
+  mandir=/usr/man \
+  bindir=/usr/games \
+  highscoredir=/var/games/$PRGNAM \
+  OPTIMIZE="$SLKCFLAGS"
 
 strip $PRGNAM
 make -j1 install \
-	prefix=$PKG/usr \
-	mandir=$PKG/usr/man \
-	highscoredir=$PKG/var/state/$PRGNAM
-
-# We prefer the binary to live in /usr/games
-mv $PKG/usr/bin $PKG/usr/games
+  prefix=$PKG/usr \
+  mandir=$PKG/usr/man \
+  bindir=$PKG/usr/games \
+  highscoredir=$PKG/var/games/$PRGNAM
 
-sed -i -e "s,/var/lib/games,/var/state/$PRGNAM," $PKG/usr/man/man6/$PRGNAM.6
 gzip -9 $PKG/usr/man/man6/$PRGNAM.6
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp ChangeLog LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp ChangeLog LICENSE README README.themes TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/share/applications
 cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 
+for i in 16 32 48; do
+  px=$( basename $i | cut -d. -f1 )
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size ${PRGNAM}_48.bmp $dir/$PRGNAM.png
+done
+
 mkdir -p $PKG/usr/share/pixmaps
-convert ${PRGNAM}_48.bmp $PRGNAM.xpm
-cp $PRGNAM.xpm $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/icebreaker/icebreaker.desktop b/games/icebreaker/icebreaker.desktop
index aea4578548eb..bbdc6de6da86 100644
--- a/games/icebreaker/icebreaker.desktop
+++ b/games/icebreaker/icebreaker.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=IceBreaker
-Exec=icebreaker
+Exec=/usr/games/icebreaker
 Type=Application
 Icon=icebreaker
 GenericName=IceBreaker
diff --git a/games/icebreaker/slack-desc b/games/icebreaker/slack-desc
index b6586a99453c..d58d2ed87361 100644
--- a/games/icebreaker/slack-desc
+++ b/games/icebreaker/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-icebreaker: icebreaker (A Jezzball-like game for Linux, with a penguin theme)
+icebreaker: icebreaker (jezzball-like game for Linux, with a penguin theme)
 icebreaker:
 icebreaker: So, uh, there's a bunch of penguins on an iceberg in Antarctica. You
 icebreaker: have been selected to catch them so they can be shipped to Finland,