From f36f43ed41c89c9a19bbfbda7a9541900e27b4b8 Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Wed, 27 Jun 2018 16:58:04 -0400
Subject: games/maelstrom: Fix build on -current.

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

(limited to 'games')

diff --git a/games/maelstrom/maelstrom.SlackBuild b/games/maelstrom/maelstrom.SlackBuild
index 9618a64277..e1d1c842e9 100644
--- a/games/maelstrom/maelstrom.SlackBuild
+++ b/games/maelstrom/maelstrom.SlackBuild
@@ -6,6 +6,8 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20180627 bkw: fix compile with gcc 8 (for -current).
+
 # 20160730 bkw:
 # - Fix compile with gcc 5 (for Slack 14.2). Also fix some
 #   compiler warnings while I'm at it.
@@ -57,9 +59,9 @@ cd $SRCNAM-$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 64-bit compile issue (not needed on 32-bit, but does no harm)
 patch -p1 < $CWD/compile_fix.diff
@@ -68,6 +70,11 @@ patch -p1 < $CWD/compile_fix.diff
 # (also make `make install' support DESTDIR properly!)
 patch -p1 < $CWD/install_dirs.diff
 
+# 20180627 bkw: It seems structs and typedefs now share a namespace
+# in gcc-8.1's g++. So rename this struct to keep the compiler happy
+# on -current (and it does no harm on 14.2 either):
+sed -i 's,struct *button,struct b_utton,g' buttonlist.h
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-- 
cgit v1.2.3