Merge branch 'msys2:master' into mingw-w64-krpc-cpp-git

2021-09-22 17:10:00 -04:00
parent ab7ec8ceb3 532bdc9f2c
commit aef78f97e1
196 changed files with 2420 additions and 3304 deletions
--- a/mingw-w64-curl/PKGBUILD
+++ b/mingw-w64-curl/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-winssl")
-pkgver=7.79.0
+pkgver=7.79.1
 pkgrel=1
 pkgdesc="Command line tool and library for transferring data with URLs. (mingw-w64)"
 arch=('any')
@@ -36,7 +36,7 @@ source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//.
        "0001-Make-cURL-relocatable.patch"
        "0002-nghttp2-static.patch"
        "0003-libpsl-static-libs.patch")
-sha256sums=('2a1420076f9ffc35c982c78e85b7a69e2ef5d532267895fdb2eac16ad9b680c9'
+sha256sums=('0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689'
            'SKIP'
            '6f1016e6647b6340fdceefaf24ff391f4c0ea3c785ddf70c9794ca2356797888'
            '6ce4dcf4ef6c4bce48dbcb6f1b5226baf79f74ac76719fb0c06419a0aadb37a3'
--- a/mingw-w64-flint/PKGBUILD
+++ b/mingw-w64-flint/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Ben Orchard <thefirstmuffinman@gmail.com>
+
+_realname=flint
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgver=2.8.0
+pkgrel=1
+pkgdesc="Fast Library for Number Theory (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+depends=("${MINGW_PACKAGE_PREFIX}-mpfr"
+         "${MINGW_PACKAGE_PREFIX}-gmp")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
+license=('LGPL2.1')
+url="https://www.flintlib.org/"
+source=(https://www.flintlib.org/${_realname}-${pkgver}.tar.gz)
+sha256sums=('584235cdc39d779d9920eaef16fe084f3c26ffeeea003a3fff64a20a0f33449e')
+
+build() {
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}"
+
+  cd "${srcdir}/build-${MSYSTEM}"
+
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+  cmake \
+    -G Ninja \
+    -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=true \
+    "../${_realname}-${pkgver}"
+
+  cmake --build .
+}
+
+check() {
+  cd "${srcdir}/build-${MSYSTEM}"
+  cmake --build . --target test
+}
+
+package() {
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR="${pkgdir}" cmake --install .
+  install -Dm0644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+}
--- a/mingw-w64-gi-docgen/PKGBUILD
+++ b/mingw-w64-gi-docgen/PKGBUILD
@@ -4,8 +4,8 @@ _pyname=gi-docgen
 _realname=gi-docgen
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=2021.6
-pkgrel=2
+pkgver=2021.7
+pkgrel=1
 pkgdesc='Documentation tool for GObject-based libraries (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -25,7 +25,7 @@ makedepends=(
 source=(
  "${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
 )
-sha256sums=('369c6da3a83b49f7bad5dc5538dd78173a6a81855ccec4507c99d719fa10194f')
+sha256sums=('0fd3f22b02204931d8feb4279fa00d4310d0b8a1f94d14025d440cddb4fe3e0a')

 prepare() {  
  cd "$srcdir"
--- a/mingw-w64-libuv/0001-workaround-for-mingw-w64.patch
+++ b/mingw-w64-libuv/0001-workaround-for-mingw-w64.patch
@@ -1,10 +0,0 @@
--- a/src/win/util.c
-+++ b/src/win/util.c
-@@ -1662,6 +1662,7 @@
-   return 0;
- }
- 
-+WINSOCK_API_LINKAGE int WSAAPI GetHostNameW(PWSTR name, int namelen);
- 
- int uv_os_gethostname(char* buffer, size_t* size) {
-   WCHAR buf[UV_MAXHOSTNAMESIZE];
--- a/mingw-w64-libuv/PKGBUILD
+++ b/mingw-w64-libuv/PKGBUILD
@@ -5,7 +5,7 @@ _realname=libuv
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.42.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform asynchronous I/O (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -15,16 +15,23 @@ makedepends=()
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 options=('staticlibs' 'strip')
 source=(https://dist.libuv.org/dist/v${pkgver}/libuv-v${pkgver}.tar.gz{,.sign}
-        "0001-workaround-for-mingw-w64.patch")
+        "string-encoding-uv_os_gethostname.patch::https://github.com/libuv/libuv/commit/95f88f4.patch")
 sha256sums=('43129625155a8aed796ebe90b8d4c990a73985ec717de2b2d5d3a23cfe4deb72'
            'SKIP'
-            '2422256061c8d77b2646bc1d162d0922eea1185f5f004bd49689ec1894d67770')
+            '18e4c2af57254f0550c684d48b259b54f9bcad27b4286aad1d8c4e5ec0932fc5')
 # PGP key IDs are available from https://github.com/libuv/libuv/blob/v1.x/MAINTAINERS.md
 validpgpkeys=('AEAD0A4B686767751A0E4AEF34A25FB128246514') # Jameson Nash <vtjnash@gmail.com>"

 prepare() {
  cd "${srcdir}/${_realname}-v${pkgver}"
-  patch -p1 -i "${srcdir}/0001-workaround-for-mingw-w64.patch"
+
+  # Revert the upstream commit to support Windows 7  because
+  # GetHostNameW is supported from Windows 8. But this also
+  # reintroduces issue in uv_os_gethostname() which returns
+  # grabled code if the name contains non ascii characters
+  # https://github.com/msys2/MINGW-packages/issues/9632
+
+  patch -R -p1 -i "${srcdir}/string-encoding-uv_os_gethostname.patch"

 ./autogen.sh
 }
--- a/mingw-w64-libvirt-glib/001-disable-glib-max-version.patch
+++ b/mingw-w64-libvirt-glib/001-disable-glib-max-version.patch
@@ -0,0 +1,10 @@
+--- a/meson.build	2021-09-22 11:56:17.941233800 -0700
+++ b/meson.build	2021-09-22 11:58:57.734639500 -0700
+@@ -51,7 +51,6 @@
+ libxml_dep = dependency('libxml-2.0', version: libxml_min_version)
+ 
+ add_global_arguments('-DGLIB_VERSION_MIN_REQUIRED=@0@'.format(glib_min_version_symbol), language: 'c')
+-add_global_arguments('-DGLIB_VERSION_MAX_ALLOWED=@0@'.format(glib_min_version_symbol), language: 'c')
+ 
+ prefix = get_option('prefix')
+ localedir = join_paths(prefix, get_option('localedir'))
--- a/mingw-w64-libvirt-glib/001-win.patch
+++ b/mingw-w64-libvirt-glib/001-win.patch
@@ -1,12 +0,0 @@
--- ./libvirt-gobject/Makefile.am.orig	2016-07-18 10:03:46.534356500 +0200
-+++ ./libvirt-gobject/Makefile.am	2016-07-18 10:06:01.550863500 +0200
-@@ -94,7 +94,8 @@
- 			$(COVERAGE_CFLAGS:-f%=-Wc,f%) \
- 			$(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) \
- 			-Wl,--version-script=$(srcdir)/libvirt-gobject.sym \
-			-version-info $(LIBVIRT_GLIB_VERSION_INFO)
-+			-version-info $(LIBVIRT_GLIB_VERSION_INFO) \
-+			-no-undefined
- 
- libvirt-gobject-enums.c: $(libvirt_gobject_1_0_la_HEADERS)
- 	$(AM_V_GEN)glib-mkenums \
--- a/mingw-w64-libvirt-glib/002-disable-stack-protector-windows.patch
+++ b/mingw-w64-libvirt-glib/002-disable-stack-protector-windows.patch
@@ -0,0 +1,11 @@
+--- a/meson.build	2021-09-22 11:56:17.941233800 -0700
+++ b/meson.build	2021-09-22 12:20:40.171597100 -0700
+@@ -381,7 +381,7 @@
+ 
+ # on aarch64 error: -fstack-protector not supported for this target
+ if host_machine.cpu_family() != 'aarch64'
+-  if host_machine.system() in [ 'linux', 'freebsd', 'windows' ]
+  if host_machine.system() in [ 'linux', 'freebsd' ]
+     # we prefer -fstack-protector-strong but fallback to -fstack-protector-all
+     fstack_cflags = cc.first_supported_argument([
+       '-fstack-protector-strong',
--- a/mingw-w64-libvirt-glib/PKGBUILD
+++ b/mingw-w64-libvirt-glib/PKGBUILD
@@ -3,59 +3,70 @@
 _realname=libvirt-glib
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.0.0
+pkgver=4.0.0
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 pkgdesc="libvirt GLib and GObject mapping library (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
+         #"${MINGW_PACKAGE_PREFIX}-libssp" # disabled due to gir issue
         "${MINGW_PACKAGE_PREFIX}-libxml2"
         "${MINGW_PACKAGE_PREFIX}-libvirt")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "gtk-doc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
+             "${MINGW_PACKAGE_PREFIX}-gtk-doc"
             "${MINGW_PACKAGE_PREFIX}-vala"
             "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
             "${MINGW_PACKAGE_PREFIX}-pkg-config")
-options=('!strip' 'debug' 'staticlibs')
+options=('strip' '!debug' 'staticlibs')
 license=("LGPL 2.1")
 url="https://www.gnome.org/"
 #install=${_realname}-${CARCH}.install
-source=(https://libvirt.org/sources/glib/${_realname}-${pkgver}.tar.gz
-        001-win.patch)
-sha256sums=('7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe'
-            '8f787245ffc5d91f628c1965a45baf0af61eb3afcf4da8642b763e578275c6c9')
+source=(https://libvirt.org/sources/glib/${_realname}-${pkgver}.tar.xz{,.asc}
+        001-disable-glib-max-version.patch
+        002-disable-stack-protector-windows.patch)
+sha256sums=('8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd'
+            'SKIP'
+            'e61628e47a80adc66e215a81c8d4eeac4b556b85c3bc96553a8ab6dc49e8f33b'
+            '5861775ea76ce66219d0494a726a59ecc8015e89be3f4ec4c3765fe561c76cda')
+validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF') # Daniel P. Berrange

 prepare() {
  cd ${_realname}-${pkgver}
-  patch -p1 -i ${srcdir}/001-win.patch

-  autoreconf -fi
+  patch -Nbp1 -i "${srcdir}/001-disable-glib-max-version.patch"
+  # https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/176,
+  # via https://github.com/mesonbuild/meson/issues/1910.
+  # Blowing up with -fstack-protector on mingw for the same reasons
+  patch -Nbp1 -i "${srcdir}/002-disable-stack-protector-windows.patch"
 }

 build() {
  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}

-  mkdir -p docs/libvirt-gconfig/html
-  cp -rf ../${_realname}-${pkgver}/docs/libvirt-gconfig/html/* docs/libvirt-gconfig/html
-  mkdir -p docs/libvirt-glib/html
-  cp -rf ../${_realname}-${pkgver}/docs/libvirt-glib/html/* docs/libvirt-glib/html
-  mkdir -p docs/libvirt-gobject/html
-  cp -rf ../${_realname}-${pkgver}/docs/libvirt-gobject/html/* docs/libvirt-gobject/html
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("--buildtype=release")
+  else
+    _extra_config+=("--buildtype=debug")
+  fi

-  ../${_realname}-${pkgver}/configure \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
-    --build=${MINGW_CHOST} \
-    --prefix=${MINGW_PREFIX} \
-    --libexecdir=${MINGW_PREFIX}/lib
+  MSYS2_ARG_CONV_EXCL="--prefix=" \
+  ${MINGW_PREFIX}/bin/meson.exe \
+    --prefix="${MINGW_PREFIX}" \
+    "${_extra_config[@]}" \
+    --wrap-mode=nodownload \
+    --default-library=both \
+    --auto-features=enabled \
+    -Dgit_werror=disabled \
+    "../${_realname}-${pkgver}"

-  make
+  ${MINGW_PREFIX}/bin/meson.exe compile
 }

 package() {
  cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR=$pkgdir install
+
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install
  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
--- a/mingw-w64-libvirt/PKGBUILD
+++ b/mingw-w64-libvirt/PKGBUILD
@@ -3,9 +3,9 @@
 _realname=libvirt
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
-_pkgdev=7.0.0
+_pkgdev=7.7.0
 pkgver=${_pkgdev//-/}
-pkgrel=2
+pkgrel=1
 pkgdesc="Windows libvirt virtualization library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -24,9 +24,7 @@ depends=(${MINGW_PACKAGE_PREFIX}-curl
         ${MINGW_PACKAGE_PREFIX}-portablexdr
         ${MINGW_PACKAGE_PREFIX}-readline
         ${MINGW_PACKAGE_PREFIX}-yajl)
-makedepends=(${MINGW_PACKAGE_PREFIX}-gcc
-             ${MINGW_PACKAGE_PREFIX}-meson
-             ${MINGW_PACKAGE_PREFIX}-ninja
+makedepends=(${MINGW_PACKAGE_PREFIX}-meson
             ${MINGW_PACKAGE_PREFIX}-pkg-config
             ${MINGW_PACKAGE_PREFIX}-python
             ${MINGW_PACKAGE_PREFIX}-python-docutils
@@ -34,16 +32,18 @@ makedepends=(${MINGW_PACKAGE_PREFIX}-gcc
             rpcsvc-proto
             perl)
 options=('strip' 'staticlibs')
-source=(https://libvirt.org/sources/${_realname}-${_pkgdev}.tar.xz
+source=("https://libvirt.org/sources/${_realname}-${_pkgdev}.tar.xz"{,.asc}
        001-fix-not-supported-authenticate-method.patch
        002-search-path.patch
        msys-rpcgen-as-portable.patch
        meson-drop-path-for-python.patch)
-sha256sums=('ca3833844d08c22867f1d1a46edc36bda7d6fe1a4f267e7d77100b79fc9ddd89'
+sha256sums=('1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2'
+            'SKIP'
            '4635fd04e596879186b74ef9ddbacf64f6058e32bfd8d8376e1b7fa7838f679b'
            '38ced91a3a7f569ecaa4d738c1fe530604bf96ed26458559be398e30a2fa1829'
            '54eb6af16a1d001eab81dbc4352ff82a2349242d9f9f3f87eb45f75e8fc8a08d'
            'fda18a489451cee114a6f02fd561afe8731e1a30cf70b754bcca6434176859ad')
+validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar@redhat.com>
 noextract=(${_realname}-${_pkgdev}.tar.xz)

 prepare() {
@@ -92,12 +92,17 @@ build() {
    -Dexpensive_tests=disabled \
    ../${_realname}-${_pkgdev%-*}

-  ninja
+  meson compile
+}
+
+check() {
+  cd ${srcdir}/build-${MINGW_CHOST}
+  meson test || true
 }

 package() {
  cd ${srcdir}/build-${MINGW_CHOST}
-  DESTDIR="${pkgdir}" ninja install
+  DESTDIR="${pkgdir}" meson install

  install -Dm644 ${srcdir}/${_realname}-${_pkgdev%-*}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
  install -Dm644 ${srcdir}/${_realname}-${_pkgdev%-*}/COPYING.LESSER "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LESSER"
--- a/mingw-w64-mesa/PKGBUILD
+++ b/mingw-w64-mesa/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=mesa
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=21.2.1
+pkgver=21.2.2
 pkgrel=1
 pkgdesc="Open-source implementation of the OpenGL specification (mingw-w64)"
 arch=('any')
@@ -27,7 +27,7 @@ license=('MIT')
 options=('staticlibs' 'strip')
 source=(https://mesa.freedesktop.org/archive/${_realname}-${pkgver}.tar.xz{,.sig}
        llvmwrapgen.sh)
-sha256sums=('2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787'
+sha256sums=('c4aaf1bf974217ed825e1c536de6ab72a4e266d44bcf69fc4ec499039f99e5c4'
            'SKIP'
            '69f21522f20c10f5699dfe3e128aa88d4fedde816f6e8df1506d7470c44bf3da')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
--- a/mingw-w64-openscad/001-openscad-2021-libintl-collisions.patch
+++ b/mingw-w64-openscad/001-openscad-2021-libintl-collisions.patch
@@ -0,0 +1,22 @@
+diff --git a/src/printutils.h b/src/printutils.h
+index 5f887f0ef..0bb021eb4 100644
+--- a/src/printutils.h
+++ b/src/printutils.h
+@@ -6,8 +6,17 @@
+ #include <boost/format.hpp>
+ #include <boost/algorithm/string.hpp>
+ #include <utility>
+
+ #include <libintl.h>
+// Undefine some defines from libintl.h to presolve
+// some collisions in boost headers later
+#if defined snprintf
+ #undef snprintf
+#endif
+#if defined vsnprintf
+#undef vsnprintf
+#endif
+
+ #include <locale.h>
+ #include "AST.h"
+ #include <set>
--- a/mingw-w64-openscad/PKGBUILD
+++ b/mingw-w64-openscad/PKGBUILD
@@ -4,7 +4,7 @@ _realname=openscad
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2021.01
-pkgrel=4
+pkgrel=6
 pkgdesc="The programmers solid 3D CAD modeller (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -31,11 +31,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
             "${MINGW_PACKAGE_PREFIX}-eigen3"
             "${MINGW_PACKAGE_PREFIX}-imagemagick")
 options=(!strip staticlibs)
-source=("https://files.openscad.org/${_realname}-${pkgver}.src.tar.gz")
-sha256sums=('d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359')
+source=("https://files.openscad.org/${_realname}-${pkgver}.src.tar.gz"
+        '001-openscad-2021-libintl-collisions.patch')
+sha256sums=('d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359'
+            'f295d41896cc55f6645e080e527ba3d033357bc744b7f7bb01b9271974ee930e')

 prepare() {
  cd "${srcdir}/${_realname}-${pkgver}"
+  patch -p1 -i "${srcdir}/001-openscad-2021-libintl-collisions.patch"
  #rm -f libraries/MCAD/*.py
 }

--- a/mingw-w64-pastix/PKGBUILD
+++ b/mingw-w64-pastix/PKGBUILD
@@ -4,7 +4,7 @@ _realname=pastix
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=6.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc='High performance parallel solver for very large sparse linear systems based on direct methods (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -16,11 +16,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-openblas"
         "${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-ninja"
             "${MINGW_PACKAGE_PREFIX}-cmake")
-provides=('spm')
+provides=("${MINGW_PACKAGE_PREFIX}-spm")
 license=('LGPL')
 url="https://gitlab.inria.fr/solverstack/pastix"
-source=("https://gitlab.inria.fr/solverstack/pastix//uploads/baa57033d98378e0f3affbf45900fb6e/${_realname}-${pkgver}.tar.gz")
-sha256sums=('50742CC0E6E03728F7529FC607D5C65B9E14205F192947678D6103A872A6210C')
+source=("https://gitlab.inria.fr/solverstack/pastix//uploads/3fc798eb3ca6282e21506349df7f9da2/${_realname}-${pkgver}.tar.gz")
+sha256sums=('B680CBFC265DF8CBA18D3A7093FCC02E260198C4A2D6A86D1E684BB291E309DD')

 build() {
  local _arch_opt=""
--- a/mingw-w64-python-build/PKGBUILD
+++ b/mingw-w64-python-build/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=build
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=0.5.1
-pkgrel=2
+pkgver=0.6.0.post1
+pkgrel=1
 pkgdesc="A simple, correct PEP517 package builder (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -13,7 +13,7 @@ license=('MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python-colorama"
         "${MINGW_PACKAGE_PREFIX}-python-packaging"
         "${MINGW_PACKAGE_PREFIX}-python-pep517"
-         "${MINGW_PACKAGE_PREFIX}-python-toml"
+         "${MINGW_PACKAGE_PREFIX}-python-tomli"
         "${MINGW_PACKAGE_PREFIX}-python-virtualenv")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
@@ -21,7 +21,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
            "${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-$pkgver.tar.gz"::"https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz"
        "0001-pass-ignore_errors-to-shutil.patch")
-sha512sums=('72e82ed1f4d6185a862726b2c2f3b4bd05c3105ff5c3bf8e7595c0c1e0ab457304eda7849c2312e41a3bb4a9262c1099263fc87c3a759fc801dbe5cb6ccaef52'
+sha512sums=('44e74173942471fde980958eedacfa44e1f322a27a0bde6bd42acece5e9d1cb8929ad6011dd867be6fdc5ff88c0617510d587b58dd19995749d0eecfb61bbe6e'
            '759940325ebaa073f3adb6b59b9afc8a7bf85583db1b98d48effca2f4c26602b134905778a72041855eef177cca317d9804c89f76d0a51262688f2c0274c9dd7')


--- a/mingw-w64-python-faker/PKGBUILD
+++ b/mingw-w64-python-faker/PKGBUILD
@@ -6,8 +6,8 @@ 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=8.9.1
-pkgrel=2
+pkgver=8.12.1
+pkgrel=1
 pkgdesc="Faker generates fake data for you (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -21,7 +21,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-ukpostcodeparser"
              "${MINGW_PACKAGE_PREFIX}-python-email-validator")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/joke2k/faker/archive/v${pkgver}.tar.gz")
-sha512sums=('b5e244537fe6f8aa61e58e0df38837f20579a7fb811af772ae1f0ef8bb66c1f87d828d4a5ade65749793dd8dd2cb21a21f5694c19cdd6cfbd54203a3f02a6ec2')
+sha512sums=('2c10c072add8ce6c5e0a0b1b2c490087c6630c6726e95cd6f987a8d62345ccd5d851463a732081ff1985d66f724b867094f8539a36ff725709118935352c4d7f')

 prepare() {
  cd "${srcdir}"
--- a/mingw-w64-python-flit/PKGBUILD
+++ b/mingw-w64-python-flit/PKGBUILD
@@ -0,0 +1,87 @@
+# Maintainer: Naveen M K <naveen521kk@gmail.com>
+
+_pyname=flit
+_realname=flit
+pkgbase=mingw-w64-python-${_realname}
+pkgname=(
+    "${MINGW_PACKAGE_PREFIX}-python-${_realname}"
+    "${MINGW_PACKAGE_PREFIX}-python-${_realname}-core"
+)
+pkgver=3.2.0
+pkgrel=1
+pkgdesc='Simplified packaging of Python modules (mingw-w64)'
+arch=('any')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
+url="https://github.com/takluyver/flit"
+license=('BSD')
+depends=(
+  "${MINGW_PACKAGE_PREFIX}-python"
+  "${MINGW_PACKAGE_PREFIX}-python-toml"
+)
+makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-python-build"
+  "${MINGW_PACKAGE_PREFIX}-python-pip"
+)
+source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
+sha512sums=('b40768fb4b0b2a2e3116ac790dfa629da5a57cda34b10abb8ce6a8febcc3436795d5122dcfa3db2c6d07d493f00391d2ca7300112561c8ff2a0b04d77c879662')
+
+prepare() {
+  cd "$srcdir"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}"
+}
+
+build() {
+  cd "${srcdir}/python-build-${CARCH}/flit_core"
+  ${MINGW_PREFIX}/bin/python -m build . -x -n -w
+
+  cd "${srcdir}/python-build-${CARCH}"
+  PYTHONPATH=flit_core  ${MINGW_PREFIX}/bin/python -m build . -x -n -w  
+  cp flit_core/dist/*.whl dist/
+}
+
+package_python-flit() {
+  depends+=(
+    "${MINGW_PACKAGE_PREFIX}-python-flit-core"
+    "${MINGW_PACKAGE_PREFIX}-python-requests" 
+    "${MINGW_PACKAGE_PREFIX}-python-docutils"
+  ) 
+
+  cd "${srcdir}/python-build-${CARCH}"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python -m pip install dist/flit-${pkgver}-py3-none-any.whl \
+    --compile \
+    --no-deps \
+    --no-warn-script-location \
+    --prefix=${MINGW_PREFIX} \
+    --root="${pkgdir}"
+
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
+}
+
+
+package_python-flit-core() {
+  pkgdesc+='Simplified packaging of Python modules (core backend) (mingw-w64)'
+  
+  cd "${srcdir}/python-build-${CARCH}"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python -m pip install dist/flit_core-${pkgver}-py3-none-any.whl \
+    --compile \
+    --no-deps \
+    --no-warn-script-location \
+    --prefix=${MINGW_PREFIX} \
+    --root="${pkgdir}"
+
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}-core/LICENSE"
+}
+
+# template start; name=mingw-w64-splitpkg-wrappers; version=1.0;
+# vim: set ft=bash :
+
+# generate wrappers
+for _name in "${pkgname[@]}"; do
+  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
+  _func="$(declare -f "${_short}")"
+  eval "${_func/#${_short}/package_${_name}}"
+done
+# template end;
--- a/mingw-w64-python-fonttools/PKGBUILD
+++ b/mingw-w64-python-fonttools/PKGBUILD
@@ -6,8 +6,8 @@ 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=4.24.4
-pkgrel=2
+pkgver=4.26.2
+pkgrel=1
 pkgdesc="Converts OpenType and TrueType fonts to and from XML (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -23,7 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-matplotlib"
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.zip::https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.zip")
-sha256sums=('df7fab667b039cd2a00a1fffcba73a32b2c630ef2a12ab7069ef6df5333f20c3')
+sha256sums=('c1c0e03dd823e9e905232e875ea02dbb2dcd2ba195418c6d11bfaea49b9c774d')

 prepare() {
  rm -rf python-build-${CARCH}
--- a/mingw-w64-python-hypothesis/PKGBUILD
+++ b/mingw-w64-python-hypothesis/PKGBUILD
@@ -6,8 +6,8 @@ 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=6.14.1
-pkgrel=2
+pkgver=6.18.0
+pkgrel=1
 pkgdesc="Advanced Quickcheck style testing library for Python (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -34,7 +34,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 #              "${MINGW_PACKAGE_PREFIX}-python-pandas")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${pkgver}.tar.gz")
-sha512sums=('b84776e2bfff130c4db7582defbe9bc55183d624b45defffebdc954ca8e1dda1dec78f921e1bc7839a1167c37bce693711cd500da547dc6f2a8fa610c0bd3540')
+sha512sums=('069deaa91b7dc7244c8fccb046e384c60009365418dfb7f76ed75428446a731ec860613201d0657c2c8b3b29e4fce3c403a93aa082f48b072471f919b7a1af5a')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
--- a/mingw-w64-python-importlib-metadata/PKGBUILD
+++ b/mingw-w64-python-importlib-metadata/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=importlib-metadata
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=4.6.0
-pkgrel=2
+pkgver=4.8.1
+pkgrel=1
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
@@ -21,7 +21,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pip"
              "${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
              "${MINGW_PACKAGE_PREFIX}-python-wheel")
 source=("${_realname}-${pkgver}.tar.gz"::"https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname//-/_}/${_realname//-/_}-${pkgver}.tar.gz")
-sha256sums=('4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb')
+sha256sums=('f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
--- a/mingw-w64-python-ipython/PKGBUILD
+++ b/mingw-w64-python-ipython/PKGBUILD
@@ -6,8 +6,8 @@ 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=7.25.0
-pkgrel=2
+pkgver=7.27.0
+pkgrel=1
 pkgdesc="An enhanced Interactive Python shell (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -39,7 +39,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-requests"
              "${MINGW_PACKAGE_PREFIX}-python-ipykernel"
              "${MINGW_PACKAGE_PREFIX}-python-numpy")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/ipython/archive/${pkgver}.tar.gz")
-sha256sums=('e4a61cde3dddf9d81099511d6906c87c3a01e0e39903fa9a6e725d74d76f337d')
+sha256sums=('7dd6dd06d0ee527e45053fad8a8a9feb733d6934b9a5507ee4f050898b14217d')

 prepare() {
  cd "${srcdir}"
--- a/mingw-w64-python-more-itertools/PKGBUILD
+++ b/mingw-w64-python-more-itertools/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=more-itertools
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=8.8.0
-pkgrel=2
+pkgver=8.9.0
+pkgrel=1
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
@@ -17,7 +17,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/erikrose/more-itertools/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('83f0308e05477c68f56ea3a888172c78ed5d5b3c282addb67508e7ba6c8f813a')
+sha256sums=('8c746e0d09871661520da4f1241ba6b908dc903839733c8203b552cffaf173bd')

 prepare() {
  cd "${srcdir}"
--- a/mingw-w64-python-packaging/PKGBUILD
+++ b/mingw-w64-python-packaging/PKGBUILD
@@ -6,23 +6,23 @@ 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=20.9
-pkgrel=2
+pkgver=21.0
+pkgrel=1
 pkgdesc="Core utilities for Python packages (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://github.com/pypa/packaging"
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python"
+depends=("${MINGW_PACKAGE_PREFIX}-python-attrs"
         "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
-         "${MINGW_PACKAGE_PREFIX}-python-six"
-         "${MINGW_PACKAGE_PREFIX}-python-attrs")
+         "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
+         "${MINGW_PACKAGE_PREFIX}-python-six")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner"
              "${MINGW_PACKAGE_PREFIX}-python-pretend"
              "${MINGW_PACKAGE_PREFIX}-python-coverage")
 source=(https://pypi.io/packages/source/p/packaging/${_realname}-${pkgver}.tar.gz)
-sha256sums=('5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5')
+sha256sums=('7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7')

 prepare() {  
  cd "${srcdir}"
--- a/mingw-w64-python-pip/PKGBUILD
+++ b/mingw-w64-python-pip/PKGBUILD
@@ -7,8 +7,8 @@ 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=21.1.3
-pkgrel=2
+pkgver=21.2.4
+pkgrel=1
 pkgdesc="The PyPA recommended tool for installing Python packages. (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -27,7 +27,7 @@ source=(
  "${_realname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz"
  "0001-use-system-distlib.patch"
 )
-sha256sums=('b5b1eb91b36894bd01b8e5a56a422c2f3838573da0b0a1c63a096bb454e3b23f'
+sha256sums=('0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b'
            'c7f98690afa60e59324f1ce52e72bd7809cbfaba4e29a2d933f08c1a025f8246')

 prepare() {
--- a/mingw-w64-python-pkgconfig/PKGBUILD
+++ b/mingw-w64-python-pkgconfig/PKGBUILD
@@ -6,8 +6,8 @@ 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=1.5.4
-pkgrel=2
+pkgver=1.5.5
+pkgrel=1
 pkgdesc="A Python interface to the pkg-config command line tool"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -19,7 +19,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
              "${MINGW_PACKAGE_PREFIX}-python-nose")
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/p/pkgconfig/${_realname}-${pkgver}.tar.gz")
-sha512sums=('56779390d2312508bc22ae44b05fa242f929005d6a96e485d6fa594ba160b4b44cfeed8c76feb196e7a2fae37bf3780917e544db97783dc024c3bdeace5623c3')
+sha512sums=('ffa838d0146125c4158b747b619cc5eed41da0e2f04664a4db89909a486922120a0e1779f99dfcda0da3e98b8770c57b638a9c7bc5994cd8102aa3cf990905b0')

 prepare() {
  cd "${srcdir}"
--- a/mingw-w64-python-pluggy/PKGBUILD
+++ b/mingw-w64-python-pluggy/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=pluggy
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=0.13.1
-pkgrel=2
+pkgver=1.0.0
+pkgrel=1
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
@@ -18,7 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pytest-dev/pluggy/archive/${pkgver}.tar.gz")
-sha512sums=('3269f7ad7801a70ba8aa3182c568f70e2ee88a90b6f6335be631f9737dd42fac3fb1b27c5b6fe6422de128ddcc58736f0c41ed60b7c0177126dd676b98ece301')
+sha512sums=('88f1180d2607115d6516cba07fa7c1f0e284d1e16fb7ed42c4a05d5d2b0dc1419d2bdbdadc34e2eb7f6b0cc9fc97715c6b184542c01f6bc33242a872c46d7903')

 prepare() {
  rm -rf python-build-${CARCH} | true
--- a/mingw-w64-python-prettytable/PKGBUILD
+++ b/mingw-w64-python-prettytable/PKGBUILD
@@ -7,8 +7,8 @@ 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=2.1.0
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="A simple Python library for easily displaying tabular data (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -20,7 +20,7 @@ options=('staticlibs' 'strip' '!debug')
 _dtoken=dc2e9370bf3be766302dbd6cd9729e258e875d31a7a21c9f760aaa5b5b5e
 source=("${_realname}-${pkgver}.tar.gz::https://files.pythonhosted.org/packages/source/P/PrettyTable/${_realname}-${pkgver}.tar.gz"
        "0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch")
-sha256sums=('5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0'
+sha256sums=('bd81678c108e6c73d4f1e47cd4283de301faaa6ff6220bcd1d4022038c56b416'
            'e9dd93c51ca3769c41cd2b7b27c58d8e6683fd4b6f4665291ad542d7917765d0')

 prepare() {
--- a/mingw-w64-python-prompt_toolkit/PKGBUILD
+++ b/mingw-w64-python-prompt_toolkit/PKGBUILD
@@ -4,8 +4,8 @@ _pyname=prompt-toolkit
 _realname=prompt_toolkit
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=3.0.19
-pkgrel=2
+pkgver=3.0.20
+pkgrel=1
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
@@ -18,7 +18,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-wcwidth")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('08360ee3a3148bdb5163621709ee322ec34fc4375099afa4bbf751e9b7b7fa4f')
+sha256sums=('eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c')

 prepare() {
  cd "${srcdir}"
--- a/mingw-w64-python-pygments/PKGBUILD
+++ b/mingw-w64-python-pygments/PKGBUILD
@@ -8,8 +8,8 @@ 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=2.9.0
-pkgrel=2
+pkgver=2.10.0
+pkgrel=1
 pkgdesc="Python syntax highlighter (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -18,7 +18,7 @@ url="https://pygments.org/"
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.org/packages/source/P/Pygments/${_pyname}-${pkgver}.tar.gz")
 noextract=("${_pyname}-${pkgver}.tar.gz")
-sha256sums=('a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f')
+sha256sums=('f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6')

 prepare() {
  # workaround for symlink issue
--- a/mingw-w64-python-pytest-checkdocs/PKGBUILD
+++ b/mingw-w64-python-pytest-checkdocs/PKGBUILD
@@ -4,8 +4,8 @@ _pyname=pytest-checkdocs
 _realname=pytest-checkdocs
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=2.7.0
-pkgrel=2
+pkgver=2.7.1
+pkgrel=1
 pkgdesc='check the README when running tests (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -19,7 +19,7 @@ makedepends=(
  "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm"
 )
 source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-sha256sums=('6eef175c9f30ee5572007aae2a94acaac3ba8ed55cccd351a38dcce21ca8c25d')
+sha256sums=('2b33b85eddfe5846a69bea4a759303e2d5a3be11d03bc7149f5ba1ef47e6c1ae')

 prepare() {  
  cd "$srcdir"
--- a/mingw-w64-python-pytest/PKGBUILD
+++ b/mingw-w64-python-pytest/PKGBUILD
@@ -6,8 +6,8 @@ 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=6.2.4
-pkgrel=2
+pkgver=6.2.5
+pkgrel=1
 pkgdesc='simple powerful testing with Python (mingw-w64)'
 url='https://pytest.org/'
 license=('MIT')
@@ -30,7 +30,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-hypothesis"
              "${MINGW_PACKAGE_PREFIX}-python-tox"
              "${MINGW_PACKAGE_PREFIX}-python-yaml")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/pytest-dev/pytest/archive/${pkgver}.tar.gz")
-sha256sums=('c83540d271f7d58d601f97f9f2dbe858e92d9bea5ff7867110e5505c12358406')
+sha256sums=('4790fe991c954befb41cb2a2031efc0bd2e67ee514438425993ab00604c477e8')

 prepare() {
  sed -i "s/'_pytest.vendored_packages'//" ${_realname}-${pkgver}/setup.py
--- a/mingw-w64-python-rich/PKGBUILD
+++ b/mingw-w64-python-rich/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=rich
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=10.4.0
-pkgrel=2
+pkgver=10.9.0
+pkgrel=1
 pkgdesc="Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -15,7 +15,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-colorama"
         "${MINGW_PACKAGE_PREFIX}-python-pygments")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${pkgver}.tar.gz::https://pypi.io/packages/source/r/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('6e8a3e2c61e6cf6193bfcffbb89865a0973af7779d3ead913fdbbbc33f457c2c')
+sha256sums=('ba285f1c519519490034284e6a9d2e6e3f16dc7690f2de3d9140737d81304d22')

 prepare() {
  cd "${srcdir}"
--- a/mingw-w64-python-setuptools-scm/PKGBUILD
+++ b/mingw-w64-python-setuptools-scm/PKGBUILD
@@ -6,18 +6,19 @@ 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=6.0.1
-pkgrel=2
+pkgver=6.3.1
+pkgrel=1
 pkgdesc='Handles managing your python package versions in scm metadata (mingw-w64)'
 url='https://github.com/pypa/setuptools_scm'
 license=('MIT')
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
-depends=("${MINGW_PACKAGE_PREFIX}-python"
+depends=("${MINGW_PACKAGE_PREFIX}-python-packaging"
         "${MINGW_PACKAGE_PREFIX}-python-setuptools"
-         "${MINGW_PACKAGE_PREFIX}-python-toml")
+         "${MINGW_PACKAGE_PREFIX}-python-toml"
+         "${MINGW_PACKAGE_PREFIX}-python-tomli")
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz")
-sha256sums=('d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92')
+sha256sums=('0f6a263912b13798c028b9a271d91af3bde0e42784091c797deccc3ad3a7f596')

 prepare() {  
  cd "${srcdir}"
--- a/mingw-w64-python-setuptools/PKGBUILD
+++ b/mingw-w64-python-setuptools/PKGBUILD
@@ -8,8 +8,8 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
           "${MINGW_PACKAGE_PREFIX}-python2-setuptools<42.0.2")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=57.1.0
-pkgrel=2
+pkgver=58.0.0
+pkgrel=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -48,7 +48,7 @@ checkdepends=(
  #"${MINGW_PACKAGE_PREFIX}-python-pytest-mypy"
  'git'
 )
-sha256sums=('cfca9c97e7eebbc8abe18d5e5e962a08dcad55bb63afddd82d681de4d22a597b'
+sha256sums=('ee45f4d69c4bbd21a27b60a7f1f32cbdcd34755cb613e5c4edcb58145394a0a3'
            '7b196884ac0151801f9638dabbf9a789fa9070a3b07a4c9e625c5523e8d47387'
            'fa54581e3dddb9f4edd332dedbc101f48939a9ca5878e13cf9cf9b3408bc8c22'
            '39503256652c7c23ce07e26539e8123d269eb5c09f5d9b07e5784b2d7fb8c96f'
--- a/mingw-w64-python-singledispatch/PKGBUILD
+++ b/mingw-w64-python-singledispatch/PKGBUILD
@@ -4,8 +4,8 @@ _pyname=singledispatch
 _realname=singledispatch
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.7.0
+pkgrel=1
 pkgdesc='Backport functools.singledispatch from Python 3.4 to Python 2.6-3.3. (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -19,7 +19,7 @@ makedepends=(
  "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm"
 )
 source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-sha256sums=('d5bb9405a4b8de48e36709238e8b91b4f6f300f81a5132ba2531a9a738eca391')
+sha256sums=('c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092')

 prepare() {  
  cd "$srcdir"
--- a/mingw-w64-python-sphinx/PKGBUILD
+++ b/mingw-w64-python-sphinx/PKGBUILD
@@ -8,8 +8,8 @@ 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=4.0.2
-pkgrel=3
+pkgver=4.1.2
+pkgrel=1
 pkgdesc="Python documentation generator (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -31,15 +31,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-babel"
         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-htmlhelp"
         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-jsmath"
         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-qthelp"
-         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-serializinghtml"
-         "${MINGW_PACKAGE_PREFIX}-python")
+         "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-serializinghtml")
 optdepends=(
  "${MINGW_PACKAGE_PREFIX}-imagemagick: ext.imageconverter"
  "${MINGW_PACKAGE_PREFIX}-texlive-latex-extra: for generation of PDF documentation"
 )
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_pyname}-${pkgver}.tar.gz"::"https://pypi.org/packages/source/S/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-sha256sums=('b5c2ae4120bf00c799ba9b3699bc895816d272d120080fbc967292f29b52b48c')
+sha256sums=('3092d929cd807926d846018f2ace47ba2f3b671b309c7a89cd3306e80c826b13')

 prepare() {
  cd ${srcdir}/${_pyname}-${pkgver}
--- a/mingw-w64-python-stevedore/PKGBUILD
+++ b/mingw-w64-python-stevedore/PKGBUILD
@@ -6,8 +6,8 @@ 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.3.0
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 pkgdesc="Manage dynamic plugins for Python applications (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -17,7 +17,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-pbr")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=(https://pypi.org/packages/source/s/stevedore/stevedore-${pkgver}.tar.gz)
-sha256sums=('3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee')
+sha256sums=('59b58edb7f57b11897f150475e7bc0c39c5381f0b8e3fa9f5c20ce6c89ec4aa1')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
--- a/mingw-w64-python-testtools/PKGBUILD
+++ b/mingw-w64-python-testtools/PKGBUILD
@@ -6,24 +6,21 @@ 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=2.4.0
-pkgrel=2
+pkgver=2.5.0
+pkgrel=1
 pkgdesc="Extensions to the Python standard library unit testing framework (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://github.com/testing-cabal/testtools'
 license=('MIT')
-depends=("${MINGW_PACKAGE_PREFIX}-python"
-         "${MINGW_PACKAGE_PREFIX}-python-pbr"
-         "${MINGW_PACKAGE_PREFIX}-python-extras"
+depends=("${MINGW_PACKAGE_PREFIX}-python-extras"
         "${MINGW_PACKAGE_PREFIX}-python-fixtures"
-         "${MINGW_PACKAGE_PREFIX}-python-pyrsistent"
-         "${MINGW_PACKAGE_PREFIX}-python-mimeparse")
+         "${MINGW_PACKAGE_PREFIX}-python-pbr")
 makedepends=('git' 
             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/testing-cabal/testtools/archive/${pkgver}.tar.gz")
-sha256sums=('8b152cd95244fedad2e7bcb824d172978b12533317c827ae7845a8c0dbb6dd0c')
+sha256sums=('5b332ceec9a893303647a152d1217653e47f7ab2c32d6a9eb16bdbce57f93757')

 prepare() {
  rm -rf python-build-${CARCH} | true
--- a/mingw-w64-python-tomli/PKGBUILD
+++ b/mingw-w64-python-tomli/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Naveen M K <naveen521kk@gmail.com>
+
+_pyname=tomli
+_realname=tomli
+pkgbase=mingw-w64-python-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+pkgver=1.2.1
+pkgrel=1
+pkgdesc="A lil' TOML parser (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+url="https://pypi.org/project/tomli/"
+license=('MIT')
+depends=(
+  "${MINGW_PACKAGE_PREFIX}-python" 
+)
+makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-python-build" 
+  "${MINGW_PACKAGE_PREFIX}-python-flit-core"
+  "${MINGW_PACKAGE_PREFIX}-python-pip"
+)
+source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+sha256sums=('a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442')
+
+prepare() {  
+  cd "$srcdir"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}"
+}
+
+build() {
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python -m build . -x -n -w
+}
+
+package() {
+  cd "${srcdir}/python-build-${CARCH}"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python -m pip install dist/${_pyname}-${pkgver}-py3-none-any.whl \
+    --compile \
+    --no-deps \
+    --no-warn-script-location \
+    --prefix=${MINGW_PREFIX} \
+    --root="${pkgdir}"
+
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
+}
--- a/mingw-w64-python-tqdm/PKGBUILD
+++ b/mingw-w64-python-tqdm/PKGBUILD
@@ -3,18 +3,18 @@
 _realname=tqdm
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=4.61.1
-pkgrel=2
+pkgver=4.62.2
+pkgrel=1
 pkgdesc='Fast, Extensible Progress Meter (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/tqdm/tqdm"
 license=('MIT' 'MPL')
-depends=("${MINGW_PACKAGE_PREFIX}-python")
+depends=("${MINGW_PACKAGE_PREFIX}-python-colorama")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-asyncio" "${MINGW_PACKAGE_PREFIX}-python-pandas" "${MINGW_PACKAGE_PREFIX}-python-numpy")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools-scm")
 source=("${_realname}-$pkgver.tar.gz::https://github.com/tqdm/tqdm/archive/v$pkgver.tar.gz")
-sha256sums=('270cbd7a5b2d1e3ed13b084437b573bdac547e200a5f498eb09408eedacb2e25')
+sha256sums=('c461d885ceaab8f4ac44e50e5ef9ea2e49788b3e5ee6e204a9a449fdb6f2b130')

 export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver

--- a/mingw-w64-python-traitlets/PKGBUILD
+++ b/mingw-w64-python-traitlets/PKGBUILD
@@ -6,18 +6,18 @@ 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=5.0.5
-pkgrel=2
+pkgver=5.1.0
+pkgrel=1
 pkgdesc="A lightweight Traits like module (mingw-w64)"
 url="https://github.com/ipython/traitlets"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 license=('Modified BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-python-ipython_genutils")
+depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/${_realname}/archive/${pkgver}.tar.gz")
-sha256sums=('dece08aa6205e9b494e134f93c2454d387f4677b50422565ec324aaf5ddf410d')
+sha256sums=('ea523391b908c1ec5f2c80bb70398e7b5112d0ff825bba01a488d2106e77334d')

 prepare() {
  cd "${srcdir}"
--- a/mingw-w64-python-typing_extensions/PKGBUILD
+++ b/mingw-w64-python-typing_extensions/PKGBUILD
@@ -5,8 +5,8 @@ _pyname=typing-extensions
 _realname=typing_extensions
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=3.10.0.0
-pkgrel=2
+pkgver=3.10.0.2
+pkgrel=1
 pkgdesc='Backported and Experimental Type Hints for Python 3.5+ (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -15,7 +15,7 @@ license=('PSF')
 depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("${_realname}-${pkgver}.tar.gz::https://pypi.python.org/packages/source/${_pyname:0:1}/${_pyname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342')
+sha256sums=('49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e')

 prepare() {
  cd "${srcdir}"
--- a/mingw-w64-python-xlsxwriter/PKGBUILD
+++ b/mingw-w64-python-xlsxwriter/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=xlsxwriter
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=1.4.3
-pkgrel=2
+pkgver=3.0.1
+pkgrel=1
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}=${pkgver}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
@@ -17,7 +17,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${pkgver}.tar.gz")
-sha256sums=('88ca0d5a5446df800694479364da94cd90e861a2f5d5b8f2e0b8dac6cea9ae5d')
+sha256sums=('27d053943ee0fe302d711687ad37335187b9352db001f3b5d6b1c527a528667f')

 build() {
  cd "${srcdir}/XlsxWriter-RELEASE_${pkgver}"
--- a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch
+++ b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch
@@ -1,7 +1,7 @@
-From 601fde65f126300e8fd67ec491cbbbf4ecda0571 Mon Sep 17 00:00:00 2001
+From 6ca397e7d4776d652e039ed57779ed4d0d4e7898 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:10 +0530
-Subject: [PATCH 001/N] make _sysconfigdata.py relocatable
+Subject: [PATCH 001/N] sysconfig: make _sysconfigdata.py relocatable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -9,11 +9,11 @@ Content-Transfer-Encoding: 8bit
 Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 Co-authored-by: lovetox <8661218+lovetox@users.noreply.github.com>
 ---
- Lib/sysconfig.py | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
+ Lib/sysconfig.py | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)

 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index e3f79bf..505d538 100644
+index e3f79bf..45eab2a 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
@@ -2,6 +2,7 @@
@@ -24,7 +24,7 @@ index e3f79bf..505d538 100644
 from os.path import pardir, realpath
 
 __all__ = [
-@@ -413,11 +414,29 @@ def _generate_posix_vars():
+@@ -413,11 +414,30 @@ def _generate_posix_vars():
     os.makedirs(pybuilddir, exist_ok=True)
     destfile = os.path.join(pybuilddir, name + '.py')
 
@@ -35,6 +35,7 @@ index e3f79bf..505d538 100644
 +            'INCLDIRSTOMAKE', 'INCLUDEDIR', 'INCLUDEPY',
 +            'LIBDEST', 'LIBDIR', 'LIBPC', 'LIBPL', 'MACHDESTLIB',
 +            'MANDIR', 'SCRIPTDIR', 'datarootdir', 'exec_prefix',
+            'TZPATH',
 +        ]
 +
 +        prefix = build_time_vars['BINDIR'][:-4]
@@ -55,5 +56,5 @@ index e3f79bf..505d538 100644
     # Create file used for sys.path fixup -- see Modules/getpath.c
     with open('pybuilddir.txt', 'w', encoding='utf8') as f:
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0002-restore-setup-config.patch
+++ b/mingw-w64-python/0002-restore-setup-config.patch
@@ -1,4 +1,4 @@
-From 65c19d285901d1791ae1bc3628550c9c4db948c1 Mon Sep 17 00:00:00 2001
+From 2a25da9a573828b206180522b02633a1a128a2dd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:12 +0530
@@ -12,7 +12,7 @@ Subject: [PATCH 002/N] restore setup config
 create mode 100644 Modules/Setup.config.in

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 2b68571..f738b3b 100644
+index 6ce7a61..e8e8e71 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
@@ -714,10 +714,12 @@ oldsharedmods: $(SHAREDMODS)
@@ -78,5 +78,5 @@ index 8fe5fa5..6ae56e1 100644
 mv config.c Modules
 
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch
+++ b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch
@@ -1,8 +1,9 @@
-From 51eb50d174eed9942b5edb3f227e1866d9eee092 Mon Sep 17 00:00:00 2001
+From 80666900d875a95b06f1baf7f9c57a38e4831764 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:12 +0530
-Subject: [PATCH 003/N] MINGW BASE use NT thread model
+Subject: [PATCH 003/N] build: add --with-nt-threads and make it default on
+ mingw
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -10,11 +11,58 @@ Content-Transfer-Encoding: 8bit
 Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
 ---
- Modules/_multiprocessing/multiprocessing.h |  3 +
- configure.ac                               | 94 +++++++++++++++++++++-
- pyconfig.h.in                              |  3 +
- 3 files changed, 98 insertions(+), 2 deletions(-)
+ Include/internal/pycore_condvar.h          |  10 ++
+ Include/pythread.h                         |   6 ++
+ Modules/_multiprocessing/multiprocessing.h |   3 +
+ configure.ac                               | 101 ++++++++++++++++++++-
+ pyconfig.h.in                              |   3 +
+ 5 files changed, 121 insertions(+), 2 deletions(-)

+diff --git a/Include/internal/pycore_condvar.h b/Include/internal/pycore_condvar.h
+index 8b89d70..dd98245 100644
+--- a/Include/internal/pycore_condvar.h
+++ b/Include/internal/pycore_condvar.h
+@@ -5,6 +5,12 @@
+ #  error "this header requires Py_BUILD_CORE define"
+ #endif
+ 
+#ifdef __MINGW32__
+# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS)
+#  undef _POSIX_THREADS
+# endif
+#endif
+
+ #ifndef _POSIX_THREADS
+ /* This means pthreads are not implemented in libc headers, hence the macro
+    not present in unistd.h. But they still can be implemented as an external
+@@ -37,6 +43,10 @@
+ /* include windows if it hasn't been done before */
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+/* winpthreads are involved via windows header, so need undef _POSIX_THREADS after header include */
+#if defined(_POSIX_THREADS)
+#undef _POSIX_THREADS
+#endif
+ 
+ /* options */
+ /* non-emulated condition variables are provided for those that want
+diff --git a/Include/pythread.h b/Include/pythread.h
+index bb9d864..f1e52c6 100644
+--- a/Include/pythread.h
+++ b/Include/pythread.h
+@@ -8,6 +8,12 @@ typedef void *PyThread_type_lock;
+ extern "C" {
+ #endif
+ 
+#ifdef __MINGW32__
+# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS)
+#  undef _POSIX_THREADS
+# endif
+#endif
+
+ /* Return status codes for Python lock acquisition.  Chosen for maximum
+  * backwards compatibility, ie failure -> 0, success -> 1.  */
+ typedef enum PyLockStatus {
 diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
 index fe78135..344b76e 100644
 --- a/Modules/_multiprocessing/multiprocessing.h
@@ -30,10 +78,10 @@ index fe78135..344b76e 100644
 #  include <fcntl.h>                 /* O_CREAT and O_EXCL */
 #  if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
 diff --git a/configure.ac b/configure.ac
-index 6ae56e1..005fc8f 100644
+index 6ae56e1..d5766cf 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2040,6 +2040,46 @@ then
+@@ -2040,6 +2040,53 @@ then
 	BASECFLAGS="$BASECFLAGS $ac_arch_flags"
 fi
 
@@ -50,24 +98,31 @@ index 6ae56e1..005fc8f 100644
 +dnl are responsible to update configure script to avoid thread models
 +dnl to be mixed.
 +
-+AC_MSG_CHECKING([for NT threads])
+AC_MSG_CHECKING([for --with-nt-threads])
 +AC_ARG_WITH(nt-threads,
-+            AS_HELP_STRING([--with-nt-threads], [build with windows threads]),
+            AS_HELP_STRING([--with-nt-threads], [build with windows threads (default is system-dependent)]),
 +[
 +	case $withval in
 +	no)	with_nt_threads=no;;
 +	yes)	with_nt_threads=yes;;
 +	*)	with_nt_threads=yes;;
-+	esac], [
-+	with_nt_threads=no])
+	esac
+], [
+	case $host in
+		*-*-mingw*) with_nt_threads=yes;;
+		*) with_nt_threads=no;;
+	esac
+])
+AC_MSG_RESULT([$with_nt_threads])
+
 +if test $with_nt_threads = yes ; then
+AC_MSG_CHECKING([whether linking with nt-threads work])
 +AC_LINK_IFELSE([
 +    AC_LANG_PROGRAM([[]],[[_beginthread(0, 0, 0);]])
 +  ],
-+  [with_nt_threads=yes],
-+  [with_nt_threads=no])
+  [AC_MSG_RESULT([yes])],
+  [AC_MSG_ERROR([failed to link with nt-threads])])
 +fi
-+AC_MSG_RESULT([$with_nt_threads])
 +
 +if test $with_nt_threads = yes ; then
 +  dnl temporary default flag to avoid additional pthread checks
@@ -80,7 +135,7 @@ index 6ae56e1..005fc8f 100644
 # On some compilers, pthreads are available without further options
 # (e.g. MacOS X). On some of these systems, the compiler will not
 # complain if unaccepted options are passed (e.g. gcc on Mac OS X).
-@@ -2158,6 +2198,8 @@ CC="$ac_save_cc"])
+@@ -2158,6 +2205,8 @@ CC="$ac_save_cc"])
 AC_MSG_RESULT($ac_cv_pthread)
 fi
 
@@ -89,7 +144,7 @@ index 6ae56e1..005fc8f 100644
 # If we have set a CC compiler flag for thread support then
 # check if it works for CXX, too.
 ac_cv_cxx_thread=no
-@@ -2178,6 +2220,10 @@ elif test "$ac_cv_pthread" = "yes"
+@@ -2178,6 +2227,10 @@ elif test "$ac_cv_pthread" = "yes"
 then
   CXX="$CXX -pthread"
   ac_cv_cxx_thread=yes
@@ -100,7 +155,7 @@ index 6ae56e1..005fc8f 100644
 fi
 
 if test $ac_cv_cxx_thread = yes
-@@ -2210,8 +2256,8 @@ dnl AC_MSG_RESULT($cpp_type)
+@@ -2210,8 +2263,8 @@ dnl AC_MSG_RESULT($cpp_type)
 AC_HEADER_STDC
 AC_CHECK_HEADERS(asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \
 fcntl.h grp.h \
@@ -111,7 +166,7 @@ index 6ae56e1..005fc8f 100644
 utime.h \
 poll.h sys/devpoll.h sys/epoll.h sys/poll.h \
 sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \
-@@ -2225,6 +2271,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h)
+@@ -2225,6 +2278,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h)
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
 
@@ -126,7 +181,7 @@ index 6ae56e1..005fc8f 100644
 # bluetooth/bluetooth.h has been known to not compile with -std=c99.
 # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294
 SAVE_CFLAGS=$CFLAGS
-@@ -2422,6 +2476,10 @@ fi
+@@ -2422,6 +2483,10 @@ fi
 
 AC_MSG_CHECKING(for pthread_t)
 have_pthread_t=no
@@ -137,7 +192,7 @@ index 6ae56e1..005fc8f 100644
 AC_COMPILE_IFELSE([
   AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])
 ],[have_pthread_t=yes],[])
-@@ -2452,6 +2510,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then
+@@ -2452,6 +2517,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then
 else
   AC_MSG_RESULT(no)
 fi
@@ -145,7 +200,7 @@ index 6ae56e1..005fc8f 100644
 CC="$ac_save_cc"
 
 AC_SUBST(OTHER_LIBTOOL_OPT)
-@@ -2897,10 +2956,15 @@ void *x = uuid_enc_be
+@@ -2897,10 +2963,15 @@ void *x = uuid_enc_be
   [AC_MSG_RESULT(no)]
 )
 
@@ -161,7 +216,7 @@ index 6ae56e1..005fc8f 100644
 
 # check if we need libintl for locale functions
 AC_CHECK_LIB(intl, textdomain,
-@@ -3232,6 +3296,11 @@ then
+@@ -3232,6 +3303,11 @@ then
         CXX="$CXX -pthread"
     fi
     posix_threads=yes
@@ -173,7 +228,7 @@ index 6ae56e1..005fc8f 100644
 else
     if test ! -z "$withval" -a -d "$withval"
     then LDFLAGS="$LDFLAGS -L$withval"
-@@ -3692,6 +3761,15 @@ else
+@@ -3692,6 +3768,15 @@ else
 fi
 
 # checks for library functions
@@ -189,7 +244,7 @@ index 6ae56e1..005fc8f 100644
 AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
  clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
  faccessat fchmod fchmodat fchown fchownat \
-@@ -4613,6 +4691,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include <math.h>]])
+@@ -4613,6 +4698,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include <math.h>]])
 # the kernel module that provides POSIX semaphores
 # isn't loaded by default, so an attempt to call
 # sem_open results in a 'Signal 12' error.
@@ -200,7 +255,7 @@ index 6ae56e1..005fc8f 100644
 AC_MSG_CHECKING(whether POSIX semaphores are enabled)
 AC_CACHE_VAL(ac_cv_posix_semaphores_enabled,
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
-@@ -4646,6 +4728,14 @@ fi
+@@ -4646,6 +4735,14 @@ fi
 
 # Multiprocessing check for broken sem_getvalue
 AC_MSG_CHECKING(for broken sem_getvalue)
@@ -230,5 +285,5 @@ index 6358e56..5f63cae 100644
 #undef PACKAGE_BUGREPORT
 
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch
+++ b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch
@@ -1,4 +1,4 @@
-From 42ac5c820eafdec381202e36f73ce50b588ce8a7 Mon Sep 17 00:00:00 2001
+From 96c05432383cc3468538aadd7f1a440ffda4165d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:13 +0530
@@ -40,5 +40,5 @@ index 4bd4eb4..475c2a8 100644
 Symbols and macros to supply platform-independent interfaces to basic
 C language & library operations whose spellings vary across platforms.
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch
+++ b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch
@@ -1,4 +1,4 @@
-From fa68425708485de2cea225d6c3ff58bff6965ab5 Mon Sep 17 00:00:00 2001
+From c2c04f16d3f6761a9ee768507c0ca8330c976ce6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:14 +0530
@@ -9,50 +9,32 @@ Content-Transfer-Encoding: 8bit

 Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 ---
- Python/getplatform.c |  6 ++++++
- configure.ac         | 22 ++++++++++++++++++++++
- 2 files changed, 28 insertions(+)
+ configure.ac | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)

-diff --git a/Python/getplatform.c b/Python/getplatform.c
-index 81a0f7a..636b0a8 100644
--- a/Python/getplatform.c
-+++ b/Python/getplatform.c
-@@ -1,6 +1,12 @@
- 
- #include "Python.h"
- 
-+#ifdef __MINGW32__
-+#  undef PLATFORM
-+/* see PC/pyconfig.h */
-+#  define PLATFORM "win32"
-+#endif
-+
- #ifndef PLATFORM
- #define PLATFORM "unknown"
- #endif
 diff --git a/configure.ac b/configure.ac
-index 005fc8f..ecdf22d 100644
+index d5766cf..a9936de 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -383,6 +383,17 @@ AC_DEFINE_UNQUOTED(_PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name])
- # Set name for machine-dependent library files
- AC_ARG_VAR([MACHDEP], [name for machine-dependent library files])
- AC_MSG_CHECKING(MACHDEP)
-+case $host in
-+  *-*-mingw*)
-+    # On those hosts MACHDEP is 'win', as platform specific files
-+    # go in plat-$(MACHDEP), but runtime platform is 'win32'
-+    test -z "$MACHDEP" && MACHDEP=win
-+
-+    dnl Configuration will be based only on "host triplet" as build
-+    dnl must not depend from posix compatible environement.
-+    ac_sys_system=ignore
-+    ;;
-+esac
- if test -z "$MACHDEP"
- then
-     # avoid using uname for cross builds
-@@ -452,12 +463,23 @@ if test "$cross_compiling" = yes; then
+@@ -400,6 +400,9 @@ then
+ 	*-*-cygwin*)
+ 		ac_sys_system=Cygwin
+ 		;;
+	*-*-mingw*)
+		ac_sys_system=MINGW
+		;;
+ 	*-*-vxworks*)
+ 	    ac_sys_system=VxWorks
+ 	    ;;
+@@ -429,6 +432,7 @@ then
+ 	linux*) MACHDEP="linux";;
+ 	cygwin*) MACHDEP="cygwin";;
+ 	darwin*) MACHDEP="darwin";;
+	mingw*) MACHDEP="win32";;
+ 	'')	MACHDEP="unknown";;
+     esac
+ fi
+@@ -452,12 +456,23 @@ if test "$cross_compiling" = yes; then
 	*-*-vxworks*)
 		_host_cpu=$host_cpu
 		;;
@@ -77,5 +59,5 @@ index 005fc8f..ecdf22d 100644
 
 # Some systems cannot stand _XOPEN_SOURCE being defined at all; they
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch
+++ b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch
@@ -1,4 +1,4 @@
-From 7c50215fdb389f4c094e15411732fe218b4fa261 Mon Sep 17 00:00:00 2001
+From 3cdb748058d33d3538a5db1c5b07251cebbd10c9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:15 +0530
@@ -53,10 +53,10 @@ index 0000000..03fde9e
 +
 +ac_cv_have_size_t_format=no
 diff --git a/configure.ac b/configure.ac
-index ecdf22d..6058002 100644
+index a9936de..a2cec23 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -920,6 +920,28 @@ if test x$MULTIARCH != x; then
+@@ -913,6 +913,28 @@ if test x$MULTIARCH != x; then
 fi
 AC_SUBST(MULTIARCH_CPPFLAGS)
 
@@ -86,5 +86,5 @@ index ecdf22d..6058002 100644
 save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch
+++ b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch
@@ -1,4 +1,4 @@
-From c4ec9b26b76ebaa442ed3ae3fa10442869e66038 Mon Sep 17 00:00:00 2001
+From 0d783f83aadf8f7dd64bf81684942be2cde01df6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:16 +0530
@@ -14,7 +14,7 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
 1 file changed, 12 insertions(+)

 diff --git a/configure.ac b/configure.ac
-index 6058002..4c964ae 100644
+index a2cec23..61a7608 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -2487,8 +2487,20 @@ AC_CHECK_SIZEOF(off_t, [], [
@@ -39,5 +39,5 @@ index 6058002..4c964ae 100644
   [Defined to enable large file support when an off_t is bigger than a long
    and long long is at least as big as an off_t. You may need
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch
+++ b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch
@@ -1,4 +1,4 @@
-From 8dbbd779f9d2b7d01bc143deb70f3e522978f0b8 Mon Sep 17 00:00:00 2001
+From af4cca07445296c92dedffde8191e96e3c468adf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:18 +0530
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 13 insertions(+)

 diff --git a/configure.ac b/configure.ac
-index 4c964ae..f335c48 100644
+index 61a7608..1f3c8af 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -5642,8 +5642,21 @@ do
@@ -39,5 +39,5 @@ index 4c964ae..f335c48 100644
 for dir in $SRCDIRS; do
     if test ! -d $dir; then
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0009-MINGW-init-system-calls.patch
+++ b/mingw-w64-python/0009-MINGW-init-system-calls.patch
@@ -1,4 +1,4 @@
-From c6e239410fcc24e73eb239b391b5670f7ec41c2f Mon Sep 17 00:00:00 2001
+From a2e178675d5376e8985c489a6cb3bb463909fb41 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:19 +0530
@@ -101,10 +101,10 @@ index c984e2e..3f3e1f3 100644
 static PyObject *
 convertenviron(void)
 diff --git a/configure.ac b/configure.ac
-index f335c48..19c3ec2 100644
+index 1f3c8af..ba8736b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -601,6 +601,14 @@ then
+@@ -594,6 +594,14 @@ then
   AC_DEFINE(_INCLUDE__STDC_A1_SOURCE, 1, Define to include mbstate_t for mbrtowc)
 fi
 
@@ -120,5 +120,5 @@ index f335c48..19c3ec2 100644
 # it may influence the way we can build extensions, so distutils
 # needs to check it
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch
+++ b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch
@@ -1,4 +1,4 @@
-From d00c155c97977adb8109f0764efb1100d6079800 Mon Sep 17 00:00:00 2001
+From 08880ce168fbb08e6476a246fd80e141ebf2eed7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:20 +0530
@@ -57,7 +57,7 @@ index fd1ccb7..b6f1a8f 100644
 static BOOL clinic_HKEY_converter(PyObject *ob, void *p);
 static PyObject *PyHKEY_FromHKEY(HKEY h);
 diff --git a/configure.ac b/configure.ac
-index 19c3ec2..e307fe3 100644
+index ba8736b..59f3edc 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -3326,6 +3326,13 @@ else
@@ -75,5 +75,5 @@ index 19c3ec2..e307fe3 100644
 # For a single AC_DEFINE, no template is needed.
 AH_TEMPLATE(_REENTRANT,
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch
+++ b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch
@@ -1,4 +1,4 @@
-From 40d6aaa0260b733a5bb004fd90287148e09a249c Mon Sep 17 00:00:00 2001
+From 892c8b91944241a71222a04d9276fdd409479408 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:21 +0530
@@ -43,7 +43,7 @@ index 612cabd..d071a74 100644
 @USE_WIN32_MODULE@winreg ../PC/winreg.c
 
 diff --git a/configure.ac b/configure.ac
-index e307fe3..52b3120 100644
+index 59f3edc..806ebe0 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -3333,6 +3333,13 @@ case $host in
@@ -61,5 +61,5 @@ index e307fe3..52b3120 100644
 # For a single AC_DEFINE, no template is needed.
 AH_TEMPLATE(_REENTRANT,
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
+++ b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
@@ -1,8 +1,8 @@
-From 5cf0ca1ebaec17df425a2b2829f6520e355f81cc Mon Sep 17 00:00:00 2001
+From b04a5d9e049ad86d70f3977cb2604b2e6b7e0bca Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:23 +0530
-Subject: [PATCH 014/N] issue6672 v2 Add Mingw recognition to pyport.h to al
+Subject: [PATCH 012/N] issue6672 v2 Add Mingw recognition to pyport.h to al
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -64,7 +64,7 @@ index 475c2a8..a05fa3a 100644
         /* module init functions outside the core must be exported */
 #                       if defined(__cplusplus)
 diff --git a/setup.py b/setup.py
-index 04eb6b2..b483dd3 100644
+index 54d4b94..d7a4e3f 100644
 --- a/setup.py
 +++ b/setup.py
@@ -444,6 +444,9 @@ class PyBuildExt(build_ext):
@@ -78,5 +78,5 @@ index 04eb6b2..b483dd3 100644
         self.detect_modules()
 
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch
+++ b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch
@@ -1,8 +1,8 @@
-From 914f08e27ac82a95ce0ddedfbb15d53415406050 Mon Sep 17 00:00:00 2001
+From ed8995bda0e5acd112b43ee5662df3640f6154f3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:24 +0530
-Subject: [PATCH 015/N] MINGW configure for shared build
+Subject: [PATCH 013/N] MINGW configure for shared build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 19 insertions(+), 1 deletion(-)

 diff --git a/configure.ac b/configure.ac
-index 52b3120..592b61a 100644
+index 806ebe0..6ebf250 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1240,6 +1240,13 @@ if test $enable_shared = "yes"; then
+@@ -1233,6 +1233,13 @@ if test $enable_shared = "yes"; then
 	;;
 
   esac
@@ -30,7 +30,7 @@ index 52b3120..592b61a 100644
 else # shared is disabled
   PY_ENABLE_SHARED=0
   case $ac_sys_system in
-@@ -1248,6 +1255,10 @@ else # shared is disabled
+@@ -1241,6 +1248,10 @@ else # shared is disabled
           LDLIBRARY='libpython$(LDVERSION).dll.a'
           ;;
   esac
@@ -65,5 +65,5 @@ index 52b3120..592b61a 100644
 esac
 
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch
+++ b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch
@@ -1,8 +1,8 @@
-From ae8ad2a897af02bb36b723276f7382c5dd240447 Mon Sep 17 00:00:00 2001
+From 4eb264922b5a1abfa9400662d88c10a3b5f447bd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:25 +0530
-Subject: [PATCH 016/N] MINGW dynamic loading support
+Subject: [PATCH 014/N] MINGW dynamic loading support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -11,11 +11,11 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 ---
 Makefile.pre.in      |  6 ++++++
 Python/dynload_win.c |  9 +++++++--
- configure.ac         | 15 +++++++++++++++
- 3 files changed, 28 insertions(+), 2 deletions(-)
+ configure.ac         | 16 ++++++++++++++++
+ 3 files changed, 29 insertions(+), 2 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index f738b3b..9f2475d 100644
+index e8e8e71..332f9a5 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
@@ -823,6 +823,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
@@ -59,7 +59,7 @@ index 81787e5..9d7690e 100644
 
         /* restore old error mode settings */
 diff --git a/configure.ac b/configure.ac
-index 592b61a..dfe55ad 100644
+index 6ebf250..a8c64a7 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -2718,6 +2718,9 @@ if test -z "$SHLIB_SUFFIX"; then
@@ -72,7 +72,7 @@ index 592b61a..dfe55ad 100644
 fi
 AC_MSG_RESULT($SHLIB_SUFFIX)
 
-@@ -3831,6 +3834,12 @@ then
+@@ -3831,6 +3834,13 @@ then
 	fi
 	;;
 	esac
@@ -80,12 +80,13 @@ index 592b61a..dfe55ad 100644
 +	*-*-mingw*)
 +	DYNLOADFILE="dynload_win.o"
 +	extra_machdep_objs="$extra_machdep_objs PC/dl_nt.o"
+	CFLAGS_NODIST="$CFLAGS_NODIST -DMS_DLL_ID='\"$VERSION\"'"
 +	;;
 +	esac
 fi
 AC_MSG_RESULT($DYNLOADFILE)
 if test "$DYNLOADFILE" != "dynload_stub.o"
-@@ -5667,6 +5676,12 @@ case "$ac_cv_computed_gotos" in yes*)
+@@ -5667,6 +5677,12 @@ case "$ac_cv_computed_gotos" in yes*)
   AC_DEFINE(HAVE_COMPUTED_GOTOS, 1,
   [Define if the C compiler supports computed gotos.])
 esac
@@ -99,5 +100,5 @@ index 592b61a..dfe55ad 100644
 case $ac_sys_system in
 AIX*)
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch
+++ b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch
@@ -1,8 +1,8 @@
-From 5230e91dc7c783925a609e8fec18955546a0cbe7 Mon Sep 17 00:00:00 2001
+From bd06581551552ea5206d6af8c757181864b11066 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:26 +0530
-Subject: [PATCH 017/N] MINGW ignore main program for frozen scripts
+Subject: [PATCH 015/N] MINGW ignore main program for frozen scripts
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,7 +14,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 2 files changed, 11 insertions(+), 1 deletion(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 9f2475d..223a266 100644
+index 332f9a5..8c8363a 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
@@ -352,7 +352,7 @@ PYTHON_OBJS=	\
@@ -27,10 +27,10 @@ index 9f2475d..223a266 100644
 		Python/getargs.o \
 		Python/getcompiler.o \
 diff --git a/configure.ac b/configure.ac
-index dfe55ad..ccc558e 100644
+index a8c64a7..7fcdd47 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5707,6 +5707,16 @@ case $host in
+@@ -5708,6 +5708,16 @@ case $host in
     ;;
 esac
 
@@ -48,5 +48,5 @@ index dfe55ad..ccc558e 100644
 SRCDIRS="Parser Parser/pegen Objects Python Modules Modules/_io Programs"
 case $host in
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch
+++ b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch
@@ -1,8 +1,8 @@
-From ad9ea63b35c8eb32a43f69530ebc798b5ac12553 Mon Sep 17 00:00:00 2001
+From 0dca777395cc304349d9d90e631407374e2c6de0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:26 +0530
-Subject: [PATCH 018/N] MINGW setup _multiprocessing module
+Subject: [PATCH 016/N] MINGW setup _multiprocessing module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 5 insertions(+)

 diff --git a/setup.py b/setup.py
-index b483dd3..1f96ad4 100644
+index d7a4e3f..a15718e 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1761,7 +1761,12 @@ class PyBuildExt(build_ext):
+@@ -1766,7 +1766,12 @@ class PyBuildExt(build_ext):
                                    libraries=libs,
                                    include_dirs=["Modules/_multiprocessing"]))
 
@@ -30,5 +30,5 @@ index b483dd3..1f96ad4 100644
 
     def detect_uuid(self):
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0017-MINGW-setup-select-module.patch
+++ b/mingw-w64-python/0017-MINGW-setup-select-module.patch
@@ -1,8 +1,8 @@
-From d8df9cbea83b1d7c1cd27cd1ab52feb6b6a882f7 Mon Sep 17 00:00:00 2001
+From 1dcb2cc12d447b3be226f61699d2570c921b67bb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:29 +0530
-Subject: [PATCH 019/N] MINGW setup select module
+Subject: [PATCH 017/N] MINGW setup select module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -39,10 +39,10 @@ index fb71e91..ad3990c 100644
 
         /* add object and its file descriptor to the list */
 diff --git a/setup.py b/setup.py
-index 1f96ad4..a6145c4 100644
+index a15718e..7914821 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -903,7 +903,11 @@ class PyBuildExt(build_ext):
+@@ -906,7 +906,11 @@ class PyBuildExt(build_ext):
             self.missing.append('spwd')
 
         # select(2); not on ancient System V
@@ -56,5 +56,5 @@ index 1f96ad4..a6145c4 100644
         # Fred Drake's interface to the Python parser
         self.add(Extension('parser', ['parsermodule.c']))
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch
+++ b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch
@@ -1,8 +1,8 @@
-From 63b12b21aae2268da35cd557e526b241a65198c2 Mon Sep 17 00:00:00 2001
+From f863b526f355dbc2dd1539be76a0f95f7abec559 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:30 +0530
-Subject: [PATCH 020/N] MINGW setup _ctypes module with system libffi
+Subject: [PATCH 018/N] MINGW setup _ctypes module with system libffi
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
 1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/setup.py b/setup.py
-index a6145c4..e36ef5d 100644
+index 7914821..60f6243 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2149,9 +2149,12 @@ class PyBuildExt(build_ext):
+@@ -2154,9 +2154,12 @@ class PyBuildExt(build_ext):
         self.add(ext)
         if TEST_EXTENSIONS:
             # function my_sqrt() needs libm for sqrt()
@@ -31,7 +31,7 @@ index a6145c4..e36ef5d 100644
 
         ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR")
         ffi_lib = None
-@@ -2196,6 +2199,8 @@ class PyBuildExt(build_ext):
+@@ -2201,6 +2204,8 @@ class PyBuildExt(build_ext):
 
             ext.include_dirs.append(ffi_inc)
             ext.libraries.append(ffi_lib)
@@ -41,5 +41,5 @@ index a6145c4..e36ef5d 100644
 
         if sysconfig.get_config_var('HAVE_LIBDL'):
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch
+++ b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch
@@ -1,8 +1,8 @@
-From 9b48dc123e5baf45c7e2180d46b13ae3aaeead8b Mon Sep 17 00:00:00 2001
+From 0a6c242ff914437f5feb80ee638b592667a519b2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:30 +0530
-Subject: [PATCH 021/N] MINGW defect winsock2 and setup _socket module
+Subject: [PATCH 019/N] MINGW defect winsock2 and setup _socket module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -61,10 +61,10 @@ index 8953185..d15bb4f 100644
 #  include "addrinfo.h"
 #endif
 diff --git a/configure.ac b/configure.ac
-index ccc558e..fc287de 100644
+index 7fcdd47..5459145 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4442,21 +4442,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@@ -4443,21 +4443,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 ],[])
 AC_MSG_RESULT($was_it_defined)
 
@@ -105,7 +105,7 @@ index ccc558e..fc287de 100644
   [ac_cv_struct_sockaddr_storage=yes],
   [ac_cv_struct_sockaddr_storage=no]))
 AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
-@@ -5597,7 +5612,10 @@ fi
+@@ -5598,7 +5613,10 @@ fi
 
 AC_CHECK_TYPE(socklen_t,,
   AC_DEFINE(socklen_t,int,
@@ -150,10 +150,10 @@ index 5f63cae..b69a7c7 100644
 
 /* Define to `int' if <sys/types.h> doesn't define. */
 diff --git a/setup.py b/setup.py
-index e36ef5d..b29d23b 100644
+index 60f6243..c8242ac 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1140,6 +1140,8 @@ class PyBuildExt(build_ext):
+@@ -1143,6 +1143,8 @@ class PyBuildExt(build_ext):
             if MACOS:
                 # Issue #35569: Expose RFC 3542 socket options.
                 kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542']
@@ -163,5 +163,5 @@ index e36ef5d..b29d23b 100644
             self.add(Extension('_socket', ['socketmodule.c'], **kwargs))
         elif self.compiler.find_library_file(self.lib_dirs, 'net'):
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch
+++ b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch
@@ -1,8 +1,8 @@
-From 44e8fbcb587f72cbfb477128f50524cb3c1ad021 Mon Sep 17 00:00:00 2001
+From 43127485a0b9ef0e6eb88436cbd3691114203324 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:31 +0530
-Subject: [PATCH 022/N] MINGW exclude unix only modules
+Subject: [PATCH 020/N] MINGW exclude unix only modules
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 29 insertions(+), 12 deletions(-)

 diff --git a/setup.py b/setup.py
-index b29d23b..5280ea0 100644
+index c8242ac..f317bf3 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -886,13 +886,21 @@ class PyBuildExt(build_ext):
+@@ -889,13 +889,21 @@ class PyBuildExt(build_ext):
         if (self.config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
             # May be necessary on AIX for flock function
             libs = ['bsd']
@@ -42,7 +42,7 @@ index b29d23b..5280ea0 100644
         # spwd, shadow passwords
         if (self.config_h_vars.get('HAVE_GETSPNAM', False) or
                 self.config_h_vars.get('HAVE_GETSPENT', False)):
-@@ -917,7 +925,10 @@ class PyBuildExt(build_ext):
+@@ -920,7 +928,10 @@ class PyBuildExt(build_ext):
 
         # Lance Ellinghaus's syslog module
         # syslog daemon interface
@@ -54,7 +54,7 @@ index b29d23b..5280ea0 100644
 
         # Python interface to subinterpreter C-API.
         self.add(Extension('_xxsubinterpreters', ['_xxsubinterpretersmodule.c']))
-@@ -943,7 +954,10 @@ class PyBuildExt(build_ext):
+@@ -946,7 +957,10 @@ class PyBuildExt(build_ext):
         self.add(Extension('_csv', ['_csv.c']))
 
         # POSIX subprocess module helper.
@@ -66,7 +66,7 @@ index b29d23b..5280ea0 100644
 
     def detect_test_extensions(self):
         # Python C API test module
-@@ -1125,13 +1139,16 @@ class PyBuildExt(build_ext):
+@@ -1128,13 +1142,16 @@ class PyBuildExt(build_ext):
             # the encryption.
             return
 
@@ -90,5 +90,5 @@ index b29d23b..5280ea0 100644
     def detect_socket(self):
         # socket(2)
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch
+++ b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch
@@ -1,8 +1,8 @@
-From 78ba60f537dc443ef5bc912e650e688619b9e798 Mon Sep 17 00:00:00 2001
+From 71342683a28f2826c9738951706c167226c2f093 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:33 +0530
-Subject: [PATCH 023/N] MINGW setup msvcrt and _winapi modules
+Subject: [PATCH 021/N] MINGW setup msvcrt and _winapi modules
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -16,7 +16,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 4 files changed, 26 insertions(+), 1 deletion(-)

 diff --git a/Modules/_winapi.c b/Modules/_winapi.c
-index e1672c4..ba318a1 100644
+index 1e0e4ec..1058184 100644
 --- a/Modules/_winapi.c
 +++ b/Modules/_winapi.c
@@ -39,7 +39,9 @@
@@ -57,10 +57,10 @@ index 7febaa0..70d5b3d 100644
 #endif
 
 diff --git a/setup.py b/setup.py
-index 5280ea0..736b0f0 100644
+index f317bf3..5466e9b 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1599,6 +1599,27 @@ class PyBuildExt(build_ext):
+@@ -1604,6 +1604,27 @@ class PyBuildExt(build_ext):
                                    '-framework', 'SystemConfiguration',
                                    '-framework', 'CoreFoundation']))
 
@@ -89,5 +89,5 @@ index 5280ea0..736b0f0 100644
         # Andrew Kuchling's zlib module.  Note that some versions of zlib
         # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch
+++ b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch
@@ -0,0 +1,25 @@
+From 81df7b055662ed80b952de911ec0c25df3e40e1f Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 20:52:42 +0200
+Subject: [PATCH 022/N] sysconfig: MINGW build extensions with GCC
+
+---
+ Lib/sysconfig.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index 45eab2a..42de9b3 100644
+--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
+@@ -657,6 +657,8 @@ def get_platform():
+ 
+     """
+     if os.name == 'nt':
+        if 'GCC' in sys.version:
+            return 'mingw'
+         if 'amd64' in sys.version.lower():
+             return 'win-amd64'
+         if '(arm)' in sys.version.lower():
+-- 
+2.33.0
+
--- a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch
+++ b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch
@@ -1,8 +1,8 @@
-From be2b7c5a9e045188cece8694358871525686d77c Mon Sep 17 00:00:00 2001
+From 3d38194a6e0ff4c07988064d51fa10ecbf7b450d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:37 +0530
-Subject: [PATCH 027/N] MINGW setup _ssl module
+Subject: [PATCH 023/N] MINGW setup _ssl module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 2 insertions(+)

 diff --git a/setup.py b/setup.py
-index 736b0f0..143a1c9 100644
+index 5466e9b..51d3f59 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2381,6 +2381,8 @@ class PyBuildExt(build_ext):
+@@ -2386,6 +2386,8 @@ class PyBuildExt(build_ext):
         openssl_includes = split_var('OPENSSL_INCLUDES', '-I')
         openssl_libdirs = split_var('OPENSSL_LDFLAGS', '-L')
         openssl_libs = split_var('OPENSSL_LIBS', '-l')
@@ -26,5 +26,5 @@ index 736b0f0..143a1c9 100644
             # libssl and libcrypto not found
             self.missing.extend(['_ssl', '_hashlib'])
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
+++ b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
@@ -1,8 +1,8 @@
-From b29739b0545771c80eadc505b6f661b0678ed0cf Mon Sep 17 00:00:00 2001
+From 9cd7f11ee87717152eb4deebdf74217495440b11 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:38 +0530
-Subject: [PATCH 028/N] MINGW generalization of posix build in sysconfig.py
+Subject: [PATCH 024/N] MINGW generalization of posix build in sysconfig.py
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 9 insertions(+), 6 deletions(-)

 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index aa49d80..d4298f7 100644
+index 42de9b3..65cb345 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
@@ -100,6 +100,9 @@ _BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
@@ -44,7 +44,7 @@ index aa49d80..d4298f7 100644
         base = os.environ.get("APPDATA") or "~"
         return joinuser(base, "Python")
 
-@@ -504,7 +507,7 @@ def parse_config_h(fp, vars=None):
+@@ -505,7 +508,7 @@ def parse_config_h(fp, vars=None):
 def get_config_h_filename():
     """Return the path of pyconfig.h."""
     if _PYTHON_BUILD:
@@ -53,7 +53,7 @@ index aa49d80..d4298f7 100644
             inc_dir = os.path.join(_sys_home or _PROJECT_BASE, "PC")
         else:
             inc_dir = _sys_home or _PROJECT_BASE
-@@ -576,10 +579,10 @@ def get_config_vars(*args):
+@@ -577,10 +580,10 @@ def get_config_vars(*args):
             # sys.abiflags may not be defined on all platforms.
             _CONFIG_VARS['abiflags'] = ''
 
@@ -66,7 +66,7 @@ index aa49d80..d4298f7 100644
             _init_posix(_CONFIG_VARS)
         # For backward compatibility, see issue19555
         SO = _CONFIG_VARS.get('EXT_SUFFIX')
-@@ -592,7 +595,7 @@ def get_config_vars(*args):
+@@ -593,7 +596,7 @@ def get_config_vars(*args):
 
         # Always convert srcdir to an absolute path
         srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE)
@@ -76,5 +76,5 @@ index aa49d80..d4298f7 100644
                 # If srcdir is a relative path (typically '.' or '..')
                 # then it should be interpreted relative to the directory
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch
+++ b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch
@@ -1,8 +1,8 @@
-From 8353a7f30f7dc0a33111f43ad2ce7acfa6de0a32 Mon Sep 17 00:00:00 2001
+From 15b977a7de9a992afdb0af75ae3c3d84a524d7df Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:39 +0530
-Subject: [PATCH 029/N] MINGW support stdcall without underscore
+Subject: [PATCH 025/N] MINGW support stdcall without underscore
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -50,5 +50,5 @@ index ceae67e..b9cf96b 100644
     return NULL;
 #endif
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch
+++ b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch
@@ -1,8 +1,8 @@
-From 8ce7dcc50395d138e1ec6b303c46a89ae7b98c24 Mon Sep 17 00:00:00 2001
+From b14a7592f54a2230d5b087e15a4547d23eeed6e1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:40 +0530
-Subject: [PATCH 030/N] use replace instead rename to avoid failure on windo
+Subject: [PATCH 026/N] use replace instead rename to avoid failure on windo
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/setup.py b/setup.py
-index 143a1c9..23e7689 100644
+index 51d3f59..ea08edf 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2602,7 +2602,7 @@ class PyBuildScripts(build_scripts):
+@@ -2607,7 +2607,7 @@ class PyBuildScripts(build_scripts):
             else:
                 newfilename = filename + minoronly
             log.info('renaming %s to %s', filename, newfilename)
@@ -27,5 +27,5 @@ index 143a1c9..23e7689 100644
             if filename in updated_files:
                 newupdated_files.append(newfilename)
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0027-MINGW-customize-site.patch
+++ b/mingw-w64-python/0027-MINGW-customize-site.patch
@@ -1,8 +1,8 @@
-From 8baa74769c98ae5a10f2766806f282d8a5980cf3 Mon Sep 17 00:00:00 2001
+From 7edbdbe649d050d6753289b61ad5d2883b5338cd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:42 +0530
-Subject: [PATCH 033/N] MINGW customize site
+Subject: [PATCH 027/N] MINGW customize site
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -55,5 +55,5 @@ index 9e617af..b344f03 100644
                 path = os.path.join(prefix, libdir,
                                     "python%d.%d" % sys.version_info[:2],
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0028-add-python-config-sh.patch
+++ b/mingw-w64-python/0028-add-python-config-sh.patch
@@ -1,8 +1,8 @@
-From b650a9cb9202cbb9acedc6cc043c622bf815ab1d Mon Sep 17 00:00:00 2001
+From 6c65a9a8245268b2260c99db33e27205d9a67837 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:43 +0530
-Subject: [PATCH 034/N] add python config sh
+Subject: [PATCH 028/N] add python config sh
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -158,5 +158,5 @@ index 2602fe2..e0e048a 100644
 esac
 done
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0029-cross-darwin-feature.patch
+++ b/mingw-w64-python/0029-cross-darwin-feature.patch
@@ -1,8 +1,8 @@
-From a75a88113ad8b46cb82be6a75de750d2407bf2fa Mon Sep 17 00:00:00 2001
+From 28b76e2a3d4a629a2e5280c760fce8d661909ae0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:44 +0530
-Subject: [PATCH 035/N] cross darwin feature
+Subject: [PATCH 029/N] cross darwin feature
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 49 insertions(+), 5 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index fc287de..453b80f 100644
+index 5459145..bd4ff50 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -398,6 +398,7 @@ if test -z "$MACHDEP"
+@@ -387,6 +387,7 @@ if test -z "$MACHDEP"
 then
     # avoid using uname for cross builds
     if test "$cross_compiling" = yes; then
@@ -24,9 +24,9 @@ index fc287de..453b80f 100644
        # ac_sys_system and ac_sys_release are used for setting
        # a lot of different things including 'define_xopen_source'
        # in the case statement below.
-@@ -411,6 +412,27 @@ then
- 	*-*-cygwin*)
- 		ac_sys_system=Cygwin
+@@ -403,6 +404,27 @@ then
+ 	*-*-mingw*)
+ 		ac_sys_system=MINGW
 		;;
 +	*-*-darwin*)
 +		ac_sys_system=Darwin
@@ -52,7 +52,7 @@ index fc287de..453b80f 100644
 	*-*-vxworks*)
 	    ac_sys_system=VxWorks
 	    ;;
-@@ -419,7 +441,6 @@ then
+@@ -411,7 +433,6 @@ then
 		MACHDEP="unknown"
 		AC_MSG_ERROR([cross build not supported for $host])
 	esac
@@ -60,7 +60,7 @@ index fc287de..453b80f 100644
     else
 	ac_sys_system=`uname -s`
 	if test "$ac_sys_system" = "AIX" \
-@@ -466,6 +487,9 @@ if test "$cross_compiling" = yes; then
+@@ -459,6 +480,9 @@ if test "$cross_compiling" = yes; then
 	*-*-mingw*)
 		_host_cpu=
 		;;
@@ -70,7 +70,7 @@ index fc287de..453b80f 100644
 	*)
 		# for now, limit cross builds to known configurations
 		MACHDEP="unknown"
-@@ -1662,6 +1686,26 @@ AC_SUBST(BASECFLAGS)
+@@ -1655,6 +1679,26 @@ AC_SUBST(BASECFLAGS)
 AC_SUBST(CFLAGS_NODIST)
 AC_SUBST(LDFLAGS_NODIST)
 
@@ -97,7 +97,7 @@ index fc287de..453b80f 100644
 # The -arch flags for universal builds on macOS
 UNIVERSAL_ARCH_FLAGS=
 AC_SUBST(UNIVERSAL_ARCH_FLAGS)
-@@ -2040,7 +2084,7 @@ yes)
+@@ -2033,7 +2077,7 @@ yes)
                     ;;
                 esac
             else
@@ -134,5 +134,5 @@ index fc287de..453b80f 100644
     		MACOSX_DEFAULT_ARCH="x86_64"
     		;;
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0030-mingw-system-libffi.patch
+++ b/mingw-w64-python/0030-mingw-system-libffi.patch
@@ -1,8 +1,8 @@
-From db3e4998d4ab6a11e3e263a848ebd332f25d77c6 Mon Sep 17 00:00:00 2001
+From 97a76defea005fff27a7f019c7ecde3f43a8ee64 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:45 +0530
-Subject: [PATCH 037/N] mingw system libffi
+Subject: [PATCH 030/N] mingw system libffi
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 2 insertions(+)

 diff --git a/setup.py b/setup.py
-index 23e7689..72f1281 100644
+index ea08edf..c52fd3b 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2241,6 +2241,8 @@ class PyBuildExt(build_ext):
+@@ -2246,6 +2246,8 @@ class PyBuildExt(build_ext):
             ext.libraries.append(ffi_lib)
             if MS_WINDOWS:
                 ext.libraries.extend(['ole32', 'oleaut32', 'uuid'])
@@ -26,5 +26,5 @@ index 23e7689..72f1281 100644
 
         if sysconfig.get_config_var('HAVE_LIBDL'):
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
+++ b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
@@ -1,7 +1,7 @@
-From 8264c28205f988c0e7147f4f82c68511bb5ec611 Mon Sep 17 00:00:00 2001
+From eef4cbef8040e29440e645138de2184bcc82c3d0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:46 +0530
-Subject: [PATCH 038/N] msys mingw prefer unix sep if MSYSTEM
+Subject: [PATCH 031/N] msys mingw prefer unix sep if MSYSTEM
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -380,7 +380,7 @@ index 9a30221..267ee4d 100644
 
 
 diff --git a/Python/traceback.c b/Python/traceback.c
-index a9a9dd9..e8d2786 100644
+index 83f3074..c0e463a 100644
 --- a/Python/traceback.c
 +++ b/Python/traceback.c
@@ -314,7 +314,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject *
@@ -393,5 +393,5 @@ index a9a9dd9..e8d2786 100644
         tail = filepath;
     else
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0032-mingw-use-posix-getpath.patch
+++ b/mingw-w64-python/0032-mingw-use-posix-getpath.patch
@@ -1,8 +1,8 @@
-From afe9fc7a1ffad8f5054050ecdc79203359c55d60 Mon Sep 17 00:00:00 2001
+From 81023c047fed86a16c63b8a185abbb34c54b023b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:47 +0530
-Subject: [PATCH 039/N] mingw use posix getpath
+Subject: [PATCH 032/N] mingw use posix getpath
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -463,10 +463,10 @@ index 9d7690e..bd34310 100644
 _Py_COMP_DIAG_PUSH
 _Py_COMP_DIAG_IGNORE_DEPR_DECLS
 diff --git a/Python/fileutils.c b/Python/fileutils.c
-index 45ea204..d5f8b79 100644
+index 11c659d..4b299b2 100644
 --- a/Python/fileutils.c
 +++ b/Python/fileutils.c
-@@ -1924,13 +1924,31 @@ _Py_wrealpath(const wchar_t *path,
+@@ -1925,13 +1925,31 @@ _Py_wrealpath(const wchar_t *path,
 #endif
 
 
@@ -501,5 +501,5 @@ index 45ea204..d5f8b79 100644
 
 /* Get an absolute path.
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch
+++ b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch
@@ -1,7 +1,7 @@
-From a8c10ce1867cef6470abf110d26cfc47ed4c5e5a Mon Sep 17 00:00:00 2001
+From 1a866712f70f3f146587b0d25ad7f66b185a0afc Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:48 +0530
-Subject: [PATCH 040/N] mingw add ModuleFileName dir to PATH
+Subject: [PATCH 033/N] mingw add ModuleFileName dir to PATH
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -54,5 +54,5 @@ index 3010182..c52e0df 100644
         && calculate->warnings)
     {
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
+++ b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
@@ -1,8 +1,8 @@
-From 6bd3b909a390939df82bdecf650f75509b752bd2 Mon Sep 17 00:00:00 2001
+From e9e44cbc990a6d1be36bc7739de1b365bd5f3deb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:49 +0530
-Subject: [PATCH 041/N] mingw add BUILDIN_WIN32_MODULEs time msvcrt
+Subject: [PATCH 034/N] mingw add BUILDIN_WIN32_MODULEs time msvcrt
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -23,5 +23,5 @@ index d071a74..825ce5d 100644
 +@USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c
 
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch
+++ b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch
@@ -1,8 +1,8 @@
-From ae4be49d5a7fbdcbc2c82aa1359e7ead2c393854 Mon Sep 17 00:00:00 2001
+From 87605ef6c8e472a8b1e38d0fbeaf4f75b87a9964 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:50 +0530
-Subject: [PATCH 042/N] msys cygwin semi native build sysconfig
+Subject: [PATCH 035/N] msys cygwin semi native build sysconfig
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 3 files changed, 74 insertions(+)

 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index d4298f7..5d336d8 100644
+index 65cb345..f69d0db 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
@@ -337,6 +337,14 @@ def _parse_makefile(filename, vars=None):
@@ -34,7 +34,7 @@ index d4298f7..5d336d8 100644
     vars.update(done)
     return vars
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 223a266..5271dd8 100644
+index 8c8363a..e0b8155 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
@@ -137,6 +137,13 @@ exec_prefix=	@exec_prefix@
@@ -52,10 +52,10 @@ index 223a266..5271dd8 100644
 BINDIR=		@bindir@
 LIBDIR=		@libdir@
 diff --git a/configure.ac b/configure.ac
-index 453b80f..4586602 100644
+index bd4ff50..a9640e9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -625,6 +625,65 @@ then
+@@ -618,6 +618,65 @@ then
   AC_DEFINE(_INCLUDE__STDC_A1_SOURCE, 1, Define to include mbstate_t for mbrtowc)
 fi
 
@@ -122,5 +122,5 @@ index 453b80f..4586602 100644
 AC_SUBST(INITSYS)
 case $host in
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0036-py3k-mingw-ntthreads-vs-pthreads.patch
+++ b/mingw-w64-python/0036-py3k-mingw-ntthreads-vs-pthreads.patch
@@ -1,64 +0,0 @@
-From cef46d4d01202b0297badf3d715928e3b7406357 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
- <alexey.pawlow@gmail.com>
-Date: Thu, 17 Jun 2021 18:51:45 +0530
-Subject: [PATCH 036/N] py3k mingw ntthreads vs pthreads
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Co-authored-by: Алексей <alexey.pawlow@gmail.com>
-Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
---
- Include/internal/pycore_condvar.h | 10 ++++++++++
- Include/pythread.h                |  6 ++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/Include/internal/pycore_condvar.h b/Include/internal/pycore_condvar.h
-index 8b89d70..dd98245 100644
--- a/Include/internal/pycore_condvar.h
-+++ b/Include/internal/pycore_condvar.h
-@@ -5,6 +5,12 @@
- #  error "this header requires Py_BUILD_CORE define"
- #endif
- 
-+#ifdef __MINGW32__
-+# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS)
-+#  undef _POSIX_THREADS
-+# endif
-+#endif
-+
- #ifndef _POSIX_THREADS
- /* This means pthreads are not implemented in libc headers, hence the macro
-    not present in unistd.h. But they still can be implemented as an external
-@@ -37,6 +43,10 @@
- /* include windows if it hasn't been done before */
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-+/* winpthreads are involved via windows header, so need undef _POSIX_THREADS after header include */
-+#if defined(_POSIX_THREADS)
-+#undef _POSIX_THREADS
-+#endif
- 
- /* options */
- /* non-emulated condition variables are provided for those that want
-diff --git a/Include/pythread.h b/Include/pythread.h
-index bb9d864..f1e52c6 100644
--- a/Include/pythread.h
-+++ b/Include/pythread.h
-@@ -8,6 +8,12 @@ typedef void *PyThread_type_lock;
- extern "C" {
- #endif
- 
-+#ifdef __MINGW32__
-+# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS)
-+#  undef _POSIX_THREADS
-+# endif
-+#endif
-+
- /* Return status codes for Python lock acquisition.  Chosen for maximum
-  * backwards compatibility, ie failure -> 0, success -> 1.  */
- typedef enum PyLockStatus {
-- 
-2.32.0
-
--- a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch
+++ b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch
@@ -1,36 +1,14 @@
-From 893ba3a5e55dc3e07bac6407075e3461a24f979f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
- <alexey.pawlow@gmail.com>
-Date: Thu, 17 Jun 2021 18:51:50 +0530
-Subject: [PATCH 043/N] mingw sysconfig like posix
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+From ab96d425d200796577c4d9eef79cc1e0e62a39dc Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 20:53:59 +0200
+Subject: [PATCH 036/N] sysconfig: mingw sysconfig like posix

-Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 ---
- Lib/distutils/command/build_ext.py |  3 ++-
- Lib/sysconfig.py                   | 28 ++++++++++++++--------------
- 2 files changed, 16 insertions(+), 15 deletions(-)
+ Lib/sysconfig.py | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)

-diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
-index 1c9d471..1dbdfe0 100644
--- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -221,9 +221,10 @@ class build_ext(Command):
-         if sys.platform[:6] == 'cygwin':
-             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
-                 # building third party extensions
-+                config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL'))
-                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
-                                                       "python" + get_python_version(),
-                                                      "config"))
-+                                                      config_dir_name))
-             else:
-                 # building python standard extensions
-                 self.library_dirs.append('.')
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 5d336d8..c0695e2 100644
+index f69d0db..64f7719 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
@@ -48,23 +48,23 @@ _INSTALL_SCHEMES = {
@@ -46,8 +24,8 @@ index 5d336d8..c0695e2 100644
 -        'scripts': '{base}/Scripts',
 +        'stdlib': '{installed_base}/lib/python{py_version_short}',
 +        'platstdlib': '{base}/lib/python{py_version_short}',
-+        'purelib': '{base}/lib/python{py_version_short}',
-+        'platlib': '{base}/lib/python{py_version_short}',
+        'purelib': '{base}/lib/python{py_version_short}/site-packages',
+        'platlib': '{base}/lib/python{py_version_short}/site-packages',
 +        'include': '{installed_base}/include/python{py_version_short}',
 +        'platinclude': '{installed_base}/include/python{py_version_short}',
 +        'scripts': '{base}/bin',
@@ -70,7 +48,7 @@ index 5d336d8..c0695e2 100644
         'data': '{userbase}',
         },
     'posix_user': {
-@@ -470,7 +470,7 @@ def _init_non_posix(vars):
+@@ -471,7 +471,7 @@ def _init_non_posix(vars):
     vars['INCLUDEPY'] = get_path('include')
     vars['EXT_SUFFIX'] = _imp.extension_suffixes()[0]
     vars['EXE'] = '.exe'
@@ -80,5 +58,5 @@ index 5d336d8..c0695e2 100644
 
 #
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch
+++ b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch
@@ -0,0 +1,39 @@
+From fa3d5a352904467d12247164a7673033c5e95d2a Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 21:13:57 +0200
+Subject: [PATCH 037/N] build _winapi earlier so we can use it in distutils
+ via subprocess
+
+---
+ Modules/Setup.config.in | 1 +
+ setup.py                | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in
+index 825ce5d..b4e7ff7 100644
+--- a/Modules/Setup.config.in
+++ b/Modules/Setup.config.in
+@@ -12,4 +12,5 @@
+ # build-in modules for windows platform:
+ @USE_WIN32_MODULE@winreg ../PC/winreg.c
+ @USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c
+@USE_WIN32_MODULE@_winapi _winapi.c
+ 
+diff --git a/setup.py b/setup.py
+index c52fd3b..6a352af 100644
+--- a/setup.py
+++ b/setup.py
+@@ -1612,7 +1612,9 @@ class PyBuildExt(build_ext):
+             self.add(Extension('msvcrt', [os.path.join(pc_srcdir, p)
+                                for p in ['msvcrtmodule.c']]))
+ 
+-            self.add(Extension('_winapi', ['_winapi.c']))
+            # Added to Setup.config.in as now needed earlier since I
+            # use subprocess (which uses Popen) in cygwinccompiler.py
+            # self.add(Extension('_winapi', ['_winapi.c']))
+ 
+             self.add(Extension('_msi', [os.path.join(pc_srcdir, p)
+                                for p in ['_msi.c']],
+-- 
+2.33.0
+
--- a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch
+++ b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch
@@ -1,8 +1,8 @@
-From c919ed9405978c2261712b8e8e860b12f7001057 Mon Sep 17 00:00:00 2001
+From 64886b38c5ad2d78730ed147ba398693731a8e89 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:52 +0530
-Subject: [PATCH 045/N] cross dont add multiarch paths if cross compiling
+Subject: [PATCH 038/N] cross dont add multiarch paths if cross compiling
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/setup.py b/setup.py
-index 36af6e9..55c7382 100644
+index 6a352af..497abbf 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -734,10 +734,10 @@ class PyBuildExt(build_ext):
+@@ -737,10 +737,10 @@ class PyBuildExt(build_ext):
         if not CROSS_COMPILING:
             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
@@ -29,5 +29,5 @@ index 36af6e9..55c7382 100644
 
     def init_inc_lib_dirs(self):
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch
+++ b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch
@@ -1,8 +1,8 @@
-From 0525d209616594f74c395e8db04aa745f6b190e2 Mon Sep 17 00:00:00 2001
+From 47c94ca56a6ebe7423ed267a69d1b9931893da3b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:53 +0530
-Subject: [PATCH 046/N] mingw use backslashes in compileall py
+Subject: [PATCH 039/N] mingw use backslashes in compileall py
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 2 insertions(+)

 diff --git a/Lib/compileall.py b/Lib/compileall.py
-index fe7f450..4102839 100644
+index 39f4bb3..3490c09 100644
 --- a/Lib/compileall.py
 +++ b/Lib/compileall.py
@@ -38,6 +38,8 @@ def _walk_dir(dir, maxlevels, quiet=0):
@@ -26,5 +26,5 @@ index fe7f450..4102839 100644
             yield fullname
         elif (maxlevels > 0 and name != os.curdir and name != os.pardir and
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch
+++ b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch
@@ -0,0 +1,42 @@
+From 22fc2593de88d46a11786898d401e4801faeb125 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 21:18:36 +0200
+Subject: [PATCH 040/N] msys convert_path fix and root hack
+
+---
+ Makefile.pre.in | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index e0b8155..cf16e93 100644
+--- a/Makefile.pre.in
+++ b/Makefile.pre.in
+@@ -1707,6 +1707,12 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+ 	else true; \
+ 	fi
+ 
+ifeq ($(shell uname -o),Msys)
+DESTDIRFINAL=$(DESTDIR)
+else
+DESTDIRFINAL=$(DESTDIR)/
+endif
+
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+@@ -1714,9 +1720,9 @@ sharedinstall: sharedmods
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
+-		--root=$(DESTDIR)/
+-	-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
+-	-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
+		--root=$(DESTDIRFINAL)
+	-rm $(DESTDIRFINAL)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
+	-rm -r $(DESTDIRFINAL)$(DESTSHARED)/__pycache__
+ 
+ # Here are a couple of targets for MacOSX again, to install a full
+ # framework-based Python. frameworkinstall installs everything, the
+-- 
+2.33.0
+
--- a/mingw-w64-python/0041-allow-static-tcltk.patch
+++ b/mingw-w64-python/0041-allow-static-tcltk.patch
@@ -1,8 +1,8 @@
-From 6777f17ccae090e6687d6317b4dafcb0c8899f8f Mon Sep 17 00:00:00 2001
+From 096b2ca2e049158126943fbd39eb969d2e040262 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:54 +0530
-Subject: [PATCH 048/N] allow static tcltk
+Subject: [PATCH 041/N] allow static tcltk
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 25 insertions(+), 10 deletions(-)

 diff --git a/setup.py b/setup.py
-index 55c7382..d8fc413 100644
+index 497abbf..31b08de 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -783,7 +783,7 @@ class PyBuildExt(build_ext):
+@@ -786,7 +786,7 @@ class PyBuildExt(build_ext):
         if HOST_PLATFORM == 'hp-ux11':
             self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
 
@@ -25,7 +25,7 @@ index 55c7382..d8fc413 100644
             # This should work on any unixy platform ;-)
             # If the user has bothered specifying additional -I and -L flags
             # in OPT and LDFLAGS we might as well use them here.
-@@ -793,6 +793,8 @@ class PyBuildExt(build_ext):
+@@ -796,6 +796,8 @@ class PyBuildExt(build_ext):
             # directories with whitespace in the name to store libraries.
             cflags, ldflags = sysconfig.get_config_vars(
                     'CFLAGS', 'LDFLAGS')
@@ -34,7 +34,7 @@ index 55c7382..d8fc413 100644
             for item in cflags.split():
                 if item.startswith('-I'):
                     self.inc_dirs.append(item[2:])
-@@ -2042,14 +2044,19 @@ class PyBuildExt(build_ext):
+@@ -2047,14 +2049,19 @@ class PyBuildExt(build_ext):
         # The versions with dots are used on Unix, and the versions without
         # dots on Windows, for detection by cygwin.
         tcllib = tklib = tcl_includes = tk_includes = None
@@ -62,7 +62,7 @@ index 55c7382..d8fc413 100644
                 break
 
         # Now check for the header files
-@@ -2120,10 +2127,18 @@ class PyBuildExt(build_ext):
+@@ -2125,10 +2132,18 @@ class PyBuildExt(build_ext):
         # Add the Tcl/Tk libraries
         libs.append('tk'+ version)
         libs.append('tcl'+ version)
@@ -83,5 +83,5 @@ index 55c7382..d8fc413 100644
         # XXX handle these, but how to detect?
         # *** Uncomment and edit for PIL (TkImaging) extension only:
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch
+++ b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch
@@ -1,8 +1,8 @@
-From 88deca4afdb3762987227d4aa3cd50cfc8658ea7 Mon Sep 17 00:00:00 2001
+From 2b8402c1cab75d631728eb1aecf02eb0f0f66265 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:55 +0530
-Subject: [PATCH 049/N] mingw pdcurses_ISPAD
+Subject: [PATCH 042/N] mingw pdcurses_ISPAD
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -31,5 +31,5 @@ index b70252d..0d5cee2 100644
 /* configure was checking <curses.h>, but we will
    use <ncurses.h>, which has some or all these features. */
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0043-grammar-fixes.patch
+++ b/mingw-w64-python/0043-grammar-fixes.patch
@@ -1,8 +1,8 @@
-From ece4431ade66c4abb835a489cacc002545ccb13a Mon Sep 17 00:00:00 2001
+From 36b85a28791eb087338e12f796e8d473d22f3ace Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:56 +0530
-Subject: [PATCH 050/N] grammar fixes
+Subject: [PATCH 043/N] grammar fixes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -41,5 +41,5 @@ index b7aa528..4a1ee9a 100644
     {2, 1},
     {3, 2},
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0044-builddir-fixes.patch
+++ b/mingw-w64-python/0044-builddir-fixes.patch
@@ -1,8 +1,8 @@
-From 6e9ed94084c501600e2ba6fdaac4b49b252e654d Mon Sep 17 00:00:00 2001
+From e835e97afda8c4c672defae902194866fc3df0a4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:57 +0530
-Subject: [PATCH 051/N] builddir fixes
+Subject: [PATCH 044/N] builddir fixes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
 2 files changed, 6 insertions(+), 6 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 72be72d..7badeec 100644
+index cf16e93..7b3fdf6 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
@@ -741,20 +741,20 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
@@ -66,5 +66,5 @@ index 2e4ccbb..a8d5c31 100644
    from frozen.obj. In the Makefile, frozen.o is not linked into this executable,
    so we define the variable here. */
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch
+++ b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch
@@ -1,8 +1,8 @@
-From 2cafb98ac994c8befe0d053e6e1524af8ec6e180 Mon Sep 17 00:00:00 2001
+From 74ee0fa7cbd23e29f60d03606ee32b34bc0dbc6c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:57 +0530
-Subject: [PATCH 052/N] msys monkeypatch os system via sh exe
+Subject: [PATCH 045/N] msys monkeypatch os system via sh exe
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 1 file changed, 11 insertions(+)

 diff --git a/setup.py b/setup.py
-index d8fc413..20fff27 100644
+index 31b08de..207a61c 100644
 --- a/setup.py
 +++ b/setup.py
@@ -58,6 +58,17 @@ def get_platform():
@@ -35,5 +35,5 @@ index d8fc413..20fff27 100644
 HOST_PLATFORM = get_platform()
 MS_WINDOWS = (HOST_PLATFORM == 'win32')
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch
+++ b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch
@@ -1,8 +1,8 @@
-From c403bd9ac50aeda60b91f6c990f4f34bedf93bd3 Mon Sep 17 00:00:00 2001
+From a85ea70acca8b8d49c5dea8451ec512ea979d88d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:58 +0530
-Subject: [PATCH 053/N] msys replace slashes used in io redirection
+Subject: [PATCH 046/N] msys replace slashes used in io redirection
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
 1 file changed, 6 insertions(+), 6 deletions(-)

 diff --git a/setup.py b/setup.py
-index 20fff27..f5914d8 100644
+index 207a61c..d7a60e0 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -643,7 +643,7 @@ class PyBuildExt(build_ext):
+@@ -646,7 +646,7 @@ class PyBuildExt(build_ext):
         # Debian/Ubuntu multiarch support.
         # https://wiki.ubuntu.com/MultiarchSpec
         cc = sysconfig.get_config_var('CC')
@@ -26,7 +26,7 @@ index 20fff27..f5914d8 100644
         if not os.path.exists(self.build_temp):
             os.makedirs(self.build_temp)
         ret = run_command(
-@@ -668,7 +668,7 @@ class PyBuildExt(build_ext):
+@@ -671,7 +671,7 @@ class PyBuildExt(build_ext):
         opt = ''
         if CROSS_COMPILING:
             opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
@@ -35,7 +35,7 @@ index 20fff27..f5914d8 100644
         if not os.path.exists(self.build_temp):
             os.makedirs(self.build_temp)
         ret = run_command(
-@@ -687,7 +687,7 @@ class PyBuildExt(build_ext):
+@@ -690,7 +690,7 @@ class PyBuildExt(build_ext):
 
     def add_cross_compiling_paths(self):
         cc = sysconfig.get_config_var('CC')
@@ -44,7 +44,7 @@ index 20fff27..f5914d8 100644
         if not os.path.exists(self.build_temp):
             os.makedirs(self.build_temp)
         ret = run_command('%s -E -v - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile))
-@@ -1001,7 +1001,7 @@ class PyBuildExt(build_ext):
+@@ -1004,7 +1004,7 @@ class PyBuildExt(build_ext):
         readline_termcap_library = ""
         curses_library = ""
         # Cannot use os.popen here in py3k.
@@ -53,7 +53,7 @@ index 20fff27..f5914d8 100644
         if not os.path.exists(self.build_temp):
             os.makedirs(self.build_temp)
         # Determine if readline is already linked against curses or tinfo.
-@@ -1998,12 +1998,12 @@ class PyBuildExt(build_ext):
+@@ -2003,12 +2003,12 @@ class PyBuildExt(build_ext):
         cflags = sysconfig.get_config_vars('CFLAGS')[0]
         archs = re.findall(r'-arch\s+(\w+)', cflags)
 
@@ -69,5 +69,5 @@ index 20fff27..f5914d8 100644
         with open(tmpfile) as fp:
             detected_archs = []
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0047-remove_path_max.default.patch
+++ b/mingw-w64-python/0047-remove_path_max.default.patch
@@ -1,8 +1,8 @@
-From d7ddae846cd17e00caca8c969b55a057f3589fec Mon Sep 17 00:00:00 2001
+From 01d2127df3190c472307aff3aaa71ab65e2450e4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:59 +0530
-Subject: [PATCH 055/N] remove_path_max.default
+Subject: [PATCH 047/N] remove_path_max.default
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index 3243944..99d4977 100644
 #endif
 
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0048-dont-link-with-gettext.patch
+++ b/mingw-w64-python/0048-dont-link-with-gettext.patch
@@ -1,8 +1,8 @@
-From fbe0b754bebcb09130fe8303ca180ef2221a8372 Mon Sep 17 00:00:00 2001
+From 9b3cfc647bdeedc9caa6d89cdbcb4dfcdb3490f8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:00 +0530
-Subject: [PATCH 056/N] dont link with gettext
+Subject: [PATCH 048/N] dont link with gettext
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -32,7 +32,7 @@ index 2e353bb..ea222af 100644
 #include <stdio.h>
 #include <locale.h>
 diff --git a/configure.ac b/configure.ac
-index 4586602..1599c74 100644
+index a9640e9..0e1e9e4 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -3154,10 +3154,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4)
@@ -56,5 +56,5 @@ index 4586602..1599c74 100644
 # checks for system dependent C++ extensions support
 case "$ac_sys_system" in
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0049-ctypes-python-dll.patch
+++ b/mingw-w64-python/0049-ctypes-python-dll.patch
@@ -1,8 +1,8 @@
-From 3347f3abb6dac9690e21055bb8a823870d4c9edd Mon Sep 17 00:00:00 2001
+From 2a0f9b8311884449312bb934557f43a93a7ab426 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:01 +0530
-Subject: [PATCH 057/N] ctypes python dll
+Subject: [PATCH 049/N] ctypes python dll
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -29,5 +29,5 @@ index 4afa4eb..2fe2eec 100644
 elif _sys.platform == "cygwin":
     pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2])
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0050-gdbm-module-includes.patch
+++ b/mingw-w64-python/0050-gdbm-module-includes.patch
@@ -1,8 +1,8 @@
-From 886617c8d1d880ef0206debff313a068669e4e6f Mon Sep 17 00:00:00 2001
+From 34ca4e0b61ce539fee85e283e71d147d4035ae72 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:02 +0530
-Subject: [PATCH 058/N] gdbm module includes
+Subject: [PATCH 050/N] gdbm module includes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -26,5 +26,5 @@ index dd4c6b1..d51015c 100644
 extern const char * gdbm_strerror(gdbm_error);
 #endif
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0051-use-gnu_printf-in-format.patch
+++ b/mingw-w64-python/0051-use-gnu_printf-in-format.patch
@@ -1,8 +1,8 @@
-From 3f773a3fb7c2ff965f5ec8dadb348a99ca5c2874 Mon Sep 17 00:00:00 2001
+From c25ea3b8769fa270074f16ead5f119260219d127 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:03 +0530
-Subject: [PATCH 059/N] use gnu_printf in format
+Subject: [PATCH 051/N] use gnu_printf in format
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -81,5 +81,5 @@ index 670e5d2..d582963 100644
 PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...);
 
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch
+++ b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch
@@ -1,7 +1,7 @@
-From 1d256fa194a67c65adab63f98e3129f203b0f3fa Mon Sep 17 00:00:00 2001
+From f5d305af4ee0826f1dcafe85fc7493657e667cb0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:03 +0530
-Subject: [PATCH 060/N] mingw fix ssl dont use enum_certificates
+Subject: [PATCH 052/N] mingw fix ssl dont use enum_certificates
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -35,5 +35,5 @@ index 30f4e59..dda3ae1 100644
                 self._load_windows_store_certs(storename, purpose)
         self.set_default_verify_paths()
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch
+++ b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch
@@ -1,8 +1,8 @@
-From 86c9d4a3a9b44f10b1c4c638243ed1f0b783901a Mon Sep 17 00:00:00 2001
+From 70aae126fda0fca2f004edd82894c13f0b279b00 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:06 +0530
-Subject: [PATCH 063/N] fix using dllhandle and winver mingw
+Subject: [PATCH 053/N] fix using dllhandle and winver mingw
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -35,5 +35,5 @@ index 3e4115f..839ed1c 100644
                         PyLong_FromVoidPtr(PyWin_DLLhModule));
     SET_SYS_FROM_STRING("winver",
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
+++ b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
@@ -1,8 +1,8 @@
-From 1c81c81b5e7f5ba55927e8ae64e148731ed9b04f Mon Sep 17 00:00:00 2001
+From 887b0e7895143809d0c8170caa3a4dd2306efefd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:07 +0530
-Subject: [PATCH 065/N] Add AMD64 to sys config so msvccompiler
+Subject: [PATCH 054/N] Add AMD64 to sys config so msvccompiler
 get_build_version works

 ---
@@ -38,5 +38,5 @@ index 59c0dbf..adccaa7 100644
 #elif defined(__cplusplus)
 #define COMPILER "[C++]"
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch
+++ b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch
@@ -1,18 +1,18 @@
-From 5e0de2a63f9534dabbdfbe422cb7952afa4b7ce2 Mon Sep 17 00:00:00 2001
+From 1d8904ee69999ae9e58bec2b177472e67493628a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:08 +0530
-Subject: [PATCH 066/N] MINGW link with additional library
+Subject: [PATCH 055/N] MINGW link with additional library

 ---
 configure.ac | 9 +++++++++
 1 file changed, 9 insertions(+)

 diff --git a/configure.ac b/configure.ac
-index 1599c74..28b69be 100644
+index 0e1e9e4..4316338 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5860,6 +5860,15 @@ for dir in $SRCDIRS; do
+@@ -5861,6 +5861,15 @@ for dir in $SRCDIRS; do
 done
 AC_MSG_RESULT(done)
 
@@ -29,5 +29,5 @@ index 1599c74..28b69be 100644
 AC_MSG_CHECKING(for -O2)
 saved_cflags="$CFLAGS"
 -- 
-2.32.0
+2.33.0

--- a/mingw-w64-python/0056-install-msilib.patch
+++ b/mingw-w64-python/0056-install-msilib.patch
@@ -1,7 +1,7 @@
-From 408a59388df34c484cc3bfc7d7465ca7ea9c6f05 Mon Sep 17 00:00:00 2001
+From 63cdce7b086866930e5d34b1ade187dc0f92309d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
 Date: Thu, 17 Jun 2021 18:52:09 +0530
-Subject: [PATCH 067/N] install msilib
+Subject: [PATCH 056/N] install msilib
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,7 +14,7 @@ Co-authored-by: Ray Donnelly <mingw.android@gmail.com>
 1 file changed, 1 insertion(+)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 7badeec..f6d0247 100644
+index 7b3fdf6..87e95ec 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
@@ -1497,6 +1497,7 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
@@ -26,5 +26,5 @@ index 7badeec..f6d0247 100644
 		unittest unittest/test unittest/test/testmock \
 		venv venv/scripts venv/scripts/common venv/scripts/posix \
 -- 
-2.32.0
+2.33.0

--- a/Show More
+++ b/Show More