diff options
| author |   Richard Freeman <rich0@gentoo.org> | 2011-03-19 19:33:05 +0000 |
|---|---|---|
| committer | Richard Freeman <rich0@gentoo.org> | 2011-03-19 19:33:05 +0000 |
| commit | af3c91bcbd6b96a50a74438157b7d8a2eef56217 (patch) | |
| tree | 548378f97ee92181df7ff7b4176b071ddc51d1c2 /games-rpg/eternal-lands | |
| parent | Fix EAPI=2 porting #359315 by A. Clark. (diff) | |
| download | gentoo-2-af3c91bcbd6b96a50a74438157b7d8a2eef56217.tar.gz gentoo-2-af3c91bcbd6b96a50a74438157b7d8a2eef56217.tar.bz2 gentoo-2-af3c91bcbd6b96a50a74438157b7d8a2eef56217.zip | |
Add libpng-1.5 patch for 356851.
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'games-rpg/eternal-lands')
| -rw-r--r-- | games-rpg/eternal-lands/ChangeLog | 8 | ||||
| -rw-r--r-- | games-rpg/eternal-lands/eternal-lands-1.9.1.ebuild | 5 | ||||
| -rw-r--r-- | games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch | 23 |
3 files changed, 32 insertions, 4 deletions
diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog index 2390be5e3f84..14ba866c5fc3 100644 --- a/games-rpg/eternal-lands/ChangeLog +++ b/games-rpg/eternal-lands/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-rpg/eternal-lands -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.55 2010/12/30 22:56:18 rich0 Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.56 2011/03/19 19:33:05 rich0 Exp $ + + 19 Mar 2011; Richard Freeman <rich0@gentoo.org> + eternal-lands-1.9.1.ebuild, +files/eternal-lands-1.9.1-libpng.patch: + Add libpng-1.5 patch for 356851. *eternal-lands-1.9.1 (30 Dec 2010) diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.1.ebuild index 87d9838aaa7a..8640f7103bde 100644 --- a/games-rpg/eternal-lands/eternal-lands-1.9.1.ebuild +++ b/games-rpg/eternal-lands/eternal-lands-1.9.1.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-rpg/eternal-lands/eternal-lands-1.9.1.ebuild,v 1.1 2010/12/30 22:56:18 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.1.ebuild,v 1.2 2011/03/19 19:33:05 rich0 Exp $ EAPI=2 inherit eutils flag-o-matic games @@ -101,6 +101,7 @@ src_prepare() { cp Makefile.linux Makefile epatch "${FILESDIR}/${PN}-1.9.0-glext.patch" + epatch "${FILESDIR}/${PN}-1.9.1-libpng.patch" } src_compile() { diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch new file mode 100644 index 000000000000..953ab8ffefd7 --- /dev/null +++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch @@ -0,0 +1,23 @@ +--- elc.orig/misc.c ++++ elc/misc.c +@@ -311,7 +311,7 @@ int IMG_SavePNG_RW (SDL_Surface *face, S + } + + /* Set error handling. */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* If we get here, we had a problem reading the file */ + IMG_SetError("Error writing the PNG file"); +@@ -360,10 +360,7 @@ done: + if (row_pointers != NULL) + free (row_pointers); + +- if (info_ptr != NULL && info_ptr->palette != NULL) +- free (info_ptr->palette); +- +- png_destroy_write_struct (&png_ptr, (png_infopp)NULL); ++ png_destroy_write_struct (&png_ptr, &info_ptr); + + return result; + } |