From 725405d414a862d39f4d75bccd8b9e3992e5d474 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Thu, 5 Mar 2020 08:47:22 +0300
Subject: [PATCH] python-matplotlib: Update to 3.2.0

---
 mingw-w64-python-matplotlib/PKGBUILD          |  6 ++--
 mingw-w64-python-matplotlib/setupext.py.patch | 32 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD
index 57071b4406..be6d847c3b 100644
--- a/mingw-w64-python-matplotlib/PKGBUILD
+++ b/mingw-w64-python-matplotlib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.1.3
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
 arch=('any')
@@ -30,9 +30,9 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python-pyqt5: Qt5Agg/Qt5Cairo backend"
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v${pkgver}.tar.gz"
         "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip"
         setupext.py.patch)
-sha256sums=('6edfe021671fcad1bd6081c980c380cb3d66d00895eb8c3450fa3842c441d1d1'
+sha256sums=('82239f040054260a34e19d381c6d3f3729929599c444b613d115e1e30526ac17'
             'f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d'
-            '329283ed24e3f91a628f204885d296dec1d8ad0e0dda2ef58a53a08c6ab8d959')
+            'a2f0e6b9f7e40881cb1b83025f8797e1431d97068189c2a0468bb84f7ce28945')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
diff --git a/mingw-w64-python-matplotlib/setupext.py.patch b/mingw-w64-python-matplotlib/setupext.py.patch
index 77585e5763..4457a26fc2 100644
--- a/mingw-w64-python-matplotlib/setupext.py.patch
+++ b/mingw-w64-python-matplotlib/setupext.py.patch
@@ -8,21 +8,21 @@
  
  def _get_xdg_cache_dir():
      """
-@@ -220,7 +221,7 @@
-     def __init__(self):
-         """Determines whether pkg-config exists on this machine."""
-         self.pkg_config = None
--        if sys.platform != 'win32':
-+        if sys.platform != 'win32' or MSYS:
-             pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
-             if shutil.which(pkg_config) is not None:
-                 self.pkg_config = pkg_config
+@@ -232,7 +233,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')
+     if shutil.which(pkg_config) is None:
 @@ -276,7 +277,7 @@
  
-         # conda Windows header and library paths.
-         # https://github.com/conda/conda/issues/2312 re: getting the env dir.
--        if sys.platform == 'win32':
-+        if sys.platform == 'win32' and not MSYS:
-             conda_env_path = (os.getenv('CONDA_PREFIX')  # conda >= 4.1
-                               or os.getenv('CONDA_DEFAULT_ENV'))  # conda < 4.1
-             if conda_env_path and os.path.isdir(conda_env_path):
+     # conda Windows header and library paths.
+     # https://github.com/conda/conda/issues/2312 re: getting the env dir.
+-    if sys.platform == 'win32':
++    if sys.platform == 'win32' and not MSYS:
+         conda_env_path = (os.getenv('CONDA_PREFIX')  # conda >= 4.1
+                           or os.getenv('CONDA_DEFAULT_ENV'))  # conda < 4.1
+         if conda_env_path and os.path.isdir(conda_env_path):