Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

thrift: add v0.20.0 and bump deps #24046

Merged
merged 1 commit into from
Jun 5, 2024
Merged

thrift: add v0.20.0 and bump deps #24046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions recipes/thrift/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"0.20.0":
url: "http://archive.apache.org/dist/thrift/0.20.0/thrift-0.20.0.tar.gz"
sha256: "b5d8311a779470e1502c027f428a1db542f5c051c8e1280ccd2163fa935ff2d6"
"0.18.1":
url: "http://archive.apache.org/dist/thrift/0.18.1/thrift-0.18.1.tar.gz"
sha256: "04c6f10e5d788ca78e13ee2ef0d2152c7b070c0af55483d6b942e29cff296726"
Expand All @@ -18,6 +21,10 @@ sources:
url: "http://archive.apache.org/dist/thrift/0.14.1/thrift-0.14.1.tar.gz"
sha256: "13da5e1cd9c8a3bb89778c0337cc57eb0c29b08f3090b41cf6ab78594b410ca5"
patches:
"0.20.0":
- patch_file: "patches/cmake-0.16.0.patch"
patch_description: "use cci packages"
patch_type: "conan"
"0.18.1":
- patch_file: "patches/cmake-0.16.0.patch"
patch_description: "use cci packages"
Expand Down
4 changes: 2 additions & 2 deletions recipes/thrift/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("boost/1.84.0", transitive_headers=True)
self.requires("boost/1.85.0", transitive_headers=True)
if self.options.with_openssl:
self.requires("openssl/[>=1.1 <4]")
if self.options.with_zlib:
self.requires("zlib/[>=1.2.11 <2]")
if self.options.with_libevent:
self.requires("libevent/2.1.12")
if self.options.with_qt5:
self.requires("qt/5.15.12")
self.requires("qt/5.15.13")

def build_requirements(self):
if self._settings_build.os == "Windows":
Expand Down
2 changes: 2 additions & 0 deletions recipes/thrift/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"0.20.0":
folder: all
"0.18.1":
folder: all
"0.17.0":
Expand Down
Loading