From d3f4f92d01b9aa1089384e43f2571ba0da8875a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Sat, 8 Oct 2022 15:11:53 +0100
Subject: [PATCH] matplotlib: update to 3.6.1

---
 .../001-fix-pointer-declaration.patch         | 19 -------------------
 mingw-w64-python-matplotlib/PKGBUILD          | 11 ++++-------
 2 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 mingw-w64-python-matplotlib/001-fix-pointer-declaration.patch

diff --git a/mingw-w64-python-matplotlib/001-fix-pointer-declaration.patch b/mingw-w64-python-matplotlib/001-fix-pointer-declaration.patch
deleted file mode 100644
index f66fcfb487..0000000000
--- a/mingw-w64-python-matplotlib/001-fix-pointer-declaration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/_tkagg.cpp
-+++ b/src/_tkagg.cpp
-@@ -231,13 +231,13 @@
- {
-     // Try to fill Tcl/Tk global vars with function pointers.  Return whether
-     // all of them have been filled.
--    if (void* ptr = dlsym(lib, "Tcl_SetVar")) {
-+    if (auto ptr = dlsym(lib, "Tcl_SetVar")) {
-         TCL_SETVAR = (Tcl_SetVar_t)ptr;
-     }
--    if (void* ptr = dlsym(lib, "Tk_FindPhoto")) {
-+    if (auto ptr = dlsym(lib, "Tk_FindPhoto")) {
-         TK_FIND_PHOTO = (Tk_FindPhoto_t)ptr;
-     }
--    if (void* ptr = dlsym(lib, "Tk_PhotoPutBlock")) {
-+    if (auto ptr = dlsym(lib, "Tk_PhotoPutBlock")) {
-         TK_PHOTO_PUT_BLOCK = (Tk_PhotoPutBlock_t)ptr;
-     }
-     return TCL_SETVAR && TK_FIND_PHOTO && TK_PHOTO_PUT_BLOCK;
diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD
index a37d32d969..348651d182 100644
--- a/mingw-w64-python-matplotlib/PKGBUILD
+++ b/mingw-w64-python-matplotlib/PKGBUILD
@@ -7,7 +7,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.6.0
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
 arch=('any')
@@ -39,16 +39,13 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python-pyqt5: Qt5Agg/Qt5Cairo backend"
             "${MINGW_PACKAGE_PREFIX}-python-cairo: cairo/GTK3Cairo/Qt5Cairo backend"
             "${MINGW_PACKAGE_PREFIX}-python-tornado: WebAgg backend")
 source=("${_realname}-${pkgver}.tar.gz"::"https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz"
-        setupext.py.patch
-        001-fix-pointer-declaration.patch)
-sha256sums=('c5108ebe67da60a9204497d8d403316228deb52b550388190c53a57394d41531'
-            'fd0cb2d039bc85c97d8b3a1837faa3c560ef4a530f729517ea115917f0f8a972'
-            '316b6d67fd6877553cc4a4a78cf98a2d86295c8aa236717191d1fe78e5364eee')
+        setupext.py.patch)
+sha256sums=('e2d1b7225666f7e1bcc94c0bc9c587a82e3e8691da4757e357e5c2515222ee37'
+            'fd0cb2d039bc85c97d8b3a1837faa3c560ef4a530f729517ea115917f0f8a972')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -p1 -i ${srcdir}/setupext.py.patch
-  patch -p1 -i ${srcdir}/001-fix-pointer-declaration.patch
 
   # Use system freetype and qhull
   sed -e 's|#system_freetype = False|system_freetype = True|' -e 's|#system_qhull = False|system_qhull = True|' mplsetup.cfg.template > mplsetup.cfg