Skip to content
This repository has been archived by the owner on Sep 24, 2024. It is now read-only.

Commit

Permalink
(conan-io#18677) libcurl: add version 8.2.0, update libnghttp2, remov…
Browse files Browse the repository at this point in the history
…e older versions

* libcurl: add version 8.2.0, update libnghttp2

* fix brotli patch
  • Loading branch information
toge committed Jul 21, 2023
1 parent 8e2d581 commit bed40ca
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
9 changes: 3 additions & 6 deletions recipes/libcurl/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"8.2.0":
url: "https://curl.se/download/curl-8.2.0.tar.gz"
sha256: "c67849462d171a3fee08b605cdd837d18ee22ecc3ee2c6a0393c9cec5d1a137e"
"8.1.2":
url: "https://curl.se/download/curl-8.1.2.tar.gz"
sha256: "2e5a9b8fcdc095bdd2f079561f369de71c5eb3b80f00a702fbe9a8b8d9897891"
Expand Down Expand Up @@ -38,9 +41,3 @@ sources:
"7.78.0":
url: "https://curl.se/download/curl-7.78.0.tar.gz"
sha256: "ed936c0b02c06d42cf84b39dd12bb14b62d77c7c4e875ade022280df5dcc81d7"
"7.77.0":
url: "https://curl.se/download/curl-7.77.0.tar.gz"
sha256: "b0a3428acb60fa59044c4d0baae4e4fc09ae9af1d8a3aa84b2e3fbcd99841f77"
"7.76.0":
url: "https://curl.se/download/curl-7.76.0.tar.gz"
sha256: "3b4378156ba09e224008e81dcce854b7ce4d182b1f9cfb97fe5ed9e9c18c6bd3"
5 changes: 3 additions & 2 deletions recipes/libcurl/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def requirements(self):
elif self.options.with_ssl == "wolfssl":
self.requires("wolfssl/5.6.3")
if self.options.with_nghttp2:
self.requires("libnghttp2/1.54.0")
self.requires("libnghttp2/1.55.1")
if self.options.with_libssh2:
self.requires("libssh2/1.11.0")
if self.options.with_zlib:
Expand Down Expand Up @@ -334,7 +334,8 @@ def _patch_cmake(self):
"include(CurlSymbolHiding)", "")

# brotli
replace_in_file(self, cmakelists, "find_package(Brotli QUIET)", "find_package(brotli REQUIRED CONFIG)")
if Version(self.version) < "8.2.0":
replace_in_file(self, cmakelists, "find_package(Brotli QUIET)", "find_package(brotli REQUIRED CONFIG)")
replace_in_file(self, cmakelists, "if(BROTLI_FOUND)", "if(brotli_FOUND)")
replace_in_file(self, cmakelists, "${BROTLI_LIBRARIES}", "brotli::brotli")
replace_in_file(self, cmakelists, "${BROTLI_INCLUDE_DIRS}", "${brotli_INCLUDE_DIRS}")
Expand Down
6 changes: 2 additions & 4 deletions recipes/libcurl/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"8.2.0":
folder: all
"8.1.2":
folder: all
"8.1.1":
Expand All @@ -25,7 +27,3 @@ versions:
folder: all
"7.78.0":
folder: all
"7.77.0":
folder: all
"7.76.0":
folder: all

0 comments on commit bed40ca

Please sign in to comment.