Fix building with libpng15 wrt #380833 by Diego Elio Pettenò

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

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 2e8349f4da002ce71931ab2757098d8d6010934b..3936d59de44a3a1aa14984809d49132610e1a24e 100644 (file)
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
 # 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.269 2011/07/16 09:32:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.270 2011/09/15 19:24:43 ssuominen Exp $
+
+  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> wxGTK-2.6.4.0-r6.ebuild:
+  Fix building with libpng15 wrt #380833 by Diego Elio Pettenò
 
   16 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> wxGTK-2.8.11.0.ebuild:
   ppc64 stable wrt #364203

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 7b1a22c5a819b1122fd816730d9f1ba518855d6c..1bcd895165498bd0948d61f8ba078b15813a5d82 100644 (file)
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
 AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
@@ -22,19 +22,17 @@ DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a8720
 DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4ae6693c2c04b SHA1 f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4 SHA256 6d5e82772b87981c2a0d78d7a08b3a4498529127be2f05016892e8866e98babd
 DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
-EBUILD wxGTK-2.6.4.0-r6.ebuild 5003 RMD160 b97e1a497c2b66dfaeaf75c2760b7c63eda0320d SHA1 868a50150f12534aa51e5b29ea25cd40c43899fb SHA256 9006425be50b94f2724109e7119f1ba3ffeacd2d273da36082b33500d19e308e
+EBUILD wxGTK-2.6.4.0-r6.ebuild 5081 RMD160 38cc13a487641134bce1c381c14249815c4cc8ff SHA1 e76cb35e1e25849155952f2c4451f7de6b7b5810 SHA256 f18ab0607de6055725b97dc81fadb80324304cd8e8923059cc76f0fcaf3a9ee2
 EBUILD wxGTK-2.8.10.1-r5.ebuild 3911 RMD160 a6789613db3edb542a6ac8a26a2d3c19375c70a7 SHA1 566cbd5fae5564534bfb9600b96a1911416c9745 SHA256 47a6d6fc2145160b4a5240568aca10dde15586e166f9916a956608928266ce68
 EBUILD wxGTK-2.8.11.0.ebuild 3593 RMD160 5e8aa42e27ee630ffd2896f01a484772e430dda8 SHA1 e4fff06d03f5332bf84c8736d8e8908129038101 SHA256 641af41063c7adfebc6356bb0dec01a06df65ed96150ddfb05127993ebb90fba
 EBUILD wxGTK-2.8.12.0.ebuild 3527 RMD160 74cbb091689ac65a5fec479251d1dba019af3a19 SHA1 0ecd162cea399f3b86084fb19bc27cc127058da9 SHA256 5d21f4908b13c633359051cd4ec19b74264c36411e9bd066b8c067abae213980
 EBUILD wxGTK-2.9.1.1.ebuild 3658 RMD160 bd9ac22c5af59d8c6a6d84858396198f6958fdb6 SHA1 d516473fee9b104820fb108d2759a56079dcb5e9 SHA256 ebd79a56236a88b2ce6abcedece33c03e02ac3e903a43c1922ea92acc6dc79ad
-MISC ChangeLog 42083 RMD160 b92e33ee7552b115cf91ed96054961e58ac1971c SHA1 93e4c26f5b849153cdcc25ad4ad6de6cbfeec73d SHA256 e0445e0b8beaad649f6c78c03f1ff7bb4ca7ced25438ba1654476341e188bad2
+MISC ChangeLog 42226 RMD160 118d2a4cb7b7d13281e581f1feeb95840da9679a SHA1 28a04eee438dc473a04a3db0bac8e31a9ad68cda SHA256 e469069b130b211a33b7cbbc835419e02625313cd5b67b85109753bd830c066a
 MISC metadata.xml 670 RMD160 fd336b73e871568e6ac86023a36923f497ee07f3 SHA1 e6a2a8aba2e72a9cb5020e36852742f85b20a5f0 SHA256 942586d9bdc5d1da6dbb785f62a2977cb6c2f710f34591a7b8861a9672a98296
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4hWrgACgkQIiMqcbOVdxRCuwP+PIa59STYl8+ClO4DIrrVonYk
-DRPHT3y32gxR6K/pGKaBb9fErteJHu4VlGCP7v3eA/Xxm8E9AHsIBHiinGt2Z1eL
-mCdc0ivF6f3MeiNVFFjdxOnNz6uam+w2vmpnhIzc1JQt4laUQjuOoeMrioMco1Fx
-HZi4tQKegI9NpLOTdPo=
-=69Z2
+iF4EAREIAAYFAk5yUTQACgkQXkR9YqOcLPFVagD+PdxUfjDCw02gWLjjpsRBxuNm
+ZMXshKr0JpYBg2vmz+UA/ik3W4WB7seCWOlo7hueVjBU0ahpvS2EvEkE4/BGWY2R
+=WBEp
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
index 04502598a514adef56b0f9faf6dccb6ff8d6d748..c783fa6c87477cf5923c8ffd4e7c2c36ffcdf019 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.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.6.4.0-r6.ebuild,v 1.11 2011/03/29 13:01:08 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.12 2011/09/15 19:24:43 ssuominen Exp $
 
 EAPI=1
 inherit eutils versionator flag-o-matic
@@ -58,6 +58,8 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
 
+       sed -i -e 's:voidp:png_voidp:' src/common/imagpng.cpp || die # Bug 380833
+
        # General Patches
 
        epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch