Fix building with libpng14 wrt #319901 by Howard B. Golden.

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

4 files changed, 39 insertions, 14 deletions

diff --git a/kde-base/ksplash/ChangeLog b/kde-base/ksplash/ChangeLog
index 68b8d579c561..67d0d52180b3 100644
--- a/kde-base/ksplash/ChangeLog
+++ b/kde-base/ksplash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksplash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.63 2010/05/03 22:01:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.64 2010/05/16 12:13:42 ssuominen Exp $
+
+  16 May 2010; Samuli Suominen <ssuominen@gentoo.org> ksplash-4.3.5.ebuild,
+  +files/ksplash-4.3.5-libpng14.patch:
+  Fix building with libpng14 wrt #319901 by Howard B. Golden.
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -ksplash-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/ksplash/Manifest b/kde-base/ksplash/Manifest
index b1e78602f567..9142b35d57a2 100644
--- a/kde-base/ksplash/Manifest
+++ b/kde-base/ksplash/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ksplash-4.3.5-libpng14.patch 725 RMD160 9fae9d9cb08ceff720854b714fd6303458aa13a0 SHA1 72e86d24405d1f61f05d4f4782251c8ce1ab9efb SHA256 df28f7561b05c1a4fc4cf553d3b3bfbb018693bb5fbeb68dae8ef899f601cc2b
 AUX ksplash-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
 DIST kdebase-workspace-4.3.5.tar.bz2 62525359 RMD160 dcf04a40412ba236365423afc877ea0c2066f972 SHA1 703582cb8a3471c5821986dbdfc3c6deedac0ff3 SHA256 7985634ed1f87889bcd6613ef41127196df442017bf895be6fb2afb196ce149b
 DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69ccb90f656266c SHA1 5fd38e48c6ddcf551bb49cf8841ba23b7682ee5b SHA256 8c32bda86e9ec67244ea2996a7e710ed04f0bb532c691af7d366c278f9b519bd
 DIST kdebase-workspace-4.4.3.tar.bz2 77035367 RMD160 df3d9ceaab33d08ea27cd1206c33b3ead9266a42 SHA1 efd427dfe8b7beebdfe162006689871c61991336 SHA256 7f56b2b12f2ca78deea31981bc47de2862d409d99b7bcda90054715d97999239
 EBUILD ksplash-4.3.3.ebuild 964 RMD160 b096caf0824cc4d1e7b3988a7526540b7aeb016b SHA1 b861e93c8110ee6861332d844da7b45adb76e608 SHA256 d8ee2db50c357623831abc811f5ad5bc106bae059553c4d41f5a44b3c0682056
-EBUILD ksplash-4.3.5.ebuild 986 RMD160 2080e9eeb6ceb42efe5d99a80832ab5a47c2d543 SHA1 444a5a175c7d3d6d3f8cbe6bef503ba5549a2b22 SHA256 a7ee16ffb5628f4ad948e566b85230e88cb7f3959ee6918cbcc841ab8fbdb06d
+EBUILD ksplash-4.3.5.ebuild 1036 RMD160 71f4e830935368c2ad52d60c06a09763258f4783 SHA1 0d5d0d1640f10f868350d584bfde59a46b3fd5ec SHA256 6fd019a67448d5868a544e356965f0af537377404b1b38cb4dccb4614699587e
 EBUILD ksplash-4.4.2-r1.ebuild 1064 RMD160 50b6d5a2eae5aa75b7ca981fb291434c0a15c12d SHA1 16a1763509e9bd147679c32d68c5b0cec60bb863 SHA256 1da7a67bf8a2fb61fbc56d6d6b9bb1fdd945c092ef32e935254a814e31660186
 EBUILD ksplash-4.4.3.ebuild 1059 RMD160 259c1f2ad4a49b0b50ea536d25ebf65168a4487f SHA1 0e034da842a88827c9cdb872f1d7569afe2cbcb4 SHA256 0a48815762031519f76befb54c50af27d7e661253904ebf90acfff37934bf044
-MISC ChangeLog 7582 RMD160 77b1541d4ec3f3dfa4fa39f2edf7129b276f09e0 SHA1 3b9b289d241859d43e6664d8acfb8bbc7aa0c961 SHA256 96034ae58dec4eb082a9dca879b4f14f19c38c6b219aacf17b443bb47ec61712
+MISC ChangeLog 7763 RMD160 59c0977971c7ef614e78144eb1a9489bd95691a1 SHA1 63a41164da1ce66e42399c454fb03ae2d4babe54 SHA256 b04078e88aeb54b066456decc665e8d18000803ddb3332acb10a1132c0ecb548
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvfSFUACgkQ5BmOA85PVLiPfgCeOJl+mgfdPS64Fr43DyZ23wPk
-B6kAoKqLKhjduEpEEWqjpT+izjfQKBl2
-=LqAG
------END PGP SIGNATURE-----
diff --git a/kde-base/ksplash/files/ksplash-4.3.5-libpng14.patch b/kde-base/ksplash/files/ksplash-4.3.5-libpng14.patch
new file mode 100644
index 000000000000..1077fdcc8f2b
--- /dev/null
+++ b/kde-base/ksplash/files/ksplash-4.3.5-libpng14.patch
@@ -0,0 +1,28 @@
+http://bugs.gentoo.org/319901
+
+--- ksplash/ksplashx/qpngio.cpp
++++ ksplash/ksplashx/qpngio.cpp
+@@ -151,7 +151,11 @@
+ 		image.setColor( i, qRgba(c,c,c,0xff) );
+ 	    }
+ 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
++	#if PNG_LIBPNG_VER < 10400
+ 		const int g = info_ptr->trans_values.gray;
++	#else
++		const int g = info_ptr->trans_color.gray;
++	#endif
+ 		if (g < ncols) {
+ 		    image.setAlphaBuffer(true);
+ 		    image.setColor(g, image.color(g) & RGB_MASK);
+@@ -179,7 +183,11 @@
+ 		    info_ptr->palette[i].red,
+ 		    info_ptr->palette[i].green,
+ 		    info_ptr->palette[i].blue,
++	#if PNG_LIBPNG_VER < 10400
+ 		    info_ptr->trans[i]
++	#else
++		    info_ptr->trans_alpha[i]
++	#endif
+ 		    )
+ 		);
+ 		i++;
diff --git a/kde-base/ksplash/ksplash-4.3.5.ebuild b/kde-base/ksplash/ksplash-4.3.5.ebuild
index 74e633497b29..0130c2bd0962 100644
--- a/kde-base/ksplash/ksplash-4.3.5.ebuild
+++ b/kde-base/ksplash/ksplash-4.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.3.5.ebuild,v 1.3 2010/03/11 18:36:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.3.5.ebuild,v 1.4 2010/05/16 12:13:42 ssuominen Exp $
 
 EAPI="2"
 
@@ -20,6 +20,8 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-libpng14.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_has 3dnow X86_3DNOW)