Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-Pillow for openSUSE:Factory checked in at 2022-06-03 14:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Pillow (Old) and /work/SRC/openSUSE:Factory/.python-Pillow.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Pillow" Fri Jun 3 14:16:32 2022 rev:55 rq:980462 version:9.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Pillow/python-Pillow.changes 2022-05-30 12:42:24.460267340 +0200 +++ /work/SRC/openSUSE:Factory/.python-Pillow.new.1548/python-Pillow.changes 2022-06-03 14:16:33.453308003 +0200 @@ -1,0 +2,5 @@ +Wed Jun 1 12:28:33 UTC 2022 - Mark??ta Machov?? <mmach...@suse.com> + +- Add patch tiff-readcount.patch to fix build with the new tiff + +------------------------------------------------------------------- New: ---- tiff-readcount.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Pillow.spec ++++++ --- /var/tmp/diff_new_pack.rE76NT/_old 2022-06-03 14:16:34.365309188 +0200 +++ /var/tmp/diff_new_pack.rE76NT/_new 2022-06-03 14:16:34.369309193 +0200 @@ -26,6 +26,8 @@ License: HPND URL: https://python-pillow.org/ Source: https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-%{version}.tar.gz +# PATCH-FIX-UPSTREAM https://github.com/python-pillow/Pillow/commit/40a918d274182b7d7c063d7797fb77d967982c4a Set readcount to TIFF_VARIABLE for a variable number of values +Patch0: tiff-readcount.patch BuildRequires: %{python_module devel >= 3.7} BuildRequires: %{python_module olefile} BuildRequires: %{python_module pytest >= 4.0} @@ -68,6 +70,7 @@ %prep %setup -q -n Pillow-%{version} +%autopatch -p1 %build %python_build ++++++ tiff-readcount.patch ++++++ >From 40a918d274182b7d7c063d7797fb77d967982c4a Mon Sep 17 00:00:00 2001 From: Andrew Murray <radarh...@users.noreply.github.com> Date: Sat, 28 May 2022 20:14:05 +1000 Subject: [PATCH] Set readcount to TIFF_VARIABLE for a variable number of values --- src/libImaging/TiffDecode.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c index f818f19d50..3bb444c804 100644 --- a/src/libImaging/TiffDecode.c +++ b/src/libImaging/TiffDecode.c @@ -815,11 +815,11 @@ ImagingLibTiffMergeFieldInfo( // custom fields added with ImagingLibTiffMergeFieldInfo are only used for // decoding, ignore readcount; - int readcount = 1; + int readcount = is_var_length ? TIFF_VARIABLE : 1; // we support writing a single value, or a variable number of values - int writecount = 1; + int writecount = is_var_length ? TIFF_VARIABLE : 1; // whether the first value should encode the number of values. - int passcount = 0; + int passcount = (is_var_length && field_type != TIFF_ASCII) ? 1 : 0; TIFFFieldInfo info[] = { {key, @@ -831,14 +831,6 @@ ImagingLibTiffMergeFieldInfo( passcount, "CustomField"}}; - if (is_var_length) { - info[0].field_writecount = -1; - } - - if (is_var_length && field_type != TIFF_ASCII) { - info[0].field_passcount = 1; - } - n = sizeof(info) / sizeof(info[0]); // Test for libtiff 4.0 or later, excluding libtiff 3.9.6 and 3.9.7
