graphics/raw-thumbnailer: Updated for version 3.0.0, new maintainer.

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

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

5 files changed, 46 insertions, 29 deletions

diff --git a/graphics/raw-thumbnailer/README b/graphics/raw-thumbnailer/README
index e09b761965284..5bf52ed689997 100644
--- a/graphics/raw-thumbnailer/README
+++ b/graphics/raw-thumbnailer/README
@@ -1,3 +1,5 @@
+raw-thumbnailer (thumbnailer for RAW camera files)
+
 This simple program generates thumbnails of digital camera raw image 
 files using libopenraw and GDK. It supports the same file formats as 
 libopenraw (http://libopenraw.freedesktop.org/wiki/FileFormats).
diff --git a/graphics/raw-thumbnailer/doinst.sh b/graphics/raw-thumbnailer/doinst.sh
new file mode 100644
index 0000000000000..aa30ae34d7a77
--- /dev/null
+++ b/graphics/raw-thumbnailer/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
diff --git a/graphics/raw-thumbnailer/raw-thumbnailer.SlackBuild b/graphics/raw-thumbnailer/raw-thumbnailer.SlackBuild
index eb7477aaa46c3..cda430967188b 100644
--- a/graphics/raw-thumbnailer/raw-thumbnailer.SlackBuild
+++ b/graphics/raw-thumbnailer/raw-thumbnailer.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for raw-thumbnailer
 # Copyright 2007-2011  Michiel van Wessem, Manchester, United Kingdom
+# Copyright 2019 B. Watson
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -23,14 +24,28 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>.
+
+# 20191231 bkw:
+# - take over maintenance
+# - update for v3.0.0
+# - i486 => i586
+# - don't install INSTALL or empty files in doc dir
+# - support both .gz and .bz2 tarballs, so we can still build v0.2.1
+# - add doinst.sh with update-mime-database
+# - fix slack-desc and README
+
+# Note to self: there's a bunch of sample images in various camera formats
+# here: https://www.rawsamples.ch/index.php/en/
+
 PRGNAM=raw-thumbnailer
-VERSION=${VERSION:-0.2.1}
+VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,15 +56,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-    LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-    LIBDIRSUFFIX=""
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -61,14 +76,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-    -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -84,15 +96,15 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-find $PKG | xargs 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 INSTALL ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $DOCDIR
+cp -a AUTHORS COPYING ChangeLog NEWS README $DOCDIR
+find $DOCDIR -type f -a -empty -a -exec rm {} \+
+cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$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}
diff --git a/graphics/raw-thumbnailer/raw-thumbnailer.info b/graphics/raw-thumbnailer/raw-thumbnailer.info
index b362b3d5c8207..aeba16e267fda 100644
--- a/graphics/raw-thumbnailer/raw-thumbnailer.info
+++ b/graphics/raw-thumbnailer/raw-thumbnailer.info
@@ -1,10 +1,10 @@
 PRGNAM="raw-thumbnailer"
-VERSION="0.2.1"
-HOMEPAGE="https://github.com/erlendd/raw-thumbnailer"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/raw-thumbnailer-0.2.1.tar.gz"
-MD5SUM="a39282120d8f754e9f6adb768d65b72a"
+VERSION="3.0.0"
+HOMEPAGE="https://libopenraw.freedesktop.org/raw-thumbnailer/"
+DOWNLOAD="https://libopenraw.freedesktop.org/download/raw-thumbnailer-3.0.0.tar.bz2"
+MD5SUM="fc56f327b3e2b2c647abd99b728b27a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libopenraw"
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/graphics/raw-thumbnailer/slack-desc b/graphics/raw-thumbnailer/slack-desc
index 20f2af6a9e378..dada2f66bbb38 100644
--- a/graphics/raw-thumbnailer/slack-desc
+++ b/graphics/raw-thumbnailer/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                |-----handy-ruler------------------------------------------------------|
-raw-thumbnailer: raw-thumbnailer (Short Application Description)
+raw-thumbnailer: raw-thumbnailer (thumbnailer for RAW camera files)
 raw-thumbnailer:
 raw-thumbnailer: This simple program generates thumbnails of digital camera
 raw-thumbnailer: raw image files using libopenraw and GDK. It supports the
-raw-thumbnailer: same file formats as  libopenraw.
+raw-thumbnailer: same file formats as libopenraw.
 raw-thumbnailer:
 raw-thumbnailer: This thumbnailer is designed to be small, lightweight
 raw-thumbnailer: and fast. It is primarily intended to be used with file