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 | 0cf161558e7275a7f089de30eda82d117dbb4095 (patch) | |
| tree | c3e7cd2ca0d974620e1e23123c17644df592b779 /games-puzzle | |
| parent | Add Arfrever as proxy maintainer as requested by him. (diff) | |
| download | gentoo-2-0cf161558e7275a7f089de30eda82d117dbb4095.tar.gz gentoo-2-0cf161558e7275a7f089de30eda82d117dbb4095.tar.bz2 gentoo-2-0cf161558e7275a7f089de30eda82d117dbb4095.zip | |
Fix building with libpng15 wrt #383247 by Diego Elio Pettenò
(Portage version: 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/files/shaaft-0.5.0-libpng15.patch | 20 | ||||
| -rw-r--r-- | games-puzzle/shaaft/shaaft-0.5.0.ebuild | 5 |
3 files changed, 28 insertions, 3 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/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 } |