diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 16:41:43 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 16:41:43 +0000 |
| commit | f92191bf55106718d9025450bcf1c79b4f30c06e (patch) | |
| tree | 6a8038766e27b5d3b3e052e68f032694a7fbbd62 /games-emulation | |
| parent | Add new version that now retrieves patch from Linus' github account. Hopefull... (diff) | |
| download | historical-f92191bf55106718d9025450bcf1c79b4f30c06e.tar.gz historical-f92191bf55106718d9025450bcf1c79b4f30c06e.tar.bz2 historical-f92191bf55106718d9025450bcf1c79b4f30c06e.zip | |
Fix building with libpng15 wrt #378149 by Diego Elio Pettenò
Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64
Diffstat (limited to 'games-emulation')
4 files changed, 35 insertions, 7 deletions
diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog index 002fe3287020..1c00134ade72 100644 --- a/games-emulation/visualboyadvance/ChangeLog +++ b/games-emulation/visualboyadvance/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-emulation/visualboyadvance -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.36 2010/11/02 14:48:59 tupone Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.37 2011/09/14 16:41:43 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> + visualboyadvance-1.7.2-r2.ebuild, + +files/visualboyadvance-1.7.2-libpng15.patch: + Fix building with libpng15 wrt #378149 by Diego Elio Pettenò 02 Nov 2010; Tupone Alfredo <tupone@gentoo.org> visualboyadvance-1.7.2-r2.ebuild, diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest index f8f7b46e9ccd..5f20c1aba471 100644 --- a/games-emulation/visualboyadvance/Manifest +++ b/games-emulation/visualboyadvance/Manifest @@ -1,11 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 1.7.2-gcc34.patch 1354 RMD160 6a3764040df0e166ca7c9e984bd6553264685460 SHA1 8e4b8f2abb93119c0fd7576bff981cf0d771076c SHA256 82c4ec3170fc982eaf5665c44ce2b767868d81f522adf45325df4a7a680d9ac5 AUX 1.7.2-gcc41.patch 1441 RMD160 bb1ddefb515022876c1ad7479b4308be4b77fab7 SHA1 531384f5d8e7f6c39951a5c946de12de618a309e SHA256 ec5f42182e6daabe560d3437ca0f95054dc5355dd32a972f923d8ba98bba88e6 AUX 1.7.2-homedir.patch 415 RMD160 c617252b5cf61a829bd25c4821c684791ac9c58e SHA1 4458dbb1b111356c22b46c84266c48cab5238c00 SHA256 c49ac18ac3a71355bc7fb790da176a45fe558d4e4f08366045d34f8c801cc05c AUX visualboyadvance-1.7.2-glibc2.10.patch 1827 RMD160 0d1d604dae7fd8e577eb594ca89706e9bfdd5380 SHA1 d6edb74cd539813b2899c5e1bd950e44f8fae2d9 SHA256 74d202288274b21210cbde5a59c56d92562151c8871223ae38f0497e69e950bc +AUX visualboyadvance-1.7.2-libpng15.patch 230 RMD160 b75ae02c13c872959efe1e6c01ed5f1efc67cdd0 SHA1 2745f29042c78f471660ebd4c0dbd9d932284632 SHA256 5715dd370b8ca891b81f3b0c7dd53dd08bf297964fbfeb0bf032244e525c5618 AUX visualboyadvance-1.7.2-ovflfix.patch 368 RMD160 696033358f8a5ab02d7b4cea0a69297524d27cca SHA1 8db91f206ddf22e07dfdd6c8457cce1e2e4d193c SHA256 8768ed788210362a367b13cff2794379ec2b2058ba5cc61228bae0519c80277a AUX visualboyadvance-1.7.2-uninit.patch 530 RMD160 2fdb59ba6038290f5e50339ff489e04a5070de77 SHA1 4eb9a2d4f098fad9e87bfd8447b2707cc622b3a4 SHA256 ba2d6f3dde29a40616b566770c215caa23353f7e8b1e44053c6299727c9402af DIST VisualBoyAdvance-src-1.7.2.tar.gz 1410762 RMD160 44f94a4f270f2cda25879681c52892f6978caf99 SHA1 04d82406079563fd17cda07f72488185e9152f51 SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7 DIST visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2 2892 RMD160 48ffe6634bd2407eef688e13dff56b645fa95339 SHA1 d05d162544aec4e346e2d4a259b6594dd12e0475 SHA256 cf61ddf1e806d3c3152a7102414929d96614319a84481333a9fca7dc640dd74b -EBUILD visualboyadvance-1.7.2-r2.ebuild 2035 RMD160 6851444bfb3bdb54c0b6d8b68dacffa5bb9a0f99 SHA1 2e396fc129288e6c52f22ab0c5552d8efee4ec2a SHA256 678ea549b6ba1c0715c48530d6294c26d763d2f10844130c5d1ae9f04aa9fed9 -MISC ChangeLog 5817 RMD160 9fb982aa6632585984474b5a8a727b9aa6355217 SHA1 9fe39c9778ec05f9d55e280ea90b714a4b1b591a SHA256 4726cc8a3a8033867eaa4281e248707beb1265ee7bb839194c3b0c7c117b20b4 +EBUILD visualboyadvance-1.7.2-r2.ebuild 2073 RMD160 f4f41de66978fa1394ff77f63cb1e1a6681d03ba SHA1 4a6a6032db7eb91a3a311fd7e5410ef4218edaca SHA256 e0ff89fdfbd508614f1e05b0ea03353ef5f4cb260b43bb3ef889d836944ea34e +MISC ChangeLog 6023 RMD160 e2b83d774017003c1cd88e3b244ccbcf359f334f SHA1 1eb589d4e27f7b124cadac1f8acebc61b6f9be66 SHA256 25019a77b07a5fa039d1cdd4d2380e6edb9af29071530916880d9a7e7e15a672 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk5w2X4ACgkQXkR9YqOcLPEwjgD+KajTRtJTZD9iTDgWZjZ6pWSg +6i/VEt0HV3BLwNw6AN0A/Rnx+6SgdhZXOo2v1N2tvVqTTfKRusHuHXqKbNdLt8bg +=Edun +-----END PGP SIGNATURE----- diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch new file mode 100644 index 000000000000..bee96dc7e5df --- /dev/null +++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch @@ -0,0 +1,11 @@ +--- src/Util.cpp ++++ src/Util.cpp +@@ -79,7 +79,7 @@ + return false; + } + +- if(setjmp(png_ptr->jmpbuf)) { ++ if(setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr,NULL); + fclose(fp); + return false; diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild index 34d159a3df78..83980a2f98b9 100644 --- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild +++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild,v 1.5 2011/02/22 21:07:44 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild,v 1.6 2011/09/14 16:41:43 ssuominen Exp $ EAPI=2 inherit eutils flag-o-matic games @@ -50,7 +50,8 @@ src_prepare() { "${WORKDIR}"/${P}-deprecatedsigc++.patch \ "${FILESDIR}"/${P}-uninit.patch \ "${FILESDIR}"/${P}-glibc2.10.patch \ - "${FILESDIR}"/${P}-ovflfix.patch + "${FILESDIR}"/${P}-ovflfix.patch \ + "${FILESDIR}"/${P}-libpng15.patch } src_configure() { |