From 22fdbd77ceded2cd3d30e5c4495ce2c0a8dbacec Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Thu, 16 Jul 2020 12:48:56 +0300
Subject: [PATCH] python: Update to 3.8.4

---
 .../0560-mingw-use-posix-getpath.patch            | 15 ++++++++-------
 mingw-w64-python/PKGBUILD                         |  8 ++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mingw-w64-python/0560-mingw-use-posix-getpath.patch b/mingw-w64-python/0560-mingw-use-posix-getpath.patch
index b108e3e37a..863ec1874a 100644
--- a/mingw-w64-python/0560-mingw-use-posix-getpath.patch
+++ b/mingw-w64-python/0560-mingw-use-posix-getpath.patch
@@ -386,15 +386,16 @@ diff -Naur Python-3.8.0-orig/Modules/posixmodule.c Python-3.8.0/Modules/posixmod
              Py_DECREF(list);
              list = path_error(path);
              goto exit;
-diff -Naur Python-3.8.0-orig/Python/dynload_win.c Python-3.8.0/Python/dynload_win.c
---- Python-3.8.0-orig/Python/dynload_win.c	2019-10-22 10:01:24.710185500 +0300
-+++ Python-3.8.0/Python/dynload_win.c	2019-10-22 10:02:45.644127700 +0300
-@@ -180,7 +180,7 @@
+diff -Naur Python-3.8.4-orig/Python/dynload_win.c Python-3.8.4/Python/dynload_win.c
+--- Python-3.8.4-orig/Python/dynload_win.c	2019-10-22 10:01:24.710185500 +0300
++++ Python-3.8.4/Python/dynload_win.c	2019-10-22 10:02:45.644127700 +0300
+@@ -180,7 +180,9 @@
      char funcname[258], *import_python;
      const wchar_t *wpathname;
  
--#ifndef _DEBUG
-+#if !defined(_DEBUG) && defined(_MSC_VER)
++#if defined(_MSC_VER)
      _Py_CheckPython3();
- #endif
++#endif
  
+     wpathname = _PyUnicode_AsUnicode(pathname);
+     if (wpathname == NULL)
diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD
index 1881256d7e..cc028d7c86 100644
--- a/mingw-w64-python/PKGBUILD
+++ b/mingw-w64-python/PKGBUILD
@@ -17,8 +17,8 @@ _realname=python
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 _pybasever=3.8
-pkgver=${_pybasever}.3
-pkgrel=2
+pkgver=${_pybasever}.4
+pkgrel=1
 provides=("${MINGW_PACKAGE_PREFIX}-python3=${pkgver}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3"
            "${MINGW_PACKAGE_PREFIX}-python2<2.7.16-7")
@@ -475,7 +475,7 @@ package() {
 
 }
 
-sha256sums=('dfab5ec723c218082fe3d5d7ae17ecbdebffa9a1aea4d64aa3a2ecdd2e795864'
+sha256sums=('5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37'
             '0ee1acf745d38d41fd098487b9595705fd8f6666d7b154d54ddba32d14f1253b'
             '0d27f52bc514dbf2b730f62fa6c18c797a2f4cbad8698d95b15e2774d68e483d'
             'd2d73d9fb9db48fecb3a6856e4606f444eaac7637fd4f65e192701e53ac422eb'
@@ -515,7 +515,7 @@ sha256sums=('dfab5ec723c218082fe3d5d7ae17ecbdebffa9a1aea4d64aa3a2ecdd2e795864'
             '840cbf8fafa2cc230dd8a9f667dbad80d54ad573f929f9970252722b9183688b'
             'fbae2e8121a027713ce9cf2197b4d702f512e65d028a2a71d4229a4c70f8410d'
             '95cf0d30ad7f0f171da79187f1564b8b2796e9d76551cfb442c26ae4d9f1aafe'
-            '23a3566e06b43ccf292bebe0a464421d41c5a30deb9f80d0964dd01ff483e5ed'
+            '6b37b7d4ecd269abcf92ada988d4be48e0fee1473d6a2cc7d6562812c579095d'
             '4bb617a956b783edfb1a4246580172c4f9eb2728ff14730618854a3be7840dad'
             '65aff7e831f3bb4b37ed5d4db5dfa75ab6bd582d132dd197e658ccb699dbfac7'
             'f2a7b6dce11311e3d318d5729258935a520dcb7ce4dc879ecb1738a2f8bfe434'