[57544] trunk/dports/graphics

[devans at macports.org]

Revision: 57544
          http://trac.macports.org/changeset/57544
Author:   devans at macports.org
Date:     2009-09-12 11:30:10 -0700 (Sat, 12 Sep 2009)
Log Message:
-----------
inkscape, inkscape-devel: prevent conflict between python25 Object.h and poppler Object.h in pdf-parser.cpp, closes #21188, perhaps #21311.

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

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile	2009-09-12 18:20:44 UTC (rev 57543)
+++ trunk/dports/graphics/inkscape/Portfile	2009-09-12 18:30:10 UTC (rev 57544)
@@ -85,6 +85,7 @@
 post-patch {
         reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.5\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
         reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
+        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
 }
 
 livecheck.type          regex

Modified: trunk/dports/graphics/inkscape-devel/Portfile
===================================================================
--- trunk/dports/graphics/inkscape-devel/Portfile	2009-09-12 18:20:44 UTC (rev 57543)
+++ trunk/dports/graphics/inkscape-devel/Portfile	2009-09-12 18:30:10 UTC (rev 57544)
@@ -91,6 +91,7 @@
 post-patch {
         reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.5\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
         reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
+        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
 }
 
 livecheck.type           none
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090912/1c3fdb99/attachment.html>