diff options
| author | B Stack <bgstack15@gmail.com> | 2020-02-18 16:02:40 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-02-18 16:02:40 +0000 |
| commit | 819051f5d8489d6193a56b5d02c3b9d21fe41775 (patch) | |
| tree | a5aecb01558219c0d302312fd8bc4d4766d2d3e9 /freefilesync/debian/patches/ffs_curl.patch | |
| parent | Merge branch 'mktrayicon-bump' into 'master' (diff) | |
| parent | fix libssh2 patch for rpm to match it for dpkg (diff) | |
| download | stackrpms-819051f5d8489d6193a56b5d02c3b9d21fe41775.tar.gz stackrpms-819051f5d8489d6193a56b5d02c3b9d21fe41775.tar.bz2 stackrpms-819051f5d8489d6193a56b5d02c3b9d21fe41775.zip | |
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 10.20
Closes #14
See merge request bgstack15/stackrpms!126
Diffstat (limited to 'freefilesync/debian/patches/ffs_curl.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_curl.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/freefilesync/debian/patches/ffs_curl.patch b/freefilesync/debian/patches/ffs_curl.patch index 2844a54..2396648 100644 --- a/freefilesync/debian/patches/ffs_curl.patch +++ b/freefilesync/debian/patches/ffs_curl.patch @@ -18,3 +18,21 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a 2. CURLFTPMETHOD_SINGLECWD requires absolute paths to skip one needless "CWD entry path": https://github.com/curl/curl/pull/4332 => https://curl.haxx.se/docs/faq.html#How_do_I_list_the_root_dir_of_an +Message: Devuan does not have whichever version of libcurl that provides these error codes, probably 7.68.0. Devuan as of 2020-02-15 has libcurl4-openssl-dev=7.67.0-2 +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-15 14:50:08.356617565 -0500 ++++ 10.20-1/libcurl/curl_wrap.h 2020-02-15 14:51:55.961645573 -0500 +@@ -135,10 +135,10 @@ + 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_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))); + } |