[70590] trunk/dports/graphics/inkscape

devans at macports.org devans at macports.org
Sat Aug 14 11:45:09 PDT 2010


Revision: 70590
          http://trac.macports.org/changeset/70590
Author:   devans at macports.org
Date:     2010-08-14 11:45:05 -0700 (Sat, 14 Aug 2010)
Log Message:
-----------
inkscape: update to version 0.48.0, update patchfiles, dependencies, add license.

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

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

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile	2010-08-14 18:35:40 UTC (rev 70589)
+++ trunk/dports/graphics/inkscape/Portfile	2010-08-14 18:45:05 UTC (rev 70590)
@@ -5,8 +5,8 @@
 
 name            inkscape
 conflicts       inkscape-devel
-version         0.47
-revision        4
+version         0.48.0
+license         GPLv2
 maintainers     devans
 categories      graphics gnome
 platforms       darwin
@@ -26,9 +26,11 @@
 
 use_bzip2       yes
 master_sites    sourceforge
-checksums       md5 7b497c8f673e40b05295a29f6e2111f4 \
-                sha1 7c75352f3882ebf4fcaebc22413bcb79bf3b7895
 
+checksums       md5     fd8b17a3f06668603807176a77167bb9 \
+                sha1    a2ab9b34937cc4f2b482c9b3720d8fd4dc7b12e8 \
+                rmd160  fe10b77f10e922a911e7117922d7553ed11d00dd
+
 depends_lib     port:boehmgc \
                 port:gsl \
                 port:gtkmm \
@@ -37,7 +39,8 @@
                 port:poppler \
                 port:boost \
                 port:ImageMagick \
-                port:libwpg
+                port:libwpg \
+                port:gtkspell2
 
 #
 # external dependencies for included Python extensions
@@ -48,8 +51,7 @@
                 port:py26-numpy \
                 port:py26-xml
 
-patchfiles      patch-configure.diff \
-                patch-poppler-0.12.2.diff
+patchfiles      patch-configure.diff
 
 configure.args  \
         --mandir=${prefix}/share/man \

Deleted: trunk/dports/graphics/inkscape/files/patch-poppler-0.12.2.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-poppler-0.12.2.diff	2010-08-14 18:35:40 UTC (rev 70589)
+++ trunk/dports/graphics/inkscape/files/patch-poppler-0.12.2.diff	2010-08-14 18:45:05 UTC (rev 70590)
@@ -1,110 +0,0 @@
-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/20100814/d7457af3/attachment.html>


More information about the macports-changes mailing list