multimedia/DivFix++: Fix doc dir, desktop, README, slack-desc.

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

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

3 files changed, 47 insertions, 33 deletions

diff --git a/multimedia/DivFix++/DivFix++.SlackBuild b/multimedia/DivFix++/DivFix++.SlackBuild
index 8ec8261d4f4b0..dd065ea558dff 100644
--- a/multimedia/DivFix++/DivFix++.SlackBuild
+++ b/multimedia/DivFix++/DivFix++.SlackBuild
@@ -22,25 +22,30 @@
 # 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
 
-# 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
@@ -50,8 +55,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"
@@ -64,32 +69,41 @@ 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* || tar xvf $CWD/DivFix%2B%2B_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
diff --git a/multimedia/DivFix++/README b/multimedia/DivFix++/README
index f52b1e44302b9..4b9fdc570fe9d 100644
--- a/multimedia/DivFix++/README
+++ b/multimedia/DivFix++/README
@@ -1,8 +1,8 @@
-This program repairs broken AVI file streams by rebuilding index
-part of file. This is very useful when trying to preview movies
-which has no index part, like some files are currently downloading
-from ed2k (eMule) or bittorent networks. DivFix++ specialy designed
-for preview video download files from P2P networks.
+This program repairs broken AVI file streams by rebuilding the index
+part of the file. This is very useful when trying to preview movies
+which have no index part, like files that are partially downloaded
+from ed2k (eMule) or bittorent networks. DivFix++ is specially
+designed for previewing video download files from P2P networks before
+they have finished downloading.
 
-Note that wxGTK3 could be used as a dependency in alternative
-to wxPython.
+Note that wxGTK3 could be used as a dependency instead of wxPython.
diff --git a/multimedia/DivFix++/slack-desc b/multimedia/DivFix++/slack-desc
index 08f14859aef40..3878d32c9e31c 100644
--- a/multimedia/DivFix++/slack-desc
+++ b/multimedia/DivFix++/slack-desc
@@ -8,12 +8,12 @@
         |-----handy-ruler------------------------------------------------------|
 DivFix++: DivFix++ (CLI "DivFix" clone)
 DivFix++:
-DivFix++: This program repairs broken AVI file streams by rebuilding index
-DivFix++: part of file. This is very useful when trying to preview movies
-DivFix++: which has no index part, like some files are currently downloading
-DivFix++: from ed2k (eMule) or bittorent networks. DivFix++ specialy designed
-DivFix++: for preview video download files from P2P networks.
+DivFix++: This program repairs broken AVI file streams by rebuilding the index
+DivFix++: part of the file. This is very useful when trying to preview movies
+DivFix++: which have no index part, like files that are partially downloaded
+DivFix++: from ed2k (eMule) or bittorent networks. DivFix++ is specially
+DivFix++: desigmed for previewing video download files from P2P networks before
+DivFix++: they have finished downloading.
 DivFix++:
 DivFix++: Homepage: http://divfixpp.sourceforge.net/
 DivFix++:
-DivFix++: