Use libpoppler so it can offer PDF import also.

Bump PKGREVISION.
Thanks to Michael A. Koerber for bringing this to my attention
and testing.

4 files changed, 55 insertions, 4 deletions

diff --git a/graphics/inkscape/DESCR b/graphics/inkscape/DESCR
index 0af5044eea1..1a4100bf15d 100644
--- a/graphics/inkscape/DESCR
+++ b/graphics/inkscape/DESCR
@@ -8,7 +8,8 @@ The goal is to be a fully XML, SVG, and CSS2 compliant extensible
 drawing tool. It has a GNOME-style interface.
 
 Inkscape can be used for slideshows, printing, converting image
-formats, and can be used without a GUI for some features.
+formats, and can be used without a GUI for some features.  It offers
+PDF import and export.
 
 This package also includes inkview, a slideshow program which uses
 SVG files.
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 592e9697af5..33709441205 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2009/05/20 12:00:17 tnn Exp $
+# $NetBSD: Makefile,v 1.41 2009/06/04 00:05:19 reed Exp $
 
 DISTNAME=	inkscape-0.46
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=inkscape/}
 EXTRACT_SUFX=	.tar.bz2
@@ -30,6 +30,7 @@ REPLACE_PERL+=		share/extensions/*.p[lm]
 REPLACE_PERL+=		share/extensions/svg_dropshadow
 
 BUILDLINK_API_DEPENDS.boehm-gc+=	boehm-gc>=6.4
+BUILDLINK_API_DEPENDS.poppler+=		poppler>=0.5.9
 
 UNLIMIT_RESOURCES=	datasize
 
@@ -40,6 +41,8 @@ UNLIMIT_RESOURCES=	datasize
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../print/poppler-glib/buildlink3.mk"
+.include "../../print/poppler-includes/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index a4b308d162e..32e69262913 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2009/05/20 12:00:17 tnn Exp $
+$NetBSD: distinfo,v 1.27 2009/06/04 00:05:19 reed Exp $
 
 SHA1 (inkscape-0.46.tar.bz2) = ca68fc9bf539d7bcfc31f36d24f884255b2154e7
 RMD160 (inkscape-0.46.tar.bz2) = c90713493557bdc17515de1287c9af401a4a3e26
@@ -13,3 +13,4 @@ SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
 SHA1 (patch-ah) = 964e51dca7e1212037a9f0122fa0ef812bf8f46c
 SHA1 (patch-ai) = 56271685b207f4056952929895f1fdd2ec74e3ef
 SHA1 (patch-aj) = ae258d2b4f3d5bdbfbc6d76d13361b6e672de73c
+SHA1 (patch-ak) = 7ce80942f955a63dd6f6e772cbf03cf7b89db2c0
diff --git a/graphics/inkscape/patches/patch-ak b/graphics/inkscape/patches/patch-ak
new file mode 100644
index 00000000000..97102a2ce95
--- /dev/null
+++ b/graphics/inkscape/patches/patch-ak
@@ -0,0 +1,46 @@
+$NetBSD: patch-ak,v 1.1 2009/06/04 00:05:19 reed Exp $
+
+from https://bugs.launchpad.net/inkscape/+bug/237574
+
+diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp
+--- src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:26:20.000000000 +0200
++++ 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();