Skip to content

Commit f570c67

Browse files
authored
Update zlib-ng to 2.2.5 (#9140)
2 parents c1538ac + b8ffea2 commit f570c67

3 files changed

Lines changed: 3 additions & 11 deletions

File tree

.github/workflows/wheels-dependencies.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ OPENJPEG_VERSION=2.5.3
101101
XZ_VERSION=5.8.1
102102
TIFF_VERSION=4.7.0
103103
LCMS2_VERSION=2.17
104-
ZLIB_VERSION=1.3.1
105-
ZLIB_NG_VERSION=2.2.4
104+
ZLIB_NG_VERSION=2.2.5
106105
LIBWEBP_VERSION=1.6.0
107106
BZIP2_VERSION=1.0.8
108107
LIBXCB_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

checks/check_wheel.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import sys
55

66
from PIL import features
7-
from Tests.helper import is_pypy
87

98

109
def 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.

winbuild/build_prepare.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
}
131131
V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])
132132

0 commit comments

Comments
 (0)