rpms/inkscape/devel inkscape-0.47-newpoppler.patch, NONE, 1.1 inkscape.spec, 1.92, 1.93

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23887

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.47-newpoppler.patch 
Log Message:
* Sun Dec 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-2
- Fix Rawhide build.


inkscape-0.47-newpoppler.patch:
 pdf-parser.cpp |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

--- NEW FILE inkscape-0.47-newpoppler.patch ---
Fix Rawhide build (more recent poppler)

Lubomir Rintel <lkundrak at v3.sk>


Index: inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp
===================================================================
--- inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp	(revision 22620)
+++ inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp	(working copy)
@@ -56,6 +56,13 @@
 #define M_PI 3.14159265358979323846
 #endif
 
+#include <glib/poppler-features.h>
+#if POPPLER_CHECK_VERSION(0,12,2)
+#define PGFX ,NULL
+#else
+#define PGFX
+#endif
+
 //------------------------------------------------------------------------
 // constants
 //------------------------------------------------------------------------
@@ -809,7 +816,7 @@
 	  blendingColorSpace = NULL;
 	  isolated = knockout = gFalse;
 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
-	    blendingColorSpace = GfxColorSpace::parse(&obj5);
+	    blendingColorSpace = GfxColorSpace::parse(&obj5 PGFX);
 	  }
 	  obj5.free();
 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
@@ -1009,9 +1016,9 @@
   state->setFillPattern(NULL);
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0]);
+    colorSpace = GfxColorSpace::parse(&args[0] PGFX);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj);
+    colorSpace = GfxColorSpace::parse(&obj PGFX);
   }
   obj.free();
   if (colorSpace) {
@@ -1032,9 +1039,9 @@
   state->setStrokePattern(NULL);
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0]);
+    colorSpace = GfxColorSpace::parse(&args[0] PGFX);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj);
+    colorSpace = GfxColorSpace::parse(&obj PGFX);
   }
   obj.free();
   if (colorSpace) {
@@ -1101,7 +1108,7 @@
       builder->updateStyle(state);
     }
     if (args[numArgs-1].isName() &&
-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+	(pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
       state->setFillPattern(pattern);
       builder->updateStyle(state);
     }
@@ -1145,7 +1152,7 @@
       builder->updateStyle(state);
     }
     if (args[numArgs-1].isName() &&
-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+	(pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
       state->setStrokePattern(pattern);
       builder->updateStyle(state);
     }
@@ -1543,7 +1550,7 @@
   double *matrix = NULL;
   GBool savedState = gFalse;
 
-  if (!(shading = res->lookupShading(args[0].getName()))) {
+  if (!(shading = res->lookupShading(args[0].getName() PGFX))) {
     return;
   }
 
@@ -2507,7 +2514,7 @@
       }
     }
     if (!obj1.isNull()) {
-      colorSpace = GfxColorSpace::parse(&obj1);
+      colorSpace = GfxColorSpace::parse(&obj1 PGFX);
     } else if (csMode == streamCSDeviceGray) {
       colorSpace = new GfxDeviceGrayColorSpace();
     } else if (csMode == streamCSDeviceRGB) {
@@ -2592,7 +2599,7 @@
 	  obj2.free();
 	}
       }
-      maskColorSpace = GfxColorSpace::parse(&obj1);
+      maskColorSpace = GfxColorSpace::parse(&obj1 PGFX);
       obj1.free();
       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
 	goto err1;
@@ -2767,7 +2774,7 @@
     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
       transpGroup = gTrue;
       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
-	blendingColorSpace = GfxColorSpace::parse(&obj3);
+	blendingColorSpace = GfxColorSpace::parse(&obj3 PGFX);
       }
       obj3.free();
       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- inkscape.spec	30 Nov 2009 13:35:59 -0000	1.92
+++ inkscape.spec	6 Dec 2009 11:22:28 -0000	1.93
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.47
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -12,6 +12,7 @@ Patch0:         inkscape-20090410svn-uni
 Patch4:         inkscape-20090410svn-formats.patch
 Patch5:         inkscape-20090925svn-el5.patch
 Patch6:         inkscape-20091101svn-icon.patch
+Patch7:         inkscape-0.47-newpoppler.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -127,6 +128,7 @@ graphics in W3C standard Scalable Vector
 %patch4 -p1 -b .formats
 %patch5 -p1 -b .el5
 %patch6 -p0 -b .japierdole
+%patch7 -p0 -b .poppler
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
@@ -218,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-2
+- Fix Rawhide build.
+
 * Wed Nov 25 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-1
 - Stable release