system/dvdisaster: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 31 insertions, 18 deletions

diff --git a/system/dvdisaster/dvdisaster.SlackBuild b/system/dvdisaster/dvdisaster.SlackBuild
index 69503f0dcbdc4..1c89d2e97e999 100644
--- a/system/dvdisaster/dvdisaster.SlackBuild
+++ b/system/dvdisaster/dvdisaster.SlackBuild
@@ -4,6 +4,10 @@
 
 # Written by Giovanne Castro <giovannefc@ig.com.br>
 
+# 20220211 bkw: Modified by SlackBuilds.org:
+# - fix parallel build on 15.0.
+# - new-style icons.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dvdisaster
@@ -14,15 +18,12 @@ PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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
@@ -32,8 +33,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -57,9 +58,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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -76,25 +77,37 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-nls=yes \
   --build=$ARCH-slackware-linux
 
+# 20220211 bkw: doing this first allows parallel makes to succeed.
+make -j1 -C locale
+
 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
+strip $PKG/usr/bin/$PRGNAM
+gzip -9 $PKG/usr/man/man*/* $PKG/usr/man/de/man*/*
 
 # Delete unnecessary file
 rm -rf $PKG/usr/bin/dvdisaster-uninstall.sh
 
-# Install icons
+# 20220211 bkw: make the .desktop file validate.
 mkdir -p $PKG/usr/share/applications
-cp -a contrib/dvdisaster.desktop $PKG/usr/share/applications
+sed -e 's,dvdisaster48\.png,dvdisaster,' \
+    -e 's,Application;,,' \
+  < contrib/dvdisaster.desktop \
+  > $PKG/usr/share/applications/dvdisaster.desktop
+
+# 20220211 bkw: new-style icons.
+for png in contrib/$PRGNAM*.png; do
+  px="$( echo $png | sed 's,.*\(..\)\.png$,\1,' )"
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cp -a $png $dir/$PRGNAM.png
+done
+
 mkdir -p $PKG/usr/share/pixmaps
-cp -a contrib/dvdisaster48.png $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-cp -a INSTALL README TRANSLATION.HOWTO $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a README TRANSLATION.HOWTO $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install