2 files changed, 21 insertions, 19 deletions
diff --git a/graphics/shotwell/shotwell.SlackBuild b/graphics/shotwell/shotwell.SlackBuild
index 4660903702b19..f65dd0ca89593 100644
--- a/graphics/shotwell/shotwell.SlackBuild
+++ b/graphics/shotwell/shotwell.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shotwell
-VERSION=${VERSION:-0.23.1}
+VERSION=${VERSION:-0.24.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
@@ -40,8 +40,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" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
@@ -57,37 +57,39 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xJf $CWD/$PRGNAM-$VERSION.tar.xz
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.xz
 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 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" \
 ./configure \
   --prefix=/usr \
-  --lib=lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-schemas-compile \
-  --disable-desktop-update \
-  --disable-icon-update \
-  --enable-build-for-glade \
-  --install-headers \
-  --release
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING INSTALL MAINTAINERS NEWS README THANKS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING INSTALL NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/shotwell/shotwell.info b/graphics/shotwell/shotwell.info
index fead47c6c5617..149dc5563aa1c 100644
--- a/graphics/shotwell/shotwell.info
+++ b/graphics/shotwell/shotwell.info
@@ -1,8 +1,8 @@
 PRGNAM="shotwell"
-VERSION="0.23.1"
+VERSION="0.24.0"
 HOMEPAGE="http://yorba.org/shotwell/"
-DOWNLOAD="https://download.gnome.org/sources/shotwell/0.23/shotwell-0.23.1.tar.xz"
-MD5SUM="2177d900fd32e4be474b346bf4b9fe16"
+DOWNLOAD="https://download.gnome.org/sources/shotwell/0.24/shotwell-0.24.0.tar.xz"
+MD5SUM="2697874c8e26c37aed3b1ea8a6fd2b7e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libgee libgexiv2 libunique webkit2gtk rest json-glib"