[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/files/, dev-python/pillow/

["Michał Górny" <mgorny@gentoo.org>]

commit:     99757c974c3490e80cd8741493292a5749f333fe
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  3 15:40:02 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov  3 15:42:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99757c97

dev-python/pillow: Revert libtiff arg passing change that broke PPC

Revert a change in how Pillow passes arguments that results
in an int64_t being passed where libtiff expects uint32_t.  This
miraculously doesn't seem to break most platforms, but it is still
clearly wrong and breaks ppc32.

Closes: https://bugs.gentoo.org/942034
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../pillow/files/pillow-11.0.0-wrong-arg.patch     |  32 +++++
 dev-python/pillow/pillow-11.0.0-r1.ebuild          | 138 +++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch b/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch
new file mode 100644
index 000000000000..3337b8c4be23
--- /dev/null
+++ b/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch
@@ -0,0 +1,32 @@
+From 180c1d1ef0c0ef12e0c56adfe10c7779dff3b55f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 3 Nov 2024 16:35:54 +0100
+Subject: [PATCH] Revert "Corrected passing TIFF_LONG to libtiff"
+
+This is the wrong solution to the problem at hand, and results
+in passing an int64_t where libtiff expects uint32_t.  This seems
+to miraculously work on most of our platforms but it is clearly wrong,
+and it breaks ppc32.
+
+Bug: https://github.com/python-pillow/Pillow/issues/8522
+Reverts: b1b0353d17bcdca99cfcb2ea48c6af7861fb43ba
+---
+ src/encode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/encode.c b/src/encode.c
+index 1a4cd489d..ba350c39a 100644
+--- a/src/encode.c
++++ b/src/encode.c
+@@ -929,7 +929,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
+                 );
+             } else if (type == TIFF_LONG) {
+                 status = ImagingLibTiffSetField(
+-                    &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value)
++                    &encoder->state, (ttag_t)key_int, (UINT32)PyLong_AsLong(value)
+                 );
+             } else if (type == TIFF_SSHORT) {
+                 status = ImagingLibTiffSetField(
+-- 
+2.47.0
+

diff --git a/dev-python/pillow/pillow-11.0.0-r1.ebuild b/dev-python/pillow/pillow-11.0.0-r1.ebuild
new file mode 100644
index 000000000000..f1fbdcb83c33
--- /dev/null
+++ b/dev-python/pillow/pillow-11.0.0-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+# setuptools wrapper
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="
+	https://python-pillow.org/
+	https://github.com/python-pillow/Pillow/
+	https://pypi.org/project/pillow/
+"
+SRC_URI="
+	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/python-pillow/pillow/pull/7634
+	"${FILESDIR}/${PN}-10.2.0-cross.patch"
+	# https://github.com/python-pillow/Pillow/issues/8522
+	"${FILESDIR}/${P}-wrong-arg.patch"
+)
+
+usepil() {
+	usex "${1}" enable disable
+}
+
+python_configure_all() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		debug = True
+		disable_platform_guessing = True
+		$(usepil truetype)_freetype = True
+		$(usepil jpeg)_jpeg = True
+		$(usepil jpeg2k)_jpeg2000 = True
+		$(usepil lcms)_lcms = True
+		$(usepil tiff)_tiff = True
+		$(usepil imagequant)_imagequant = True
+		$(usepil webp)_webp = True
+		$(usepil xcb)_xcb = True
+		$(usepil zlib)_zlib = True
+	EOF
+	if use truetype; then
+		# these dependencies are implicitly disabled by USE=-truetype
+		# and we can't pass both disable_* and vendor_*
+		# https://bugs.gentoo.org/935124
+		cat >> setup.cfg <<-EOF || die
+			vendor_raqm = False
+			vendor_fribidi = False
+		EOF
+	fi
+
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO (is clipboard unreliable in Xvfb?)
+		Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
+		# requires xz-utils[extra-filters]?
+		Tests/test_file_libtiff.py::TestFileLibTiff::test_lzma
+	)
+
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# leak tests are fragile and broken under xdist
+	epytest -k "not leak" -p timeout || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}