Fix building with libpng15 wrt #378175 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/sci-chemistry/molscript/ChangeLog b/sci-chemistry/molscript/ChangeLog
index 843c1c854b288c9ef99d126fe4c8aae472f6f254..7584e3740f3fa6bd534593fb41e38020ae19172d 100644 (file)
--- 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/Manifest b/sci-chemistry/molscript/Manifest
index be85cfefb68f076a1d68890615146b010698f46b..8f30da9a3a441cc8120faf2e3cd9dd9932b84c61 100644 (file)
--- a/sci-chemistry/molscript/Manifest
+++ b/sci-chemistry/molscript/Manifest
@@ -2,19 +2,18 @@
 Hash: SHA256
 
 AUX 2.1.2-ldflags.patch 818 RMD160 535c0d9750aa32e206b3cbb365477de6653f0e0d SHA1 39fdeeb7d24a329ebae5f4f96b0e14ccc3e93df5 SHA256 ef1f4079d7b11d69f8f9835266b7bf066fa74623ef2e34c1a5638125153771ab
+AUX 2.1.2-libpng15.patch 536 RMD160 028b910812b8e990c09e72b7e9568bcf09da7907 SHA1 2b7ca9181e25f0b0da407d4b9a9e4b01e82bed59 SHA256 46a9b1f08aabf4c6afe879a40241a4ffe3fb0e7489e73e074be1fec3bfa580de
 AUX 2.1.2-prll.patch 409 RMD160 ee5815d45c2e93030db071a0110edd80b05fb703 SHA1 8800d2103df5e0c2a3b2562885af4b82b07ed5eb SHA256 23d968365bc5de71d43a9ef6bf2333dc749871b0ada84815f8687a82ca697364
 AUX fix-makefile-shared.patch 2051 RMD160 d8e8a099b8b546bd1c053e8a2b7d5df7b5032a95 SHA1 be36472093520a14312c24c73e651666b539bb14 SHA256 d692b236634d76f3f9d3482d3cc7b05451c0a116ad6edb8ade9075523e6b9bdf
 AUX glutbitmap.h 845 RMD160 e06c28dee5a947cd0716d17ecc487b03294ad980 SHA1 6cb718dba3e394d752f5232d10ba5117b56b1a14 SHA256 ba4caf7c2e7135e80385c2d33d7c780a28f5e9fc3ac557e297f65b70ce925a81
 DIST molscript-2.1.2.tar.gz 412497 RMD160 9539b04c982c8bc855ae368d2743d8db48f15f34 SHA1 4bb4e0c2f1623e9889a3b0fbbc7fa2cd20ac3727 SHA256 01252931f5a3542d5659ddaa4ebceaed2e75becb8ed150dfa14b59da9a63ca01
-EBUILD molscript-2.1.2-r1.ebuild 1508 RMD160 35d70e791d16be8f73498af191f31ae04af21f8b SHA1 11788d1be84d886a7427763a92bd4700e0abd8d7 SHA256 ed469c124ecf99b8d495aac4b428a90fca3c5ca1edabb555f2b2505bc2e1d28e
-MISC ChangeLog 2254 RMD160 7bdd82fd1b86bc0aa771b87497e4657537c24847 SHA1 0ca65abe343cf2c88e24d6ae92dcab52af1388c6 SHA256 78d8bfd14b44fb738def5135bcdde5ff90042363929b0353d9ea4de7df4c0dea
+EBUILD molscript-2.1.2-r1.ebuild 1546 RMD160 a7b8e286b9d84bf0863644ff4edbe1fdf328ced4 SHA1 9486ccf9fb3c97a606ae6d3657d197035451648d SHA256 2f8a41b9387e55157a0e4f0cc2ff1ad38f3374bf36fcee8484aac3b4ee125320
+MISC ChangeLog 2430 RMD160 275f544c2f7fa0fe0939838a945c0c41caedbd09 SHA1 7567de0f0b73a7de1852c29558ff19da51d59249 SHA256 ca6e5ff5241e7590291f59ccf865d123c52d28f97c568ff26f367c51760747a6
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk4j7oUACgkQIiMqcbOVdxRgTAP9EVcp8m5tpyGRx5swOkoz4T/g
-gjAAuZ8Za/2ZGKx/ttoHPWWf+Sour5Q9eA69TJ2HJWW48ALahVC3obsWDeS3nCKv
-Q9/ffQ1r/aUSFY3LRYZSGMXmAqSKsx2XgLmgontt+Q5gTtw0HP8w7LdMWEhT2Qak
-yUdYKHwba+vJmhndj9g=
-=JaAK
+iF4EAREIAAYFAk5A7vMACgkQXkR9YqOcLPHifgD/ZzfcDes9hcJD+LhJFDSk76jd
+lLCRnPwSaQIeR3Up4NoA/RFGo+7cpvEi5zYa5BEOUjEFbMRFwrgVQbGDCq1h/UhM
+=JD0C
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..9ed1b85
--- /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 5693bafbb4c81108c91a38d5bb5617302b8c6bb4..71d7ca135e9d7159fda650edcc2d8c00fd8adaf1 100644 (file)
--- 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/