diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 14:40:55 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 14:40:55 +0000 |
| commit | c12b3220d4389dce8decca4b20607ccbafc75b3b (patch) | |
| tree | 969fa8f34cd5bbab5550a52b924c82f22f780124 /sci-visualization | |
| parent | Version bump, drop .la file, remove old. (diff) | |
| download | gentoo-2-c12b3220d4389dce8decca4b20607ccbafc75b3b.tar.gz gentoo-2-c12b3220d4389dce8decca4b20607ccbafc75b3b.tar.bz2 gentoo-2-c12b3220d4389dce8decca4b20607ccbafc75b3b.zip | |
Fix building with libpng15 (missing zlib.h include) wrt #380635 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization')
| -rw-r--r-- | sci-visualization/gwyddion/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch | 10 | ||||
| -rw-r--r-- | sci-visualization/gwyddion/gwyddion-2.25.ebuild | 8 |
3 files changed, 22 insertions, 3 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/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 \ |