Mercurial > hg > orthanc

annotate OrthancFramework/Resources/Patches/curl-7.77.0.patch @ 5103:899f303613fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from 1.11.2 branch
author Alain Mazy <am@osimis.io>
date Thu, 27 Oct 2022 12:53:47 +0200
parents dbb1a90c4df4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4710
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb curl-7.77.0.orig/CMake/Macros.cmake curl-7.77.0/CMake/Macros.cmake
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- curl-7.77.0.orig/CMake/Macros.cmake 2021-06-22 10:31:21.875004553 +0200
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ curl-7.77.0/CMake/Macros.cmake 2021-06-22 10:31:45.219024665 +0200
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -59,7 +59,7 @@
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 message(STATUS "Performing Curl Test ${CURL_TEST}")
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 try_compile(${CURL_TEST}
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 ${CMAKE_BINARY_DIR}
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 - ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 + ${CURL_SOURCES_DIR}/CMake/CurlTests.c
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 "${CURL_TEST_ADD_LIBRARIES}"
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 OUTPUT_VARIABLE OUTPUT)
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 diff -urEb curl-7.77.0.orig/lib/vssh/ssh.h curl-7.77.0/lib/vssh/ssh.h
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 --- curl-7.77.0.orig/lib/vssh/ssh.h 2021-06-22 10:31:21.843004526 +0200
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 +++ curl-7.77.0/lib/vssh/ssh.h 2021-06-22 10:36:34.271266232 +0200
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 @@ -22,7 +22,7 @@
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 *
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 ***************************************************************************/
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 -#include "curl_setup.h"
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 +#include "../curl_setup.h"
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #if defined(HAVE_LIBSSH2_H)
dbb1a90c4df4 upgrade to curl 7.77.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include <libssh2.h>