diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:31:01 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:31:01 +0000 |
| commit | 4fc8b7aa6ef151bbc999ca1c7ac411213a69bdcd (patch) | |
| tree | b315a1757ab4f893b0e59ddaaa4d1bbd4e2ae4fb /dev-games/clanlib | |
| parent | Fix building with libpng15 (missing zlib.h include) wrt #380139 by Diego Elio... (diff) | |
| download | gentoo-2-4fc8b7aa6ef151bbc999ca1c7ac411213a69bdcd.tar.gz gentoo-2-4fc8b7aa6ef151bbc999ca1c7ac411213a69bdcd.tar.bz2 gentoo-2-4fc8b7aa6ef151bbc999ca1c7ac411213a69bdcd.zip | |
Fix building with libpng15 wrt #378203 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'dev-games/clanlib')
| -rw-r--r-- | dev-games/clanlib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/clanlib/clanlib-0.8.1.ebuild | 5 | ||||
| -rw-r--r-- | dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch | 11 |
3 files changed, 19 insertions, 3 deletions
diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog index e7d1fd143961..fb88b0cee4ef 100644 --- a/dev-games/clanlib/ChangeLog +++ b/dev-games/clanlib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/clanlib # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.48 2011/02/25 18:24:23 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.49 2011/09/15 02:31:01 ssuominen Exp $ + + 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> clanlib-0.8.1.ebuild, + +files/clanlib-0.8.1-libpng15.patch: + Fix building with libpng15 wrt #378203 by Diego Elio Pettenò 25 Feb 2011; Kevin McCarthy <signals@gentoo.org> clanlib-0.8.1.ebuild: Update depends from media-libs/jpeg to virtual/jpeg diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild index 73c241c1ef8c..7607642819ec 100644 --- a/dev-games/clanlib/clanlib-0.8.1.ebuild +++ b/dev-games/clanlib/clanlib-0.8.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/dev-games/clanlib/clanlib-0.8.1.ebuild,v 1.8 2011/02/25 18:24:23 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.8.1.ebuild,v 1.9 2011/09/15 02:31:01 ssuominen Exp $ EAPI=2 inherit flag-o-matic eutils @@ -38,7 +38,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-ndebug.patch \ "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc44.patch + "${FILESDIR}"/${P}-gcc44.patch \ + "${FILESDIR}"/${P}-libpng15.patch } src_configure() { diff --git a/dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch b/dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch new file mode 100644 index 000000000000..03d0ba536acf --- /dev/null +++ b/dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch @@ -0,0 +1,11 @@ +--- Sources/Display/Providers/png_provider_generic.cpp ++++ Sources/Display/Providers/png_provider_generic.cpp +@@ -107,7 +107,7 @@ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + cl_assert(false); + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + cl_assert(false); |