09/17: gnu: python-pillow: Fix build with zlib 1.3.

[guix-commits]

jpoiret pushed a commit to branch core-updates
in repository guix.

commit 19537eae379ba715d8df4594997448a2be86d17c
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Sat Jan 13 11:30:08 2024 +0100

    gnu: python-pillow: Fix build with zlib 1.3.
    
    * gnu/packages/patches/python-pillow-use-zlib-1.3.patch: New patch.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/python-xyz.scm (python-pillow): Use it.
    
    Change-Id: I97e706c11f616c42fb604cb616a94663f389a376
---
 gnu/local.mk                                        |  1 +
 .../patches/python-pillow-use-zlib-1.3.patch        | 21 +++++++++++++++++++++
 gnu/packages/python-xyz.scm                         |  4 +++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6affc9895d..f7b246d55a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1812,6 +1812,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/python-feedparser-missing-import.patch  \
   %D%/packages/patches/python-louvain-fix-test.patch           \
   %D%/packages/patches/python-random2-getrandbits-test.patch           \
+  %D%/packages/patches/python-pillow-use-zlib-1.3.patch        \
   %D%/packages/patches/python-poppler-qt5-fix-build.patch      \
   %D%/packages/patches/python-pyreadstat-link-libiconv.patch   \
   %D%/packages/patches/python-pyls-black-41.patch              \
diff --git a/gnu/packages/patches/python-pillow-use-zlib-1.3.patch 
b/gnu/packages/patches/python-pillow-use-zlib-1.3.patch
new file mode 100644
index 0000000000..48863ba8da
--- /dev/null
+++ b/gnu/packages/patches/python-pillow-use-zlib-1.3.patch
@@ -0,0 +1,21 @@
+From 9ef7cb39def45b0fe1cdf4828ca20838a1fc39d1 Mon Sep 17 00:00:00 2001
+From: Andrew Murray <radarhere@users.noreply.github.com>
+Date: Fri, 18 Aug 2023 22:22:51 +1000
+Subject: [PATCH] Updated zlib to 1.3
+
+---
+ Tests/test_file_png.py    | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py
+index 3ffe93c6d15..f8df88d6777 100644
+--- a/Tests/test_file_png.py
++++ b/Tests/test_file_png.py
+@@ -79,6 +79,6 @@ def get_chunks(self, filename):
+ 
+     def test_sanity(self, tmp_path):
+         # internal version number
+-        assert re.search(r"\d+\.\d+\.\d+(\.\d+)?$", 
features.version_codec("zlib"))
++        assert re.search(r"\d+(\.\d+){1,3}$", features.version_codec("zlib"))
+ 
+         test_file = str(tmp_path / "temp.png")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0b7bf4f825..020b2a330f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9281,7 +9281,9 @@ retrieve text and metadata from PDFs as well as merge 
entire files together.")
               (snippet '(begin
                           (delete-file-recursively "src/thirdparty")))
               (patches
-               (search-patches "python-pillow-CVE-2022-45199.patch"))))
+               (search-patches "python-pillow-CVE-2022-45199.patch"
+                               ;; Included in 10.1.0.
+                               "python-pillow-use-zlib-1.3.patch"))))
     (build-system python-build-system)
     (native-inputs (list python-pytest))
     (inputs (list freetype