fix build

Author: T-Dynamos

pythonforandroid/recipes/apsw/__init__.py

@@ -1,34 +1,16 @@
-from pythonforandroid.recipe import PythonRecipe
-from pythonforandroid.toolchain import current_directory, shprint
-import sh
+from pythonforandroid.recipe import PyProjectRecipe
 
 
-class ApswRecipe(PythonRecipe):
-    version = '3.15.0'
-    url = ('https://files.pythonhosted.org/packages/02/ea/'
-           '7469e89d75a07972255aac4c1b98675bfbc74df32a19dd5dc8ba87aa552b/'
-           'apsw-{version}.tar.gz')
-    depends = ['sqlite3', 'setuptools']
-    call_hostpython_via_targetpython = False
+class ApswRecipe(PyProjectRecipe):
+    version = '3.50.4.0'
+    url = 'https://github.com/rogerbinns/apsw/releases/download/{version}/apsw-{version}.tar.gz'
+    depends = ['sqlite3']
     site_packages_name = 'apsw'
 
-    def build_arch(self, arch):
-        env = self.get_recipe_env(arch)
-        with current_directory(self.get_build_dir(arch.arch)):
-            # Build python bindings
-            hostpython = sh.Command(self.hostpython_location)
-            shprint(hostpython,
-                    'setup.py',
-                    'build_ext',
-                    '--enable=fts4', _env=env)
-        # Install python bindings
-        super().build_arch(arch)
-
-    def get_recipe_env(self, arch):
-        env = super().get_recipe_env(arch)
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
         sqlite_recipe = self.get_recipe('sqlite3', self.ctx)
         env['CFLAGS'] += ' -I' + sqlite_recipe.get_build_dir(arch.arch)
-        env['LDFLAGS'] += ' -L' + sqlite_recipe.get_lib_dir(arch)
         env['LIBS'] = env.get('LIBS', '') + ' -lsqlite3'
         return env
 

pythonforandroid/recipes/freetype-py/__init__.py

@@ -3,11 +3,15 @@
 
 class FreetypePyRecipe(PyProjectRecipe):
     version = '2.5.1'
-    url = ('https://files.pythonhosted.org/packages/d0/9c/'
-           '61ba17f846b922c2d6d101cc886b0e8fb597c109cedfcb39b8c5d2304b54/'
-           'freetype-py-{version}.zip')
+    url = 'https://github.com/rougier/freetype-py/archive/refs/tags/v{version}.tar.gz'
+    patches = ["fix_import.patch"]
     depends = ['freetype']
     site_packages_name = 'freetype'
 
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
+        env["SETUPTOOLS_SCM_PRETEND_VERSION_FOR_freetype_py"] = self.version
+        return env
+
 
 recipe = FreetypePyRecipe()

pythonforandroid/recipes/freetype-py/fix_import.patch

@@ -0,0 +1,8 @@
+diff '--color=auto' -uNr freetype-py-2.5.1/MANIFEST.in freetype-py-2.5.1.mod/MANIFEST.in
+--- freetype-py-2.5.1/MANIFEST.in	2024-08-29 23:12:30.000000000 +0530
++++ freetype-py-2.5.1.mod/MANIFEST.in	2025-10-26 11:54:45.052025521 +0530
+@@ -9,3 +9,4 @@
+ include LICENSE.txt
+ include README.rst
+ include setup-build-freetype.py
++recursive-include _custom_build *.py

pythonforandroid/recipes/freetype/__init__.py

@@ -77,6 +77,7 @@ def build_arch(self, arch, with_harfbuzz=False):
             '--host={}'.format(arch.command_prefix),
             '--prefix={}'.format(prefix_path),
             '--without-bzip2',
+            '--without-brotli',
             '--with-png=no',
         }
         if not harfbuzz_in_recipes:

pythonforandroid/recipes/sqlite3/Android.mk

@@ -1,36 +1,27 @@
-from os.path import join
-import shutil
-
-from pythonforandroid.recipe import NDKRecipe
-from pythonforandroid.util import ensure_dir
-
-
-class Sqlite3Recipe(NDKRecipe):
-    version = '3.35.5'
-    # Don't forget to change the URL when changing the version
-    url = 'https://www.sqlite.org/2021/sqlite-amalgamation-3350500.zip'
-    generated_libraries = ['sqlite3']
-
-    def should_build(self, arch):
-        return not self.has_libs(arch, 'libsqlite3.so')
-
-    def prebuild_arch(self, arch):
-        super().prebuild_arch(arch)
-        # Copy the Android make file
-        ensure_dir(join(self.get_build_dir(arch.arch), 'jni'))
-        shutil.copyfile(join(self.get_recipe_dir(), 'Android.mk'),
-                        join(self.get_build_dir(arch.arch), 'jni/Android.mk'))
-
-    def build_arch(self, arch, *extra_args):
-        super().build_arch(arch)
-        # Copy the shared library
-        shutil.copyfile(join(self.get_build_dir(arch.arch), 'libs', arch.arch, 'libsqlite3.so'),
-                        join(self.ctx.get_libs_dir(arch.arch), 'libsqlite3.so'))
-
-    def get_recipe_env(self, arch):
-        env = super().get_recipe_env(arch)
-        env['NDK_PROJECT_PATH'] = self.get_build_dir(arch.arch)
-        return env
+import sh
+from pythonforandroid.logger import shprint
+from pythonforandroid.util import current_directory
+from pythonforandroid.recipe import Recipe
+from multiprocessing import cpu_count
+
+
+class Sqlite3Recipe(Recipe):
+    version = '3.50.4'
+    url = 'https://github.com/sqlite/sqlite/archive/refs/tags/version-{version}.tar.gz'
+    built_libraries = {'libsqlite3.so': '.'}
+
+    def build_arch(self, arch):
+        env = self.get_recipe_env(arch)
+        build_dir = self.get_build_dir(arch.arch)
+        config_args = {
+            '--host={}'.format(arch.command_prefix),
+            '--prefix={}'.format(build_dir),
+            '--disable-tcl',
+        }
+        with current_directory(build_dir):
+            configure = sh.Command('./configure')
+            shprint(configure, *config_args, _env=env)
+            shprint(sh.make, '-j', str(cpu_count()), _env=env)
 
 
 recipe = Sqlite3Recipe()