diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 21:19:39 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 21:19:39 +0000 |
| commit | d7b05e76aebeb107f7cdc21e11d7acab464c24b9 (patch) | |
| tree | af29f0639d28f62c62dfd4bb36673c6c645e17ac /games-arcade | |
| parent | Marked ppc stable for bug #252210. (diff) | |
| download | gentoo-2-d7b05e76aebeb107f7cdc21e11d7acab464c24b9.tar.gz gentoo-2-d7b05e76aebeb107f7cdc21e11d7acab464c24b9.tar.bz2 gentoo-2-d7b05e76aebeb107f7cdc21e11d7acab464c24b9.zip | |
Fix building with libpng14 wrt #308731 by Locke Shinseiko.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/xbubble/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch | 13 | ||||
| -rw-r--r-- | games-arcade/xbubble/xbubble-0.5.8.ebuild | 7 |
3 files changed, 23 insertions, 5 deletions
diff --git a/games-arcade/xbubble/ChangeLog b/games-arcade/xbubble/ChangeLog index 6bea5ff09fbe..292c0529194b 100644 --- a/games-arcade/xbubble/ChangeLog +++ b/games-arcade/xbubble/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/xbubble -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/ChangeLog,v 1.11 2008/10/07 16:05:08 mr_bones_ Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/ChangeLog,v 1.12 2010/03/09 21:19:38 ssuominen Exp $ + + 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> xbubble-0.5.8.ebuild, + +files/xbubble-0.5.8-libpng14.patch: + Fix building with libpng14 wrt #308731 by Locke Shinseiko. 07 Oct 2008; Michael Sterrett <mr_bones_@gentoo.org> +files/xbubble-0.5.8-locale.patch, xbubble-0.5.8.ebuild: diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch new file mode 100644 index 000000000000..ad689e29d739 --- /dev/null +++ b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/show_bug.cgi?id=308731 + +--- src/loadpng.c ++++ src/loadpng.c +@@ -55,7 +55,7 @@ unsigned char * load_png_file( const cha + } + /* ensure that we opened a PNG file */ + fread( header, 1, 8, fd ); +- if ( ! png_check_sig( header, 8 ) ) { ++ if ( png_sig_cmp( header, 0, 8 ) ) { + fclose(fd); + fprintf(stderr,_("File %s does not have a valid PNG signature.\n"), file); + return NULL; diff --git a/games-arcade/xbubble/xbubble-0.5.8.ebuild b/games-arcade/xbubble/xbubble-0.5.8.ebuild index 2f87925081e5..7e56591a882c 100644 --- a/games-arcade/xbubble/xbubble-0.5.8.ebuild +++ b/games-arcade/xbubble/xbubble-0.5.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/xbubble-0.5.8.ebuild,v 1.13 2008/10/07 16:05:08 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbubble/xbubble-0.5.8.ebuild,v 1.14 2010/03/09 21:19:38 ssuominen Exp $ inherit eutils games @@ -25,7 +25,8 @@ src_unpack() { cd "${S}" epatch \ "${FILESDIR}"/${P}-xpaths.patch \ - "${FILESDIR}"/${P}-locale.patch + "${FILESDIR}"/${P}-locale.patch \ + "${FILESDIR}"/${P}-libpng14.patch sed -i \ -e '/^AM_CFLAGS/d' \ src/Makefile.in || die "sed cflags" |