diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2018-12-30 11:49:16 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2018-12-30 11:49:31 +0200 |
commit | 152d6bf014a16c6759f3ebd8d5109b758990bae8 (patch) | |
tree | 55f08ae87bc179c7a7479023f97cf4ffeb6ad60a /gnu/packages/patches | |
parent | af8fd11bed63af2ba97749fe7375880e0c5f0b20 (diff) | |
download | guix-152d6bf014a16c6759f3ebd8d5109b758990bae8.tar guix-152d6bf014a16c6759f3ebd8d5109b758990bae8.tar.gz |
gnu: fbreader: Fix building with newer curl.
* gnu/packages/ebook.scm (fbreader)[source]: Add patch.
* gnu/packages/patches/fbreader-curl-7.62.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/fbreader-curl-7.62.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/gnu/packages/patches/fbreader-curl-7.62.patch b/gnu/packages/patches/fbreader-curl-7.62.patch new file mode 100644 index 0000000000..e42a3375f0 --- /dev/null +++ b/gnu/packages/patches/fbreader-curl-7.62.patch @@ -0,0 +1,30 @@ +https://github.com/geometer/FBReader/commit/b7c78e965d06f78043a57e230c866c3af3f5a1eb.patch +https://github.com/geometer/FBReader/issues/310 +https://github.com/geometer/FBReader/pull/311/commits + +From b7c78e965d06f78043a57e230c866c3af3f5a1eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> +Date: Sun, 9 Dec 2018 10:18:03 +0100 +Subject: [PATCH] fix compatibility with curl-7.62 + +https://github.com/curl/curl/commit/3f3b26d6fe +--- + zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp +index 54cc37f6c..03e2a5721 100644 +--- a/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp ++++ b/zlibrary/core/src/unix/curl/ZLCurlNetworkManager.cpp +@@ -285,9 +285,11 @@ std::string ZLCurlNetworkManager::perform(const ZLExecutionData::Vector &dataLis + #endif + errors.insert(ZLStringUtil::printf(errorResource["peerFailedVerificationMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); + break; ++#if LIBCURL_VERSION_NUM < 0x073e00 + case CURLE_SSL_CACERT: + errors.insert(ZLStringUtil::printf(errorResource["sslCertificateAuthorityMessage"].value(), ZLNetworkUtil::hostFromUrl(url))); + break; ++#endif + case CURLE_SSL_CACERT_BADFILE: + errors.insert(ZLStringUtil::printf(errorResource["sslBadCertificateFileMessage"].value(), request.sslCertificate().Path)); + break; |