[97391] trunk/dports/graphics/inkscape

[royliu at macports.org]

Revision: 97391
          https://trac.macports.org/changeset/97391
Author:   royliu at macports.org
Date:     2012-09-04 13:34:32 -0700 (Tue, 04 Sep 2012)
Log Message:
-----------
inkscape: fix the build process to accommodate libpng version 1.5

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

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

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile	2012-09-04 20:32:38 UTC (rev 97390)
+++ trunk/dports/graphics/inkscape/Portfile	2012-09-04 20:34:32 UTC (rev 97391)
@@ -6,7 +6,7 @@
 name            inkscape
 conflicts       inkscape-devel
 version         0.48.3.1
-revision        3
+revision        4
 license         GPL-2 LGPL-2.1
 maintainers     devans
 categories      graphics gnome
@@ -58,6 +58,7 @@
 
 patchfiles      patch-configure-poppler20.diff \
                 patch-config.h.in.diff \
+                patch-libpng15.diff \
                 patch-src-extension-internal-pdfinput-pdf-parser.cpp.diff \
                 patch-src-extension-internal-pdfinput-svg-builder.cpp.diff
 

Added: trunk/dports/graphics/inkscape/files/patch-libpng15.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-libpng15.diff	                        (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-libpng15.diff	2012-09-04 20:34:32 UTC (rev 97391)
@@ -0,0 +1,33 @@
+--- src/helper/png-write.cpp.orig	2012-09-04 16:04:30.000000000 -0400
++++ src/helper/png-write.cpp	2012-09-04 16:04:30.000000000 -0400
+@@ -165,7 +165,7 @@
+     /* Set error handling.  REQUIRED if you aren't supplying your own
+      * error hadnling functions in the png_create_write_struct() call.
+      */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         /* If we get here, we had a problem reading the file */
+         fclose(fp);
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+--- src/sp-image.cpp.orig	2012-09-04 16:04:30.000000000 -0400
++++ src/sp-image.cpp	2012-09-04 16:04:30.000000000 -0400
+@@ -396,7 +396,7 @@
+                 {
+                     char* name = 0;
+                     int compression_type = 0;
+-                    char* profile = 0;
++                    png_bytep profile = 0;
+                     png_uint_32 proflen = 0;
+                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
+ //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
+--- src/extension/internal/pdfinput/svg-builder.cpp.orig	2012-09-04 16:04:30.000000000 -0400
++++ src/extension/internal/pdfinput/svg-builder.cpp	2012-09-04 16:04:30.000000000 -0400
+@@ -1443,7 +1443,7 @@
+         return NULL;
+     }
+     // Set error handler
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return NULL;
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120904/ce2ce8f4/attachment.html>