Fix building with libpng15 (missing zlib.h include) wrt #380635 by Diego Elio Pettenò

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

4 files changed, 29 insertions, 9 deletions

diff --git a/sci-visualization/gwyddion/ChangeLog b/sci-visualization/gwyddion/ChangeLog
index acc4725cd4c4..c45e39a07dbb 100644
--- a/sci-visualization/gwyddion/ChangeLog
+++ b/sci-visualization/gwyddion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gwyddion
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.30 2011/08/25 11:26:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.31 2011/09/14 14:40:55 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> gwyddion-2.25.ebuild,
+  +files/gwyddion-2.25-libpng15.patch:
+  Fix building with libpng15 (missing zlib.h include) wrt #380635 by Diego Elio
+  Pettenò
 
   25 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> gwyddion-2.25.ebuild:
   QA: add missing libpng dependency.
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 6d42915b71b8..4f584f9abbb5 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX gwyddion-2.25-libpng15.patch 158 RMD160 a924a52875702240659b66e9187d08474043a077 SHA1 14978af51d53324f790c5f5be37ddb540d43836f SHA256 e039b79411177aeb4be582888503536984fc08d81f8d1d135298c3605b32e2ad
 DIST gwyddion-2.10.tar.bz2 2425036 RMD160 a4c32fefe9c31c1aee9169cad6399f25ec3bbff6 SHA1 186d0cc03edefd807b33efdbb6d59cc7f98fdad6 SHA256 90bde6f10e38c563886251984c60d32155119601e400f97a0cd59b7378a740eb
 DIST gwyddion-2.24.tar.bz2 3426597 RMD160 95217be39c89f52fa15cfa47f3c4e5f4716bcd24 SHA1 cf4201e16653daa4aee7ba9fe1cf3a2a5061859f SHA256 deaf9ffb05d3d75dc513e8ca6bbdfc6e7d6e0864b8c7ff8ab7683263a5255aa6
 DIST gwyddion-2.25.tar.bz2 3504567 RMD160 89bc35e208d3c380e872c361a7e79c00212a98d0 SHA1 a4346f550fd1aae00b861ac18fbcbebcb7a54679 SHA256 ca38e2ab722930a52a56df222a1cac325de6aed3a0e4d9ad09ba8de1712341ea
 EBUILD gwyddion-2.10.ebuild 1153 RMD160 f388128eb472218079dd52a94cd850ccb817fb9e SHA1 4da2c08160a14e95563271c03d73767c05e71c33 SHA256 55b245ffd1efaa4d070802760c29f4489bff7dd64edafe6033b042eade6d79f0
 EBUILD gwyddion-2.24.ebuild 1902 RMD160 05ee2fd611c66818ac1a25707ad22e35172ed325 SHA1 c31e5c7d789e0540b9a4859d712d1a4e91f2032e SHA256 b59038b2a4dda5f4eeda922683499735eeb454ea480f62d21ed5ea0a803a2ffc
-EBUILD gwyddion-2.25.ebuild 1920 RMD160 156e91cadd82920cc78e2c4d73e09a42cabd3737 SHA1 3d02c65e611b81f24747e282a1eee0fb0b727204 SHA256 9078c9d58bcdeb12b486f09f855c698fb6e6aa301dbd1f825f2f3ff8f16361d8
-MISC ChangeLog 4884 RMD160 6af5e75c7425d90db4093bbae39c28a7d558b362 SHA1 89e8f2b9f04ebc40e260e38d0ad6ce3dd427d3c1 SHA256 29db00bb25e31707af9bd9825a1b92d6741aff287a399bff00ae23c253f7e977
+EBUILD gwyddion-2.25.ebuild 1988 RMD160 9557cc0ab6b3546965f22b29ae7bcaea4448603a SHA1 63e584613a97a997dd2a2276c4a9bffe27680414 SHA256 1ad0084003190770c6dda4e5752e4cfa34b2301423e433f9b4b1f75e7e9c06c3
+MISC ChangeLog 5091 RMD160 af7a9e09d246d7656333058fad3d6d351d92ca2c SHA1 733eb828dfcb777912a3cab3353d4ce3d6e5fd15 SHA256 8ea1bd75db7961c4f26e2b3942275db923beee1617b00d69afba77b43f54ef3b
 MISC metadata.xml 604 RMD160 a62411f2a25b2b5521774028b31a48ad6ddc0ef3 SHA1 c4f9e2daa43b4fc26ad7a3cafc06adf78ee5afe6 SHA256 4b4b3d9287a63a11d4ad1078020ad190589da530e743ed78952e6b91caec392f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5WMW0ACgkQAiZjviIA2XidyQCffdlRO+wLaON+Y2e4cBfnnKnf
-hq8AoOSOcpp/7W3VgaNCIQk55yOglWYj
-=zCLo
+iF4EAREIAAYFAk5wvS4ACgkQXkR9YqOcLPFpXQD/Z3vgXTrmkc7cEQpl9nnJUduW
+B3jqbOuPk5JYjrT7WfgBAIEAK3BX6vE+ADGxNDdl8ClQDVPgwC1ymXV8tEU0V5/K
+=4bRi
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch b/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch
new file mode 100644
index 000000000000..f13eaa985ad5
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch
@@ -0,0 +1,10 @@
+--- modules/file/pixmap.c
++++ modules/file/pixmap.c
+@@ -39,6 +39,7 @@
+ #include <gtk/gtk.h>
+ 
+ #ifdef HAVE_PNG
++#include <zlib.h>
+ #include <png.h>
+ #endif
+ 
diff --git a/sci-visualization/gwyddion/gwyddion-2.25.ebuild b/sci-visualization/gwyddion/gwyddion-2.25.ebuild
index 02f83009de36..98ce9e83bc80 100644
--- a/sci-visualization/gwyddion/gwyddion-2.25.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.25.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.25.ebuild,v 1.2 2011/08/25 11:26:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.25.ebuild,v 1.3 2011/09/14 14:40:55 ssuominen Exp $
 
 EAPI=2
 
 PYTHON_DEPEND="python? 2"
 
-inherit fdo-mime gnome2-utils python
+inherit eutils fdo-mime gnome2-utils python
 
 DESCRIPTION="A software framework for SPM data analysis"
 HOMEPAGE="http://gwyddion.net/"
@@ -40,6 +40,10 @@ pkg_setup() {
 	use python && python_set_active_version 2
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
+
 src_configure() {
 	econf \
 		--disable-desktop-file-update \