From 114cf86bfefef215e5cd433d55b62eae69db0600 Mon Sep 17 00:00:00 2001
From: Sarah Ottinger <schalaalexiazeal@gmail.com>
Date: Tue, 20 Apr 2021 17:20:29 -0700
Subject: [PATCH] aiohttp 3.7.4.post0

---
 mingw-w64-python-aiohttp/PKGBUILD             | 13 ++++----
 .../python-aiohttp-chardet-4.patch            | 30 -------------------
 2 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 mingw-w64-python-aiohttp/python-aiohttp-chardet-4.patch

diff --git a/mingw-w64-python-aiohttp/PKGBUILD b/mingw-w64-python-aiohttp/PKGBUILD
index 74a5939328..1024bf8746 100644
--- a/mingw-w64-python-aiohttp/PKGBUILD
+++ b/mingw-w64-python-aiohttp/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=aiohttp
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=3.7.4
-_gitcommit=0a26acc1de9e1b0244456b7881ec16ba8bb64fc3
+pkgver=3.7.4.post0
+_gitcommit=184274d9b28bbfa06ac60e48bf286a761c6a6cb0
 pkgrel=1
 pkgdesc='HTTP client/server for asyncio (mingw-w64)'
 arch=('any')
@@ -30,13 +30,11 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python-brotli: for Brotli transfer-encoding
 source=("git+https://github.com/aio-libs/aiohttp#commit=${_gitcommit}"
         "git+https://github.com/nodejs/http-parser"
 		"python-aiohttp-release-resources-pytest.patch"
-        "python-aiohttp-brotli.patch"
-        "python-aiohttp-chardet-4.patch")
+        "python-aiohttp-brotli.patch")
 sha256sums=('SKIP'
             'SKIP'
             '68eac724a7ed691de5f242b062e80f4070e87dbc13739d10d4ae9602832fc026'
-            '79b55f820809d7441ebe4124e101511f3e8b6ee20d7eeeb7da7c7ed49d448c9e'
-            '2f0f83ca8f15fc2fe0e4560611ece9417c3c3e57a356969103b55abffa8e9cdc')
+            '79b55f820809d7441ebe4124e101511f3e8b6ee20d7eeeb7da7c7ed49d448c9e')
 
 pkgver() {
   cd $srcdir/${_realname}
@@ -48,13 +46,14 @@ prepare() {
   git submodule init
   git config submodule."vendor/http-parser".url "${srcdir}/http-parser"
   git submodule update --recursive
+  # fix tests
+  git revert -n 942c1b801f0ce4b5cd0103be58eb0359edf698a2
   cd ..
   rm -rf python-build-${CARCH} | true
   cp -r "${_realname}" "python-build-${CARCH}"
   cd "${srcdir}/python-build-${CARCH}"
   patch -p1 -i ../python-aiohttp-release-resources-pytest.patch
   patch -p1 -i ../python-aiohttp-brotli.patch
-  patch -p1 -i ../python-aiohttp-chardet-4.patch
   sed 's|.install-cython ||' -i Makefile
 }
 
diff --git a/mingw-w64-python-aiohttp/python-aiohttp-chardet-4.patch b/mingw-w64-python-aiohttp/python-aiohttp-chardet-4.patch
deleted file mode 100644
index b0d356cb4f..0000000000
--- a/mingw-w64-python-aiohttp/python-aiohttp-chardet-4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0c4e57f350b5129bdc63c529995da7e909d36a36 Mon Sep 17 00:00:00 2001
-From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
-Date: Fri, 11 Dec 2020 10:22:48 +0200
-Subject: [PATCH] Bump chardet from 3.0.4 to 4.0.0 (#5334)
-
-Bumps [chardet](https://github.com/chardet/chardet) from 3.0.4 to 4.0.0.
-- [Release notes](https://github.com/chardet/chardet/releases)
-- [Commits](https://github.com/chardet/chardet/compare/3.0.4...4.0.0)
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
-Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
----
- requirements/base.txt | 2 +-
- setup.py              | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index f21681333e..d542f85298 100644
---- a/setup.py
-+++ b/setup.py
-@@ -64,7 +64,7 @@ def build_extension(self, ext):
- 
- install_requires = [
-     "attrs>=17.3.0",
--    "chardet>=2.0,<4.0",
-+    "chardet>=2.0,<5.0",
-     "multidict>=4.5,<7.0",
-     "async_timeout>=4.0.0a3,<5.0",
-     'asynctest==0.13.0; python_version<"3.8"',