python-matplotlib: update to 3.5.1

This commit is contained in:
Mehdi Chinoune
2022-04-03 15:28:45 +01:00
parent 50cf5f8944
commit aee092110a
2 changed files with 30 additions and 21 deletions

View File

@@ -1,6 +1,6 @@
--- matplotlib-3.3.4/setupext.py.orig 2021-01-28 09:30:28.000000000 +0100
+++ matplotlib-3.3.4/setupext.py 2021-02-07 12:11:03.590667300 +0100
@@ -20,6 +20,7 @@
--- a/setupext.py
+++ b/setupext.py
@@ -19,6 +19,7 @@
_log = logging.getLogger(__name__)
@@ -8,28 +8,28 @@
def _get_xdg_cache_dir():
"""
@@ -146,9 +147,9 @@
@@ -188,9 +189,9 @@
options = {
'backend': config.get('rc_options', 'backend', fallback=None),
'system_freetype': config.getboolean(
- 'libs', 'system_freetype', fallback=sys.platform.startswith('aix')),
+ 'libs', 'system_freetype', fallback=sys.platform.startswith('aix') or MSYS),
'system_qhull': config.getboolean('libs', 'system_qhull',
- fallback=False),
+ fallback=False or MSYS),
'system_qhull': config.getboolean(
- 'libs', 'system_qhull', fallback=False),
+ 'libs', 'system_qhull', fallback=False or MSYS),
}
@@ -171,7 +172,7 @@
@@ -213,7 +214,7 @@
"""
Get path to pkg-config and set up the PKG_CONFIG environment variable.
"""
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not MSYS:
return None
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
pkg_config = os.environ.get('PKG_CONFIG') or 'pkg-config'
if shutil.which(pkg_config) is None:
@@ -223,7 +224,7 @@
@@ -265,7 +266,7 @@
# conda Windows header and library paths.
# https://github.com/conda/conda/issues/2312 re: getting the env dir.