From 16b4100e0eb9eb874566a7ebd3aab66a0f0d34bf Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Sun, 20 Feb 2022 15:40:13 -0500
Subject: games/gnurobbo: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 games/gnurobbo/gnurobbo.SlackBuild | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'games/gnurobbo')

diff --git a/games/gnurobbo/gnurobbo.SlackBuild b/games/gnurobbo/gnurobbo.SlackBuild
index a5b37f66b55e..5eb59a3f7983 100644
--- a/games/gnurobbo/gnurobbo.SlackBuild
+++ b/games/gnurobbo/gnurobbo.SlackBuild
@@ -22,11 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220220 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build on 15.0.
+# - actually use SLKCFLAGS.
+# - move installed docs to correct doc dir (not /usr/share/gnurobbo).
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gnurobbo
 VERSION=${VERSION:-0.66}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,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
@@ -75,9 +77,9 @@ 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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # fix the linking process
 patch -p0 < $CWD/gnurobbo-fix_linking.diff
@@ -89,19 +91,18 @@ if [ ! $TTFONTS == "yes" ]; then
     -e 's/#FONT_USE_PIXMAP/FONT_USE_PIXMAP/'
 fi
 
+sed -i "/^CFLAGS/s,-O3,$SLKCFLAGS -fcommon," Makefile
+
 make \
   PACKAGE_DATA_DIR=/usr/share/games/$PRGNAM \
   BINDIR=/usr/games \
   DOCDIR=/usr/share/$PRGNAM \
-#  CFLAGS="$SLKCFLAGS" \
-#  CXXFLAGS="$SLKCFLAGS"
 
 make install BINDIR=$PKG/usr/games \
-  DOCDIR=$PKG/usr/share/$PRGNAM \
+  DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION \
   PACKAGE_DATA_DIR=$PKG/usr/share/games/$PRGNAM
 
-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
+strip $PKG/usr/games/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-- 
cgit v1.2.3