png-1.5 build fix

4 files changed, 43 insertions, 1 deletions

diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 6e070650b9f..a0bb275e432 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2010/12/14 22:19:52 adam Exp $
+$NetBSD: distinfo,v 1.33 2011/01/16 18:18:18 tnn Exp $
 
 SHA1 (inkscape-0.48.0.tar.bz2) = a2ab9b34937cc4f2b482c9b3720d8fd4dc7b12e8
 RMD160 (inkscape-0.48.0.tar.bz2) = fe10b77f10e922a911e7117922d7553ed11d00dd
@@ -13,4 +13,7 @@ SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
 SHA1 (patch-ah) = 7f5517171073017b3e96367237af2c981cecf628
 SHA1 (patch-ai) = 1cd8e744848d6b52ffb4f07922e09689b5e43f61
 SHA1 (patch-aj) = 8564ee2d4e884dc31e4ad4232267f6fad09f71ee
+SHA1 (patch-ak) = ec222b8d964b9b297d5284eef771411dd100f04e
+SHA1 (patch-al) = 1ab7727a232001e9962dd34f125b220cb0ea889c
+SHA1 (patch-am) = 26475847b197f7c7acaccf51f58a3213f73761ae
 SHA1 (patch-ap) = cd29bd178dc2c6c9456bc09d6663d6a25acc7da1
diff --git a/graphics/inkscape/patches/patch-ak b/graphics/inkscape/patches/patch-ak
new file mode 100644
index 00000000000..f68f8355dd4
--- /dev/null
+++ b/graphics/inkscape/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.5 2011/01/16 18:18:19 tnn Exp $
+
+--- src/sp-image.cpp.orig	2010-07-13 03:48:40.000000000 +0000
++++ src/sp-image.cpp
+@@ -388,7 +388,7 @@ static bool readPngAndHeaders( PushPull 
+                 {
+                     char* name = 0;
+                     int compression_type = 0;
+-                    char* profile = 0;
++                    png_byte* 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);
diff --git a/graphics/inkscape/patches/patch-al b/graphics/inkscape/patches/patch-al
new file mode 100644
index 00000000000..fc59a0af97e
--- /dev/null
+++ b/graphics/inkscape/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.3 2011/01/16 18:18:19 tnn Exp $
+
+--- src/helper/png-write.cpp.orig	2010-07-13 03:48:40.000000000 +0000
++++ src/helper/png-write.cpp
+@@ -165,7 +165,7 @@ sp_png_write_rgba_striped(SPDocument *do
+     /* 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);
diff --git a/graphics/inkscape/patches/patch-am b/graphics/inkscape/patches/patch-am
new file mode 100644
index 00000000000..31762b7f7d8
--- /dev/null
+++ b/graphics/inkscape/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.3 2011/01/16 18:18:19 tnn Exp $
+
+--- src/extension/internal/pdfinput/svg-builder.cpp.orig	2010-07-13 03:48:40.000000000 +0000
++++ src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1440,7 +1440,7 @@ Inkscape::XML::Node *SvgBuilder::_create
+         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;
+     }