Fix build with png-1.5.

3 files changed, 33 insertions, 1 deletions

diff --git a/graphics/gimageview/distinfo b/graphics/gimageview/distinfo
index 476fdb7e531..cc154aca83c 100644
--- a/graphics/gimageview/distinfo
+++ b/graphics/gimageview/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2009/02/25 01:17:01 joerg Exp $
+$NetBSD: distinfo,v 1.10 2011/02/01 08:50:06 wiz Exp $
 
 SHA1 (gimageview-0.2.27.tar.gz) = 333f0682e4f8f8ead4abb24f6eddf86f776c2478
 RMD160 (gimageview-0.2.27.tar.gz) = 1d35b3a1b453f87dc232b84407524c3011ec91eb
@@ -16,3 +16,5 @@ SHA1 (patch-aj) = 73ffb15d6451469ba1cc89d6b8918cecfbd24847
 SHA1 (patch-ak) = 7e8faa1712a5c4aeae2f12e64bb9c7ce415f17db
 SHA1 (patch-al) = cbd0c2ae2fdb096ddbf31dfbc747e25fe8c6311a
 SHA1 (patch-am) = e6e3b6e859b6de2ca7dc17fe714cea0e7fe542ef
+SHA1 (patch-plugins_image__loader_png__loader.c) = e10b69c3b580630b47d0730b24c4fb321fd81cc7
+SHA1 (patch-plugins_image__saver_png__saver.c) = e55ad89bd41c6654354d76ef3996ea683234d585
diff --git a/graphics/gimageview/patches/patch-plugins_image__loader_png__loader.c b/graphics/gimageview/patches/patch-plugins_image__loader_png__loader.c
new file mode 100644
index 00000000000..d241cd08988
--- /dev/null
+++ b/graphics/gimageview/patches/patch-plugins_image__loader_png__loader.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_image__loader_png__loader.c,v 1.1 2011/02/01 08:50:07 wiz Exp $
+
+Fix build with png-1.5.
+
+--- plugins/image_loader/png_loader.c.orig	2004-05-23 14:08:16.000000000 +0000
++++ plugins/image_loader/png_loader.c
+@@ -255,7 +255,7 @@ gimv_png_load (GimvImageLoader *loader, 
+       return NULL;
+    }
+ 
+-   if (setjmp (png_ptr->jmpbuf)) goto ERROR;
++   if (setjmp (png_jmpbuf(png_ptr))) goto ERROR;
+ 
+    context.gio = gio;
+    context.bytes_read = 0;
diff --git a/graphics/gimageview/patches/patch-plugins_image__saver_png__saver.c b/graphics/gimageview/patches/patch-plugins_image__saver_png__saver.c
new file mode 100644
index 00000000000..57a86fa25ca
--- /dev/null
+++ b/graphics/gimageview/patches/patch-plugins_image__saver_png__saver.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_image__saver_png__saver.c,v 1.1 2011/02/01 08:50:07 wiz Exp $
+
+Fix build with png-1.5.
+
+--- plugins/image_saver/png_saver.c.orig	2004-05-23 14:08:11.000000000 +0000
++++ plugins/image_saver/png_saver.c
+@@ -130,7 +130,7 @@ save_png (GimvImageSaver *saver,
+       return FALSE;
+    }
+ 
+-   if (setjmp (png_ptr->jmpbuf)) {
++   if (setjmp (png_jmpbuf(png_ptr))) {
+       png_destroy_write_struct (&png_ptr, &info_ptr);
+       fclose (handle);
+       return FALSE;