From 7f977f65229cd7037bfc4896fccc22b2c279d749 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 30 May 2024 09:10:28 +1000 Subject: [PATCH 1/2] Updated xz to 5.6.2 --- .github/workflows/wheels-dependencies.sh | 2 +- winbuild/build_prepare.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 0d45d5a209d..0df3bf17930 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -20,7 +20,7 @@ HARFBUZZ_VERSION=8.4.0 LIBPNG_VERSION=1.6.43 JPEGTURBO_VERSION=3.0.2 OPENJPEG_VERSION=2.5.2 -XZ_VERSION=5.4.5 +XZ_VERSION=5.6.2 TIFF_VERSION=4.6.0 LCMS2_VERSION=2.16 if [[ -n "$IS_MACOS" ]]; then diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 0d6da77549f..1df8db17bc7 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -120,7 +120,7 @@ def cmd_msbuild( "LIBWEBP": "1.3.2", "OPENJPEG": "2.5.2", "TIFF": "4.6.0", - "XZ": "5.4.5", + "XZ": "5.6.2", "ZLIB": "1.3.1", } V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "") From 142cb11dcce7b82df56c018a457e6d9876c7397e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 13 Jun 2024 10:58:51 +1000 Subject: [PATCH 2/2] Use GitHub URL for xz --- winbuild/build_prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 1df8db17bc7..0bc739ea816 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -176,7 +176,7 @@ def cmd_msbuild( "libs": [r"*.lib"], }, "xz": { - "url": f"{SF_PROJECTS}/lzmautils/files/xz-{V['XZ']}.tar.gz/download", + "url": f"https://github.com/tukaani-project/xz/releases/download/v{V['XZ']}/xz-{V['XZ']}.tar.gz", "filename": f"xz-{V['XZ']}.tar.gz", "dir": f"xz-{V['XZ']}", "license": "COPYING",