File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -101,8 +101,7 @@ OPENJPEG_VERSION=2.5.3
101101XZ_VERSION=5.8.1
102102TIFF_VERSION=4.7.0
103103LCMS2_VERSION=2.17
104- ZLIB_VERSION=1.3.1
105- ZLIB_NG_VERSION=2.2.4
104+ ZLIB_NG_VERSION=2.2.5
106105LIBWEBP_VERSION=1.6.0
107106BZIP2_VERSION=1.0.8
108107LIBXCB_VERSION=1.17.0
@@ -259,11 +258,7 @@ function build {
259258 if [ -z " $IS_ALPINE " ] && [ -z " $SANITIZER " ] && [ -z " $IS_MACOS " ]; then
260259 yum remove -y zlib-devel
261260 fi
262- if [[ -n " $IS_MACOS " ]] && [[ " $MACOSX_DEPLOYMENT_TARGET " == " 10.10" || " $MACOSX_DEPLOYMENT_TARGET " == " 10.13" ]]; then
263- build_new_zlib
264- else
265- build_zlib_ng
266- fi
261+ build_zlib_ng
267262
268263 build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
269264 if [[ -n " $IS_MACOS " ]]; then
Original file line number Diff line number Diff line change 44import sys
55
66from PIL import features
7- from Tests .helper import is_pypy
87
98
109def test_wheel_modules () -> None :
@@ -48,8 +47,6 @@ def test_wheel_features() -> None:
4847
4948 if sys .platform == "win32" :
5049 expected_features .remove ("xcb" )
51- elif sys .platform == "darwin" and not is_pypy () and platform .processor () != "arm" :
52- expected_features .remove ("zlib_ng" )
5350 elif sys .platform == "ios" :
5451 # Can't distribute raqm due to licensing, and there's no system version;
5552 # fribidi and harfbuzz won't be available if raqm isn't available.
Original file line number Diff line number Diff line change @@ -126,7 +126,7 @@ def cmd_msbuild(
126126 "OPENJPEG" : "2.5.3" ,
127127 "TIFF" : "4.7.0" ,
128128 "XZ" : "5.8.1" ,
129- "ZLIBNG" : "2.2.4 " ,
129+ "ZLIBNG" : "2.2.5 " ,
130130}
131131V ["LIBPNG_XY" ] = "" .join (V ["LIBPNG" ].split ("." )[:2 ])
132132
You can’t perform that action at this time.
0 commit comments