1 files changed, 44 insertions, 20 deletions
diff --git a/multimedia/DivFix++/DivFix++.SlackBuild b/multimedia/DivFix++/DivFix++.SlackBuild
index 0601d4c62b..dd065ea558 100644
--- a/multimedia/DivFix++/DivFix++.SlackBuild
+++ b/multimedia/DivFix++/DivFix++.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for DivFix++
 
@@ -22,26 +22,41 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220331 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - install docs to correct dir, usr/doc/$PRGNAM-$VERSION.
+# - i486 => i586.
+# - do not use wildcards for tarball name.
+# - fix grammar in README and slack-desc.
+# - make .desktop file validate.
+# - use "set -e".
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=DivFix++
 VERSION=${VERSION:-0.34}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+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
 
-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}
 
-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"
@@ -54,36 +69,45 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_v$VERSION-src.tar.?z* || exit 1
+tar xvf $CWD/${PRGNAM}_v$VERSION-src.tar.bz2 || \
+  tar xvf $CWD/DivFix%2B%2B_v$VERSION-src.tar.bz2
 cd ${PRGNAM}_v$VERSION || exit 1
 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 {} \+
+
+# 20220331 bkw: fix warnings and errors from desktop-file-validate. also
+# use absolute path to icon, since it's not in /usr/share/icons/.
+sed -i \
+  -e '/Version/s,=v,=,' \
+  -e '/^Icon/s,=,=/usr/share/pixmaps/,' \
+  -e '/^Categories/s,Application;,,' \
+  -e '/^Encoding/d' \
+  resources/DivFix++.desktop
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-	make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+	make
+make install DESTDIR=$PKG
+strip $PKG/usr/bin/$PRGNAM
 
 cd $TMP/${PRGNAM}_v$VERSION/docs
-mkdir -p $PKG/usr/doc/${PRGNAM}_v$VERSION
-cp -a Change.log GPL.txt ReadMe.txt \
-  $PKG/usr/doc/${PRGNAM}_v$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/${PRGNAM}_v$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Change.log GPL.txt ReadMe.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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