From 2780fc32673b78ff0155faa32cb4dfad2d8520f3 Mon Sep 17 00:00:00 2001 From: Zachary Spector Date: Wed, 22 Oct 2025 14:23:42 +1300 Subject: [PATCH 1/2] Import from setuptools and not distutils in the `android` recipe --- pythonforandroid/recipes/android/src/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonforandroid/recipes/android/src/setup.py b/pythonforandroid/recipes/android/src/setup.py index 8bf4512e0..8182ba9c5 100755 --- a/pythonforandroid/recipes/android/src/setup.py +++ b/pythonforandroid/recipes/android/src/setup.py @@ -1,4 +1,4 @@ -from distutils.core import setup, Extension +from setuptools import setup, Extension from Cython.Build import cythonize import os From 6d1b9d38260a56e58558b81038fea820e2997a96 Mon Sep 17 00:00:00 2001 From: Zachary Spector Date: Wed, 22 Oct 2025 14:25:19 +1300 Subject: [PATCH 2/2] Remove freetype's distutils "fallback" It was actually using distutils every time, apparently? --- pythonforandroid/recipes/freetype-py/__init__.py | 1 - .../freetype-py/fall-back-to-distutils.patch | 15 --------------- 2 files changed, 16 deletions(-) delete mode 100644 pythonforandroid/recipes/freetype-py/fall-back-to-distutils.patch diff --git a/pythonforandroid/recipes/freetype-py/__init__.py b/pythonforandroid/recipes/freetype-py/__init__.py index 7be2f2e10..2e737f37b 100644 --- a/pythonforandroid/recipes/freetype-py/__init__.py +++ b/pythonforandroid/recipes/freetype-py/__init__.py @@ -5,7 +5,6 @@ class FreetypePyRecipe(PythonRecipe): version = '2.2.0' url = 'https://github.com/rougier/freetype-py/archive/refs/tags/v{version}.tar.gz' depends = ['freetype'] - patches = ['fall-back-to-distutils.patch'] site_packages_name = 'freetype' diff --git a/pythonforandroid/recipes/freetype-py/fall-back-to-distutils.patch b/pythonforandroid/recipes/freetype-py/fall-back-to-distutils.patch deleted file mode 100644 index 0f06f1854..000000000 --- a/pythonforandroid/recipes/freetype-py/fall-back-to-distutils.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN freetype-py.orig/setup.py freetype-py/setup.py ---- freetype-py.orig/setup.py 2020-07-09 20:58:51.000000000 +0700 -+++ freetype-py/setup.py 2022-03-02 19:28:17.948831134 +0700 -@@ -12,7 +12,10 @@ - from io import open - from os import path - --from setuptools import setup -+try: -+ from setuptools import setup -+except ImportError: -+ from distutils.core import setup - - if os.environ.get("FREETYPEPY_BUNDLE_FT"): - print("# Will build and bundle FreeType.")