Fix build with libpng-1.5, bug 383915

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 87f51ee3fc107b33f65ddb15f092fa6734ced33b..4beb182fdb164b10976f77ecc7b39e036773e3f8 100644 (file)
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.785 2011/09/23 21:32:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.786 2011/09/24 15:35:16 dilfridge Exp $
+
+  24 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdelibs-4.7.1-r1.ebuild, +files/kdelibs-4.7.1-libpng15.patch:
+  Fix build with libpng-1.5, bug 383915
 
 *kdelibs-4.7.1-r1 (23 Sep 2011)
 

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 136cc2216c7d435fe989be8007f18c3b8bd5714d..482ae6fe244739192eb360ba8deb41f7191942c6 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -21,6 +21,7 @@ AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 RMD160 d1570291799f3b87963da05ddaa94
 AUX kdelibs-4.6.3-use_QWeakPointer.patch 3884 RMD160 c23d4f6a2eea9a16e89720a5b3a4562097ee0366 SHA1 10fbbac1cb70e6032d918302824e6ceff98e9ff5 SHA256 dabf4e8e8b451783f0f3b474141ffae7557d28dbfe9276a5e148ff0e0117c6b6
 AUX kdelibs-4.6.5-cardinality.patch 11947 RMD160 2712fadedc0504d622a54a72cf3e35cd655ca3c9 SHA1 3159edd0252436ab755a3e4970116af6fa69a2e4 SHA256 aae50b729cfc116654d01313062bc5a6a02a1f8c475eceef723ff99d3f395282
 AUX kdelibs-4.7.1-clearbutton.patch 3523 RMD160 8bdfde44ab59c4f6adc1678599bdec6913938ce8 SHA1 877c70e1bc7eee5a6fb63fb0e2118c1003f2c16f SHA256 e79a51de565a3b4d4dd9ced50caa867205f843cde468a44f32fa0f1b00fd557a
+AUX kdelibs-4.7.1-libpng15.patch 498 RMD160 cbb61db267bb80b89de2963f6d73c2a79de637e5 SHA1 8343944314614f6aa21320c7de3289c9eda6e335 SHA256 4e102b98b30987a8a860b57436637c27ed32533a5bb7df76cc359e083a93c181
 DIST kdelibs-4.6.3.tar.bz2 12916816 RMD160 f7f78ef93fa75d488efcd7c66dcbce6d153f9c28 SHA1 c7fb089c9d52a6b1d9188b9e788753373a3288e4 SHA256 b6ea04dc9014ff3fca0242fd927faeb67dc53288779aeb873d46104aa6109e38
 DIST kdelibs-4.6.5.tar.bz2 12917554 RMD160 cd167d17c4c090b21f7271c84d52bfa6401b8f6c SHA1 9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120 SHA256 d7b0de699f6db29a6309053719a523f2516a08e77b951d15610aeb11ea9d5ba0
 DIST kdelibs-4.7.0.tar.bz2 12032091 RMD160 8bcc65072818285031f5611f4b183a74ad0f4d1a SHA1 2a7a59ac78a161c7c2393db89179449b495dd2db SHA256 db6bed2159c192a614e793ae583c9f0ce446af93dd0b1a1b566e52c035ab1cb8
@@ -29,24 +30,24 @@ EBUILD kdelibs-4.6.3-r2.ebuild 10274 RMD160 c748b1ac47cd5f75ae30e59659d6f8057a95
 EBUILD kdelibs-4.6.3-r3.ebuild 10317 RMD160 66ab258e9c360dc84b17e4ae2932ba2b2cdac7aa SHA1 ce71cfa98a6642744cddc5a8f616b7032cef091e SHA256 cdb146d2cd4d45203d91ec3b890a407cb195a7edbaa40d33456ab4553a40a4aa
 EBUILD kdelibs-4.6.5-r1.ebuild 10225 RMD160 aef9c6922a3c5a82c1aa383335917d1245ba06e8 SHA1 1902170d6a79c851b48da35a7d2e8ef119c6228a SHA256 dd3b27125574655dbf525f0d90e8855d3fad786ea5af8bfc99ae81a04b29dd7f
 EBUILD kdelibs-4.7.0-r1.ebuild 9799 RMD160 d26d79209a7d849e40b5710e1071498901578e5c SHA1 895a9ef91374c0a44aa4ff6ac336d2aeaeb6fb5b SHA256 79ebaa6afccb6d1ca93a417f9f4136e0356512077a810f7d88881fa93dae8c4e
-EBUILD kdelibs-4.7.1-r1.ebuild 9801 RMD160 de1ebac5d8382f71aa5cc81759d892db1431da21 SHA1 558e186aa31105e642d30f78af1fa0e52ccdcec7 SHA256 097a009200a671ce32877c512ff8ae9fc0e75733bd61dacfb7b4159ed7273fc7
+EBUILD kdelibs-4.7.1-r1.ebuild 9843 RMD160 9be854200d221c032ca013a9dffaf973f659c028 SHA1 943444df7e3614c1f6a37529b6b324bcd12ec386 SHA256 2b0eb3c92125ba32dccf6d7408bd849c8bc9a4e868b6384fe5d040f6fc064f26
 EBUILD kdelibs-4.7.1.ebuild 9750 RMD160 0905fe3efba7ce5197b97366882b7cab2f5ebd14 SHA1 e75b107847f50657fd6ad87ab9843e81818a448b SHA256 6f7aa754c2e3fcd53efa5af1c629b76e4831cef8a11cf121c05a0575aa6d4b4a
-MISC ChangeLog 131221 RMD160 1e53b5e368e1006935211c4cec19c1dddf64b526 SHA1 124116064218241d5e3306cb99964d10fc88fc8f SHA256 47871c0060744626f7904543b87caf8724eb6e3db254bd04dcefa79785b3013c
+MISC ChangeLog 131383 RMD160 1d6fc3eb5474875d424df1c7a1c4da35129bb314 SHA1 dd15a40053a8361969a6840c7a906823d74abf3c SHA256 92dc0c5c720d88cc489dbe05d907b9012ff70fa519e44284f6eab676dda96147
 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOfPr6AAoJENwGBM22xffepDEP/07XQZPooty1HGM8rE8ssK/c
-IkbMwfZH1hPhC6q4kTw5qqPjYeHmCdBGEl+R2IPtB3AggpO72yXkKHZ6Qdjv71Th
-suIsY0hHc/XqQ/Lo0Ee8PO+Xt9pDcMLlu/ZA37A3L0Eemw45RjnA4moMW5FZrimy
-ZKAeIxOHNmaTo2DGq66h41p/r3vIkZXjF5KKdq80cErQi539yhESoR+flyRJ8lxh
-Loao8npEaqRG5cZqngZ/XCSSDqPH+NGd2vud0RsEsLsfuDKWuCcg7485glr4erIl
-D6hCnUkWexES73ZIcuu8hCxQjNKlg1aR/kBqaANV34ofH2odLplOzsa0MLdxJd7j
-IvCdALz2DQZ6mik0vuAPReMENMCziAKwuY0PMy/rYYrHyh6ybIDrMo6pZEsP46pe
-u8z/YobroC55WAZJ4hNKSNsHrrH1fd5Z5tf0m68TX2/b3IozSb26GKTvb53mA05T
-+u+RcDAXz3njzgIlkZHsU5d7tWcvPBQLnIajl5yJpCGemPL5jcIsWkkiESD92wEU
-BQemvTERbX8gDEyvDJ4KGUGKPyCUVzUyLsDJRcy94tcniNxEyP0+fMXOoajtfrZI
-VIkoOizMya6mgbpOpRqb95iapBgea6IhdRoEwMsnnmeuKwuC5cdAyb9IeSfEBgHn
-nJk7XtSamtVnoJDMvWMu
-=wqIr
+iQIcBAEBCgAGBQJOffjZAAoJENwGBM22xffebt4QAIqTpoKw9PpaXuSDD/XfM2Lz
+wmOBZm7rVEK+XQpLquD43BFXRQpXJqcIqBJ0iBt0V1UeNhR6X4EZJ1XHd+1cK345
+8+bCTbKcjAAHn741IcvJu3klw4Nj3eTCynGgYkaMrbB9OZNPVSqV6Hr7oSJxJKjp
++6bw3aWmyyp3Mmli7v4V/dS4on/gr+9Mq6XpzUHo6mpbazdgakvegfn1Is9ccz4L
+jogsmyCxrsm1e9L6DWR5QiNvPX3Dt8Jq/u2MOzgXT6Mgq2dmz4N7YEVVV7RLe2Hf
+lwPmUwzGACIB/+EpcsUcCxhQrwgG9kBiWD2YAJn/UXMUzmCOsJkhXJATnQbbSD/w
+BY+pBJQ+FB9VRHVs1KVMH0GxDeYYHXR5ClNaB3ldFyZGC5rMCNv1wGoNCo2TqfJb
+EChhUyKTTOfQd3wXq6E+XYAJQHKTDuSEeTBaf6e4NhR/tHX+NElNtwanknCcGspY
+O7XD7K/Dh8mgAApo9zP5wm+VO4PwmD4onu585SJUfb3uhfC2mJcggna5t55T6jTz
+ffUS8xlSCUIuKffYscXdTtTGN/lB4JwlwavREnyFVzZ58IlQRy9LOafgkuSDcW92
+YE6vZgyXhW9Eiu/125N/KVrGyw9T73MbMMPetJfkBXXzPlBe9d81hbsI0hyylffE
+mqigTbQQgiEZrfF9f8Mp
+=OQQj
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch b/kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch
new file mode 100644 (file)
index 0000000..7fd52d9
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch
@@ -0,0 +1,11 @@
+--- kdelibs-4.7.1/khtml/imload/decoders/pngloader.cpp
++++ kdelibs-4.7.1/khtml/imload/decoders/pngloader.cpp
+@@ -198,7 +198,7 @@
+     {
+         if (interlaced)
+         {
+-            Q_ASSERT(pngReadStruct->row_info.pixel_depth <= depth * 8);
++            //Q_ASSERT(pngReadStruct->row_info.pixel_depth <= depth * 8);
+             requestScanline(rowNum, scanlineBuf);
+             png_progressive_combine_row(pngReadStruct, scanlineBuf, data);
+             notifyScanline(pass + 1, scanlineBuf);

diff --git a/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild
index a0fa621988dea026f17ab11637c5dbffe3b1ca90..6292292451222fe4a84290551f43069f0fc99f90 100644 (file)
--- a/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.1-r1.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/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild,v 1.1 2011/09/23 21:32:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild,v 1.2 2011/09/24 15:35:16 dilfridge Exp $
 
 EAPI=4
 
@@ -141,6 +141,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
        "${FILESDIR}/${PN}-4.6.3-bytecode.patch"
        "${FILESDIR}/${PN}-4.7.1-clearbutton.patch"
+       "${FILESDIR}/${PN}-4.7.1-libpng15.patch"
 )
 
 pkg_pretend() {