Fix building with libpng14.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index fc747b48cf81d19df35183efaca9a9f8a4f1f7b0..c75f51debdd4625423a7f58f8cb6c636a0c0750b 100644 (file)
--- 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/Manifest b/dev-python/matplotlib/Manifest
index eea150f83034c980b33fc7761c0bcf20ff2b67b4..623068d0c90a12b965cd00dcaf69c8f35dbc5712 100644 (file)
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,8 +1,9 @@
 AUX matplotlib-0.98.5.2-no-xv.patch 368 RMD160 e0d3cf32f2e74f2f6b9dbcb1de603e5588d9be92 SHA1 a4671aac2912d32646d14245d2d25b3a088887b9 SHA256 c03edfaca5b01335b126b88de423923229ec9418d0f81093ff109004c155931d
 AUX matplotlib-0.99.0-freebsd7+.patch 311 RMD160 3c39e6c196b2195691dafcb718fdb2c5d1456121 SHA1 7928d232b5228a22f8cd6897f4eadf75c30aefb0 SHA256 a86e74c7048474768eb1aaa23076454d132ccaf630119dbf3546532f4b96fe85
+AUX matplotlib-0.99.1.1-libpng14.patch 404 RMD160 c259f9acb51b9981da68f14268d0c446184f1501 SHA1 eab90ab67ab4a7757f85e35f14b85c6dc363cc20 SHA256 7d1676f1b508ef27dabccd4efe52d5a47ca23c55735fd9777ae303a612cd1749
 AUX matplotlib-0.99.1.1-prefix.patch 1374 RMD160 f30e66336d6e51414babc63f0cc1e79319f27a3a SHA1 8201f7f5f4ce788aac91acc8cdd1d0ff43ae6a93 SHA256 0cf04d6d5124793af0e89bbf7aa20d821dccb5b7b95eb04aeeaa2723a48345ff
 DIST matplotlib-0.99.1.1.tar.gz 11905737 RMD160 2bd025944eab18d41ddf9f521c00a1f065346738 SHA1 57b5f1e3f0c8866af99f72fca06b4e529acba31d SHA256 1b94b4632ee4dcd41862f2a2e90fdca8f2e6fb108700c06a16e764782da49041
-EBUILD matplotlib-0.99.1.1-r1.ebuild 5483 RMD160 1de7181ab97f678b9bfad8a6bb7ea24b8b191f59 SHA1 7bded56ff64edce444c869198a229dc58179bf00 SHA256 d06e162a4a9e9427d5a9e175faa384634bd93c2d3e82f705f330ca08496b64c9
+EBUILD matplotlib-0.99.1.1-r1.ebuild 5526 RMD160 34593bf7a2f65654743b50e249aeeae3746217b7 SHA1 1f3c1e899b621d8b582066e7d90d3b8e88d14453 SHA256 ad322e5ead36bb118eb5a8c72a46418d025950e18e8397693e739fb9cda3fb0d
 EBUILD matplotlib-0.99.1.1.ebuild 5181 RMD160 b24cdaf858c0b11749b359974e390c2ae3d25a36 SHA1 ef675a41cb5cfd8e623bf2ab4392b26a028a49b0 SHA256 267f2924c889bfb6f6db5bb8eeadb6af40be04bf30c9a5741801cd3429e3145f
-MISC ChangeLog 15930 RMD160 25abb6fd070c5c93b142904b01fbaff5043f353e SHA1 a01d6f5dc8da14122daae03985ab911967762432 SHA256 27018708a5d7f4b01b15e790a17ba167129af19390e154314a891ea9215f051e
+MISC ChangeLog 16091 RMD160 fb00fce64922026b335257b9e04c8772d9c87179 SHA1 665d993f933df5d27608714ba7480a9f96eb15a1 SHA256 9fd64c790256c1ec0f33e8034726e4451cb30f48c538bd725d8c2b26e7714079
 MISC metadata.xml 640 RMD160 5a3412572c06b5f54b7570a6d42e503b5711b8b9 SHA1 dbdefc26499cd67470a363f54fcb928f2f510fcf SHA256 6643fb3ec5019f58c1a7af76a25d791f1109c37929b3332ddbe1a2911f5de3b4

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 (file)
index 0000000..bcdcb14
--- /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 ca512ef209fe243164afe6ba7977d607884615e9..97e0a5f7e67cd0da27092438f16c3733a54a6b43 100644 (file)
--- 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() {