Skip to content

Commit

Permalink
sentry-native: Use patch from getsentry/sentry-native#816 instead
Browse files Browse the repository at this point in the history
  • Loading branch information
Cyriuz committed Mar 17, 2023
1 parent b82ff88 commit 5d66ef5
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 35 deletions.
5 changes: 3 additions & 2 deletions recipes/sentry-native/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
33 changes: 0 additions & 33 deletions recipes/sentry-native/all/patches/crashpad-wer-support.patch

This file was deleted.

35 changes: 35 additions & 0 deletions recipes/sentry-native/all/patches/sentry-native-903c17a.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 903c17ae20888679caab1871cc74de577509452e Mon Sep 17 00:00:00 2001
From: Cyriuz <Cyriuz@users.noreply.github.com>
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

0 comments on commit 5d66ef5

Please sign in to comment.