diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 16:59:33 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 16:59:33 +0000 |
| commit | 2ea65262eb462b6cc5f404fd07578e1332b68e13 (patch) | |
| tree | 728db47af73c824818dcded1ba305d420845f0ab /media-gfx | |
| parent | app-admin/webalizer: Fix SRC_URI (diff) | |
| download | gentoo-2-2ea65262eb462b6cc5f404fd07578e1332b68e13.tar.gz gentoo-2-2ea65262eb462b6cc5f404fd07578e1332b68e13.tar.bz2 gentoo-2-2ea65262eb462b6cc5f404fd07578e1332b68e13.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/pngnq/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/pngnq/files/pngnq-1.0-libpng14.patch | 13 | ||||
| -rw-r--r-- | media-gfx/pngnq/pngnq-1.0.ebuild | 12 |
3 files changed, 24 insertions, 7 deletions
diff --git a/media-gfx/pngnq/ChangeLog b/media-gfx/pngnq/ChangeLog index d28e8ff63a8d..da6d90dce748 100644 --- a/media-gfx/pngnq/ChangeLog +++ b/media-gfx/pngnq/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/pngnq # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/ChangeLog,v 1.6 2010/01/17 22:32:13 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/ChangeLog,v 1.7 2010/03/10 16:59:32 ssuominen Exp $ + + 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> pngnq-1.0.ebuild, + +files/pngnq-1.0-libpng14.patch: + Fix building with libpng14. 17 Jan 2010; Hanno Boeck <hanno@gentoo.org> pngnq-1.0.ebuild, +files/pngnq-1.0-as-needed.patch: diff --git a/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch b/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch new file mode 100644 index 000000000000..e2eb9c8972e5 --- /dev/null +++ b/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch @@ -0,0 +1,13 @@ +http://aur.archlinux.org/packages.php?ID=10325 + +--- src/rwpng.c ++++ src/rwpng.c +@@ -80,7 +80,7 @@ + * have used slightly more general png_sig_cmp() function instead */ + + fread(sig, 1, 8, infile); +- if (!png_check_sig(sig, 8)) { ++ if (png_sig_cmp(sig, 0, 8)) { + mainprog_ptr->retval = 21; /* bad signature */ + return mainprog_ptr->retval; + } diff --git a/media-gfx/pngnq/pngnq-1.0.ebuild b/media-gfx/pngnq/pngnq-1.0.ebuild index a0646cfd2157..3ca3f6177fab 100644 --- a/media-gfx/pngnq/pngnq-1.0.ebuild +++ b/media-gfx/pngnq/pngnq-1.0.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/pngnq-1.0.ebuild,v 1.2 2010/01/17 22:32:13 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngnq/pngnq-1.0.ebuild,v 1.3 2010/03/10 16:59:32 ssuominen Exp $ EAPI=2 - -inherit eutils autotools +inherit autotools eutils DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format." HOMEPAGE="http://pngnq.sourceforge.net/" @@ -18,11 +17,12 @@ IUSE="" DEPEND="media-libs/libpng" src_prepare() { - epatch "${FILESDIR}/pngnq-1.0-as-needed.patch" + epatch "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-libpng14.patch eautoreconf } src_install() { - emake DESTDIR="${D}" install || die "install failed" - dodoc README NEWS || die "dodoc failed" + emake DESTDIR="${D}" install || die + dodoc README NEWS || die } |