Mercurial > hg > orthanc

changeset 5732:49c29af02b13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgraded curl to 8.9.0
author Alain Mazy <am@orthanc.team>
date Fri, 26 Jul 2024 18:52:26 +0200
parents ede854dfef3a
children 49730b6cade7
files NEWS OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake OrthancFramework/Resources/Patches/curl-8.5.0.patch OrthancFramework/Resources/Patches/curl-8.9.0.patch
diffstat 4 files changed, 18 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Fri Jul 26 18:03:36 2024 +0200
+++ b/NEWS	Fri Jul 26 18:52:26 2024 +0200
@@ -21,7 +21,8 @@
   in very specific use-cases.
 * Fix extremely rare error when 2 threads are trying to create the same folder in the File Storage 
   at the same time.
-
+* Upgraded dependencies for static builds:
+  - curl 8.9.0
 
 
 Version 1.12.4 (2024-06-05)
--- a/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Fri Jul 26 18:03:36 2024 +0200
+++ b/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Fri Jul 26 18:52:26 2024 +0200
@@ -21,9 +21,9 @@
 
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL)
-  SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-8.5.0)
-  SET(CURL_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/curl-8.5.0.tar.gz")
-  SET(CURL_MD5 "0bc69288b20ae165ff4b7d6d7bbe70d2")
+  SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-8.9.0)
+  SET(CURL_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/curl-8.9.0.tar.gz")
+  SET(CURL_MD5 "f9bca5d4d5bac1f04e6c5eb4d0418618")
 
   if (IS_DIRECTORY "${CURL_SOURCES_DIR}")
     set(FirstRun OFF)
@@ -36,7 +36,7 @@
   if (FirstRun)
     execute_process(
       COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-      ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-8.5.0.patch
+      ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-8.9.0.patch
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       RESULT_VARIABLE Failure
       )
--- a/OrthancFramework/Resources/Patches/curl-8.5.0.patch	Fri Jul 26 18:03:36 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urEb curl-8.5.0.orig/CMake/Macros.cmake curl-8.5.0/CMake/Macros.cmake
---- curl-8.5.0.orig/CMake/Macros.cmake	2024-01-24 17:21:21.387965189 +0100
-+++ curl-8.5.0/CMake/Macros.cmake	2024-01-24 17:21:48.523719072 +0100
-@@ -48,7 +48,7 @@
-     message(STATUS "Performing Curl Test ${CURL_TEST}")
-     try_compile(${CURL_TEST}
-       ${CMAKE_BINARY_DIR}
--      ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c
-+      ${CURL_SOURCES_DIR}/CMake/CurlTests.c
-       CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
-       "${CURL_TEST_ADD_LIBRARIES}"
-       OUTPUT_VARIABLE OUTPUT)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancFramework/Resources/Patches/curl-8.9.0.patch	Fri Jul 26 18:52:26 2024 +0200
@@ -0,0 +1,12 @@
+diff -urEb curl-8.5.0.orig/CMake/Macros.cmake curl-8.5.0/CMake/Macros.cmake
+--- curl-8.5.0.orig/CMake/Macros.cmake	2024-07-26 18:47:52.920588300 +0200
++++ curl-8.5.0/CMake/Macros.cmake	2024-07-26 18:48:08.345522100 +0200
+@@ -48,7 +48,7 @@
+     message(STATUS "Performing Test ${CURL_TEST}")
+     try_compile(${CURL_TEST}
+       ${CMAKE_BINARY_DIR}
+-      ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c
++      ${CURL_SOURCES_DIR}/CMake/CurlTests.c
+       CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
+       "${CURL_TEST_ADD_LIBRARIES}"
+       OUTPUT_VARIABLE OUTPUT)