From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R7UHl-0005xP-Fd for garchives@archives.gentoo.org; Sat, 24 Sep 2011 15:37:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A868721C0DF; Sat, 24 Sep 2011 15:36:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 74EF121C0DF for ; Sat, 24 Sep 2011 15:36:48 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A8641B400B for ; Sat, 24 Sep 2011 15:36:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6404E80042 for ; Sat, 24 Sep 2011 15:36:47 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild X-VCS-Directories: kde-base/kdelibs/ kde-base/kdelibs/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: ae1b325a14e51f8826158ca2296d771dab9c1f53 Date: Sat, 24 Sep 2011 15:36:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 817c739a45f00abc7d594be6ddf353f1 commit: ae1b325a14e51f8826158ca2296d771dab9c1f53 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sat Sep 24 15:37:07 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sat Sep 24 15:37:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dae1b325a Fix build with libpng-1.5, bug 383915 (Portage version: 2.1.10.19/git/Linux x86_64, signed Manifest commit with= key B6C5F7DE) --- .../kdelibs/files/kdelibs-4.7.1-libpng15.patch | 11 +++++++++++ kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch b/kde-ba= se/kdelibs/files/kdelibs-4.7.1-libpng15.patch new file mode 100644 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 <=3D depth * 8= ); ++ //Q_ASSERT(pngReadStruct->row_info.pixel_depth <=3D depth *= 8); + requestScanline(rowNum, scanlineBuf); + png_progressive_combine_row(pngReadStruct, scanlineBuf, dat= a); + notifyScanline(pass + 1, scanlineBuf); diff --git a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild b/kde-base/kdeli= bs/kdelibs-4.7.49.9999.ebuild index 691119f..ff4385b 100644 --- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild @@ -122,6 +122,7 @@ PATCHES=3D( "${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" ) =20 pkg_pretend() {