1 files changed, 29 insertions, 8 deletions
diff --git a/games/nuvie/nuvie.SlackBuild b/games/nuvie/nuvie.SlackBuild
index 5faed72922..454930a881 100644
--- a/games/nuvie/nuvie.SlackBuild
+++ b/games/nuvie/nuvie.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nuvie
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220221 bkw: Modified by SlackBuilds.org:
+# - fix 15.0 build.
+# - make the .desktop file validate.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nuvie
 VERSION=${VERSION:-2018.01.13_1fa4044}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +76,21 @@ 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 {} \+
+
+# 20220221 bkw: C++ grew a clamp() of its own in recent years, which
+# steps on the one defined in the source. Just rename it.
+grep -lr '\<clamp *(' | xargs sed -i 's,\<clamp *(,Clamp(,g'
+
+# 20220221 bkw: icon's not in /usr/share/icons, use abs path.
+# Also use abs path for the binary and make it validate.
+sed -i -e '/^Icon/s,=,=/usr/share/pixmaps/,' \
+       -e '/^Exec=/s,=,=/usr/games/,' \
+       -e '/^Encoding/d' \
+       -e 's,Application;,,' \
+    builds/linux/$PRGNAM.desktop
 
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
@@ -79,6 +102,7 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install DESTDIR=$PKG
+strip $PKG/usr/games/$PRGNAM
 
 # Copy missing data files
 for i in images maps scripts; do
@@ -89,9 +113,6 @@ done
 install -Dm0644 $PRGNAM.cfg.sample $PKG/usr/share/$PRGNAM/$PRGNAM.cfg.new
 sed -i "s|./data|/usr/share/$PRGNAM|" $PKG/usr/share/$PRGNAM/$PRGNAM.cfg.new
 
-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
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README $PRGNAM.cfg.sample $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -101,4 +122,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE