diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2011-06-14 22:00:20 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2011-06-14 22:00:20 +0000 |
| commit | bb57b1b2195942a63473c046a2f61365d97e2406 (patch) | |
| tree | 261901168268639e3132fbc1d503925bb2861066 /games-sports | |
| parent | Stable for HPPA (bug #369501). (diff) | |
| download | gentoo-2-bb57b1b2195942a63473c046a2f61365d97e2406.tar.gz gentoo-2-bb57b1b2195942a63473c046a2f61365d97e2406.tar.bz2 gentoo-2-bb57b1b2195942a63473c046a2f61365d97e2406.zip | |
add patch for building against libpng15 (bug #371651)
(Portage version: 2.1.9.42/cvs/Linux i686)
Diffstat (limited to 'games-sports')
| -rw-r--r-- | games-sports/speed-dreams/ChangeLog | 8 | ||||
| -rw-r--r-- | games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch | 20 | ||||
| -rw-r--r-- | games-sports/speed-dreams/speed-dreams-1.4.0.ebuild | 14 |
3 files changed, 34 insertions, 8 deletions
diff --git a/games-sports/speed-dreams/ChangeLog b/games-sports/speed-dreams/ChangeLog index 26675985d9d6..682ad3361662 100644 --- a/games-sports/speed-dreams/ChangeLog +++ b/games-sports/speed-dreams/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-sports/speed-dreams -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/speed-dreams/ChangeLog,v 1.8 2010/11/09 16:22:46 tomka Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-sports/speed-dreams/ChangeLog,v 1.9 2011/06/14 22:00:20 mr_bones_ Exp $ + + 14 Jun 2011; Michael Sterrett <mr_bones_@gentoo.org> + speed-dreams-1.4.0.ebuild, +files/speed-dreams-1.4.0-libpng15.patch: + add patch for building against libpng15 (bug #371651) 09 Nov 2010; Thomas Kahle <tomka@gentoo.org> speed-dreams-1.4.0.ebuild: x86 stable per bug 333261 diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch new file mode 100644 index 000000000000..6b09ce2a41c8 --- /dev/null +++ b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch @@ -0,0 +1,20 @@ +--- a/src/libs/tgfclient/img.cpp ++++ b/src/libs/tgfclient/img.cpp +@@ -98,7 +98,7 @@ + return (unsigned char *)NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); +@@ -229,7 +229,7 @@ + return -1; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); + return -1; diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild index fafe570a05af..29ec847313bb 100644 --- a/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild +++ b/games-sports/speed-dreams/speed-dreams-1.4.0.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-sports/speed-dreams/speed-dreams-1.4.0.ebuild,v 1.4 2010/11/09 16:22:46 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild,v 1.5 2011/06/14 22:00:20 mr_bones_ Exp $ EAPI=2 inherit autotools eutils versionator games @@ -38,11 +38,13 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src -# http://sourceforge.net/apps/trac/speed-dreams/ticket/111 -MAKEOPTS="${MAKEOPTS} -j1" - src_prepare() { - epatch "${FILESDIR}"/${P}-asneeded.patch + # http://sourceforge.net/apps/trac/speed-dreams/ticket/111 + MAKEOPTS="${MAKEOPTS} -j1" + + epatch \ + "${FILESDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-libpng15.patch sed -i \ -e '/ADDCFLAGS/s: -O2::' \ |