diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 14:48:08 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 14:48:08 +0000 |
| commit | b4d443dd67e8ea66e5c4d39e69b55892ad616bdc (patch) | |
| tree | bef9a6d5187fbdba3a08675ac234314de0d894bb /sci-visualization/grace | |
| parent | Fix building with libpng15 (missing zlib.h include) wrt #380635 by Diego Elio... (diff) | |
| download | gentoo-2-b4d443dd67e8ea66e5c4d39e69b55892ad616bdc.tar.gz gentoo-2-b4d443dd67e8ea66e5c4d39e69b55892ad616bdc.tar.bz2 gentoo-2-b4d443dd67e8ea66e5c4d39e69b55892ad616bdc.zip | |
Fix building with libpng15 (including missing zlib.h include) wrt #380437 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/grace')
| -rw-r--r-- | sci-visualization/grace/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-visualization/grace/files/grace-5.1.22-libpng15.patch | 19 | ||||
| -rw-r--r-- | sci-visualization/grace/grace-5.1.22-r2.ebuild | 5 |
3 files changed, 28 insertions, 3 deletions
diff --git a/sci-visualization/grace/ChangeLog b/sci-visualization/grace/ChangeLog index b7267dbb76b0..f9186eca4628 100644 --- a/sci-visualization/grace/ChangeLog +++ b/sci-visualization/grace/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-visualization/grace # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.51 2011/06/21 14:30:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.52 2011/09/14 14:48:08 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> grace-5.1.22-r2.ebuild, + +files/grace-5.1.22-libpng15.patch: + Fix building with libpng15 (including missing zlib.h include) wrt #380437 by + Diego Elio Pettenò 21 Jun 2011; Justin Lecher <jlec@gentoo.org> grace-5.1.22-r1.ebuild, grace-5.1.22-r2.ebuild: diff --git a/sci-visualization/grace/files/grace-5.1.22-libpng15.patch b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch new file mode 100644 index 000000000000..43db9e0723a5 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch @@ -0,0 +1,19 @@ +--- src/rstdrv.c ++++ src/rstdrv.c +@@ -53,6 +53,7 @@ + #endif + + #ifdef HAVE_LIBPNG ++# include <zlib.h> + # include <png.h> + #endif + +@@ -885,7 +886,7 @@ + return; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return; + } diff --git a/sci-visualization/grace/grace-5.1.22-r2.ebuild b/sci-visualization/grace/grace-5.1.22-r2.ebuild index a693026bdd84..a9b98de426b0 100644 --- a/sci-visualization/grace/grace-5.1.22-r2.ebuild +++ b/sci-visualization/grace/grace-5.1.22-r2.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-visualization/grace/grace-5.1.22-r2.ebuild,v 1.9 2011/06/21 14:30:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r2.ebuild,v 1.10 2011/09/14 14:48:08 ssuominen Exp $ EAPI=4 @@ -46,7 +46,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch # fix a leak (from freebsd) epatch "${FILESDIR}"/${P}-dlmodule.patch \ - "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-ldflags.patch \ + "${FILESDIR}"/${P}-libpng15.patch # don't strip if not asked for sed -i \ |