[65641] trunk/dports/graphics/inkscape

[raimue at macports.org]

Revision: 65641
          http://trac.macports.org/changeset/65641
Author:   raimue at macports.org
Date:     2010-03-29 11:16:52 -0700 (Mon, 29 Mar 2010)
Log Message:
-----------
graphics/inkscape:
Fix build against poppler >=0.12.2, overriding maintainer as the port is
broken.
http://lists.macosforge.org/pipermail/macports-users/2010-March/019540.html

Modified Paths:
--------------
    trunk/dports/graphics/inkscape/Portfile

Added Paths:
-----------
    trunk/dports/graphics/inkscape/files/patch-poppler-0.12.2.diff

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile	2010-03-29 16:54:39 UTC (rev 65640)
+++ trunk/dports/graphics/inkscape/Portfile	2010-03-29 18:16:52 UTC (rev 65641)
@@ -6,7 +6,7 @@
 name            inkscape
 conflicts       inkscape-devel
 version         0.47
-revision        0
+revision        1
 maintainers     devans
 categories      graphics gnome
 platforms       darwin
@@ -47,7 +47,8 @@
                 port:ImageMagick \
                 port:libwpg
 
-patchfiles      patch-configure.diff
+patchfiles      patch-configure.diff \
+                patch-poppler-0.12.2.diff
 
 configure.args  \
         --mandir=${prefix}/share/man \

Added: trunk/dports/graphics/inkscape/files/patch-poppler-0.12.2.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-poppler-0.12.2.diff	                        (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-poppler-0.12.2.diff	2010-03-29 18:16:52 UTC (rev 65641)
@@ -0,0 +1,110 @@
+Fix Rawhide build (more recent poppler)
+
+Lubomir Rintel <lkundrak at v3.sk>
+
+
+Index: src/extension/internal/pdfinput/pdf-parser.cpp
+===================================================================
+--- src/extension/internal/pdfinput/pdf-parser.cpp	(revision 22620)
++++ 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()) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100329/d234e301/attachment.html>