[pkgsrc/trunk]: pkgsrc/graphics/py-Pillow py-Pillow: improve zlib detection w...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/839d1171470d
branches:  trunk
changeset: 382617:839d1171470d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Aug 01 14:51:15 2022 +0000

description:
py-Pillow: improve zlib detection workaround

It started failing for me, I don't understand why - improve the existing
workaround.

diffstat:

 graphics/py-Pillow/distinfo               |   4 ++--
 graphics/py-Pillow/patches/patch-setup.py |  10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r c6d76ff726bb -r 839d1171470d graphics/py-Pillow/distinfo
--- a/graphics/py-Pillow/distinfo       Mon Aug 01 14:49:09 2022 +0000
+++ b/graphics/py-Pillow/distinfo       Mon Aug 01 14:51:15 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.53 2022/07/12 09:20:40 adam Exp $
+$NetBSD: distinfo,v 1.54 2022/08/01 14:51:15 wiz Exp $
 
 BLAKE2s (Pillow-9.2.0.tar.gz) = 293324645e1578d6087cc467cd5770c5a34a9761d42bb6c140cfa397b31d73d7
 SHA512 (Pillow-9.2.0.tar.gz) = 79d48a932d1b8e0cb7ff528a3fee0291e1dfad1af58eb1efdad75ff6103611a48924adccd30c9e4ff325c4a3df8c621b56c87b65988e4c894b9abe55ff42eb34
 Size (Pillow-9.2.0.tar.gz) = 50017840 bytes
-SHA1 (patch-setup.py) = 11d48f7a21088eeb304fb88571d6c0f6eccffdb6
+SHA1 (patch-setup.py) = 9e95214579d45b1a3230ea342ae8be82ed2d61c9
diff -r c6d76ff726bb -r 839d1171470d graphics/py-Pillow/patches/patch-setup.py
--- a/graphics/py-Pillow/patches/patch-setup.py Mon Aug 01 14:49:09 2022 +0000
+++ b/graphics/py-Pillow/patches/patch-setup.py Mon Aug 01 14:51:15 2022 +0000
@@ -1,15 +1,17 @@
-$NetBSD: patch-setup.py,v 1.23 2021/03/10 18:43:30 adam Exp $
+$NetBSD: patch-setup.py,v 1.24 2022/08/01 14:51:15 wiz Exp $
 
 Fix finding zlib.h.
 
---- setup.py.orig      2021-03-06 05:17:25.000000000 +0000
+--- setup.py.orig      2022-07-01 13:14:51.000000000 +0000
 +++ setup.py
-@@ -561,7 +561,7 @@ class pil_build_ext(build_ext):
+@@ -636,7 +636,9 @@ class pil_build_ext(build_ext):
  
          if feature.want("zlib"):
              _dbg("Looking for zlib")
 -            if _find_include_file(self, "zlib.h"):
-+            if True or _find_include_file(self, "zlib.h"):
++            if True:
++                feature.zlib = "z"
++            elif _find_include_file(self, "zlib.h"):
                  if _find_library_file(self, "z"):
                      feature.zlib = "z"
                  elif sys.platform == "win32" and _find_library_file(self, "zlib"):