8000 conda: update patches · matplotlib/matplotlib@7753d0e · GitHub
[go: up one dir, main page]
Skip to content

Commit 7753d0e

Browse files
jankatinsjankatins
committed
conda: update patches
1 parent f035525 commit 7753d0e

File tree

5 files changed

+10
-40
lines changed

5 files changed

+10
-40
lines changed

‎ci/conda_recipe/cfg_qt4agg.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
diff --git setup.cfg.template setup.cfg.template
2-
index 8af8b6d..4e4f9d2 100644
2+
index cae6f67..fd11c79 100644
33
--- setup.cfg.template
44
+++ setup.cfg.template
5-
@@ -78,5 +78,5 @@
5+
@@ -88,7 +88,7 @@
66
# if you have disabled the relevent extension modules. Agg will be used
77
# by default.
88
#
99
-#backend = Agg
1010
+backend = Qt4Agg
1111
#
12+
13+
[package_data]

‎ci/conda_recipe/meta.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ source:
99
path: ../../
1010

1111
patches:
12-
# A patch to add Tcl directly to the search path on Windows.
13-
#- setupext.patch # [win]
1412
# A patch to make Qt4Agg the default backend.
1513
- cfg_qt4agg.patch # [linux]
1614
# Patches the matplotlibrc template to default to Qt4.

‎ci/conda_recipe/osx-tk.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
diff --git setupext.py setupext.py
2-
index 9219c88..e3a9653 100644
2+
index ddf2ca1..b9e0729 100755
33
--- setupext.py
44
+++ setupext.py
5-
@@ -1334,52 +1334,11 @@ class BackendTkAgg(OptionalBackendPackage):
6-
ext.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
5+
@@ -1659,52 +1659,11 @@ class BackendTkAgg(OptionalBackendPackage):
6+
ext.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
77

88
elif sys.platform == 'darwin':
99
- # this config section lifted directly from Imaging - thanks to
@@ -16,7 +16,7 @@ index 9219c88..e3a9653 100644
1616
- '/Library/Frameworks',
1717
- '/System/Library/Frameworks/',
1818
- ]
19-
-
19+
2020
- # Find the directory that contains the Tcl.framework and
2121
- # Tk.framework bundles.
2222
- tk_framework_found = 0
@@ -46,7 +46,7 @@ index 9219c88..e3a9653 100644
4646
- # than include a complicated search, this is a
4747
- # hard-coded path. It could bail out if X11 libs are
4848
- # not found...
49-
49+
-
5050
- # tk_include_dirs.append('/usr/X11R6/include')
5151
- frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
5252
- ext.include_dirs.extend(tk_include_dirs)

‎ci/conda_recipe/rctmp_pyside.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ index fdbbf26..6902fe9 100644
66
# You can also deploy your own backend outside of matplotlib by
77
# referring to the module name (which must be in the PYTHONPATH) as
88
# 'module://my_backend'.
9-
-backend : %(backend)s
9+
-backend : $TEMPLATE_BACKEND
1010
+backend : Qt4Agg
1111

1212
# If you are using the Qt4Agg backend, you can choose here

‎ci/conda_recipe/setupext.patch

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0