Fix build with png-1.5.

4 files changed, 35 insertions, 6 deletions

diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo
index 60ca805ca02..7ee7e3b2a8f 100644
--- a/x11/wxGTK24/distinfo
+++ b/x11/wxGTK24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2010/12/22 19:44:24 chuck Exp $
+$NetBSD: distinfo,v 1.14 2011/01/24 09:38:13 wiz Exp $
 
 SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
 RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
@@ -17,6 +17,6 @@ SHA1 (patch-ak) = 3f26086c8f16ac972db89c21f665c187570937cc
 SHA1 (patch-al) = bceed88db708c83afca0fe3adb5c923f9bc661b0
 SHA1 (patch-am) = 445ae223a6fd88b86efafa7c13dbcf3f359f364f
 SHA1 (patch-an) = a9d276244cac87fa00a3c3338179e68084b72b1d
-SHA1 (patch-ao) = 7fb559c8662b20a61d39b308d3b6723b0dde6673
+SHA1 (patch-ao) = 3ee66e4bdef6ede5e715fc951f48887e90d0d13a
 SHA1 (patch-ap) = b1217506bfffe9ed7a282c960a99921c61d76dbd
 SHA1 (patch-aq) = 72cc09c94ca6911859f3b40f01e13f0f95d07141
diff --git a/x11/wxGTK24/patches/patch-ao b/x11/wxGTK24/patches/patch-ao
index c6aabd03277..370c26de879 100644
--- a/x11/wxGTK24/patches/patch-ao
+++ b/x11/wxGTK24/patches/patch-ao
@@ -1,9 +1,28 @@
-$NetBSD: patch-ao,v 1.1 2010/02/16 17:33:39 taca Exp $
+$NetBSD: patch-ao,v 1.2 2011/01/24 09:38:13 wiz Exp $
 
+Fix build with png-1.5.
 deal with CVE-2009-2369.
 
 --- src/common/imagpng.cpp.orig	2003-09-21 11:31:39.000000000 +0000
 +++ src/common/imagpng.cpp
+@@ -167,7 +167,7 @@ bool wxPNGHandler::LoadFile( wxImage *im
+     image->Destroy();
+ 
+     png_structp png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING,
+-        (voidp) NULL,
++        NULL,
+         (png_error_ptr) NULL,
+         (png_error_ptr) NULL );
+     if (!png_ptr)
+@@ -186,7 +186,7 @@ bool wxPNGHandler::LoadFile( wxImage *im
+     if (setjmp(wxinfo.jmpbuf))
+         goto error_nolines;
+ 
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++    if (png_get_color_type( png_ptr, info_ptr ) == PNG_COLOR_TYPE_RGB_ALPHA)
+         goto error_nolines;
+ 
+     png_uint_32 width,height;
 @@ -213,18 +213,16 @@ bool wxPNGHandler::LoadFile( wxImage *im
      if (!image->Ok())
          goto error_nolines;
diff --git a/x11/wxGTK26/distinfo b/x11/wxGTK26/distinfo
index 92a523b5ff6..5c9e6132775 100644
--- a/x11/wxGTK26/distinfo
+++ b/x11/wxGTK26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2010/06/13 22:45:54 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/01/24 09:33:32 wiz Exp $
 
 SHA1 (wxGTK-2.6.3-libtool.diff3.bz2) = 657566a9384a4bc160dffd26678b5e0c6a1cb5b2
 RMD160 (wxGTK-2.6.3-libtool.diff3.bz2) = 233af8dd61317ed1771c1862c6cec65f131b6de0
@@ -11,6 +11,6 @@ SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b
 SHA1 (patch-ac) = 50bd7d4291e44dac1d2bbbae1b12167177f5ef01
 SHA1 (patch-ad) = fb51bb80451d39ba2bba53d42722327888b4a0be
 SHA1 (patch-ae) = d6fcc9b21fd457e79c32f2dc47166dc7afbd65b1
-SHA1 (patch-af) = 96e29001bcf1fbc33f4cb185f25f53a6901ce9d2
+SHA1 (patch-af) = 3c284feffe3e1c8fae6302dbd86ce8421fd0f6ba
 SHA1 (patch-ag) = ccaac341ecd589dbde465f49064dd2ab480fc639
 SHA1 (patch-ah) = e7da6aacd004048d0d07965df09e97cef5a76551
diff --git a/x11/wxGTK26/patches/patch-af b/x11/wxGTK26/patches/patch-af
index 32ff807c1dc..a56491a9daf 100644
--- a/x11/wxGTK26/patches/patch-af
+++ b/x11/wxGTK26/patches/patch-af
@@ -1,9 +1,19 @@
-$NetBSD: patch-af,v 1.1 2010/02/16 17:35:34 taca Exp $
+$NetBSD: patch-af,v 1.2 2011/01/24 09:33:33 wiz Exp $
 
+Fix build with png-1.5.
 deal with CVE-2009-2369.
 
 --- src/common/imagpng.cpp.orig	2006-03-21 23:42:10.000000000 +0000
 +++ src/common/imagpng.cpp
+@@ -528,7 +528,7 @@ wxPNGHandler::LoadFile(wxImage *image,
+     png_structp png_ptr = png_create_read_struct
+                           (
+                             PNG_LIBPNG_VER_STRING,
+-                            (voidp) NULL,
++                            NULL,
+                             wx_png_error,
+                             wx_png_warning
+                           );
 @@ -570,18 +570,16 @@ wxPNGHandler::LoadFile(wxImage *image,
      if (!image->Ok())
          goto error;