Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/matplotlib/files: matplotlib-0.99.1.1-libpng14.patch
Date: Mon, 31 May 2010 20:38:45
Message-Id: 20100531203842.783852CAD8@corvid.gentoo.org
1 bicatali 10/05/31 20:38:42
2
3 Modified: matplotlib-0.99.1.1-libpng14.patch
4 Log:
5 Revert libpng14 patch, useless according to ssuominen
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.3 dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch?r1=1.2&r2=1.3
14
15 Index: matplotlib-0.99.1.1-libpng14.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- matplotlib-0.99.1.1-libpng14.patch 31 May 2010 20:23:16 -0000 1.2
22 +++ matplotlib-0.99.1.1-libpng14.patch 31 May 2010 20:38:42 -0000 1.3
23 @@ -2,14 +2,12 @@
24
25 --- src/_png.cpp
26 +++ src/_png.cpp
27 -@@ -290,7 +290,9 @@
28 +@@ -290,7 +290,7 @@
29
30 //free the png memory
31 png_read_end(png_ptr, info_ptr);
32 - png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
33 -+#ifndef png_infopp_NULL
34 + png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
35 -+#endif
36 fclose(fp);
37 for (row = 0; row < height; row++)
38 delete [] row_pointers[row];