1 files changed, 13 insertions, 13 deletions
diff --git a/games/freeblocks/freeblocks.SlackBuild b/games/freeblocks/freeblocks.SlackBuild
index de52f7be10b9..02efeb850c40 100644
--- a/games/freeblocks/freeblocks.SlackBuild
+++ b/games/freeblocks/freeblocks.SlackBuild
@@ -6,14 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# 20170301 bkw:
-# - use long-form github URL
+# 20210808 bkw: fix build on -current
+# 20170301 bkw: use long-form github URL
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=freeblocks
 VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -25,9 +25,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,11 +57,15 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 \
- \( -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 {} \+
+
+# 20210808 bkw: Build was failing on -current due to duplicate symbols
+# at link time. The correct solution would be a big patch that turns
+# all the declarations in the headers into externs, and add all the
+# declarations as non-extern to some .c file. This seems to work OK
+# though (and the -Wl,-s strips the binary).
+SLKCFLAGS="$SLKCFLAGS -Wl,--allow-multiple-definition -Wl,-s"
 
 mkdir -p build
 cd build
@@ -75,10 +76,9 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-strip $PKG/usr/games/$PRGNAM
 sed -i \
   '/^Categories/s,\(games\|SDL\);,,g' \
   $PKG/usr/share/applications/$PRGNAM.desktop