diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 16:20:45 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 16:20:45 +0000 |
| commit | 7c4a0631675048b03cbe99ad74e7c29063177fa0 (patch) | |
| tree | 4bc3fd69e02ea512fc199b662a42afa024f6b5b4 /games-arcade | |
| parent | Bump policies to basepol rev 4 (diff) | |
| download | gentoo-2-7c4a0631675048b03cbe99ad74e7c29063177fa0.tar.gz gentoo-2-7c4a0631675048b03cbe99ad74e7c29063177fa0.tar.bz2 gentoo-2-7c4a0631675048b03cbe99ad74e7c29063177fa0.zip | |
Fix building with libpng15 wrt #383207 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/criticalmass/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/criticalmass/criticalmass-1.0.2.ebuild | 5 | ||||
| -rw-r--r-- | games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch | 31 |
3 files changed, 39 insertions, 3 deletions
diff --git a/games-arcade/criticalmass/ChangeLog b/games-arcade/criticalmass/ChangeLog index e253b0e68f66..4bdafbc5c959 100644 --- a/games-arcade/criticalmass/ChangeLog +++ b/games-arcade/criticalmass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/criticalmass # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.23 2011/09/13 18:59:27 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/ChangeLog,v 1.24 2011/09/17 16:20:45 ssuominen Exp $ + + 17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> + criticalmass-1.0.2.ebuild, +files/criticalmass-1.0.2-libpng15.patch: + Fix building with libpng15 wrt #383207 by Diego Elio Pettenò 13 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> criticalmass-1.0.0-r1.ebuild, criticalmass-1.0.2.ebuild: diff --git a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild index e37d23809011..0396588b5aa1 100644 --- a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild +++ b/games-arcade/criticalmass/criticalmass-1.0.2.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-arcade/criticalmass/criticalmass-1.0.2.ebuild,v 1.4 2011/09/13 18:59:27 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/criticalmass/criticalmass-1.0.2.ebuild,v 1.5 2011/09/17 16:20:45 ssuominen Exp $ EAPI=2 inherit autotools eutils games @@ -26,7 +26,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-gcc43.patch \ "${FILESDIR}"/${P}-system_curl.patch \ "${FILESDIR}"/${P}-libpng14.patch \ - "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-cflags.patch \ + "${FILESDIR}"/${P}-libpng15.patch rm -rf curl eautoreconf } diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch new file mode 100644 index 000000000000..ac1b8c0c617f --- /dev/null +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch @@ -0,0 +1,31 @@ +--- game/main.cpp ++++ game/main.cpp +@@ -28,6 +28,8 @@ + #include <sys/stat.h> + #include <sys/types.h> + ++#include <zlib.h> ++ + void migrateConfig( void) + { + //if onlineCheck is not set, default it to true +--- utilssdl/PNG.cpp ++++ utilssdl/PNG.cpp +@@ -45,7 +45,7 @@ + { + png_size_t 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); |