~olbohlen/oi-userland.git

parent: 0ce7dff0 | patch | commit | ignore whitespace

Marcel Telka

2024-04-02 427a3515f6e96ea3b092345cdad006cf2b3dde76

python/pillow: update to 10.3.0

1 files deleted

1 files added

8 files modified

	components/python/pillow/Makefile	13 ●●●●● patch \| view \| raw \| blame \| history
	components/python/pillow/manifests/sample-manifest.p5m	20 ●●●●● patch \| view \| raw \| blame \| history
	components/python/pillow/patches/01-no-pip-install.patch	4 ●●●●● patch \| view \| raw \| blame \| history
	components/python/pillow/patches/02-no-numpy.patch	12 ●●●●● patch \| view \| raw \| blame \| history
	components/python/pillow/patches/02-no-pilinfo.patch	22 ●●●●● patch \| view \| raw \| blame \| history
	components/python/pillow/patches/03-tox-no-make-clean.patch	6 ●●●●● patch \| view \| raw \| blame \| history
	components/python/pillow/pillow-PYVER.p5m	20 ●●●●● patch \| view \| raw \| blame \| history
	components/python/pillow/pkg5	7 ●●●●● patch \| view \| raw \| blame \| history
	components/python/pillow/python-integrate-project.conf	8 ●●●●● patch \| view \| raw \| blame \| history
	components/python/pillow/test/results-all.master	8985 ●●●●● patch \| view \| raw \| blame \| history

 components/python/pillow/Makefile

@@ -19,28 +19,22 @@
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME =        pillow
HUMAN_VERSION =            10.2.0
HUMAN_VERSION =            10.3.0
COMPONENT_SUMMARY =        pillow - Python Imaging Library (Fork)
COMPONENT_PROJECT_URL =        https://python-pillow.org
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/f8/3e/32cbd0129a28686621434cbf17bb64bf1458bfb838f1f668262fefce145c/pillow-10.2.0.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:e87f0b2c78157e12d7686b27d63c070fd65d994e8ddae6f328e0dcf4a0cd007e
    sha256:9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d
COMPONENT_LICENSE =        HPND
COMPONENT_LICENSE_FILE =    LICENSE

include $(WS_MAKE_RULES)/common.mk

# build with the distribution preferred libjpeg implementation
CFLAGS   += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
LDFLAGS  += $(JPEG_LDFLAGS)

# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
PYTHON_REQUIRED_PACKAGES += library/python/wheel
PYTHON_REQUIRED_PACKAGES += runtime/python
REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG)
REQUIRED_PACKAGES += image/library/libjpeg-turbo
REQUIRED_PACKAGES += image/library/libtiff
REQUIRED_PACKAGES += image/library/openjpeg
REQUIRED_PACKAGES += library/lcms2
@@ -54,6 +48,7 @@
TEST_REQUIRED_PACKAGES.python += library/python/coverage
TEST_REQUIRED_PACKAGES.python += library/python/defusedxml
TEST_REQUIRED_PACKAGES.python += library/python/markdown2
TEST_REQUIRED_PACKAGES.python += library/python/numpy
TEST_REQUIRED_PACKAGES.python += library/python/olefile
TEST_REQUIRED_PACKAGES.python += library/python/packaging
TEST_REQUIRED_PACKAGES.python += library/python/pyroma

 components/python/pillow/manifests/sample-manifest.p5m

@@ -113,20 +113,26 @@
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/__main__.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_binary.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_deprecate.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingcms.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingcms.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingcms.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmorph.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingtk.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmorph.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmorph.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingtk.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_tkinter_finder.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_typing.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_util.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_version.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_webp.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_webp.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_webp.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/features.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/py.typed
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/report.py
file path=usr/lib/python$(PYVER)/vendor-packages/pillow-$(HUMAN_VERSION).dist-info/LICENSE
file path=usr/lib/python$(PYVER)/vendor-packages/pillow-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/pillow-$(HUMAN_VERSION).dist-info/WHEEL

 components/python/pillow/patches/01-no-pip-install.patch

@@ -1,5 +1,5 @@
--- pillow-10.2.0/tox.ini.orig
+++ pillow-10.2.0/tox.ini
--- pillow-10.3.0/tox.ini.orig
+++ pillow-10.3.0/tox.ini
@@ -13,7 +13,6 @@
     tests
 commands =

 components/python/pillow/patches/02-no-numpy.patch

File was deleted

 components/python/pillow/patches/02-no-pilinfo.patch

New file
@@ -0,0 +1,22 @@
We do not need one more pilinfo.  The one printed by selftest.py is enough.

--- pillow-10.3.0/Tests/conftest.py.orig
+++ pillow-10.3.0/Tests/conftest.py
@@ -5,17 +5,6 @@
 import pytest
 
 
-def pytest_report_header(config: pytest.Config) -> str:
-    try:
-        from PIL import features
-
-        with io.StringIO() as out:
-            features.pilinfo(out=out, supported_formats=False)
-            return out.getvalue()
-    except Exception as e:
-        return f"pytest_report_header failed: {e}"
-
-
 def pytest_configure(config: pytest.Config) -> None:
     config.addinivalue_line(
         "markers",

 components/python/pillow/patches/03-tox-no-make-clean.patch

@@ -1,6 +1,6 @@
--- pillow-10.2.0/tox.ini.orig
+++ pillow-10.2.0/tox.ini
@@ -11,7 +11,6 @@
--- pillow-10.3.0/tox.ini.orig
+++ pillow-10.3.0/tox.ini
@@ -12,7 +12,6 @@
 extras =
     tests
 commands =

 components/python/pillow/pillow-PYVER.p5m

@@ -113,20 +113,26 @@
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/__main__.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_binary.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_deprecate.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingcms.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingcms.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingcms.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmorph.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingtk.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmorph.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmorph.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingtk.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_tkinter_finder.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_typing.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_util.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_version.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_webp.so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_webp.cpython-$(PYV).so
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_webp.pyi
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/features.py
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/py.typed
file path=usr/lib/python$(PYVER)/vendor-packages/PIL/report.py
file path=usr/lib/python$(PYVER)/vendor-packages/pillow-$(HUMAN_VERSION).dist-info/LICENSE
file path=usr/lib/python$(PYVER)/vendor-packages/pillow-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/pillow-$(HUMAN_VERSION).dist-info/WHEEL

 components/python/pillow/pkg5

@@ -1,5 +1,6 @@
{
    "dependencies": [
        "image/library/libjpeg-turbo",
        "image/library/libjpeg8-turbo",
        "image/library/libtiff",
        "image/library/openjpeg",
@@ -14,8 +15,8 @@
        "x11/library/libxcb"
    ],
    "fmris": [
        "library/python/pillow-39",
        "library/python/pillow"
        "library/python/pillow",
        "library/python/pillow-39"
    ],
    "name": "pillow"
}
}

 components/python/pillow/python-integrate-project.conf

@@ -15,11 +15,5 @@
#

%patch% 01-no-pip-install.patch
%patch% 02-no-numpy.patch
%patch% 02-no-pilinfo.patch
%patch% 03-tox-no-make-clean.patch

%include-3%
# build with the distribution preferred libjpeg implementation
CFLAGS   += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
LDFLAGS  += $(JPEG_LDFLAGS)

 components/python/pillow/test/results-all.master

Diff too large

			@@ -19,28 +19,22 @@
			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME = pillow
			HUMAN_VERSION = 10.2.0
			HUMAN_VERSION = 10.3.0
			COMPONENT_SUMMARY = pillow - Python Imaging Library (Fork)
			COMPONENT_PROJECT_URL = https://python-pillow.org
			COMPONENT_ARCHIVE_URL = \
			https://files.pythonhosted.org/packages/f8/3e/32cbd0129a28686621434cbf17bb64bf1458bfb838f1f668262fefce145c/pillow-10.2.0.tar.gz
			COMPONENT_ARCHIVE_HASH = \
			sha256:e87f0b2c78157e12d7686b27d63c070fd65d994e8ddae6f328e0dcf4a0cd007e
			sha256:9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d
			COMPONENT_LICENSE = HPND
			COMPONENT_LICENSE_FILE = LICENSE

			include $(WS_MAKE_RULES)/common.mk

			# build with the distribution preferred libjpeg implementation
			CFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
			CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
			LDFLAGS += $(JPEG_LDFLAGS)

			# Auto-generated dependencies
			PYTHON_REQUIRED_PACKAGES += library/python/setuptools
			PYTHON_REQUIRED_PACKAGES += library/python/wheel
			PYTHON_REQUIRED_PACKAGES += runtime/python
			REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG)
			REQUIRED_PACKAGES += image/library/libjpeg-turbo
			REQUIRED_PACKAGES += image/library/libtiff
			REQUIRED_PACKAGES += image/library/openjpeg
			REQUIRED_PACKAGES += library/lcms2
			@@ -54,6 +48,7 @@
			TEST_REQUIRED_PACKAGES.python += library/python/coverage
			TEST_REQUIRED_PACKAGES.python += library/python/defusedxml
			TEST_REQUIRED_PACKAGES.python += library/python/markdown2
			TEST_REQUIRED_PACKAGES.python += library/python/numpy
			TEST_REQUIRED_PACKAGES.python += library/python/olefile
			TEST_REQUIRED_PACKAGES.python += library/python/packaging
			TEST_REQUIRED_PACKAGES.python += library/python/pyroma

			@@ -113,20 +113,26 @@
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/__main__.py
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_binary.py
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_deprecate.py
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.cpython-$(PYV).so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.pyi
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingcms.cpython-$(PYV).so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingcms.pyi
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingcms.so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.cpython-$(PYV).so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.pyi
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmorph.so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingtk.so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.cpython-$(PYV).so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.pyi
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmorph.cpython-$(PYV).so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmorph.pyi
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingtk.cpython-$(PYV).so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_tkinter_finder.py
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_typing.py
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_util.py
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_version.py
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_webp.so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_webp.cpython-$(PYV).so
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_webp.pyi
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/features.py
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/py.typed
			file path=usr/lib/python$(PYVER)/vendor-packages/PIL/report.py
			file path=usr/lib/python$(PYVER)/vendor-packages/pillow-$(HUMAN_VERSION).dist-info/LICENSE
			file path=usr/lib/python$(PYVER)/vendor-packages/pillow-$(HUMAN_VERSION).dist-info/METADATA
			file path=usr/lib/python$(PYVER)/vendor-packages/pillow-$(HUMAN_VERSION).dist-info/WHEEL

			@@ -1,5 +1,5 @@
			--- pillow-10.2.0/tox.ini.orig
			+++ pillow-10.2.0/tox.ini
			--- pillow-10.3.0/tox.ini.orig
			+++ pillow-10.3.0/tox.ini
			@@ -13,7 +13,6 @@
			tests
			commands =

New file
			@@ -0,0 +1,22 @@
			We do not need one more pilinfo. The one printed by selftest.py is enough.

			--- pillow-10.3.0/Tests/conftest.py.orig
			+++ pillow-10.3.0/Tests/conftest.py
			@@ -5,17 +5,6 @@
			import pytest


			-def pytest_report_header(config: pytest.Config) -> str:
			- try:
			- from PIL import features
			-
			- with io.StringIO() as out:
			- features.pilinfo(out=out, supported_formats=False)
			- return out.getvalue()
			- except Exception as e:
			- return f"pytest_report_header failed: {e}"
			-
			-
			def pytest_configure(config: pytest.Config) -> None:
			config.addinivalue_line(
			"markers",

			@@ -1,6 +1,6 @@
			--- pillow-10.2.0/tox.ini.orig
			+++ pillow-10.2.0/tox.ini
			@@ -11,7 +11,6 @@
			--- pillow-10.3.0/tox.ini.orig
			+++ pillow-10.3.0/tox.ini
			@@ -12,7 +12,6 @@
			extras =
			tests
			commands =

			@@ -1,5 +1,6 @@
			{
			"dependencies": [
			"image/library/libjpeg-turbo",
			"image/library/libjpeg8-turbo",
			"image/library/libtiff",
			"image/library/openjpeg",
			@@ -14,8 +15,8 @@
			"x11/library/libxcb"
			],
			"fmris": [
			"library/python/pillow-39",
			"library/python/pillow"
			"library/python/pillow",
			"library/python/pillow-39"
			],
			"name": "pillow"
			}
			}

			@@ -15,11 +15,5 @@
			#

			%patch% 01-no-pip-install.patch
			%patch% 02-no-numpy.patch
			%patch% 02-no-pilinfo.patch
			%patch% 03-tox-no-make-clean.patch

			%include-3%
			# build with the distribution preferred libjpeg implementation
			CFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
			CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
			LDFLAGS += $(JPEG_LDFLAGS)