[gentoo-commits] gentoo-x86 commit in dev-python/matplotlib/files: matplotlib-1.2.0-ft-refcount.patch matplotlib-1.2.0-setup.patch

[Ian Delaney (idella4)]

idella4     12/11/29 10:03:01

  Added:                matplotlib-1.2.0-ft-refcount.patch
                        matplotlib-1.2.0-setup.patch
  Log:
  bump to 1.2.0, test phase upgraded, new ft-refcount.patch from upstream, python3 support but for USE doc requiring  special treatment, ack to users Nicolas Bigaouette and Rafal Muzylo for patches in entered in Bug #443836
  
  (Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

Revision  Changes    Path
1.1                  dev-python/matplotlib/files/matplotlib-1.2.0-ft-refcount.patch

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

Index: matplotlib-1.2.0-ft-refcount.patch
===================================================================
Issue 532; https://github.com/mdboom/matplotlib/commit/81068e9967387ea69133277242a9804d646ea4ef
diff -ur matplotlib-1.2.0.orig/src/ft2font.cpp matplotlib-1.2.0/src/ft2font.cpp
--- src/ft2font.cpp	2012-10-31 08:11:14.000000000 +0800
+++ src/ft2font.cpp	2012-11-29 11:09:43.569808461 +0800
@@ -852,28 +852,24 @@
     {
         std::ostringstream s;
         s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
     else if (error == FT_Err_Cannot_Open_Resource)
     {
         std::ostringstream s;
         s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
     else if (error == FT_Err_Invalid_File_Format)
     {
         std::ostringstream s;
         s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
     else if (error)
     {
         std::ostringstream s;
         s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
 
@@ -891,7 +887,6 @@
     {
         std::ostringstream s;
         s << "Could not set the fontsize for facefile  " << facefile << std::endl;
-        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
 



1.1                  dev-python/matplotlib/files/matplotlib-1.2.0-setup.patch

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

Index: matplotlib-1.2.0-setup.patch
===================================================================
diff -ur matplotlib-1.2.0.orig/setup.py matplotlib-1.2.0/setup.py
--- setup.py	2012-11-08 10:24:12.000000000 +0800
+++ setup.py	2012-11-25 06:55:27.531042898 +0800
@@ -176,15 +176,12 @@
         build_tkagg(ext_modules, packages)
         rc['backend'] = 'TkAgg'
 
-hasgtk = check_for_gtk()
-if options['build_gtk']:
-    if hasgtk or (options['build_gtk'] is True):
-        build_gdk(ext_modules, packages)
-if options['build_gtkagg']:
-    if hasgtk or (options['build_gtkagg'] is True):
-        options['build_agg'] = 1
-        build_gtkagg(ext_modules, packages)
-        rc['backend'] = 'GTKAgg'
+hasgtk = False if sys.version_info[0] >= 3 else True
+if hasgtk and (options['build_gtk'] is True):
+    build_gdk(ext_modules, packages)
+    options['build_agg'] = 1
+    build_gtkagg(ext_modules, packages)
+    rc['backend'] = 'GTKAgg'
 
 if options['build_macosx']:
     if check_for_macosx() or (options['build_macosx'] is True):