From bbe9a759831c4b4fe97833824845af5cebf6171c Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Tue, 22 Feb 2022 17:58:27 -0500
Subject: games/freedroidrpg: Fix 15.0 build.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 games/freedroidrpg/freedroidrpg.SlackBuild | 25 +++++++++++++------------
 games/freedroidrpg/freedroidrpg.desktop    |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'games')

diff --git a/games/freedroidrpg/freedroidrpg.SlackBuild b/games/freedroidrpg/freedroidrpg.SlackBuild
index 55cef4147f42..ccd3a497d29d 100644
--- a/games/freedroidrpg/freedroidrpg.SlackBuild
+++ b/games/freedroidrpg/freedroidrpg.SlackBuild
@@ -23,6 +23,11 @@
 
 # Modified by the SlackBuilds.org project.
 
+# 20220222 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build on 15.0.
+# - binary in /usr/games.
+# - absolute path in .desktop.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=freedroidrpg
@@ -40,9 +45,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
@@ -74,14 +76,17 @@ 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 \
+ -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 {} \+
+
+SLKCFLAGS+=" -fcommon"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --bindir=/usr/games \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -90,18 +95,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog HELP_WANTED INSTALL* NEWS README \
+cp -a AUTHORS COPYING ChangeLog HELP_WANTED NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/freedroidrpg/freedroidrpg.desktop b/games/freedroidrpg/freedroidrpg.desktop
index da08cfee220f..80f57d85fff8 100644
--- a/games/freedroidrpg/freedroidrpg.desktop
+++ b/games/freedroidrpg/freedroidrpg.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=FreedroidRPG
 Comment=FreedroidRPG - A Diablo/Freedroid fusion
-Exec=freedroidRPG
+Exec=/usr/games/freedroidRPG
 Icon=/usr/share/freedroidrpg/graphics/paraicon.bmp
 Terminal=false
 Type=Application
-- 
cgit v1.2.3