Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 1 #947

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions kivy_ios/recipes/bitarray/__init__.py
Original file line number Diff line number Diff line change
@@ -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()
6 changes: 3 additions & 3 deletions kivy_ios/recipes/itsdangerous/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
4 changes: 2 additions & 2 deletions kivy_ios/recipes/pillow/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 5 additions & 6 deletions kivy_ios/recipes/pillow/bypass-find-library.patch
Original file line number Diff line number Diff line change
@@ -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))
Expand All @@ -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:
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pbxproj==3.5.0
Pillow>=6.1.0
cookiecutter==2.1.1
sh==1.12.14
Cython==0.29.36
Cython>=3.0.0
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading