Backport libpng14 patch from Qt 4.6.3.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 46 insertions, 5 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 98ff28b6e3da..d3c83f66933e 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.105 2010/06/24 17:33:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.106 2010/07/04 11:51:56 ssuominen Exp $
+
+  04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  qt-gui-4.5.3-r2.ebuild, +files/qt-4.5.3-libpng14.patch:
+  Backport libpng14 patch from Qt 4.6.3.
 
   24 Jun 2010; Markos Chandras <hwoarang@gentoo.org> -qt-gui-4.6.1.ebuild:
   Drop Qt-4.6.1
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 4cfcfc6950b9..064d1a817329 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,11 +1,12 @@
 AUX hardcoded_fonts.patch 520 RMD160 cdc8f5b4db20b4eede5eabad61ea7893e7b2fc8f SHA1 e23e2731074170585165d89822b83215ba0e3bea SHA256 0d428c620f995d1e96e649b3e49e9ce591b2882a38e600b485c6c8b509504c51
 AUX qt-4.5.3-glib-event-loop.patch 770 RMD160 0b854962f1b46958e8b969f949fe5e0d6e66b5ff SHA1 26543a05f894678fd1357d7b0fca217dac6b1a0c SHA256 83f010690d3a7220f5bd559b2aa82d9135d31a2c04bf9d6b12ed78a2dd3da6bb
+AUX qt-4.5.3-libpng14.patch 1545 RMD160 1bfc03a474c3ff5f55144fece013031dc2425b1b SHA1 e95e1100ba939a3a58858d5a439b5ce4a64a7d1d SHA256 c1428a4ba11fd25bc6bbc9f6a8b0e4db24b58c2bc8d6b5ccc7a1b5d7e0b66aa7
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6
-EBUILD qt-gui-4.5.3-r2.ebuild 5954 RMD160 7c920064963fc0ca6cc6cb6f6953c70b224ac9a1 SHA1 396265aea4631ebabaf6e917832c7513d1baf277 SHA256 1c927ed5eb92dbb54d77bfea26aaf755e3bd1a275578ec618724169ccc3bd64d
+EBUILD qt-gui-4.5.3-r2.ebuild 6048 RMD160 3c85f1ed221262d230dc6ab0ec3f72c00550e40d SHA1 33b3257c70524196401498a8399c6a4dc872476d SHA256 d4063aa78674ad690704b5857287c286fe5fa6f5f7c887329cb3be6742fca77b
 EBUILD qt-gui-4.6.2-r1.ebuild 5343 RMD160 8b29fb4432b5008a944d50f9cdc1ab80519f58c9 SHA1 341597ed0999cf4c9959e95d3ec46656841f7bbc SHA256 7db29fd43799274c1db970329b9cd749ac7159da3e3d87566e1a80da6a1b984d
 EBUILD qt-gui-4.6.2.ebuild 5215 RMD160 6b1c4cbeaf5ea17799b1a6b9e0204909c4943ceb SHA1 eafd55a233f4ab515fdde61febfa5547d2281886 SHA256 a771de1bbb2bcb35b9ef1638d1514e3811edd5de7f5f809a9d81b9a14bf75da3
 EBUILD qt-gui-4.6.3.ebuild 5339 RMD160 99c9d5bc4dedbcb04f63763eec131face9d999ac SHA1 c2f2dffe0f763fbc6206b3c0cd8c58abaf0006ed SHA256 b4c5fd9a718c049c76c07536249bc18c013d450182252139ed2322057122d60d
-MISC ChangeLog 16531 RMD160 71d886166f92daf00af62a3c09a0e46847fe4989 SHA1 40a0ba0173c0c6f6ce3a1ed11caf99d294c13a3c SHA256 a87244ee98c7f231ac9c4e0e09b1277d0198fde29971b1cf127c8ef1e130dade
+MISC ChangeLog 16686 RMD160 3ffc6ec780af1ecb660f454bffb17ea452b2930f SHA1 1744c5b0b3acb90fa697e23126db54e12d6d67a7 SHA256 8e30cbf307e6e79b820feac9a33627adde5bbde39ac258207055644b838e2bd1
 MISC metadata.xml 851 RMD160 8180a368a140c2223e3c0d99bac31a0b1284b639 SHA1 84f35f3fe344072bd38c58cf7ed39a4bbfbecbff SHA256 7129b71867455575817f2f6915813ca84a059a8f878a73782278700edd50ab31
diff --git a/x11-libs/qt-gui/files/qt-4.5.3-libpng14.patch b/x11-libs/qt-gui/files/qt-4.5.3-libpng14.patch
new file mode 100644
index 000000000000..656cbaddfd42
--- /dev/null
+++ b/x11-libs/qt-gui/files/qt-4.5.3-libpng14.patch
@@ -0,0 +1,33 @@
+--- src/gui/image/qpnghandler.cpp
++++ src/gui/image/qpnghandler.cpp
+@@ -205,7 +205,7 @@
+                 image.setColor(i, qRgba(c,c,c,0xff));
+             }
+             if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+-                const int g = info_ptr->trans_values.gray;
++                const int g = info_ptr->trans_color.gray;
+                 if (g < ncols) {
+                     image.setColor(g, 0);
+                 }
+@@ -234,7 +234,7 @@
+                     info_ptr->palette[i].red,
+                     info_ptr->palette[i].green,
+                     info_ptr->palette[i].blue,
+-                    info_ptr->trans[i]
++                    info_ptr->trans_alpha[i]
+                    )
+                );
+                 i++;
+@@ -454,9 +454,9 @@
+     png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
+         if (outImage->depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+             QRgb trans = 0xFF000000 | qRgb(
+-                (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
+-                (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
+-                (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
++                (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
++                (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
++                (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
+             for (uint y=0; y<height; y++) {
+                 for (uint x=0; x<info_ptr->width; x++) {
+                     if (((uint**)jt)[y][x] == trans) {
diff --git a/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild
index d3ab5eccdaf4..692e96e51e6e 100644
--- a/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v 1.7 2009/11/10 22:38:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v 1.8 2010/07/04 11:51:56 ssuominen Exp $
 
 EAPI="2"
 inherit eutils qt4-build
@@ -90,6 +90,9 @@ src_prepare() {
 	# fixing hardcoded fonts, bug #252312
 	EPATCH_OPTS="--ignore-whitespace"
 	epatch "${FILESDIR}"/hardcoded_fonts.patch
+
+	has_version ">=media-libs/libpng-1.4" && epatch \
+		"${FILESDIR}"/${P}-libpng14.patch
 }
 
 src_configure() {