[gentoo-commits] gentoo-x86 commit in dev-python/matplotlib/files: matplotlib-0.99.1.1-eintr.patch matplotlib-0.99.1.1-libpng14.patch matplotlib-0.99.1.1-docs.patch matplotlib-0.99.1.1-gtk-tooltip.patch

[Sebastien Fabbro (bicatali)]

bicatali    10/05/31 20:23:16

  Modified:             matplotlib-0.99.1.1-libpng14.patch
  Added:                matplotlib-0.99.1.1-eintr.patch
                        matplotlib-0.99.1.1-docs.patch
                        matplotlib-0.99.1.1-gtk-tooltip.patch
  Log:
  Added a few useful patches from upstream. Now use default config before documentation generation (fix bug #307881). Cleaning some dependencies, and allow png-1.4 patch to work with previous versions too
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch?r1=1.1&r2=1.2

Index: matplotlib-0.99.1.1-libpng14.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-libpng14.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- matplotlib-0.99.1.1-libpng14.patch	8 Mar 2010 17:54:03 -0000	1.1
+++ matplotlib-0.99.1.1-libpng14.patch	31 May 2010 20:23:16 -0000	1.2
@@ -2,12 +2,14 @@
 
 --- src/_png.cpp
 +++ src/_png.cpp
-@@ -290,7 +290,7 @@
+@@ -290,7 +290,9 @@
  
    //free the png memory
    png_read_end(png_ptr, info_ptr);
 -  png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++#ifndef png_infopp_NULL
 +  png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
++#endif
    fclose(fp);
    for (row = 0; row < height; row++)
      delete [] row_pointers[row];



1.1                  dev-python/matplotlib/files/matplotlib-0.99.1.1-eintr.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-eintr.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-eintr.patch?rev=1.1&content-type=text/plain

Index: matplotlib-0.99.1.1-eintr.patch
===================================================================
--- lib/matplotlib/font_manager.py	2009/11/12 17:27:34	7952
+++ lib/matplotlib/font_manager.py	2009/11/12 17:28:22	7953
@@ -42,7 +42,7 @@
             see license/LICENSE_TTFQUERY.
 """
 
-import os, sys, glob
+import os, sys, glob, subprocess
 try:
     set
 except NameError:
@@ -292,16 +292,12 @@
     grab all of the fonts the user wants to be made available to
     applications, without needing knowing where all of them reside.
     """
-    try:
-        import commands
-    except ImportError:
-        return {}
-
     fontext = get_fontext_synonyms(fontext)
 
     fontfiles = {}
-    status, output = commands.getstatusoutput("fc-list file")
-    if status == 0:
+    pipe = subprocess.Popen(['fc-list', '', 'file'], stdout=subprocess.PIPE)
+    output = pipe.communicate()[0]
+    if pipe.returncode == 0:
         for line in output.split('\n'):
             fname = line.split(':')[0]
             if (os.path.splitext(fname)[1][1:] in fontext and
@@ -1244,11 +1240,11 @@
     import re
 
     def fc_match(pattern, fontext):
-        import commands
         fontexts = get_fontext_synonyms(fontext)
         ext = "." + fontext
-        status, output = commands.getstatusoutput('fc-match -sv "%s"' % pattern)
-        if status == 0:
+        pipe = subprocess.Popen(['fc-match', '-sv', pattern], stdout=subprocess.PIPE)
+        output = pipe.communicate()[0]
+        if pipe.returncode == 0:
             for match in _fc_match_regex.finditer(output):
                 file = match.group(1)
                 if os.path.splitext(file)[1][1:] in fontexts:



1.1                  dev-python/matplotlib/files/matplotlib-0.99.1.1-docs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-docs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-docs.patch?rev=1.1&content-type=text/plain

Index: matplotlib-0.99.1.1-docs.patch
===================================================================
Description: Pass DPI, along with format, in plot format configuration
Forwarded: yes
Author: Sandro Tosi <morph@××××××.org>

diff -urNad matplotlib~/doc/make.py matplotlib/doc/make.py
--- matplotlib~/doc/make.py	2009-08-01 21:14:12.000000000 +0200
+++ matplotlib/doc/make.py	2009-10-09 08:56:04.000000000 +0200
@@ -30,7 +30,7 @@
     check_build()
     shutil.copy('../lib/matplotlib/mpl-data/matplotlibrc', '_static/matplotlibrc')
     if small_docs:
-        options = "-D plot_formats=\"['png']\""
+        options = "-D plot_formats=\"[('png', 80)]\""
     else:
         options = ''
     if os.system('sphinx-build %s -P -b html -d build/doctrees . build/html' % options):



1.1                  dev-python/matplotlib/files/matplotlib-0.99.1.1-gtk-tooltip.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-gtk-tooltip.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-0.99.1.1-gtk-tooltip.patch?rev=1.1&content-type=text/plain

Index: matplotlib-0.99.1.1-gtk-tooltip.patch
===================================================================
--- lib/matplotlib/backends/backend_gtk.py	2010/02/18 14:54:30	8141
+++ lib/matplotlib/backends/backend_gtk.py	2010/03/20 22:49:25	8203
@@ -17,6 +17,8 @@
                       % (gtk.pygtk_version + pygtk_version_required))
 del pygtk_version_required
 
+_new_tooltip_api =  (gtk.pygtk_version[1] >= 12)
+
 import matplotlib
 from matplotlib import verbose
 from matplotlib._pylab_helpers import Gcf
@@ -448,7 +450,7 @@
                 # diong a blanket catch here, but an not sure what a
                 # better way is - JDH
                 verbose.report('Could not load matplotlib icon: %s' % sys.exc_info()[1])
-                
+
         self.vbox = gtk.VBox()
         self.window.add(self.vbox)
         self.vbox.show()
@@ -618,7 +620,8 @@
 
     def _init_toolbar2_4(self):
         basedir = os.path.join(matplotlib.rcParams['datapath'],'images')
-        self.tooltips = gtk.Tooltips()
+        if not _new_tooltip_api:
+            self.tooltips = gtk.Tooltips()
 
         for text, tooltip_text, image_file, callback in self.toolitems:
             if text is None:
@@ -630,7 +633,10 @@
             tbutton = gtk.ToolButton(image, text)
             self.insert(tbutton, -1)
             tbutton.connect('clicked', getattr(self, callback))
-            tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
+            if _new_tooltip_api:
+                tbutton.set_tooltip_text(tooltip_text)
+            else:
+                tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
 
         toolitem = gtk.SeparatorToolItem()
         self.insert(toolitem, -1)
@@ -760,7 +766,8 @@
     def _create_toolitems_2_4(self):
         # use the GTK+ 2.4 GtkToolbar API
         iconSize = gtk.ICON_SIZE_SMALL_TOOLBAR
-        self.tooltips = gtk.Tooltips()
+        if not _new_tooltip_api:
+            self.tooltips = gtk.Tooltips()
 
         for text, tooltip_text, image_num, callback, callback_arg, scroll \
                 in self.toolitems:
@@ -778,15 +785,22 @@
                 tbutton.connect('clicked', getattr(self, callback))
             if scroll:
                 tbutton.connect('scroll_event', getattr(self, callback))
-            tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
+            if _new_tooltip_api:
+                tbutton.set_tooltip_text(tooltip_text)
+            else:
+                tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
 
         # Axes toolitem, is empty at start, update() adds a menu if >=2 axes
         self.axes_toolitem = gtk.ToolItem()
         self.insert(self.axes_toolitem, 0)
-        self.axes_toolitem.set_tooltip (
-            self.tooltips,
-            tip_text='Select axes that controls affect',
-            tip_private = 'Private')
+        if _new_tooltip_api:
+            self.axes_toolitem.set_tooltip_text(
+                                'Select axes that controls affect')
+        else:
+            self.axes_toolitem.set_tooltip (
+                self.tooltips,
+                tip_text='Select axes that controls affect',
+                tip_private = 'Private')
 
         align = gtk.Alignment (xalign=0.5, yalign=0.5, xscale=0.0, yscale=0.0)
         self.axes_toolitem.add(align)