From 7b927af2a1754d88f5150ff3170f7fabb454f742 Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Sun, 27 Feb 2022 01:51:39 -0500
Subject: graphics/Pixie: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 graphics/Pixie/Pixie.SlackBuild | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'graphics/Pixie')

diff --git a/graphics/Pixie/Pixie.SlackBuild b/graphics/Pixie/Pixie.SlackBuild
index 3bf4d4c4b9..89de46056e 100644
--- a/graphics/Pixie/Pixie.SlackBuild
+++ b/graphics/Pixie/Pixie.SlackBuild
@@ -22,6 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=Pixie
@@ -38,9 +40,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
@@ -76,9 +75,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 \
+ -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 {} \+
 
 # Patch code for more accurate pointer casting
 patch -p1 < $CWD/Pixie-2.2.6-strict.patch
@@ -94,6 +93,14 @@ sed -i \
 
 patch -p1 < $CWD/Pixie.patch
 
+# 20220226 bkw: Slackware 15.0 hasn't got this header (and we didn't need it):
+sed -i '/include.*<sys\/sysctl\.h>/d' src/common/os.cpp
+
+# 20220226 bkw: newer STL, has min() and max(), which step on the ones
+# defined here. Rename.
+grep -rl '\<min *(' src | xargs sed -i 's,\<min *(,Min(,g'
+grep -rl '\<max *(' src | xargs sed -i 's,\<max *(,Max(,g'
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -108,13 +115,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-openexr-threads
 
 make
-make install DESTDIR=$PKG
-
-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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 # Evidently, configure is somewhat broken:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
@@ -129,6 +131,8 @@ rm -rf $PKG/usr/share/doc
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-- 
cgit v1.2.3