conda: update patches

jankatins · jankatins · commit 7753d0e437f2 · 2016-01-25T18:06:55.000+01:00
diff --git a/ci/conda_recipe/cfg_qt4agg.patch b/ci/conda_recipe/cfg_qt4agg.patch
@@ -1,11 +1,13 @@
 diff --git setup.cfg.template setup.cfg.template
-index 8af8b6d..4e4f9d2 100644
+index cae6f67..fd11c79 100644
 --- setup.cfg.template
 +++ setup.cfg.template
-@@ -78,5 +78,5 @@
+@@ -88,7 +88,7 @@
  # if you have disabled the relevent extension modules.  Agg will be used
  # by default.
  #
 -#backend = Agg
 +backend = Qt4Agg
  #
+ 
+ [package_data]
diff --git a/ci/conda_recipe/meta.yaml b/ci/conda_recipe/meta.yaml
@@ -9,8 +9,6 @@ source:
   path: ../../
 
   patches:
-    # A patch to add Tcl directly to the search path on Windows.
-    #- setupext.patch      # [win]
     # A patch to make Qt4Agg the default backend.
     - cfg_qt4agg.patch    # [linux]
     # Patches the matplotlibrc template to default to Qt4.
diff --git a/ci/conda_recipe/osx-tk.patch b/ci/conda_recipe/osx-tk.patch
@@ -1,9 +1,9 @@
 diff --git setupext.py setupext.py
-index 9219c88..e3a9653 100644
+index ddf2ca1..b9e0729 100755
 --- setupext.py
 +++ setupext.py
-@@ -1334,52 +1334,11 @@ class BackendTkAgg(OptionalBackendPackage):
-             ext.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
+@@ -1659,52 +1659,11 @@ class BackendTkAgg(OptionalBackendPackage):
+                 ext.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
  
          elif sys.platform == 'darwin':
 -            # this config section lifted directly from Imaging - thanks to
@@ -16,7 +16,7 @@ index 9219c88..e3a9653 100644
 -                '/Library/Frameworks',
 -                '/System/Library/Frameworks/',
 -            ]
--
+ 
 -            # Find the directory that contains the Tcl.framework and
 -            # Tk.framework bundles.
 -            tk_framework_found = 0
@@ -46,7 +46,7 @@ index 9219c88..e3a9653 100644
 -                # than include a complicated search, this is a
 -                # hard-coded path. It could bail out if X11 libs are
 -                # not found...
- 
+-
 -                # tk_include_dirs.append('/usr/X11R6/include')
 -                frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
 -                ext.include_dirs.extend(tk_include_dirs)
diff --git a/ci/conda_recipe/rctmp_pyside.patch b/ci/conda_recipe/rctmp_pyside.patch
@@ -6,7 +6,7 @@ index fdbbf26..6902fe9 100644
  # You can also deploy your own backend outside of matplotlib by
  # referring to the module name (which must be in the PYTHONPATH) as
  # 'module://my_backend'.
--backend      : %(backend)s
+-backend      : $TEMPLATE_BACKEND
 +backend      : Qt4Agg
  
  # If you are using the Qt4Agg backend, you can choose here
diff --git a/ci/conda_recipe/setupext.patch b/ci/conda_recipe/setupext.patch
