diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-09 08:25:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-09 08:25:28 +0000 |
| commit | 49182c72575d8eb52f95ee4866a7c7e08728bdb2 (patch) | |
| tree | f067db250f8747159f22a77502e01d18a1a4eebb | |
| parent | Version bump mercurial to 1.9.1. (diff) | |
| download | gentoo-2-49182c72575d8eb52f95ee4866a7c7e08728bdb2.tar.gz gentoo-2-49182c72575d8eb52f95ee4866a7c7e08728bdb2.tar.bz2 gentoo-2-49182c72575d8eb52f95ee4866a7c7e08728bdb2.zip | |
Fix building with libpng15 wrt #378175 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
| -rw-r--r-- | sci-chemistry/molscript/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/molscript/files/2.1.2-libpng15.patch | 19 | ||||
| -rw-r--r-- | sci-chemistry/molscript/molscript-2.1.2-r1.ebuild | 5 |
3 files changed, 27 insertions, 3 deletions
diff --git a/sci-chemistry/molscript/ChangeLog b/sci-chemistry/molscript/ChangeLog index 843c1c854b28..7584e3740f3f 100644 --- a/sci-chemistry/molscript/ChangeLog +++ b/sci-chemistry/molscript/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/molscript # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.14 2011/07/18 08:27:40 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.15 2011/08/09 08:25:28 ssuominen Exp $ + + 09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> + +files/2.1.2-libpng15.patch, molscript-2.1.2-r1.ebuild: + Fix building with libpng15 wrt #378175 by Diego Elio Pettenò 18 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> molscript-2.1.2-r1.ebuild: diff --git a/sci-chemistry/molscript/files/2.1.2-libpng15.patch b/sci-chemistry/molscript/files/2.1.2-libpng15.patch new file mode 100644 index 000000000000..9ed1b85909e8 --- /dev/null +++ b/sci-chemistry/molscript/files/2.1.2-libpng15.patch @@ -0,0 +1,19 @@ +--- png_img.c ++++ png_img.c +@@ -18,6 +18,7 @@ + + #include <GL/gl.h> + ++#include <zlib.h> + #include <png.h> + + #include "clib/str_utils.h" +@@ -69,7 +70,7 @@ + info_ptr = png_create_info_struct (png_ptr); + if (info_ptr == NULL) + yyerror ("png_img: could not create PNG info structure"); +- if (setjmp (png_ptr->jmpbuf)) yyerror ("png_img: could not setjmp"); ++ if (setjmp (png_jmpbuf(png_ptr))) yyerror ("png_img: could not setjmp"); + + png_init_io (png_ptr, outfile); + png_set_compression_level (png_ptr, compression_level); diff --git a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild index 5693bafbb4c8..71d7ca135e9d 100644 --- a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild +++ b/sci-chemistry/molscript/molscript-2.1.2-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-chemistry/molscript/molscript-2.1.2-r1.ebuild,v 1.7 2011/07/18 08:27:40 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild,v 1.8 2011/08/09 08:25:28 ssuominen Exp $ EAPI="3" @@ -36,7 +36,8 @@ src_prepare() { epatch \ "${FILESDIR}"/fix-makefile-shared.patch \ "${FILESDIR}"/${PV}-ldflags.patch \ - "${FILESDIR}"/${PV}-prll.patch + "${FILESDIR}"/${PV}-prll.patch \ + "${FILESDIR}"/${PV}-libpng15.patch # Provide glutbitmap.h, because freeglut doesn't have it cp "${FILESDIR}"/glutbitmap.h "${S}"/clib/ |