Mon Aug 1 14:51:15 2022 UTC ()
py-Pillow: improve zlib detection workaround

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


(wiz)
diff -r1.53 -r1.54 pkgsrc/graphics/py-Pillow/distinfo
diff -r1.23 -r1.24 pkgsrc/graphics/py-Pillow/patches/patch-setup.py
cvs diff -r1.53 -r1.54 pkgsrc/graphics/py-Pillow/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/py-Pillow/distinfo 2022/07/12 09:20:40 1.53
+++ pkgsrc/graphics/py-Pillow/distinfo 2022/08/01 14:51:15 1.54
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.53 2022/07/12 09:20:40 adam Exp $ 1$NetBSD: distinfo,v 1.54 2022/08/01 14:51:15 wiz Exp $
2 2
3BLAKE2s (Pillow-9.2.0.tar.gz) = 293324645e1578d6087cc467cd5770c5a34a9761d42bb6c140cfa397b31d73d7 3BLAKE2s (Pillow-9.2.0.tar.gz) = 293324645e1578d6087cc467cd5770c5a34a9761d42bb6c140cfa397b31d73d7
4SHA512 (Pillow-9.2.0.tar.gz) = 79d48a932d1b8e0cb7ff528a3fee0291e1dfad1af58eb1efdad75ff6103611a48924adccd30c9e4ff325c4a3df8c621b56c87b65988e4c894b9abe55ff42eb34 4SHA512 (Pillow-9.2.0.tar.gz) = 79d48a932d1b8e0cb7ff528a3fee0291e1dfad1af58eb1efdad75ff6103611a48924adccd30c9e4ff325c4a3df8c621b56c87b65988e4c894b9abe55ff42eb34
5Size (Pillow-9.2.0.tar.gz) = 50017840 bytes 5Size (Pillow-9.2.0.tar.gz) = 50017840 bytes
6SHA1 (patch-setup.py) = 11d48f7a21088eeb304fb88571d6c0f6eccffdb6 6SHA1 (patch-setup.py) = 9e95214579d45b1a3230ea342ae8be82ed2d61c9
cvs diff -r1.23 -r1.24 pkgsrc/graphics/py-Pillow/patches/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/graphics/py-Pillow/patches/patch-setup.py 2021/03/10 18:43:30 1.23
+++ pkgsrc/graphics/py-Pillow/patches/patch-setup.py 2022/08/01 14:51:15 1.24
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-setup.py,v 1.23 2021/03/10 18:43:30 adam Exp $ 1$NetBSD: patch-setup.py,v 1.24 2022/08/01 14:51:15 wiz Exp $
2 2
3Fix finding zlib.h. 3Fix finding zlib.h.
4 4
5--- setup.py.orig 2021-03-06 05:17:25.000000000 +0000 5--- setup.py.orig 2022-07-01 13:14:51.000000000 +0000
6+++ setup.py 6+++ setup.py
7@@ -561,7 +561,7 @@ class pil_build_ext(build_ext): 7@@ -636,7 +636,9 @@ class pil_build_ext(build_ext):
8  8
9 if feature.want("zlib"): 9 if feature.want("zlib"):
10 _dbg("Looking for zlib") 10 _dbg("Looking for zlib")
11- if _find_include_file(self, "zlib.h"): 11- if _find_include_file(self, "zlib.h"):
12+ if True or _find_include_file(self, "zlib.h"): 12+ if True:
 13+ feature.zlib = "z"
 14+ elif _find_include_file(self, "zlib.h"):
13 if _find_library_file(self, "z"): 15 if _find_library_file(self, "z"):
14 feature.zlib = "z" 16 feature.zlib = "z"
15 elif sys.platform == "win32" and _find_library_file(self, "zlib"): 17 elif sys.platform == "win32" and _find_library_file(self, "zlib"):