office/scribus: Updated for version 1.3.5.1

4 files changed, 28 insertions, 19 deletions

diff --git a/office/scribus/README b/office/scribus/README
index dff295d44f..4fa54a0756 100644
--- a/office/scribus/README
+++ b/office/scribus/README
@@ -1,3 +1,5 @@
 Scribus is an open-source program that brings award-winning professional page 
 layout to Linux/Unix, MacOS X and Windows desktops with a combination of 
 "press-ready" output and new approaches to page layout.
+
+podofo is an optional dependency of scribus.
diff --git a/office/scribus/doinst.sh b/office/scribus/doinst.sh
index 0010e3238b..9830478e8c 100644
--- a/office/scribus/doinst.sh
+++ b/office/scribus/doinst.sh
@@ -1,9 +1,14 @@
-
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
 if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild
index 78a889350e..73bfca1041 100644
--- a/office/scribus/scribus.SlackBuild
+++ b/office/scribus/scribus.SlackBuild
@@ -27,7 +27,7 @@
 # Including input by Yalla-One and some code cleanup by rworkman
 
 PRGNAM=scribus
-VERSION=1.3.3.13
+VERSION=1.3.5.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -39,10 +39,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -51,7 +54,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
@@ -60,30 +63,27 @@ cmake \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+  -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
   -DRENDER_LIB=CAIRO
 
 make
 make install DESTDIR=$PKG
 
-# Install .desktop file and mime information
-install -m 0644 -D vnd.scribus.desktop $PKG/usr/share/applications/scribus.desktop
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cat scribus.desktop > $PKG/usr/share/applications/scribus.desktop
+( cd $PKG/usr/share/pixmaps ; ln -s ../scribus/icons/scribus.png . )
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mv $PKG/usr/share/man $PKG/usr
-mkdir -p $PKG/usr/man/de/man1
-mv $PKG/usr/man/man1/scribus.1.de $PKG/usr/man/de/man1/scribus.1
-
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
-mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/doc/scribus $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
-
+mv $PKG/usr/share/doc $PKG/usr
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -91,4 +91,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info
index 3635447cf8..f152e8d99e 100644
--- a/office/scribus/scribus.info
+++ b/office/scribus/scribus.info
@@ -1,8 +1,10 @@
 PRGNAM="scribus"
-VERSION="1.3.3.13"
+VERSION="1.3.5.1"
 HOMEPAGE="http://www.scribus.net"
-DOWNLOAD="http://downloads.sourceforge.net/scribus/scribus-1.3.3.13.tar.bz2"
-MD5SUM="e698b0d118c7f037e57163cba302d96e"
-MAINTAINER="ppr:kut"
+DOWNLOAD="http://downloads.sourceforge.net/scribus/scribus-1.3.5.1.tar.bz2"
+MD5SUM="4cadca0c780491ad61dc2d815776f10b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="pprkut"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="dsomero"
+APPROVED="rworkman"