summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-09-14 16:41:43 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-09-14 16:41:43 +0000
commit5d6fc945b097eda66152fddce88c6f9d08b6d689 (patch)
treef458d711926256e89048a902e8f7d05b7b66f468 /games-emulation
parentAdd new version that now retrieves patch from Linus' github account. Hopefull... (diff)
downloadgentoo-2-5d6fc945b097eda66152fddce88c6f9d08b6d689.tar.gz
gentoo-2-5d6fc945b097eda66152fddce88c6f9d08b6d689.tar.bz2
gentoo-2-5d6fc945b097eda66152fddce88c6f9d08b6d689.zip
Fix building with libpng15 wrt #378149 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/visualboyadvance/ChangeLog9
-rw-r--r--games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch11
-rw-r--r--games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild7
3 files changed, 22 insertions, 5 deletions
diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index 002fe3287020..1c00134ade72 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-emulation/visualboyadvance
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.36 2010/11/02 14:48:59 tupone Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.37 2011/09/14 16:41:43 ssuominen Exp $
+
+ 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+ visualboyadvance-1.7.2-r2.ebuild,
+ +files/visualboyadvance-1.7.2-libpng15.patch:
+ Fix building with libpng15 wrt #378149 by Diego Elio Pettenò
02 Nov 2010; Tupone Alfredo <tupone@gentoo.org>
visualboyadvance-1.7.2-r2.ebuild,
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch
new file mode 100644
index 000000000000..bee96dc7e5df
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libpng15.patch
@@ -0,0 +1,11 @@
+--- src/Util.cpp
++++ src/Util.cpp
+@@ -79,7 +79,7 @@
+ return false;
+ }
+
+- if(setjmp(png_ptr->jmpbuf)) {
++ if(setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr,NULL);
+ fclose(fp);
+ return false;
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
index 34d159a3df78..83980a2f98b9 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.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-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild,v 1.5 2011/02/22 21:07:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild,v 1.6 2011/09/14 16:41:43 ssuominen Exp $
EAPI=2
inherit eutils flag-o-matic games
@@ -50,7 +50,8 @@ src_prepare() {
"${WORKDIR}"/${P}-deprecatedsigc++.patch \
"${FILESDIR}"/${P}-uninit.patch \
"${FILESDIR}"/${P}-glibc2.10.patch \
- "${FILESDIR}"/${P}-ovflfix.patch
+ "${FILESDIR}"/${P}-ovflfix.patch \
+ "${FILESDIR}"/${P}-libpng15.patch
}
src_configure() {