summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_curl.patch
diff options
context:
space:
mode:
Diffstat (limited to 'freefilesync/ffs_curl.patch')
-rw-r--r--freefilesync/ffs_curl.patch35
1 files changed, 32 insertions, 3 deletions
diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch
index 25ad6a6..4c584fe 100644
--- a/freefilesync/ffs_curl.patch
+++ b/freefilesync/ffs_curl.patch
@@ -21,9 +21,9 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a
=> https://curl.haxx.se/docs/faq.html#How_do_I_list_the_root_dir_of_an
Message: For Fedora <= 30 that has curl < 7.66.0 you need this patch.
-diff -x '*.swp' -Naur 10.17-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.17-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h
---- 10.17-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-10-21 11:23:51.238139296 -0400
-+++ 10.17-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-10-21 11:37:17.175140528 -0400
+diff -Naur 10.20-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.20-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h
+--- 10.20-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2019-11-20 07:57:22.146753270 -0500
++++ 10.20-1/FreeFileSync/Source/afs/libcurl/curl_wrap.h 2020-02-18 07:26:34.057709413 -0500
@@ -16,7 +16,8 @@
//-------------------------------------------------
@@ -48,3 +48,32 @@ diff -x '*.swp' -Naur 10.17-0/FreeFileSync/Source/afs/libcurl/curl_wrap.h 10.17-
return replaceCpy<std::wstring>(L"Curl status %x.", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
}
+diff -Naur 10.20-0/libcurl/curl_wrap.h 10.20-1/libcurl/curl_wrap.h
+--- 10.20-0/libcurl/curl_wrap.h 2020-02-18 07:23:30.008454286 -0500
++++ 10.20-1/libcurl/curl_wrap.h 2020-02-18 07:25:34.397984509 -0500
+@@ -17,7 +17,8 @@
+ //-------------------------------------------------
+
+ #ifndef CURLINC_CURL_H
+- #error curl.h header guard changed
++ // disable for Fedora <= 30
++ //#error curl.h header guard changed
+ #endif
+
+ namespace zen
+@@ -134,11 +135,11 @@
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_INVALIDCERTSTATUS);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP2_STREAM);
+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_RECURSIVE_API_CALL);
+- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
+- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
+- ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
++ //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
++ //ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
++ //ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
+ }
+- static_assert(CURL_LAST == CURLE_HTTP3 + 1);
++ //static_assert(CURL_LAST == CURLE_HTTP3 + 1);
+
+ return replaceCpy<std::wstring>(L"Curl status %x.", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
+ }
bgstack15