From e173794e38811c3d1755354586b8874039178555 Mon Sep 17 00:00:00 2001
From: Robby Workman <rw@rlworkman.net>
Date: Wed, 12 May 2010 17:39:58 +0200
Subject: graphics/inkscape: Updated for version 0.46

---
 graphics/inkscape/README              |  4 ----
 graphics/inkscape/doinst.sh           |  5 ++---
 graphics/inkscape/inkscape.SlackBuild | 25 +++++++++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'graphics/inkscape')

diff --git a/graphics/inkscape/README b/graphics/inkscape/README
index a173dbfb25..fe736dff96 100644
--- a/graphics/inkscape/README
+++ b/graphics/inkscape/README
@@ -7,9 +7,5 @@ layers, complex path operations, bitmap tracing, text-on-path, flowed text,
 direct XML editing, and more. It imports formats such as JPEG, PNG, TIFF, and 
 others and exports PNG as well as multiple vector-based formats.
 
-This build script includes a patch that might be needed if you're building
-inkscape against a newer version of poppler than what Slackware 12.1 has;
-if you need it, uncomment it in the build script.
-
 Inkscape requires boost, libsigc++, glibmm, gtkmm (which requires cairomm), 
 and gc,  all of which are available at SlackBuilds.org.
diff --git a/graphics/inkscape/doinst.sh b/graphics/inkscape/doinst.sh
index 22d4849bce..65fd352418 100644
--- a/graphics/inkscape/doinst.sh
+++ b/graphics/inkscape/doinst.sh
@@ -1,5 +1,4 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
 
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild
index 9c145b708e..6b0d29330d 100644
--- a/graphics/inkscape/inkscape.SlackBuild
+++ b/graphics/inkscape/inkscape.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=inkscape
 VERSION=0.46
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -37,20 +37,24 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 # Add a patch from Gentoo so that this version of inkscape
-# will build on >12.1  If you need this, uncomment it.
-# patch -p1 < $CWD/inkscape-0.46-poppler-0.8.3.patch
+# will build on 12.2
+patch -p1 < $CWD/inkscape-0.46-poppler-0.8.3.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -59,16 +63,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install 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
 
-( cd $PKG/usr/man
+( cd $PKG/usr/man || exit 1
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
-- 
cgit v1.2.3