diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 16:03:09 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 16:03:09 +0000 |
| commit | cfe1beab89d6b668b2904cc830ccb54faf406901 (patch) | |
| tree | eed156be45e8ca3e7eb2c69ffa6ca4dfa05dc2b4 /www-client | |
| parent | Marked ppc stable for bug #301519. (diff) | |
| download | gentoo-2-cfe1beab89d6b668b2904cc830ccb54faf406901.tar.gz gentoo-2-cfe1beab89d6b668b2904cc830ccb54faf406901.tar.bz2 gentoo-2-cfe1beab89d6b668b2904cc830ccb54faf406901.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/dillo/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/dillo/dillo-2.2.ebuild | 5 | ||||
| -rw-r--r-- | www-client/dillo/files/dillo-2.2-libpng14.patch | 13 |
3 files changed, 21 insertions, 3 deletions
diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog index 3417e5f3f56f..314f43b22036 100644 --- a/www-client/dillo/ChangeLog +++ b/www-client/dillo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/dillo # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.84 2010/02/12 13:47:28 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.85 2010/03/11 16:03:08 ssuominen Exp $ + + 11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> dillo-2.2.ebuild, + +files/dillo-2.2-libpng14.patch: + Fix building with libpng14. 12 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> dillo-2.1.1.ebuild, dillo-2.2.ebuild, dillo-9999.ebuild: diff --git a/www-client/dillo/dillo-2.2.ebuild b/www-client/dillo/dillo-2.2.ebuild index 698b54b73f03..ba26e2086c00 100644 --- a/www-client/dillo/dillo-2.2.ebuild +++ b/www-client/dillo/dillo-2.2.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/www-client/dillo/dillo-2.2.ebuild,v 1.2 2010/02/12 13:47:28 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.2.ebuild,v 1.3 2010/03/11 16:03:08 ssuominen Exp $ EAPI="2" inherit eutils flag-o-matic multilib @@ -23,7 +23,8 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" src_prepare() { - epatch "${FILESDIR}"/dillo2-inbuf.patch + epatch "${FILESDIR}"/dillo2-inbuf.patch \ + "${FILESDIR}"/${P}-libpng14.patch } src_configure() { diff --git a/www-client/dillo/files/dillo-2.2-libpng14.patch b/www-client/dillo/files/dillo-2.2-libpng14.patch new file mode 100644 index 000000000000..f4af67e4b196 --- /dev/null +++ b/www-client/dillo/files/dillo-2.2-libpng14.patch @@ -0,0 +1,13 @@ +http://repos.archlinux.org/wsvn/community/dillo/trunk/libpng14.patch + +--- src/png.c ++++ src/png.c +@@ -345,7 +345,7 @@ static void Png_write(DilloPng *png, voi + return; /* need MORE data */ + } + /* check the image signature - DON'T update ipbufstart! */ +- if (!png_check_sig(png->ipbuf, DATASIZE)) { ++ if (png_sig_cmp(png->ipbuf, 0, DATASIZE)) { + /* you lied to me about it being a PNG image */ + MSG_WARN("\"%s\" is not a PNG file.\n", URL_STR(png->url)); + png->state = IS_finished; |