From a2ebc69f81d5e2e0de516e78650e6d19d366d98e Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Tue, 22 Feb 2022 16:44:55 -0500
Subject: games/gargoyle: Fix 15.0 build.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 games/gargoyle/gargoyle.SlackBuild | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'games/gargoyle/gargoyle.SlackBuild')

diff --git a/games/gargoyle/gargoyle.SlackBuild b/games/gargoyle/gargoyle.SlackBuild
index d399272e6a..2d78598ec5 100644
--- a/games/gargoyle/gargoyle.SlackBuild
+++ b/games/gargoyle/gargoyle.SlackBuild
@@ -4,11 +4,17 @@
 # Written by Dugan Chen (thedoogster@gmail.com)
 # Yth | Pont-en-Royans, France | yth@ythogtha.org
 
+# 20220222 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - fix build on 15.0.
+# - move executable to /usr/games.
+# - correct paths in .desktop file.
+# - do not install useless INSTALL in package.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gargoyle
 VERSION=${VERSION:-2019.1.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -23,9 +29,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
@@ -60,24 +63,24 @@ cd $SRCNAM-$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 \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 env -u BUILD \
 jam -s DESTDIR=$PKG \
  -s _BINDIR=/usr/libexec/gargoyle \
  -s _APPDIR=/usr/libexec/gargoyle \
  -s _LIBDIR=/usr/lib$LIBDIRSUFFIX/gargoyle \
- -s CCFLAGS="$SLKCFLAGS -fgnu89-inline -fpermissive" \
+ -s CCFLAGS="$SLKCFLAGS -fcommon -fgnu89-inline -fpermissive" \
  -dx \
  install
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/bin
-install -m755 $CWD/gargoyle.sh $PKG/usr/bin/gargoyle
+mkdir -p $PKG/usr/games
+install -m755 $CWD/gargoyle.sh $PKG/usr/games/gargoyle
 
 ln -s gargoyle/libgarglk.so $PKG/usr/lib${LIBDIRSUFFIX}/libgarglk.so
 
@@ -88,10 +91,12 @@ mkdir -p $PKG/usr/share/pixmaps
 cp garglk/gargoyle-house.png $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/share/applications
-cp garglk/gargoyle.desktop $PKG/usr/share/applications
+sed -e "/^Icon/s,=,=/usr/share/pixmaps/," \
+    -e "/^Exec/s,=,=/usr/games/," \
+    < garglk/gargoyle.desktop \
+    > $PKG/usr/share/applications/gargoyle.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3-65-gdbad