diff --git a/packages/python/graphics/Pillow/package.mk b/packages/python/graphics/Pillow/package.mk index e40f324ddd..7f8f2ac8b3 100644 --- a/packages/python/graphics/Pillow/package.mk +++ b/packages/python/graphics/Pillow/package.mk @@ -10,15 +10,9 @@ PKG_SITE="https://python-pillow.org/" PKG_URL="https://github.com/python-pillow/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 zlib freetype libjpeg-turbo tiff" PKG_LONGDESC="The Python Imaging Library adds image processing capabilities to your Python interpreter." -PKG_TOOLCHAIN="manual" +PKG_TOOLCHAIN="python" -make_target() { - python_target_env python3 setup.py build_ext --disable-platform-guessing build -} - -makeinstall_target() { - exec_thread_safe python_target_env python3 setup.py build_ext --disable-platform-guessing install --root=${INSTALL} --prefix=/usr -} +PKG_PYTHON_OPTS_TARGET="-C--build-option=build_ext -C--build-option=--disable-platform-guessing" post_makeinstall_target() { python_remove_source diff --git a/packages/python/graphics/Pillow/patches/Pillow-0002-Revert-Move-build-config-from-setup.cfg-to-pyproject.patch b/packages/python/graphics/Pillow/patches/Pillow-0002-Revert-Move-build-config-from-setup.cfg-to-pyproject.patch deleted file mode 100644 index 577d1c21d8..0000000000 --- a/packages/python/graphics/Pillow/patches/Pillow-0002-Revert-Move-build-config-from-setup.cfg-to-pyproject.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 346de8011ac8ece998d9bd857d661cf2bb7479a2 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Sat, 20 Jan 2024 02:20:01 +0000 -Subject: [PATCH] Revert "Move build config from setup.cfg to pyproject.toml" - -This partially reverts commit 430920e2a8420bdfcd08eafe6446d6173692e24e. ---- - setup.cfg | 67 +++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 67 insertions(+) - create mode 100644 setup.cfg - -diff --git a/setup.cfg b/setup.cfg -new file mode 100644 -index 000000000..627788cd8 ---- /dev/null -+++ b/setup.cfg -@@ -0,0 +1,67 @@ -+[metadata] -+name = Pillow -+description = Python Imaging Library (Fork) -+long_description = file: README.md -+long_description_content_type = text/markdown -+url = https://python-pillow.org -+author = Jeffrey A. Clark (Alex) -+author_email = aclark@aclark.net -+license = HPND -+classifiers = -+ Development Status :: 6 - Mature -+ License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND) -+ Programming Language :: Python :: 3 -+ Programming Language :: Python :: 3 :: Only -+ Programming Language :: Python :: 3.8 -+ Programming Language :: Python :: 3.9 -+ Programming Language :: Python :: 3.10 -+ Programming Language :: Python :: 3.11 -+ Programming Language :: Python :: 3.12 -+ Programming Language :: Python :: Implementation :: CPython -+ Programming Language :: Python :: Implementation :: PyPy -+ Topic :: Multimedia :: Graphics -+ Topic :: Multimedia :: Graphics :: Capture :: Digital Camera -+ Topic :: Multimedia :: Graphics :: Capture :: Screen Capture -+ Topic :: Multimedia :: Graphics :: Graphics Conversion -+ Topic :: Multimedia :: Graphics :: Viewers -+keywords = Imaging -+project_urls = -+ Documentation=https://pillow.readthedocs.io -+ Source=https://github.com/python-pillow/Pillow -+ Funding=https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi -+ Release notes=https://pillow.readthedocs.io/en/stable/releasenotes/index.html -+ Changelog=https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst -+ Twitter=https://twitter.com/PythonPillow -+ Mastodon=https://fosstodon.org/@pillow -+ -+[options] -+packages = PIL -+python_requires = >=3.8 -+include_package_data = True -+package_dir = -+ = src -+ -+[options.extras_require] -+docs = -+ furo -+ olefile -+ sphinx>=2.4 -+ sphinx-copybutton -+ sphinx-inline-tabs -+ sphinx-removed-in -+ sphinxext-opengraph -+tests = -+ check-manifest -+ coverage -+ defusedxml -+ markdown2 -+ olefile -+ packaging -+ pyroma -+ pytest -+ pytest-cov -+ pytest-timeout -+ -+[flake8] -+extend-ignore = E203 -+max-line-length = 88 --- -2.43.0 -