Add patch fixing build with libpng-1.5 (bug #355035).

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 49 insertions, 7 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index e8d6f3160dc7..c88a5032cfd6 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.259 2011/02/27 14:32:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.260 2011/03/19 17:20:02 dirtyepic Exp $
+
+  19 Mar 2011; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxGTK-2.8.11-libpng15.patch, wxGTK-2.8.11.0.ebuild:
+  Add patch fixing build with libpng-1.5 (bug #355035).
 
   27 Feb 2011; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.10.1-r5.ebuild,
   wxGTK-2.8.11.0.ebuild, wxGTK-2.9.1.1.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index b46a6973efe9..a55fbe1201fd 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -12,6 +12,7 @@ AUX wxGTK-2.8.10.1-gsocket.patch 480 RMD160 8aa2654dfe926980388235a91d78aa73fc84
 AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 RMD160 2444b56d28dacf4def2e329419596a491e88f2a2 SHA1 80039dc3e6a796c6fa86088d0c2d6ccda1a3d040 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698
 AUX wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch 1620 RMD160 5263552010efd258e94251f215d26ed0b2cedd38 SHA1 a18887d73b8c04a865f10521f5197ed217ec6c6d SHA256 28574bdcdddf6223038727d2bb0637611d3e39bb6613ed8353634e7d2621658f
 AUX wxGTK-2.8.11-collision.patch 5720 RMD160 afce2ed0ce4247f43d6db92e6652f739f58aa97e SHA1 8fc4d98b5bfc0cdf755795fff9eb6c8cb8009cdd SHA256 f2fc90c35c798b9546117707b3f9d81d627a122b9bf395657d78c79355ae717d
+AUX wxGTK-2.8.11-libpng15.patch 1390 RMD160 0f835458016a5eddda4f865ddadc6f96da72be58 SHA1 44c6086e3651c669df468bd129161693d0ba3e55 SHA256 b04b82f0db227cd1b5d2d5cd332b917eac1cd18967eab84791e23375e6245982
 AUX wxGTK-2.8.11-unicode-odbc.patch 624 RMD160 436cc03a4e45ed649298cf08a8ec134b97f4c4b5 SHA1 6cdf8f6e5140355d7bf6433d3afad483201c0961 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65
 AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85
 AUX wxGTK-2.9.1.1-collision.patch 5953 RMD160 a80b62e8a6c099d27ff7df6e63a0c55078f342a7 SHA1 3f6897bfe49c5d3123f7fc53479dcb31977b5600 SHA256 b7470d4e2eaed28b2fedc5f8e94fb897a837daa0aa33c77ca99e4e379b0e9cdf
@@ -22,14 +23,14 @@ DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c35
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
 EBUILD wxGTK-2.6.4.0-r6.ebuild 5004 RMD160 daf49935539ec56c44d426bce745d2c467f3727e SHA1 0bcf68107370f91ea53fe11d6b64eba5068abad3 SHA256 7fc4a8330ec3a51679529f817fb76866d508e7184fd286a090398e0acc29c74a
 EBUILD wxGTK-2.8.10.1-r5.ebuild 3911 RMD160 a6789613db3edb542a6ac8a26a2d3c19375c70a7 SHA1 566cbd5fae5564534bfb9600b96a1911416c9745 SHA256 47a6d6fc2145160b4a5240568aca10dde15586e166f9916a956608928266ce68
-EBUILD wxGTK-2.8.11.0.ebuild 3527 RMD160 7220b6995a8ad01bccd7ee440832b7a82e22d441 SHA1 3931388b1502052991036b3a13a5dcd425a302cf SHA256 42faef0d7fb4817d63d6499034f75f1b8d19c6ec70475f7e7ad2a34074557aeb
+EBUILD wxGTK-2.8.11.0.ebuild 3601 RMD160 0f9c6382239dd8fcc63432fc7487841a1dc8270a SHA1 5133edae6226c0e0e5e63a0fe1b3b814b5ffe943 SHA256 006ff1bc24d25949ff155a7c1143f41a7dffc6c4bd750c451efa4867e8fa9fe0
 EBUILD wxGTK-2.9.1.1.ebuild 3658 RMD160 bd9ac22c5af59d8c6a6d84858396198f6958fdb6 SHA1 d516473fee9b104820fb108d2759a56079dcb5e9 SHA256 ebd79a56236a88b2ce6abcedece33c03e02ac3e903a43c1922ea92acc6dc79ad
-MISC ChangeLog 40938 RMD160 af5d990c4ad3b93682165665c8a62ef6a4496ca0 SHA1 9dd434a683de09e7ac1e011303bfbf938302d56e SHA256 cdc804b2c4119600486d7f1d10394a03386ed1e5063d822bc35acc7db169ac8c
+MISC ChangeLog 41104 RMD160 13236da2e830a371c51fddf9381c35eb2fbe3013 SHA1 55d911c0fd4a506ad101be530d6864f14cfda0f9 SHA256 d31ed208b1632d6aadba8602011bce5d607eb3fc1d3994a3478cf25dd21d9692
 MISC metadata.xml 670 RMD160 fd336b73e871568e6ac86023a36923f497ee07f3 SHA1 e6a2a8aba2e72a9cb5020e36852742f85b20a5f0 SHA256 942586d9bdc5d1da6dbb785f62a2977cb6c2f710f34591a7b8861a9672a98296
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1qYfcACgkQiqiDRvmkBmL6iQCdF5LM1u9dqVKX7O+VJKPRalqX
-/VgAoJMLPL/kGoRZVqv0sE/AVdg0ToBO
-=nyOU
+iEYEARECAAYFAk2E5z0ACgkQiqiDRvmkBmJuXwCbBTLvviWMoeazH+LqBXPdB1he
+VXEAoMycqFYZdpdbe3BeQEtHxKlZ/IhK
+=2P5Y
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-libpng15.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-libpng15.patch
new file mode 100644
index 000000000000..56abde593155
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-libpng15.patch
@@ -0,0 +1,36 @@
+diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
+index 7891ff8..197bda5 100644
+--- a/src/common/imagpng.cpp
++++ b/src/common/imagpng.cpp
+@@ -529,7 +529,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
+                           );
+@@ -586,16 +586,18 @@ wxPNGHandler::LoadFile(wxImage *image,
+ #if wxUSE_PALETTE
+     if (color_type == PNG_COLOR_TYPE_PALETTE)
+     {
+-        const size_t ncolors = info_ptr->num_palette;
++        int ncolors = 0;
++        png_colorp palette;
++        png_get_PLTE( png_ptr, info_ptr, &palette, &ncolors);
+         unsigned char* r = new unsigned char[ncolors];
+         unsigned char* g = new unsigned char[ncolors];
+         unsigned char* b = new unsigned char[ncolors];
+ 
+         for (size_t j = 0; j < ncolors; j++)
+         {
+-            r[j] = info_ptr->palette[j].red;
+-            g[j] = info_ptr->palette[j].green;
+-            b[j] = info_ptr->palette[j].blue;
++            r[j] = palette[j].red;
++            g[j] = palette[j].green;
++            b[j] = palette[j].blue;
+         }
+ 
+         image->SetPalette(wxPalette(ncolors, r, g, b));
diff --git a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
index 74668888f109..86368e439bfe 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v 1.4 2011/02/27 14:32:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v 1.5 2011/03/19 17:20:02 dirtyepic Exp $
 
 EAPI="2"
 
@@ -61,6 +61,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
 	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
 	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
+	epatch "${FILESDIR}"/${PN}-2.8.11-libpng15.patch           # Bug #355035
 }
 
 src_configure() {