Merge remote-tracking branch 'origin/develop' into no-distutils

clayote · clayote · commit a75232913c03 · 2025-10-22T15:30:33.000+13:00
diff --git 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
 
diff --git a/pythonforandroid/recipes/freetype-py/__init__.py b/pythonforandroid/recipes/freetype-py/__init__.py
@@ -2,10 +2,9 @@
 
 
 class FreetypePyRecipe(PythonRecipe):
-    version = '2.2.0'
+    version = '2.14.1'
     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
diff --git a/pythonforandroid/recipes/freetype/__init__.py b/pythonforandroid/recipes/freetype/__init__.py
@@ -24,7 +24,7 @@ class FreetypeRecipe(Recipe):
         https://sourceforge.net/projects/freetype/files/freetype2/2.5.3/
     """
 
-    version = '2.10.1'
+    version = '2.14.1'
     url = 'https://download.savannah.gnu.org/releases/freetype/freetype-{version}.tar.gz'  # noqa
     built_libraries = {'libfreetype.so': 'objs/.libs'}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from distutils.core import setup, Extension`
	`1`	`+from setuptools import setup, Extension`
`2`	`2`	`from Cython.Build import cythonize`
`3`	`3`	`import os`
`4`	`4`