diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 17:54:03 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 17:54:03 +0000 |
| commit | 67b04fd9fc67f31d46f3c233895f8666a054c5f7 (patch) | |
| tree | c9cb9b32819c3b1256c839ebf9ae727b28ea0f32 /dev-python/matplotlib | |
| parent | Marking fwbuilder-3.0.7 ppc64 for bug 285861 (diff) | |
| download | gentoo-2-67b04fd9fc67f31d46f3c233895f8666a054c5f7.tar.gz gentoo-2-67b04fd9fc67f31d46f3c233895f8666a054c5f7.tar.bz2 gentoo-2-67b04fd9fc67f31d46f3c233895f8666a054c5f7.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/matplotlib')
| -rw-r--r-- | dev-python/matplotlib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch | 13 | ||||
| -rw-r--r-- | dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog index fc747b48cf81..c75f51debdd4 100644 --- a/dev-python/matplotlib/ChangeLog +++ b/dev-python/matplotlib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/matplotlib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.81 2010/02/10 22:43:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.82 2010/03/08 17:54:02 ssuominen Exp $ + + 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + matplotlib-0.99.1.1-r1.ebuild, +files/matplotlib-0.99.1.1-libpng14.patch: + Fix building with libpng14. 10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> matplotlib-0.99.1.1.ebuild, matplotlib-0.99.1.1-r1.ebuild: diff --git a/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch b/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch new file mode 100644 index 000000000000..bcdcb14e0673 --- /dev/null +++ b/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch @@ -0,0 +1,13 @@ +http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg209718.html + +--- src/_png.cpp ++++ src/_png.cpp +@@ -290,7 +290,7 @@ + + //free the png memory + png_read_end(png_ptr, info_ptr); +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(fp); + for (row = 0; row < height; row++) + delete [] row_pointers[row]; diff --git a/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild b/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild index ca512ef209fe..97e0a5f7e67c 100644 --- a/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild +++ b/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild,v 1.3 2010/02/10 22:43:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild,v 1.4 2010/03/08 17:54:02 ssuominen Exp $ EAPI="2" PYTHON_DEPEND="2" @@ -134,6 +134,8 @@ src_prepare() { # remove pyparsing only when upstream pyparsing included matplotlib # fixes. See bug #260025 #rm -f lib/matplotlib/pyparsing.py + + epatch "${FILESDIR}"/${P}-libpng14.patch } src_compile() { |