diff --git a/README.md b/README.md index 988430c2..4166747e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Kivy for iOS - [![Backers on Open Collective](https://opencollective.com/kivy/backers/badge.svg)](https://opencollective.com/kivy) [![Sponsors on Open Collective](https://opencollective.com/kivy/sponsors/badge.svg)](https://opencollective.com/kivy) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md) @@ -47,7 +46,7 @@ Additionally, you would need a few system dependencies and configuration. - Using brew, you can install the following dependencies: - brew install autoconf automake libtool pkg-config + brew install autoconf automake libtool pkg-config libjpeg libtiff webp little-cms2 brew link libtool ## Using the toolchain diff --git a/kivy_ios/recipes/bitarray/__init__.py b/kivy_ios/recipes/bitarray/__init__.py new file mode 100644 index 00000000..41796217 --- /dev/null +++ b/kivy_ios/recipes/bitarray/__init__.py @@ -0,0 +1,10 @@ +from kivy_ios.toolchain import PythonRecipe + + +class BitarrayRecipe(PythonRecipe): + version = "3.0.0" + url = "https://github.com/ilanschnell/bitarray/archive/refs/tags/{version}.tar.gz" + depends = ["hostpython3", "python3"] + + +recipe = BitarrayRecipe() diff --git a/kivy_ios/recipes/itsdangerous/__init__.py b/kivy_ios/recipes/itsdangerous/__init__.py index 4157b9e3..3905c059 100644 --- a/kivy_ios/recipes/itsdangerous/__init__.py +++ b/kivy_ios/recipes/itsdangerous/__init__.py @@ -6,19 +6,19 @@ class ItsDangerousRecipe(PythonRecipe): - version = "1.1.0" + version = "2.2.0" url = "https://github.com/mitsuhiko/itsdangerous/archive/{version}.zip" depends = ["python"] def install(self): plat = list(self.platforms_to_build)[0] build_dir = self.get_build_dir(plat) - hostpython = sh.Command(self.ctx.hostpython) + hostpython_pip = sh.Command(join(self.ctx.dist_dir, "hostpython3", "bin", "pip3")) build_env = plat.get_env() dest_dir = join(self.ctx.dist_dir, "root", "python3") build_env['PYTHONPATH'] = self.ctx.site_packages_dir with cd(build_dir): - shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env) + shprint(hostpython_pip, "install", build_dir, "--prefix", dest_dir, _env=build_env) recipe = ItsDangerousRecipe() diff --git a/kivy_ios/recipes/pillow/__init__.py b/kivy_ios/recipes/pillow/__init__.py index b91e0f3d..7236ef0b 100644 --- a/kivy_ios/recipes/pillow/__init__.py +++ b/kivy_ios/recipes/pillow/__init__.py @@ -5,8 +5,8 @@ class PillowRecipe(CythonRecipe): - version = "8.2.0" - url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-{version}.tar.gz" + version = "11.0.0" + url = "https://github.com/python-pillow/Pillow/archive/refs/tags/{version}.tar.gz" library = "libpillow.a" depends = [ "hostpython3", diff --git a/kivy_ios/recipes/pillow/bypass-find-library.patch b/kivy_ios/recipes/pillow/bypass-find-library.patch index ccf92d2c..999df6ee 100644 --- a/kivy_ios/recipes/pillow/bypass-find-library.patch +++ b/kivy_ios/recipes/pillow/bypass-find-library.patch @@ -1,10 +1,9 @@ -diff -Naur Pillow-8.2.0.orig/setup.py Pillow-8.2.0/setup.py ---- Pillow-8.2.0.orig/setup.py 2021-04-05 11:11:26.000000000 +0200 -+++ Pillow-8.2.0/setup.py 2021-04-05 11:16:12.000000000 +0200 -@@ -222,12 +222,9 @@ +--- Pillow-11.0.0.orig/setup.py 2024-10-15 01:55:00.000000000 -0400 ++++ Pillow-11.0.0/setup.py 2024-11-19 12:20:09.514795844 -0500 +@@ -231,12 +231,9 @@ - def _find_library_file(self, library): + def _find_library_file(self: pil_build_ext, library: str) -> str | None: - ret = self.compiler.find_library_file(self.compiler.library_dirs, library) - if ret: - _dbg("Found library %s at %s", (library, ret)) @@ -16,4 +15,4 @@ diff -Naur Pillow-8.2.0.orig/setup.py Pillow-8.2.0/setup.py + return True - def _find_include_dir(self, dirname, include): + def _find_include_dir(self: pil_build_ext, dirname: str, include: str) -> bool | str: diff --git a/requirements.txt b/requirements.txt index 2933f3aa..97545157 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ pbxproj==3.5.0 Pillow>=6.1.0 cookiecutter==2.1.1 sh==1.12.14 -Cython==0.29.36 \ No newline at end of file +Cython>=3.0.0 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 710990f7..3df0a12a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ project_urls = [options] python_requires >= "3.8.0" install_requires = - Cython==0.29.36 + Cython>=3.0.0 cookiecutter pbxproj Pillow