games/rott: New-style icons.

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

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

6 files changed, 29 insertions, 38 deletions

diff --git a/games/rott/README b/games/rott/README
index 0b0bbfe3c9..666f77988b 100644
--- a/games/rott/README
+++ b/games/rott/README
@@ -7,12 +7,10 @@ life-preserving armor, traps and ambushes galore.
 
 WARNING: Rise of the Triad features wanton and gratuitous violence.
 
-In order to play the game, you need the data files from
-either the retail or shareware (demo) version of the game. See
-README_gamedata.txt for details. If you want to include the
-shareware game data in your Slackware package, download the file
-http://icculus.org/rott/share/1rott13.zip and place it in the directory
-with the SlackBuild script, before running the script.
+In order to play the game, you need the data files from either the
+retail or shareware (demo) version of the game.  The shareware/demo
+data files are included in the package. If you want to play the retail
+version, see README_gamedata.txt for details.
 
 Multiplayer games (aka comm-bat) are NOT truly supported: you can
 start up a comm-bat game, but you can only play by yourself (no actual
diff --git a/games/rott/README_gamedata.txt b/games/rott/README_gamedata.txt
index 5994214260..6820faef50 100644
--- a/games/rott/README_gamedata.txt
+++ b/games/rott/README_gamedata.txt
@@ -24,22 +24,7 @@ Shareware/Demo version 1.3
 --------------------------
 Data files: HUNTBGIN.WAD HUNTBGIN.RTC HUNTBGIN.RTL REMOTE1.RTS
 
-If you want to include the shareware game data files in your package,
-download the shareware version of the game and place it in the SlackBuild
-directory before building:
-
-# wget http://icculus.org/rott/share/1rott13.zip
-# ./rott.SlackBuild
-# installpkg /tmp/rott-$VERSION-$ARCH-$BUILD.tgz
-
-If the icculus.org link doesn't work, the same file can be downloaded
-from http://www.3drealms.com/rott/ (look for "v1.3 Shareware
-Episode" on the page). Either way, the md5sum for rott13.zip is
-0fafd6b629eab80278fc726e31f9cf41.
-
-If you built the package without the shareware data files, you can just
-extract the zip file and copy the data files to /usr/share/games/rott
-manually.
+This is always included in the package.
 
 The binary for the shareware version is called "rott-demo".
 ---
diff --git a/games/rott/doinst.sh b/games/rott/doinst.sh
index a30493342c..726ffe403b 100644
--- a/games/rott/doinst.sh
+++ b/games/rott/doinst.sh
@@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/games/rott/rott.SlackBuild b/games/rott/rott.SlackBuild
index 30ce09cd00..030515a094 100644
--- a/games/rott/rott.SlackBuild
+++ b/games/rott/rott.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211025 bkw: BUILD=2
+# - new-style icons.
+# - .desktop file starts in windowed mode, not fullscreen.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=rott
@@ -22,9 +26,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
@@ -53,12 +54,8 @@ cd $TMP
 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 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 {} \+
 
 patch -p1 < $CWD/manpage.diff
 
@@ -96,7 +93,7 @@ ln -s $PRGNAM.6.gz $MANDIR/$PRGNAM-demo.6.gz
 ln -s $PRGNAM.6.gz $MANDIR/$PRGNAM-reg.6.gz
 ln -s $PRGNAM.6.gz $MANDIR/$PRGNAM-cdrom.6.gz
 
-# Optional shareware game data
+# Shareware game data. Used to be optional, always included now.
 mkdir -p $PKG/usr/share/games/$PRGNAM
 if [ -e $CWD/1rott13.zip ]; then
   unzip $CWD/1rott13.zip ROTTSW13.SHR
@@ -109,8 +106,20 @@ fi
 install -m0755 -oroot -groot $CWD/$PRGNAM.sh $PKG/usr/games/$PRGNAM
 
 mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
-cp misc/$PRGNAM.desktop $PKG/usr/share/applications
-cp misc/$PRGNAM.xpm $PKG/usr/share/pixmaps
+sed -e 's,Exec=,&/usr/games/,' \
+    -e 's,-window,,' \
+    < misc/$PRGNAM.desktop \
+    > $PKG/usr/share/applications/$PRGNAM.desktop
+
+# Icon made for this SlackBuild.
+for px in 16 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
+
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp COPYING README doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/rott/rott.info b/games/rott/rott.info
index cc02fa203f..e934ac7437 100644
--- a/games/rott/rott.info
+++ b/games/rott/rott.info
@@ -1,8 +1,8 @@
 PRGNAM="rott"
 VERSION="1.1.2"
-HOMEPAGE="http://icculus.org/rott/"
-DOWNLOAD="http://icculus.org/rott/share/1rott13.zip \
-          http://icculus.org/rott/releases/rott-1.1.2.tar.gz"
+HOMEPAGE="https://icculus.org/rott/"
+DOWNLOAD="https://icculus.org/rott/share/1rott13.zip \
+          https://icculus.org/rott/releases/rott-1.1.2.tar.gz"
 MD5SUM="0fafd6b629eab80278fc726e31f9cf41 \
         d523c7c6c97f95ba84b8cf4deae7db38"
 DOWNLOAD_x86_64=""
diff --git a/games/rott/rott.png b/games/rott/rott.png
new file mode 100644
index 0000000000..382a492588
--- /dev/null
+++ b/games/rott/rott.png