# HG changeset patch # User Alain Mazy # Date 1763457526 -3600 # Node ID 4e7b2af984750de375ffa29b1bdc44266aecb62c # Parent 9612aa45134f8ab725873859af1b1c391d290e5b fix zlib build on MacOS 15 diff -r 9612aa45134f -r 4e7b2af98475 OrthancFramework/Resources/CMake/ZlibConfiguration.cmake --- a/OrthancFramework/Resources/CMake/ZlibConfiguration.cmake Mon Nov 17 12:08:30 2025 +0100 +++ b/OrthancFramework/Resources/CMake/ZlibConfiguration.cmake Tue Nov 18 10:18:46 2025 +0100 @@ -27,6 +27,14 @@ DownloadPackage(${ZLIB_MD5} ${ZLIB_URL} "${ZLIB_SOURCES_DIR}") + # fix https://github.com/madler/zlib/issues/1044 + execute_process( + COMMAND ${PATCH_EXECUTABLE} -p0 -N -i + ${CMAKE_CURRENT_LIST_DIR}/../Patches/zlib-1.3.1-zconf.patch + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE Failure + ) + include_directories( ${ZLIB_SOURCES_DIR} ) diff -r 9612aa45134f -r 4e7b2af98475 OrthancFramework/Resources/Patches/zlib-1.3.1-zconf.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancFramework/Resources/Patches/zlib-1.3.1-zconf.patch Tue Nov 18 10:18:46 2025 +0100 @@ -0,0 +1,12 @@ +diff -ruN zlib-1.3.1-orig/zlib.h zlib-1.3.1/zlib.h +--- zlib-1.3.1-orig/zlib.h 2025-11-18 10:09:54.402921485 +0100 ++++ zlib-1.3.1/zlib.h 2025-11-18 10:10:33.743470112 +0100 +@@ -31,7 +31,7 @@ + #ifndef ZLIB_H + #define ZLIB_H + +-#include "zconf.h" ++#include + + #ifdef __cplusplus + extern "C" {