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

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

4 files changed, 47 insertions, 9 deletions

diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index a7d082071d43..8f99378b1bd6 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/molmol
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.26 2011/07/15 20:37:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.27 2011/09/14 21:25:05 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> +files/libpng15.patch,
+  molmol-2k_p2-r2.ebuild:
+  Fix building with libpng15 wrt #378341 by Diego Elio Pettenò
 
   15 Jul 2011; Markus Meier <maekke@gentoo.org> molmol-2k_p2-r2.ebuild:
   x86 stable, bug #373091
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index a72317c52ed1..0ff15a4f9ccd 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX cast.patch 519 RMD160 3ce926dbda9345a380b7e9da9dd062db7b5f4b78 SHA1 2f1bfefbc5a146665cf90cf3a7147387ee3d7eb8 SHA256 25acec7df7e5739e2e4664672e979636ccd13c68b2ce5d26e555b3d619be0e77
 AUX ldflags.patch 435 RMD160 17c6cfc1539c0d774531c950d82f1fb28f366aea SHA1 e9e736664e773b32f2ae861f65fc0670d3625998 SHA256 cbae8934e2be43ceac0f541ed14e843ed76baf86219e0f669eab0af6d5714c64
+AUX libpng15.patch 826 RMD160 3ae336cba8937bfde272a4384103efa6e15f0c5d SHA1 d2baa71a5055638d1c5f6b90e7f8020a29ae573a SHA256 656a088b11f0ce171ab666aed8de36e3eeac3576322055ab0036794b02c370ed
 AUX pjf_RH9_molmol2k2.diff 3138 RMD160 1792aa433a21c2f64880b244d11b6bbd2552c95b SHA1 e654f3105d496538af42a8282f1d55c272ff3d4d SHA256 5b7c3ede5714b123824cc0b8533f679d22d1c5219bf88e8d6a4cebe8e245aeb9
 AUX prefix.patch 513 RMD160 23239041256a23c6223daab56e1aa59b5e911afa SHA1 5f3707fec532b15579020b5f21112d3fa2d41924 SHA256 efcb5d3fa7258cf88f02b63d1df3100eb0b73848c0ebabb59c84cb9ea082d8e7
 DIST molmol-2k.2.0-doc.tar.gz 1062297 RMD160 08b3e21ab6eb7c9044e59373334181ff91ca8a53 SHA1 b47551283fa19f57f4d5edcbd52f725055d80b7f SHA256 07e1c3fd04ffe7c9e9d91eaefa0bf72e6d0913a981eec3bf0879bfc65537a6be
 DIST molmol-2k.2.0-src.tar.gz 1088805 RMD160 b1de89953631dd9b11928751d7853cb511bf45f0 SHA1 09482a1dea601563ca64e773dc0ec47019e22c63 SHA256 1104dcb1b2517581c7d6b1695ff2e92f4076ad34afc48dd896eec38e5acf2287
-EBUILD molmol-2k_p2-r2.ebuild 1693 RMD160 416465ad49dc869ec5553f401fa1957c6fd96fc3 SHA1 97cc607f9706d21dc6d2b6449868a1e16b38f2c8 SHA256 87ccb84fd4e561cc1055689bb812644c15f47d2bab0e738743e8ca31c2344278
+EBUILD molmol-2k_p2-r2.ebuild 1733 RMD160 aedb9a05ce3211c1bd00d3608e13f4ce164d0424 SHA1 62a1d255d2341e0b7e80ffb393c0140f29b7bed4 SHA256 59e78559b92aff7273050e216f069a1d01bca662237ec403f82cdbe2cee450f5
 EBUILD molmol-2k_p2.ebuild 1785 RMD160 361413e938f036cdf086089868baf99f7cda049b SHA1 315909e6d899e283e1459cf0b481e1ce53c7ab5b SHA256 8bf7de3885cb1ca21895acda65de02b330576bbf799ee535047582c0bbd61986
-MISC ChangeLog 3658 RMD160 041230518bcab187fb585108a5955c13bb4db7ae SHA1 35b5a6252a9b0b21cc1f0e2a7eae510d70acdd5f SHA256 ceb2e901750879d493c025a0cb8709151f20d7414a5e83feb2b345d44866fd30
+MISC ChangeLog 3829 RMD160 074a34482468d6c6856c9cb2fd6630a537d9b82c SHA1 9f404c8dbdf9c8e15f6af08d93352d33c50d7914 SHA256 4caecdcf46ff09801ef3d8fc958417e2ec7536308968efcbb65431fad9589d5a
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4gpUcACgkQkKaRLQcq0GLZTgCeJ52iqFYtiVEtmP7dV5sV0e21
-6T0An21URYdAcVnX8MRSL2XX0JcKX2n1
-=BLIm
+iF4EAREIAAYFAk5xG+gACgkQXkR9YqOcLPHnQQD/QIPdCY+h7Tqe8ATsPc58meGp
+mkNPbzNi2DuwHoUru88A/AsDWs+Aqo1vFxdrymfICb5E39NmEXGEUoENVohSHJf2
+=AWnm
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molmol/files/libpng15.patch b/sci-chemistry/molmol/files/libpng15.patch
new file mode 100644
index 000000000000..cd27e4906608
--- /dev/null
+++ b/sci-chemistry/molmol/files/libpng15.patch
@@ -0,0 +1,32 @@
+--- src/motogl/MotOGLDump.c
++++ src/motogl/MotOGLDump.c
+@@ -248,7 +248,7 @@
+ pngErrHand(png_structp pngStrucP, char *errMsg)
+ {
+   IORaiseError(errMsg);
+-  longjmp(pngStrucP->jmpbuf, 1);
++  longjmp(png_jmpbuf(pngStrucP), 1);
+ }
+ #endif
+ 
+@@ -357,7 +357,7 @@
+       return IO_RES_ERR;
+     }
+ 
+-    if (setjmp(pngStrucP->jmpbuf)) {
++    if (setjmp(png_jmpbuf(pngStrucP))) {
+       if (cBuf != NULL)
+ 	free(cBuf);
+       if (fBuf != NULL)
+@@ -368,10 +368,7 @@
+ 
+     png_init_io(pngStrucP, ImgFileP);
+ 
+-    pngInfoP->width = imgW;
+-    pngInfoP->height = imgH;
+-    pngInfoP->bit_depth = 8;
+-    pngInfoP->color_type = PNG_COLOR_TYPE_RGB;
++    png_set_IHDR(pngStrucP, pngInfoP, imgW, imgH, 8, PNG_COLOR_TYPE_RGB, 0, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+     png_write_info(pngStrucP, pngInfoP);
+   }
+ #endif
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
index 719bd8cca888..cef6add6ea62 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-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-chemistry/molmol/molmol-2k_p2-r2.ebuild,v 1.7 2011/07/15 20:37:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild,v 1.8 2011/09/14 21:25:05 ssuominen Exp $
 
 EAPI=4
 
@@ -59,6 +59,7 @@ src_prepare() {
 		-i "${S}"/makedef || die
 
 	epatch "${FILESDIR}"/cast.patch
+	epatch "${FILESDIR}"/libpng15.patch
 }
 
 src_install() {