games/xspacewarp: Fix window close button.

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

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

1 files changed, 29 insertions, 43 deletions

diff --git a/games/xspacewarp/xspacewarp.SlackBuild b/games/xspacewarp/xspacewarp.SlackBuild
index f620f0171b..27305a04a2 100644
--- a/games/xspacewarp/xspacewarp.SlackBuild
+++ b/games/xspacewarp/xspacewarp.SlackBuild
@@ -1,49 +1,35 @@
 #!/bin/bash
 
 # Slackware build script for xspacewarp
-# Time Trek - like game for X Window System
 
-# Written by Niels Horn <niels.horn@gmail.com>
+# Written by Niels Horn <email removed>.
+# man page by Luis Henrique <email removed>.
+# Formerly maintained by Ryan P.C. McQuen.
+# Now maintained by B. Watson <yalhcru@gmail.com>.
 
-# man-page and app-defaults files by Luis Henrique <lmello.009@gmail.com>
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# Formerly maintained by:
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-
-# Now maintained by B. Watson <yalhcru@gmail.com>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version, with the following exception:
-# the text of the GPL license may be omitted.
-
-# This program is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
-
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING).  If not, see
-# <http://www.gnu.org/licenses/>.
+# 20211012 bkw: BUILD=3
+# - relicense as WTFPL with permissions from Ryan (who was the one
+#   who originally added the license).
+# - new-style icon.
+# - use copy of app defaults file shipped with the source, instead
+#   of including our own. they were identical except for one extra
+#   blank line.
+# - fix man page typos.
+# - make the window close button work.
 
 # 20170309 bkw:
 # - take over maintenance
 # - fix download & homepage URLs
 # - i486 => i586
 # - minor tweaks
-# - TODO: re-enable the close button on the window? I don't see a way
-#   to quit the game (nothing mentioned in the 'Orientation', man page,
-#   or README).
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xspacewarp
 VERSION=${VERSION:-1.2b}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -57,9 +43,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
@@ -92,15 +75,17 @@ rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
 cd $PRGNAM-$SRCVER
 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 {} \+
 
 # Apply patch to version 1.2b (adapt for modern gcc compiler)
 patch -p1 < $CWD/version12b.patch
 
+# Patch by B. Watson: make the window close button work. This took
+# more effort than I wanted it to... and I had to look at the source
+# to xbiff to see how this gibberish works.
+patch -p1 < $CWD/winclose.diff
+
 xmkmf
 make Makefile
 make CDEBUGFLAGS="$SLKCFLAGS -fno-strength-reduce -fno-strict-aliasing" $PRGNAM
@@ -108,17 +93,18 @@ make CDEBUGFLAGS="$SLKCFLAGS -fno-strength-reduce -fno-strict-aliasing" $PRGNAM
 strip $PRGNAM
 make install BINDIR=/usr/games DESTDIR=$PKG
 
-mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/share/applications \
+         $PKG/usr/share/pixmaps \
+         $PKG/usr/share/icons/hicolor/32x32/apps
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+cat $CWD/$PRGNAM.png > $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
+ln -s ../icons/hicolor/32x32/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-# Install X app-defaults
 mkdir -p $PKG/etc/X11/app-defaults
-cat $CWD/XSpacewarp > $PKG/etc/X11/app-defaults/XSpacewarp.new
+cat XSpacewarp.app_def > $PKG/etc/X11/app-defaults/XSpacewarp.new
 
-# Put man-page in package
 mkdir -p $PKG/usr/man/man6
-cat $CWD/xspacewarp.man | gzip -9 > $PKG/usr/man/man6/xspacewarp.6.gz
+gzip -9c <$CWD/xspacewarp.man > $PKG/usr/man/man6/xspacewarp.6.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGES $PKG/usr/doc/$PRGNAM-$VERSION/