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 | efccd7635864cdc0d94fde23fb30c19464d7144b (patch) | |
| tree | 16c1d7719392ea5567e913b8f3b6d4cf955e58ff /games-arcade/xbubble | |
| parent | Marked ppc stable for bug #252210. (diff) | |
| download | historical-efccd7635864cdc0d94fde23fb30c19464d7144b.tar.gz historical-efccd7635864cdc0d94fde23fb30c19464d7144b.tar.bz2 historical-efccd7635864cdc0d94fde23fb30c19464d7144b.zip | |
Fix building with libpng14 wrt #308731 by Locke Shinseiko.
Package-Manager: portage-2.2_rc66/cvs/Linux x86_64
Diffstat (limited to 'games-arcade/xbubble')
| -rw-r--r-- | games-arcade/xbubble/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/xbubble/Manifest | 5 | ||||
| -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 |
4 files changed, 26 insertions, 7 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/Manifest b/games-arcade/xbubble/Manifest index 64a7623b625f..b0f81cac578b 100644 --- a/games-arcade/xbubble/Manifest +++ b/games-arcade/xbubble/Manifest @@ -1,6 +1,7 @@ +AUX xbubble-0.5.8-libpng14.patch 415 RMD160 ac4530045df74b8d97815a0e1b6b15571d8eb11f SHA1 7e898c1dae357d4357812c33606e35d8141e7dc4 SHA256 c72191921045953aee0a532349b7ecedbba13453ccee0f24b0ba80ba9249dc73 AUX xbubble-0.5.8-locale.patch 248 RMD160 8852c2fc82de8ba7f0171c9457efdb4f236d7b55 SHA1 4d8b394e2ad8898d6e0c1643f66da2c57fa750b3 SHA256 12d1ed774e9e75010fb4882fd1d3e86f1acde500be5fd91479bab47c5995abcd AUX xbubble-0.5.8-xpaths.patch 200 RMD160 00b58c86ec7492e36c5513aefa4b7ff498c258c9 SHA1 bdbf5cd116adb3b2b29c0a334bf5c2211975617f SHA256 445a5349d2185c2633733f9d617b28f083956ef00ec6124ac6b76db36911aa95 DIST xbubble-0.5.8.tar.gz 5544359 RMD160 001dc3eda2e821a2b2cec4d6600834fa04cbec38 SHA1 96a14d891a05729a0350a9ef609d192c9a5b4466 SHA256 91fc805f661f5fdc3ddca4cfcfc06670b948f4f80f01333372368a0be4743025 -EBUILD xbubble-0.5.8.ebuild 1318 RMD160 071544f3e21bcb4648a67526d917d444c79a68cc SHA1 ba382facdbc04b568753c2c82a6610861ef67ecd SHA256 a5b63eb43dde3208fb9fcc1f5cdc698975e487b616ddb0cbd3d35de0ea029d34 -MISC ChangeLog 1594 RMD160 81be16bdafca7e25ede5fed811d38247f7854bd3 SHA1 6875ce46d7429e2d0cbaf5d3027e2a627a79dbdb SHA256 f816a1f2fe5e791d1780a9a3bbd5fbf48342e7b9528f1059cf8206329a7a6c0e +EBUILD xbubble-0.5.8.ebuild 1356 RMD160 f8162339ed34636aac02825c064f29e83ea0efb0 SHA1 f5cfe9a8b701ae58f463d8837f9d598e5802baba SHA256 ade261c8952711b7c6af791af36465c89c261323eb7bd11ff8a3093621b8213b +MISC ChangeLog 1771 RMD160 73b48b8766c30d0271803d24a8d90ae7f568afff SHA1 611270195a8e4f123b51e4927006cf74ba36609f SHA256 21a68ecf27af4676b300d55017aa0ce5e36bb8671750da1f2fda4a240f495fe0 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 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" |