diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:53:41 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:53:41 +0000 |
| commit | 8c3295f737a5c7a6c6a83df104c24bb03b42b501 (patch) | |
| tree | db0c782e7cfff592b8c428e7df7f70f5bb2b68a1 /games-rpg/freedroidrpg | |
| parent | Fix building with libpng15 wrt #380145 by Diego Elio Pettenò (diff) | |
| download | gentoo-2-8c3295f737a5c7a6c6a83df104c24bb03b42b501.tar.gz gentoo-2-8c3295f737a5c7a6c6a83df104c24bb03b42b501.tar.bz2 gentoo-2-8c3295f737a5c7a6c6a83df104c24bb03b42b501.zip | |
Fix building with libpng15 wrt #378239 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'games-rpg/freedroidrpg')
| -rw-r--r-- | games-rpg/freedroidrpg/ChangeLog | 6 | ||||
| -rw-r--r-- | games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-libpng15.patch | 11 | ||||
| -rw-r--r-- | games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild | 6 |
3 files changed, 20 insertions, 3 deletions
diff --git a/games-rpg/freedroidrpg/ChangeLog b/games-rpg/freedroidrpg/ChangeLog index e3bf3b35993a..b30e6120ac16 100644 --- a/games-rpg/freedroidrpg/ChangeLog +++ b/games-rpg/freedroidrpg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-rpg/freedroidrpg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.30 2011/01/15 15:06:57 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.31 2011/09/15 02:53:41 ssuominen Exp $ + + 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> + freedroidrpg-0.14.1.ebuild, +files/freedroidrpg-0.14.1-libpng15.patch: + Fix building with libpng15 wrt #378239 by Diego Elio Pettenò 15 Jan 2011; Markus Meier <maekke@gentoo.org> freedroidrpg-0.14.1.ebuild: x86 stable, bug #350769 diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-libpng15.patch b/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-libpng15.patch new file mode 100644 index 000000000000..1c61a3a43ab2 --- /dev/null +++ b/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-libpng15.patch @@ -0,0 +1,11 @@ +--- win32/pngtoico.c ++++ win32/pngtoico.c +@@ -188,7 +188,7 @@ + goto perrexit; + } + +- if ( setjmp(png_ptr->jmpbuf) ) { ++ if ( setjmp(png_jmpbuf(png_ptr)) ) { + fprintf(stderr, "%s: PNG format error\n", file); + goto errexit; + } diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild index a1eca4e30a0f..3f9d38a74afe 100644 --- a/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild +++ b/games-rpg/freedroidrpg/freedroidrpg-0.14.1.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-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild,v 1.4 2011/01/15 15:06:57 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild,v 1.5 2011/09/15 02:53:41 ssuominen Exp $ EAPI=2 PYTHON_DEPEND="2" @@ -38,7 +38,9 @@ pkg_setup() { src_prepare() { rm -rf lua src/SDL_rotozoom* - epatch "${FILESDIR}"/${P}-syslibs.patch + epatch \ + "${FILESDIR}"/${P}-syslibs.patch \ + "${FILESDIR}"/${P}-libpng15.patch python_convert_shebangs -r 2 . |