3 files changed, 26 insertions, 9 deletions
diff --git a/source/xfce/tumbler/slack-desc b/source/xfce/tumbler/slack-desc
index d40670e4..89d74bd7 100644
--- a/source/xfce/tumbler/slack-desc
+++ b/source/xfce/tumbler/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
@@ -10,7 +10,7 @@ tumbler: tumbler (thumbnail generator)
 tumbler:
 tumbler: Tumbler is a D-Bus service for applications to request thumbnails
 tumbler: for various URI schemes and MIME types. It is written in an object-
-tumbler: oriented fashion using GLib and GObject.  It provides plugin
+tumbler: oriented fashion using GLib and GObject. It provides plugin
 tumbler: interfaces for extending the URI schemes and MIME types for which
 tumbler: thumbnails can be generated as well as for replacing the storage
 tumbler: backend that is used to store the thumbnails on disk. 
diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild
index a6e538d7..186467f7 100755
--- a/source/xfce/tumbler/tumbler.SlackBuild
+++ b/source/xfce/tumbler/tumbler.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2012, 2013, 2015  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2013, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=tumbler
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then
   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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:--j6}
 
 if [ "$ARCH" = "i586" ]; then
@@ -52,7 +62,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -62,7 +71,7 @@ mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
+cd $PKGNAM-$VERSION || cd $PKGNAM-$PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
 find . \
@@ -71,6 +80,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+if [ ! -x configure ]; then
+  ./autogen.sh
+fi
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -87,6 +100,9 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Strip binaries:
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/xfce/tumbler/tumbler.url b/source/xfce/tumbler/tumbler.url
new file mode 100644
index 00000000..b5e7e85f
--- /dev/null
+++ b/source/xfce/tumbler/tumbler.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/apps/tumbler/0.2/tumbler-0.2.1.tar.bz2