Fix building with libpng14.

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

5 files changed, 27 insertions, 7 deletions

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index 404fa464540b..d747a928441f 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.111 2010/02/27 22:17:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.112 2010/03/08 13:25:33 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> krita-2.1.0.ebuild,
+  krita-2.1.1.ebuild, +files/krita-2.1.1-libpng14.patch:
+  Fix building with libpng14.
 
 *krita-2.1.1 (27 Feb 2010)
 
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index d60f97f87c52..8c980555708e 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -1,7 +1,8 @@
 AUX krita-2.1.0-opengl.patch 425 RMD160 957b1df959402314f5e5b2167d2c16ed8e32c960 SHA1 4f8fb8deea43a3303b5457dceecd1b330da23027 SHA256 aa7d65328462b8aefcd48da6ff2fe5571ef512c886448eadf9e44869a67ff565
+AUX krita-2.1.1-libpng14.patch 327 RMD160 9ec9c492d456d388b8d944b4a40e360693dd8605 SHA1 941850dc8485729edf3296cfd7bace6c1b56414c SHA256 93ef65c7da0e8f5d480ec90424e16e44c82068e7db5218ff4910f8e9a3b19b46
 DIST koffice-2.1.0.tar.bz2 76150485 RMD160 9703bdf4d70d0556c5c101f4cf4baecb17b66a10 SHA1 0fd0bf64e6d166d41bae41730b17d5194e7f5adf SHA256 96ea36d1e7e2495f0076805eacf29a84607dc597f58b129a310df7227716acc9
 DIST koffice-2.1.1.tar.bz2 50332433 RMD160 9c7123bf31370d406a6e5272d7e752c39b3596d5 SHA1 72a82cfaaca8fbdcd0ba4622f80d4cf27aff74d2 SHA256 ff928c2698ef37a5cc808faddf758ee0c44603ec19194c973f8e4d8fcc6aac01
-EBUILD krita-2.1.0.ebuild 1285 RMD160 6445002cf0feaf3e4efc0e3ea2b5dbb5c728de32 SHA1 d493f6205abbd6e0d5cc98d3906270b2b836ff4c SHA256 af07d55bdd49154c322004f2327f65801790087eb0076d46817d504ddd668f12
-EBUILD krita-2.1.1.ebuild 1243 RMD160 d5986d059e0f04fc8ae5c72d3311e54b7d6abcdf SHA1 42a213d1d3d960d7ed52746495d835ea6c4ecb66 SHA256 14dcf1fcf6a1052ef2ee0be88fd6c2444bce677433397dfeb58088cedd74e465
-MISC ChangeLog 13323 RMD160 5f49698928a133e69fc3be85fa7c5a8ac44fa709 SHA1 20b048ef9da0591fba202b31a6d494abde894a78 SHA256 a12520201e425a2df99738ce936288ab3ccaa1915b7bd44ce51610dae16e5cca
+EBUILD krita-2.1.0.ebuild 1327 RMD160 da5510749afc5d04bd0933ff6a432371c0e28472 SHA1 6e2032efcc50cb31c50cc07c505b6c21bf3d6fd0 SHA256 74b470c56d20e426771971986f5b5a9e42c9b47f7b495f91342e0abfc86513b4
+EBUILD krita-2.1.1.ebuild 1330 RMD160 7c2b1ccd98fd7de28893ec41808103a840b09217 SHA1 f37bc8e8ec219271729352cfb8673b6f5c3d1f43 SHA256 b320c9c66663c6918ca8e359bc007e08470953056add51afc8ca62562fbcf497
+MISC ChangeLog 13485 RMD160 11a1e60c7f218ba1dc07cf2a25dfd8701fe75cbf SHA1 f4e442cac710bfcb1f1f1549c45cdbf770e91869 SHA256 cbca153b0ae9cf6bf2f1ed6c2644d812aaebebd174db7b6f644d9d8c0e609a16
 MISC metadata.xml 318 RMD160 2341b49b24f95cc26f19933f8a785c5550970e3f SHA1 7264bf7bba1b5e206e47b8e85b783d3f5292ecc9 SHA256 41a628ecdd9b2fcd3405c2a146b1780eb75d282b956da88120963e441a1135d4
diff --git a/app-office/krita/files/krita-2.1.1-libpng14.patch b/app-office/krita/files/krita-2.1.1-libpng14.patch
new file mode 100644
index 000000000000..326c5ee3114d
--- /dev/null
+++ b/app-office/krita/files/krita-2.1.1-libpng14.patch
@@ -0,0 +1,11 @@
+--- krita/ui/kis_png_converter.cpp
++++ krita/ui/kis_png_converter.cpp
+@@ -404,7 +404,7 @@
+ 
+     png_byte signature[8];
+     iod->peek((char*)signature, 8);
+-    if (!png_check_sig(signature, 8)) {
++    if (!png_sig_cmp(signature, 0, 8) == 0) {
+         iod->close();
+         return (KisImageBuilder_RESULT_BAD_FETCH);
+     }
diff --git a/app-office/krita/krita-2.1.0.ebuild b/app-office/krita/krita-2.1.0.ebuild
index b950ca64888d..0ad60dcde8c1 100644
--- a/app-office/krita/krita-2.1.0.ebuild
+++ b/app-office/krita/krita-2.1.0.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/app-office/krita/krita-2.1.0.ebuild,v 1.8 2010/02/10 19:26:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.1.0.ebuild,v 1.9 2010/03/08 13:25:33 ssuominen Exp $
 
 EAPI="2"
 
@@ -31,7 +31,8 @@ KMEXTRACTONLY="libs/"
 
 KMLOADLIBS="koffice-libs"
 
-PATCHES=( "${FILESDIR}/${P}-opengl.patch" )
+PATCHES=( "${FILESDIR}/${P}-opengl.patch"
+	"${FILESDIR}/${PN}-2.1.1-libpng14.patch" )
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
diff --git a/app-office/krita/krita-2.1.1.ebuild b/app-office/krita/krita-2.1.1.ebuild
index cb625bd1eec2..7680fd912da4 100644
--- a/app-office/krita/krita-2.1.1.ebuild
+++ b/app-office/krita/krita-2.1.1.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/app-office/krita/krita-2.1.1.ebuild,v 1.1 2010/02/27 22:17:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.1.1.ebuild,v 1.2 2010/03/08 13:25:33 ssuominen Exp $
 
 EAPI="2"
 
@@ -31,6 +31,9 @@ KMEXTRACTONLY="libs/"
 
 KMLOADLIBS="koffice-libs"
 
+PATCHES=( "${FILESDIR}/${PN}-2.1.0-opengl.patch"
+	"${FILESDIR}/${P}-libpng14.patch" )
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		-DWITH_Eigen2=On