From 0fd3df1e7f46c404e82359d109e3cdc24a2041fd Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Mon, 13 Sep 2021 17:09:19 +0200 Subject: [PATCH 1/3] sentry-native: Bump openssl and libcurl version --- recipes/sentry-native/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/sentry-native/all/conanfile.py b/recipes/sentry-native/all/conanfile.py index 349e24c322cee..6ac1e48381f06 100644 --- a/recipes/sentry-native/all/conanfile.py +++ b/recipes/sentry-native/all/conanfile.py @@ -106,7 +106,7 @@ def build_requirements(self): def requirements(self): if self.options.transport == "curl": - self.requires("libcurl/7.75.0") + self.requires("libcurl/7.78.0") if self.options.backend == "crashpad": if self.options.with_crashpad == "sentry": self.requires("sentry-crashpad/{}".format(self.version)) @@ -119,7 +119,7 @@ def requirements(self): self.requires("breakpad/cci.20210521") if self.options.qt: self.requires("qt/5.15.2") - self.requires("openssl/1.1.1k") + self.requires("openssl/1.1.1l") if tools.Version(self.version) < "0.4.5": raise ConanInvalidConfiguration("Qt integration available from version 0.4.5") From 345584a1704b6f7de184541d1fb92404f8625c6d Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Mon, 20 Sep 2021 13:14:28 +0200 Subject: [PATCH 2/3] Remove crashpad/armv8 support for version < 0.4.7 --- recipes/sentry-native/all/conanfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/sentry-native/all/conanfile.py b/recipes/sentry-native/all/conanfile.py index 6ac1e48381f06..75006d14b84b3 100644 --- a/recipes/sentry-native/all/conanfile.py +++ b/recipes/sentry-native/all/conanfile.py @@ -79,6 +79,8 @@ def config_options(self): def configure(self): if self.options.shared: del self.options.fPIC + + def validate(self): if self.settings.compiler.cppstd: tools.check_min_cppstd(self, 14) @@ -99,6 +101,8 @@ def configure(self): raise ConanInvalidConfiguration("The winhttp transport is only supported on Windows") if tools.Version(self.version) >= "0.4.7" and self.settings.compiler == "apple-clang" and tools.Version(self.settings.compiler.version) < "10.0": raise ConanInvalidConfiguration("apple-clang < 10.0 not supported") + if self.options.backend = "crashpad" and tools.Version(self.version) < "0.4.7" and self.settings.os == "Macos" and self.settings.arch == "armv8": + raise ConanInvalidConfiguration("This version doesn't support ARM compilation") def build_requirements(self): if self.options.backend == "breakpad": From acb9d35fc3774e6195489fc853af856728549d68 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Sun, 26 Sep 2021 12:33:15 +0200 Subject: [PATCH 3/3] Fix equals --- recipes/sentry-native/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/sentry-native/all/conanfile.py b/recipes/sentry-native/all/conanfile.py index 75006d14b84b3..9146014705f34 100644 --- a/recipes/sentry-native/all/conanfile.py +++ b/recipes/sentry-native/all/conanfile.py @@ -101,7 +101,7 @@ def validate(self): raise ConanInvalidConfiguration("The winhttp transport is only supported on Windows") if tools.Version(self.version) >= "0.4.7" and self.settings.compiler == "apple-clang" and tools.Version(self.settings.compiler.version) < "10.0": raise ConanInvalidConfiguration("apple-clang < 10.0 not supported") - if self.options.backend = "crashpad" and tools.Version(self.version) < "0.4.7" and self.settings.os == "Macos" and self.settings.arch == "armv8": + if self.options.backend == "crashpad" and tools.Version(self.version) < "0.4.7" and self.settings.os == "Macos" and self.settings.arch == "armv8": raise ConanInvalidConfiguration("This version doesn't support ARM compilation") def build_requirements(self):