diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 13:25:35 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 13:25:35 +0000 |
| commit | 164c4108f3e7c2efadf515ffe116c54a2f4cc6b4 (patch) | |
| tree | d37c48927805b7d547e580cc968fe9bff412d3da /app-office | |
| parent | Version bumps (diff) | |
| download | gentoo-2-164c4108f3e7c2efadf515ffe116c54a2f4cc6b4.tar.gz gentoo-2-164c4108f3e7c2efadf515ffe116c54a2f4cc6b4.tar.bz2 gentoo-2-164c4108f3e7c2efadf515ffe116c54a2f4cc6b4.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/krita/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/krita/files/krita-2.1.1-libpng14.patch | 11 | ||||
| -rw-r--r-- | app-office/krita/krita-2.1.0.ebuild | 5 | ||||
| -rw-r--r-- | app-office/krita/krita-2.1.1.ebuild | 5 |
4 files changed, 23 insertions, 4 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/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 |