From b07895500a83d0bb90be11c55516efb33aca8a59 Mon Sep 17 00:00:00 2001
From: Xavier Fiechter <31884704+xavierfiechter@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:04:50 +0200
Subject: [PATCH 1/5] Make CI compile aiohttp again.

References:
https://stackoverflow.com/a/64755338/20124004,
https://stackoverflow.com/a/64755052/20124004,
https://github.com/kivy/python-for-android/pull/2518
---
 pythonforandroid/recipes/aiohttp/__init__.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pythonforandroid/recipes/aiohttp/__init__.py b/pythonforandroid/recipes/aiohttp/__init__.py
index 74f6a07c7c..fab99366a7 100644
--- a/pythonforandroid/recipes/aiohttp/__init__.py
+++ b/pythonforandroid/recipes/aiohttp/__init__.py
@@ -1,16 +1,17 @@
 """Build AIOHTTP"""
 from typing import List
-from pythonforandroid.recipe import CythonRecipe  # type: ignore
+from pythonforandroid.recipe import CppCompiledComponentsPythonRecipe
 
-
-class AIOHTTPRecipe(CythonRecipe):  # type: ignore # pylint: disable=R0903
-    """Build AIOHTTP"""
-
-    version = "v3.6.2"
-    url = "https://github.com/aio-libs/aiohttp/archive/{version}.zip"
+class AIOHTTPRecipe(CppCompiledComponentsPythonRecipe):  # type: ignore # pylint: disable=R0903
+    url = "https://files.pythonhosted.org/packages/ff/4f/62d9859b7d4e6dc32feda67815c5f5ab4421e6909e48cbc970b6a40d60b7/aiohttp-3.8.3.tar.gz"
     name = "aiohttp"
-
     depends: List[str] = ["setuptools"]
+    call_hostpython_via_targetpython = False
+    install_in_hostpython = True
 
+    def get_recipe_env(self, arch):
+        env = super().get_recipe_env(arch)
+        env['LDFLAGS'] += ' -lc++_shared'
+        return env
 
 recipe = AIOHTTPRecipe()

From ebb9f4b0a9b3a9a013894c7feccdf086adb796f3 Mon Sep 17 00:00:00 2001
From: Xavier Fiechter <31884704+xavierfiechter@users.noreply.github.com>
Date: Wed, 19 Oct 2022 11:36:02 +0200
Subject: [PATCH 2/5] version variable and github url

---
 pythonforandroid/recipes/aiohttp/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pythonforandroid/recipes/aiohttp/__init__.py b/pythonforandroid/recipes/aiohttp/__init__.py
index fab99366a7..bf55521077 100644
--- a/pythonforandroid/recipes/aiohttp/__init__.py
+++ b/pythonforandroid/recipes/aiohttp/__init__.py
@@ -2,9 +2,10 @@
 from typing import List
 from pythonforandroid.recipe import CppCompiledComponentsPythonRecipe
 
+
 class AIOHTTPRecipe(CppCompiledComponentsPythonRecipe):  # type: ignore # pylint: disable=R0903
-    url = "https://files.pythonhosted.org/packages/ff/4f/62d9859b7d4e6dc32feda67815c5f5ab4421e6909e48cbc970b6a40d60b7/aiohttp-3.8.3.tar.gz"
-    name = "aiohttp"
+    version = "3.8.3"
+    url = "https://github.com/aio-libs/aiohttp/archive/v{version}.zip"name = "aiohttp"
     depends: List[str] = ["setuptools"]
     call_hostpython_via_targetpython = False
     install_in_hostpython = True

From a3608605459d84e9ec30fe3d3d486af5491b5e57 Mon Sep 17 00:00:00 2001
From: Xavier Fiechter <31884704+xavierfiechter@users.noreply.github.com>
Date: Wed, 19 Oct 2022 11:36:21 +0200
Subject: [PATCH 3/5] lost a newline

---
 pythonforandroid/recipes/aiohttp/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pythonforandroid/recipes/aiohttp/__init__.py b/pythonforandroid/recipes/aiohttp/__init__.py
index bf55521077..746a8f14a5 100644
--- a/pythonforandroid/recipes/aiohttp/__init__.py
+++ b/pythonforandroid/recipes/aiohttp/__init__.py
@@ -5,7 +5,8 @@
 
 class AIOHTTPRecipe(CppCompiledComponentsPythonRecipe):  # type: ignore # pylint: disable=R0903
     version = "3.8.3"
-    url = "https://github.com/aio-libs/aiohttp/archive/v{version}.zip"name = "aiohttp"
+    url = "https://github.com/aio-libs/aiohttp/archive/v{version}.zip"
+    name = "aiohttp"
     depends: List[str] = ["setuptools"]
     call_hostpython_via_targetpython = False
     install_in_hostpython = True

From 6dee3ab5ad9b64ecda8e205d19f7d7b957b03695 Mon Sep 17 00:00:00 2001
From: Xavier Fiechter <31884704+xavierfiechter@users.noreply.github.com>
Date: Wed, 19 Oct 2022 14:18:54 +0200
Subject: [PATCH 4/5] added missing line for pep

---
 pythonforandroid/recipes/aiohttp/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pythonforandroid/recipes/aiohttp/__init__.py b/pythonforandroid/recipes/aiohttp/__init__.py
index 746a8f14a5..fb04787bf2 100644
--- a/pythonforandroid/recipes/aiohttp/__init__.py
+++ b/pythonforandroid/recipes/aiohttp/__init__.py
@@ -16,4 +16,5 @@ def get_recipe_env(self, arch):
         env['LDFLAGS'] += ' -lc++_shared'
         return env
 
+
 recipe = AIOHTTPRecipe()

From cd0f04d8989aa2bab8da226ff7c1e37fe94c06e2 Mon Sep 17 00:00:00 2001
From: Xavier Fiechter <31884704+xavierfiechter@users.noreply.github.com>
Date: Wed, 19 Oct 2022 21:33:28 +0200
Subject: [PATCH 5/5] Changed URL

---
 pythonforandroid/recipes/aiohttp/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pythonforandroid/recipes/aiohttp/__init__.py b/pythonforandroid/recipes/aiohttp/__init__.py
index fb04787bf2..f32c653fcb 100644
--- a/pythonforandroid/recipes/aiohttp/__init__.py
+++ b/pythonforandroid/recipes/aiohttp/__init__.py
@@ -5,7 +5,7 @@
 
 class AIOHTTPRecipe(CppCompiledComponentsPythonRecipe):  # type: ignore # pylint: disable=R0903
     version = "3.8.3"
-    url = "https://github.com/aio-libs/aiohttp/archive/v{version}.zip"
+    url = "https://pypi.python.org/packages/source/a/aiohttp/aiohttp-{version}.tar.gz"
     name = "aiohttp"
     depends: List[str] = ["setuptools"]
     call_hostpython_via_targetpython = False