diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 18:51:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 18:51:32 +0000 |
| commit | 2eded76f89cc2ed690c96d7839d1a5bc0daaa596 (patch) | |
| tree | 17460fbbd7d4d1dc05b927e28d4fb5244c37ed05 /sci-physics | |
| parent | x86 stable, thanks JC, bug 382401 (diff) | |
| download | gentoo-2-2eded76f89cc2ed690c96d7839d1a5bc0daaa596.tar.gz gentoo-2-2eded76f89cc2ed690c96d7839d1a5bc0daaa596.tar.bz2 gentoo-2-2eded76f89cc2ed690c96d7839d1a5bc0daaa596.zip | |
Fix building with libpng15 wrt #378397 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/lightspeed/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-physics/lightspeed/files/lightspeed-1.2a-libpng15.patch | 19 | ||||
| -rw-r--r-- | sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild | 6 |
3 files changed, 28 insertions, 3 deletions
diff --git a/sci-physics/lightspeed/ChangeLog b/sci-physics/lightspeed/ChangeLog index e6bb8af7ce90..04f993197c64 100644 --- a/sci-physics/lightspeed/ChangeLog +++ b/sci-physics/lightspeed/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-physics/lightspeed # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/ChangeLog,v 1.17 2011/04/07 18:37:15 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/ChangeLog,v 1.18 2011/09/14 18:51:32 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> + lightspeed-1.2a-r1.ebuild, +files/lightspeed-1.2a-libpng15.patch: + Fix building with libpng15 wrt #378397 by Diego Elio Pettenò 07 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org> lightspeed-1.2a-r1.ebuild, +files/lightspeed-1.2a-autoconf.patch: diff --git a/sci-physics/lightspeed/files/lightspeed-1.2a-libpng15.patch b/sci-physics/lightspeed/files/lightspeed-1.2a-libpng15.patch new file mode 100644 index 000000000000..c3909a7b4dac --- /dev/null +++ b/sci-physics/lightspeed/files/lightspeed-1.2a-libpng15.patch @@ -0,0 +1,19 @@ +--- src/snapshot.c ++++ src/snapshot.c +@@ -26,6 +26,7 @@ + #include "lightspeed.h" + + #ifdef HAVE_LIBPNG ++#include <zlib.h> + #include <png.h> + static int write_png( int message, const void *data ); + #endif +@@ -305,7 +306,7 @@ + return -1; + png_write_s = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); + png_info_s = png_create_info_struct( png_write_s ); +- if (setjmp( png_write_s->jmpbuf )) { ++ if (setjmp( png_jmpbuf( png_write_s ) )) { + /* Error writing file */ + png_destroy_write_struct( &png_write_s, &png_info_s ); + fclose( png_fp ); diff --git a/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild b/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild index 4ea83e1f16ab..3a36357ad843 100644 --- a/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild +++ b/sci-physics/lightspeed/lightspeed-1.2a-r1.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/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild,v 1.12 2011/04/07 18:37:15 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild,v 1.13 2011/09/14 18:51:32 ssuominen Exp $ EAPI=2 @@ -40,7 +40,9 @@ S2="${WORKDIR}/objects" src_prepare() { epatch "${WORKDIR}/${DEB_PATCH}.diff" - epatch "${FILESDIR}"/${P}-autoconf.patch + epatch \ + "${FILESDIR}"/${P}-autoconf.patch \ + "${FILESDIR}"/${P}-libpng15.patch eautoreconf } |