From 2c6c03ad0a98a33f8043ed8ffef03f2a48aaae2b Mon Sep 17 00:00:00 2001 From: Rye Date: Thu, 6 Feb 2025 11:33:30 -0500 Subject: [PATCH] Update zlib-ng submodule to 2.2.3 --- patches/fix-macos-arm64-and-win-build.patch | 8 ++++---- zlib-ng | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/fix-macos-arm64-and-win-build.patch b/patches/fix-macos-arm64-and-win-build.patch index b51f321..f3ef294 100644 --- a/patches/fix-macos-arm64-and-win-build.patch +++ b/patches/fix-macos-arm64-and-win-build.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index fba3575d..c0bd04fd 100644 +index b97c2021..f30a5140 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,7 +193,7 @@ elseif(MSVC) # /Oi ? set(WARNFLAGS /W3 /w34242 /WX) set(WARNFLAGS_MAINTAINER /W4) -- set(WARNFLAGS_DISABLE /wd4206 /wd4054) -+ set(WARNFLAGS_DISABLE /wd4206 /wd4054 /wd4267) +- set(WARNFLAGS_DISABLE /wd4206 /wd4054 /wd4324) ++ set(WARNFLAGS_DISABLE /wd4206 /wd4054 /wd4324 /wd4267) if(BASEARCH_ARM_FOUND) add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) if(NOT "${ARCH}" MATCHES "aarch64") @@ -34,7 +34,7 @@ index dfdc6013..a021550b 100644 set(BASEARCH_ARM_FOUND TRUE) elseif("${ARCH}" MATCHES "ppc(64(le)?)?|powerpc(64(le)?)?") diff --git a/cmake/detect-intrinsics.cmake b/cmake/detect-intrinsics.cmake -index 1906f215..593b3123 100644 +index b96ac0a4..13277db2 100644 --- a/cmake/detect-intrinsics.cmake +++ b/cmake/detect-intrinsics.cmake @@ -178,7 +178,7 @@ endmacro() diff --git a/zlib-ng b/zlib-ng index c939498..cbb6ec1 160000 --- a/zlib-ng +++ b/zlib-ng @@ -1 +1 @@ -Subproject commit c939498c7f2a1d645833a98251365e2c814fd736 +Subproject commit cbb6ec1d74e8061efdf7251f8c2dae778bed14fd