diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 14:13:41 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 14:13:41 +0000 |
| commit | 77c1d0dda15a19d6c0590f584b364075fe35bf81 (patch) | |
| tree | d843586ea595f90436bda6a44787b5c48b640d8b /media-gfx/freewrl | |
| parent | Marking portage-2.1.7.17 ppc64 for bug 307151 (diff) | |
| download | gentoo-2-77c1d0dda15a19d6c0590f584b364075fe35bf81.tar.gz gentoo-2-77c1d0dda15a19d6c0590f584b364075fe35bf81.tar.bz2 gentoo-2-77c1d0dda15a19d6c0590f584b364075fe35bf81.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/freewrl')
| -rw-r--r-- | media-gfx/freewrl/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/freewrl/files/freewrl-1.22.6-libpng14.patch | 14 | ||||
| -rw-r--r-- | media-gfx/freewrl/freewrl-1.22.6-r1.ebuild | 4 |
3 files changed, 22 insertions, 2 deletions
diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog index c764eaf42a20..ca31516f9168 100644 --- a/media-gfx/freewrl/ChangeLog +++ b/media-gfx/freewrl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/freewrl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.23 2010/02/08 23:50:53 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.24 2010/03/10 14:13:41 ssuominen Exp $ + + 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + freewrl-1.22.6-r1.ebuild, +files/freewrl-1.22.6-libpng14.patch: + Fix building with libpng14. *freewrl-1.22.6-r1 (08 Feb 2010) diff --git a/media-gfx/freewrl/files/freewrl-1.22.6-libpng14.patch b/media-gfx/freewrl/files/freewrl-1.22.6-libpng14.patch new file mode 100644 index 000000000000..e8f55cbd4ced --- /dev/null +++ b/media-gfx/freewrl/files/freewrl-1.22.6-libpng14.patch @@ -0,0 +1,14 @@ +http://repos.archlinux.org/wsvn/community/freewrl/trunk/ +http://repos.archlinux.org/wsvn/community/freewrl/trunk/build-fix.patch + +--- src/lib/scenegraph/readpng.c ++++ src/lib/scenegraph/readpng.c +@@ -106,7 +106,7 @@ + * have used slightly more general png_sig_cmp() function instead */ + + rv=fread(sig, 1, 8, infile); +- if (!png_check_sig(sig, 8)) ++ if (!png_sig_cmp(sig, 0, 8)) + return 1; /* bad signature */ + + diff --git a/media-gfx/freewrl/freewrl-1.22.6-r1.ebuild b/media-gfx/freewrl/freewrl-1.22.6-r1.ebuild index f15369ec1a6c..6f6dac604100 100644 --- a/media-gfx/freewrl/freewrl-1.22.6-r1.ebuild +++ b/media-gfx/freewrl/freewrl-1.22.6-r1.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/media-gfx/freewrl/freewrl-1.22.6-r1.ebuild,v 1.1 2010/02/08 23:50:53 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.6-r1.ebuild,v 1.2 2010/03/10 14:13:41 ssuominen Exp $ EAPI="2" @@ -54,6 +54,8 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-libpng14.patch + # A hack to get around expat being grabbed from xulrunner if use xulrunner && has_version ">=net-libs/xulrunner-1.9.2"; then mkdir "${S}/src/lib/include"; |