OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=21

inkscape-lp237574-poppler.patch

@@ -0,0 +1,43 @@
+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();
+

inkscape.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct  3 21:01:44 CEST 2008 - vuntz@novell.com
+
+- Add inkscape-lp237574-poppler.patch to compile with poppler in
+  Factory.
+
 -------------------------------------------------------------------
 Wed Sep 24 13:56:13 CEST 2008 - sbrabec@suse.cz
 

inkscape.spec

@@ -25,7 +25,7 @@ Group:          Productivity/Graphics/Vector Editors
 Requires:       ghostscript-fonts-std python-gtk python-numeric pstoedit gzip /usr/bin/gs
 Summary:        Inkscape Vector Illustration Program
 Version:        0.46
-Release:        61
+Release:        62
 # package in <= NLD9 and SuSE Linux <= 9.1
 Provides:       sodipodi
 Obsoletes:      sodipodi
@@ -45,6 +45,8 @@ Patch14:        %{name}-buffer-overrun.patch
 Patch15:        inkscape-warnings.patch
 # PATCH-FIX-UPSTREAM inkscape-gtk-clist.patch maw@novell.com -- https://bugs.launchpad.net/inkscape/+bug/238223
 Patch16:        inkscape-gtk-clist.patch
+# PATCH-FIX-UPSTREAM inkscape-lp237574-poppler.patch lp237574 vuntz@novell.com -- Fix compilation with latest poppler
+Patch17:        inkscape-lp237574-poppler.patch
 Url:            http://www.inkscape.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %{name}-lang = %{version}
@@ -428,6 +430,7 @@ Authors:
 %patch14 -p1
 %patch15 -p0
 %patch16 -p0
+%patch17 -p1
 pushd ../gc*
 %patch10
 popd
@@ -536,6 +539,9 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}.lang
 
 %changelog
+* Fri Oct 03 2008 vuntz@novell.com
+- Add inkscape-lp237574-poppler.patch to compile with poppler in
+  Factory.
 * Wed Sep 24 2008 sbrabec@suse.cz
 - Require and supplement correct resolvables for gimp.
 * Tue Jul 01 2008 sbrabec@suse.cz