Unverified Commit cc2cfef6 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #288071 from wegank/freefilesync-curl 

freefilesync: fix build with curl 8.6.0
parents 54eaf4d9 277a870c

pkgs/by-name/fr/freefilesync/curl-8.6.0.patch

0 → 100644
+16 −0
Original line number Diff line number Diff line 
diff --git a/libcurl/curl_wrap.cpp b/libcurl/curl_wrap.cpp

index 11ac9dd..93edd44 100644

--- a/libcurl/curl_wrap.cpp

+++ b/libcurl/curl_wrap.cpp

@@ -401,9 +401,10 @@ std::wstring zen::formatCurlStatusCode(CURLcode sc)

             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PROXY);

             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CLIENTCERT);

             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNRECOVERABLE_POLL);

+            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE);

             ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);

     }

-    static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1);

+    static_assert(CURL_LAST == CURLE_TOO_LARGE + 1);

 

     return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));

 }

pkgs/by-name/fr/freefilesync/package.nix

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ stdenv.mkDerivation (finalAttrs: { 
      patch = "ffs_no_check_updates.patch";

      hash = "sha256-lPyHpxhZz8BSnDI8QfAzKpKwVkp2jiF49RWjKNuZGII=";

    })

    # Fix build with curl 8.6.0

    ./curl-8.6.0.patch

  ];



  nativeBuildInputs = [