Re: CVS commit: pkgsrc/graphics/py-Pillow

[Adam <adam%netbsd.org@localhost>]

> Module Name:  pkgsrc
> Committed By: minskim
> Date:         Wed Nov 20 23:34:36 UTC 2019
> 
> Modified Files:
>       pkgsrc/graphics/py-Pillow: distinfo
>       pkgsrc/graphics/py-Pillow/patches: patch-setup.py
> 
> Log Message:
> graphics/py-Pillow: Skip zlib header search
> 
> pkgsrc always provides zlib.h.
> 
> This makes py-Pillow build on Darwin.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.40 -r1.41 pkgsrc/graphics/py-Pillow/distinfo
> cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/py-Pillow/patches/patch-setup.py
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> Modified files:
> 
> Index: pkgsrc/graphics/py-Pillow/distinfo
> diff -u pkgsrc/graphics/py-Pillow/distinfo:1.40 pkgsrc/graphics/py-Pillow/distinfo:1.41
> --- pkgsrc/graphics/py-Pillow/distinfo:1.40   Tue Oct 22 18:45:02 2019
> +++ pkgsrc/graphics/py-Pillow/distinfo        Wed Nov 20 23:34:36 2019
> @@ -1,7 +1,7 @@
> -$NetBSD: distinfo,v 1.40 2019/10/22 18:45:02 adam Exp $
> +$NetBSD: distinfo,v 1.41 2019/11/20 23:34:36 minskim Exp $
> 
> SHA1 (Pillow-6.2.1.tar.gz) = efb43a7be73f13cd300fa30f3f21634cfa3d6056
> RMD160 (Pillow-6.2.1.tar.gz) = b6a0743f45072e5000f4d985dc1274d32bb7a40b
> SHA512 (Pillow-6.2.1.tar.gz) = 757bfdab2ba418195e96e696d2d111de3b38b6bafe4f6f94012f024f59c9bc8542fdab54f643eaf7b2867a9214db806e72eecbdd636bfceb55b47d3164f643ec
> Size (Pillow-6.2.1.tar.gz) = 37673162 bytes
> -SHA1 (patch-setup.py) = 08af410697c6d0e01cf2c2b4955b8707a1807fdd
> +SHA1 (patch-setup.py) = 5a7b2d56532e6688bfe1a0349d4c3136a7c26d2a
> 
> Index: pkgsrc/graphics/py-Pillow/patches/patch-setup.py
> diff -u pkgsrc/graphics/py-Pillow/patches/patch-setup.py:1.21 pkgsrc/graphics/py-Pillow/patches/patch-setup.py:1.22
> --- pkgsrc/graphics/py-Pillow/patches/patch-setup.py:1.21     Tue Oct 22 18:45:03 2019
> +++ pkgsrc/graphics/py-Pillow/patches/patch-setup.py  Wed Nov 20 23:34:36 2019
> @@ -1,4 +1,4 @@
> -$NetBSD: patch-setup.py,v 1.21 2019/10/22 18:45:03 adam Exp $
> +$NetBSD: patch-setup.py,v 1.22 2019/11/20 23:34:36 minskim Exp $
> 
> Disable mp_compile hack; it has problems with native parallel building.
> 
> @@ -25,3 +25,12 @@ Disable mp_compile hack; it has problems
>          for x in self.feature:
>              if getattr(self, "disable_%s" % x):
>                  setattr(self.feature, x, False)
> +@@ -539,7 +532,7 @@ 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 _find_library_file(self, "z"):
> +                     feature.zlib = "z"
> +                 elif sys.platform == "win32" and _find_library_file(self, "zlib"):

This seems wrong.

What error do you get when you don't apply this patch?

Which macOS version do you try?

Adam