[gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

[Marc Schiffbauer]

commit:     6adf728bca168413e7db5191ebe2f84602b8aef7
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 10:55:46 2011 +0000
Commit:     Marc Schiffbauer <marc <AT> schiffbauer <DOT> net>
CommitDate: Wed Sep 28 10:55:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6adf728b

[kde-base/kdelibs] removed files/kdelibs-4.7.1-libpng15.patch, fixed upstream

(Portage version: 2.2.0_alpha59/git/Linux x86_64, signed Manifest commit with key 0x35A64134)

---
 .../kdelibs/files/kdelibs-4.7.1-libpng15.patch     |   11 -----------
 kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild        |    1 -
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch b/kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch
deleted file mode 100644
index 7fd52d9..0000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
index b4b5de4..e6694c5 100644
--- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
@@ -125,7 +125,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
 	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
 	"${FILESDIR}/${PN}-4.6.3-bytecode.patch"
-	"${FILESDIR}/${PN}-4.7.1-libpng15.patch"
 )
 
 pkg_pretend() {