graphics/inkscape: Updated for version 0.47

5 files changed, 25 insertions, 65 deletions

diff --git a/graphics/inkscape/README b/graphics/inkscape/README
index fe736dff96..064f3ef3df 100644
--- a/graphics/inkscape/README
+++ b/graphics/inkscape/README
@@ -7,5 +7,6 @@ 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.
 
-Inkscape requires boost, libsigc++, glibmm, gtkmm (which requires cairomm), 
-and gc,  all of which are available at SlackBuilds.org.
+Inkscape requires gc, gsl, libsigc++, glibmm, cairomm, pangomm, and gtkmm.
+lxml and numpy are optional dependencies, but they are strongly recommended
+if you want all of inkscape's intended functionality.
diff --git a/graphics/inkscape/inkscape-0.46-poppler-0.8.3.patch b/graphics/inkscape/inkscape-0.46-poppler-0.8.3.patch
deleted file mode 100644
index 10fede41cf..0000000000
--- a/graphics/inkscape/inkscape-0.46-poppler-0.8.3.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp
---- inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:26:20.000000000 +0200
-+++ inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:51:47.000000000 +0200
-@@ -2194,11 +2194,11 @@
- void PdfParser::doShowText(GooString *s) {
-   GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
--  Unicode u[8];
-+  Unicode *u = NULL;
-   double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
-   double originX, originY, tOriginX, tOriginY;
-   double oldCTM[6], newCTM[6];
-   double *mat;
-   Object charProc;
-@@ -2242,11 +2242,11 @@
-     oldParser = parser;
-     p = s->getCString();
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
--			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
-+			    &u, &uLen,
- 			    &dx, &dy, &originX, &originY);
-       dx = dx * state->getFontSize() + state->getCharSpace();
-       if (n == 1 && *p == ' ') {
- 	dx += state->getWordSpace();
-       }
-@@ -2291,11 +2291,11 @@
-     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
-     p = s->getCString();
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
--			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
-+			    &u, &uLen,
- 			    &dx, &dy, &originX, &originY);
-       
-       if (wMode) {
- 	dx *= state->getFontSize();
- 	dy = dy * state->getFontSize() + state->getCharSpace();
-
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild
index 6b0d29330d..1831e5f8d7 100644
--- a/graphics/inkscape/inkscape.SlackBuild
+++ b/graphics/inkscape/inkscape.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for inkscape
 
-# Copyright 2006-2008  Robby Workman, Northport, AL, USA
+# Copyright 2006-2009  Robby Workman, Northport, AL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=inkscape
-VERSION=0.46
+VERSION=0.47
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,10 +35,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
@@ -52,26 +55,22 @@ 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.2
-patch -p1 < $CWD/inkscape-0.46-poppler-0.8.3.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-static=no \
   --build=$ARCH-slackware-linux
 
 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
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 ( cd $PKG/usr/man || exit 1
   find . -type f -exec gzip -9 {} \;
@@ -79,7 +78,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* HACKING* INSTALL NEWS README* TRANSLATORS doc/* \
+cp -a \
+  AUTHORS COPYING* HACKING* INSTALL NEWS README* TRANSLATORS doc/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -name "Makefile*" -exec rm {} \;
@@ -90,4 +90,4 @@ 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info
index 2c2b932e51..9c6a4c1e29 100644
--- a/graphics/inkscape/inkscape.info
+++ b/graphics/inkscape/inkscape.info
@@ -1,8 +1,10 @@
 PRGNAM="inkscape"
-VERSION="0.46"
+VERSION="0.47"
 HOMEPAGE="http://www.inkscape.org/"
-DOWNLOAD="http://downloads.sourceforge.net/inkscape/inkscape-0.46.tar.gz"
-MD5SUM="3bae9034047379012127e52f9b138d32"
+DOWNLOAD="http://downloads.sourceforge.net/inkscape/inkscape-0.47.tar.gz"
+MD5SUM="916c85b501bcfb0ae61fcf7318f36348"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="David Somero"
+APPROVED="Erik Hanson"
diff --git a/graphics/inkscape/slack-desc b/graphics/inkscape/slack-desc
index 2481ea65e8..8e7749d550 100644
--- a/graphics/inkscape/slack-desc
+++ b/graphics/inkscape/slack-desc
@@ -7,13 +7,13 @@
 
         |-----handy-ruler-----------------------------------------------------|
 inkscape: Inkscape (Open Source vector graphics editor)
-inkscape: 
+inkscape:
 inkscape: Inkscape is an Open Source vector graphics editor, with capabilities 
 inkscape: similar to Illustrator, Freehand, CorelDraw, or Xara X using the W3C 
 inkscape: standard Scalable Vector Graphics (SVG) file format.
-inkscape: 
+inkscape:
 inkscape: Homepage: http://www.inkscape.org/
-inkscape: 
-inkscape: 
-inkscape: 
-inkscape: 
+inkscape:
+inkscape:
+inkscape:
+inkscape: