diff --git a/recipes/sentry-native/all/conandata.yml b/recipes/sentry-native/all/conandata.yml index d34b92939237ef..c90310127fc667 100644 --- a/recipes/sentry-native/all/conandata.yml +++ b/recipes/sentry-native/all/conandata.yml @@ -10,6 +10,7 @@ sources: sha256: "41fdf6499cd8576142beb03104badcc9e0b80b8ef27080ca71cd4408cc1d7ece" patches: "0.6.0": - - patch_file: "patches/crashpad-wer-support.patch" + - patch_file: "patches/sentry-native-903c17a.patch" patch_description: "Make it possible to build with support for the crashpad WER module while using the sentry-crashpad package" - patch_type: "conan" + patch_type: "official" + patch_source: "https://github.com/getsentry/sentry-native/pull/816" diff --git a/recipes/sentry-native/all/patches/crashpad-wer-support.patch b/recipes/sentry-native/all/patches/crashpad-wer-support.patch deleted file mode 100644 index f08e227564c5b7..00000000000000 --- a/recipes/sentry-native/all/patches/crashpad-wer-support.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -413,6 +413,9 @@ - - if(SENTRY_BACKEND_CRASHPAD) - option(SENTRY_CRASHPAD_SYSTEM "Use system crashpad" OFF) -+ if(CRASHPAD_WER_ENABLED) -+ add_compile_definitions(CRASHPAD_WER_ENABLED) -+ endif() - if(SENTRY_CRASHPAD_SYSTEM) - find_package(crashpad REQUIRED) - target_link_libraries(sentry PUBLIC crashpad::client) -@@ -426,9 +429,6 @@ - set(CRASHPAD_ENABLE_INSTALL ON CACHE BOOL "Enable crashpad installation" FORCE) - endif() - add_subdirectory(external/crashpad crashpad_build) -- if(CRASHPAD_WER_ENABLED) -- add_compile_definitions(CRASHPAD_WER_ENABLED) -- endif() - - # set static runtime if enabled - if(SENTRY_BUILD_RUNTIMESTATIC AND MSVC) -@@ -482,9 +482,6 @@ - endif() - endif() - add_dependencies(sentry crashpad::handler) -- if(CRASHPAD_WER_ENABLED) -- add_dependencies(sentry crashpad::wer) -- endif() - elseif(SENTRY_BACKEND_BREAKPAD) - option(SENTRY_BREAKPAD_SYSTEM "Use system breakpad" OFF) - if(SENTRY_BREAKPAD_SYSTEM) - diff --git a/recipes/sentry-native/all/patches/sentry-native-903c17a.patch b/recipes/sentry-native/all/patches/sentry-native-903c17a.patch new file mode 100644 index 00000000000000..09c8222b564185 --- /dev/null +++ b/recipes/sentry-native/all/patches/sentry-native-903c17a.patch @@ -0,0 +1,35 @@ +From 903c17ae20888679caab1871cc74de577509452e Mon Sep 17 00:00:00 2001 +From: Cyriuz +Date: Mon, 13 Mar 2023 14:55:26 +0100 +Subject: [PATCH] Allow setting CRASHPAD_WER_ENABLED when using system crashpad + (#816) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 831e8e1..aeea09f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -426,8 +426,9 @@ if(SENTRY_BACKEND_CRASHPAD) + set(CRASHPAD_ENABLE_INSTALL ON CACHE BOOL "Enable crashpad installation" FORCE) + endif() + add_subdirectory(external/crashpad crashpad_build) ++ + if(CRASHPAD_WER_ENABLED) +- add_compile_definitions(CRASHPAD_WER_ENABLED) ++ add_dependencies(sentry crashpad::wer) + endif() + + # set static runtime if enabled +@@ -482,8 +483,9 @@ if(SENTRY_BACKEND_CRASHPAD) + endif() + endif() + add_dependencies(sentry crashpad::handler) ++ + if(CRASHPAD_WER_ENABLED) +- add_dependencies(sentry crashpad::wer) ++ add_compile_definitions(CRASHPAD_WER_ENABLED) + endif() + elseif(SENTRY_BACKEND_BREAKPAD) + option(SENTRY_BREAKPAD_SYSTEM "Use system breakpad" OFF) +-- +2.39.1.windows.1 +