diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 16:22:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 16:22:20 +0000 |
| commit | 26c88c99e1ad666691505a3e915baf53d9c69123 (patch) | |
| tree | 4e6fd0f2568abb630b4fc170dd63ebb5e12cb837 /games-puzzle | |
| parent | Add Arfrever as proxy maintainer as requested by him. (diff) | |
| download | historical-26c88c99e1ad666691505a3e915baf53d9c69123.tar.gz historical-26c88c99e1ad666691505a3e915baf53d9c69123.tar.bz2 historical-26c88c99e1ad666691505a3e915baf53d9c69123.zip | |
Fix building with libpng15 wrt #383247 by Diego Elio Pettenò
Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/shaaft/ChangeLog | 6 | ||||
| -rw-r--r-- | games-puzzle/shaaft/Manifest | 15 | ||||
| -rw-r--r-- | games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch | 20 | ||||
| -rw-r--r-- | games-puzzle/shaaft/shaaft-0.5.0.ebuild | 5 |
4 files changed, 41 insertions, 5 deletions
diff --git a/games-puzzle/shaaft/ChangeLog b/games-puzzle/shaaft/ChangeLog index 189d66c7f529..37cc964874f6 100644 --- a/games-puzzle/shaaft/ChangeLog +++ b/games-puzzle/shaaft/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/shaaft # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.12 2011/08/11 04:32:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.13 2011/09/17 16:22:20 ssuominen Exp $ + + 17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> shaaft-0.5.0.ebuild, + +files/shaaft-0.5.0-libpng15.patch: + Fix building with libpng15 wrt #383247 by Diego Elio Pettenò 11 Aug 2011; Michael Sterrett <mr_bones_@gentoo.org> shaaft-0.5.0.ebuild: Add use deps; respect CXXFLAGS; use a non-404 HOMEPAGE (bug #371689) diff --git a/games-puzzle/shaaft/Manifest b/games-puzzle/shaaft/Manifest index 7b6b20181b3e..ae77b00f302d 100644 --- a/games-puzzle/shaaft/Manifest +++ b/games-puzzle/shaaft/Manifest @@ -1,7 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX shaaft-0.5.0-gcc34.patch 544 RMD160 d54ef48c0557ce2dc0774f2897b7796989e97b53 SHA1 ec7ee84e40543bb7f65cc22b6cebdcf93bf91e2a SHA256 0eecaba26e1d7e8d43a4a7c556e9624e910d8e1c292228755cf4f4670cb3a052 AUX shaaft-0.5.0-gcc41.patch 277 RMD160 666f376a8313f0df536f326f94552e3c6a15d307 SHA1 ac240b39a9f718cfe0038404782eea7fec62c373 SHA256 15c5a0b6a48e44c2b42dbb7a37ea348f12fc4ebcb4b9866594f39283ccbf9dd1 AUX shaaft-0.5.0-gcc43.patch 428 RMD160 1445bde8b9c4c2e3592bea9688b4cb923c960d66 SHA1 559bf65d1a5b5a1d3af16c2b2f84b2e9443807b1 SHA256 923bbf44762997fa9cef7b42c93bac31da05ae622eb8f3f12abad4f11d7a7549 +AUX shaaft-0.5.0-libpng15.patch 472 RMD160 535a6627d246ed4937a43dd5515e09dca8112860 SHA1 a26fe044829a4b439cb86128f519e72af57e7eb5 SHA256 0e38ad14f625ce89f1a7b8d17b169e7ae3f92f46b89127e95d3cdfaa39c5b71e DIST Shaaft-0.5.0.tar.bz2 512996 RMD160 88441778220be57923aa6ca50de0d08a365ee9fc SHA1 d9e5d70e13e406ec98dee551ec77544010c786ab SHA256 db8040c4fee36da9ec9653fd6c04ffb21112c4c9c2297ee66f08b94efa61dc80 -EBUILD shaaft-0.5.0.ebuild 1267 RMD160 44151370057e2a6939782aebbbefd5c85aebb4e3 SHA1 21293569e240aa4149e49e7fd87fe7dac7032ba8 SHA256 38d521200e9c9ab83865cecfac3c32252d9a3d4860650a53467e5f8b3ee8cf8b -MISC ChangeLog 1603 RMD160 26e37e7e46a4e5f0f3c5210a07a9da5049cc9e85 SHA1 8ef6c083b0782bdd7b180b466ff34ccee603ccc5 SHA256 1acad0fc8c72fa96bae9e97c6270b42ee2a4950f1399f3761dc78b0a1e214d7d +EBUILD shaaft-0.5.0.ebuild 1305 RMD160 7eeb47a1223529a5601383ef2d76d0e103ab216d SHA1 bb5fedc2f4d6ecf7d0630956a4dbaa4696fb0301 SHA256 2cdd0708a7fcc2ee19734e6fc42d368935fd92bd7a1dba9cd68f76b3f471ddd5 +MISC ChangeLog 1781 RMD160 a74a9d373f210f6891d6852a571d61441bc4453f SHA1 cc3558a53cc61ebb1b2957840ee2f5521724de4c SHA256 2695a1787d4d70370496628584b7520d7cff2c8de31795a1369954fc3e1231d5 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk50yXgACgkQXkR9YqOcLPHEWwD9Ech6VWfSrxHICHcpz00EAAJG +oJ9GuUOI4sUsK11k908A/A1pDVCQeBLnQpaQjVl8jOlqeW/QWyfeQKMVhK/5CxIf +=G+k0 +-----END PGP SIGNATURE----- diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch new file mode 100644 index 000000000000..6773242ea6dc --- /dev/null +++ b/games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch @@ -0,0 +1,20 @@ +--- utilssdl/PNG.cpp ++++ utilssdl/PNG.cpp +@@ -45,7 +45,7 @@ + { + png_uint_32 check; + +- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); ++ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png))); + if( check != length) + { + png_error( png, "Write Error"); +@@ -72,7 +72,7 @@ + return false; + } + +- if( setjmp(_png->jmpbuf)) ++ if( setjmp(png_jmpbuf(_png))) + { + fclose( fp); + png_destroy_write_struct(&_png, (png_infopp)NULL); diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild index a6bb2282a94a..a5f750ce633b 100644 --- a/games-puzzle/shaaft/shaaft-0.5.0.ebuild +++ b/games-puzzle/shaaft/shaaft-0.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.14 2011/08/11 04:32:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.15 2011/09/17 16:22:20 ssuominen Exp $ EAPI=2 inherit autotools eutils games @@ -38,7 +38,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-gcc34.patch \ "${FILESDIR}"/${P}-gcc41.patch \ - "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-libpng15.patch eautoreconf } |