From f8a8a29cdc062aa3c21ac73669a02e224010dbd5 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Wed, 5 Jun 2024 10:32:17 +0200 Subject: [PATCH] (#24046) thrift: add v0.20.0 and bump deps --- recipes/thrift/all/conandata.yml | 7 +++++++ recipes/thrift/all/conanfile.py | 4 ++-- recipes/thrift/config.yml | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/recipes/thrift/all/conandata.yml b/recipes/thrift/all/conandata.yml index 57ad35a140baa..6ddf0c58f5a00 100644 --- a/recipes/thrift/all/conandata.yml +++ b/recipes/thrift/all/conandata.yml @@ -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" @@ -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" diff --git a/recipes/thrift/all/conanfile.py b/recipes/thrift/all/conanfile.py index 7b6885cf89f45..4239d05bfd5e2 100644 --- a/recipes/thrift/all/conanfile.py +++ b/recipes/thrift/all/conanfile.py @@ -67,7 +67,7 @@ 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: @@ -75,7 +75,7 @@ def requirements(self): 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": diff --git a/recipes/thrift/config.yml b/recipes/thrift/config.yml index 8ce3e9b3821f4..f54d46190d9d2 100644 --- a/recipes/thrift/config.yml +++ b/recipes/thrift/config.yml @@ -1,4 +1,6 @@ versions: + "0.20.0": + folder: all "0.18.1": folder: all "0.17.0":