Skip to content

Commit

Permalink
[sentry-native] update to 0.6.0 (microsoft#29653)
Browse files Browse the repository at this point in the history
Signed-off-by: Vitalii Koshura <[email protected]>
  • Loading branch information
AenBleidd authored Feb 15, 2023
1 parent 39c4d05 commit e96a58f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
15 changes: 5 additions & 10 deletions ports/sentry-native/fix-config-cmake.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ index 846797d..d7c4ae6 100644
+++ b/external/crashpad/crashpad-config.cmake.in
@@ -1,6 +1,9 @@
include("${CMAKE_CURRENT_LIST_DIR}/crashpad-targets.cmake")

if(@CRASHPAD_ZLIB_SYSTEM@)
+ include(CMakeFindDependencyMacro)
+ find_dependency(ZLIB)
Expand All @@ -16,20 +16,15 @@ diff --git a/external/crashpad/third_party/zlib/CMakeLists.txt b/external/crashp
index eeb449f..59a6ff1 100644
--- a/external/crashpad/third_party/zlib/CMakeLists.txt
+++ b/external/crashpad/third_party/zlib/CMakeLists.txt
@@ -1,15 +1,10 @@
@@ -1,11 +1,10 @@
if(CRASHPAD_ZLIB_SYSTEM)
add_library(crashpad_zlib INTERFACE)
- string(REPLACE ";" "$<SEMICOLON>" GENEX_ZLIB_LIBRARIES "${ZLIB_LIBRARIES}")
- target_include_directories(crashpad_zlib INTERFACE
- $<BUILD_INTERFACE:${ZLIB_INCLUDE_DIRS}>
- )
target_compile_definitions(crashpad_zlib INTERFACE
ZLIB_CONST
CRASHPAD_ZLIB_SOURCE_SYSTEM
- $<BUILD_INTERFACE:${ZLIB_COMPILE_DEFINITIONS}>
)
- target_link_libraries(crashpad_zlib INTERFACE $<BUILD_INTERFACE:${GENEX_ZLIB_LIBRARIES}>)
+ target_link_libraries(crashpad_zlib INTERFACE ZLIB::ZLIB)
target_link_libraries(crashpad_zlib INTERFACE ZLIB::ZLIB)
else()
add_library(crashpad_zlib STATIC
zlib/adler32.c
Expand All @@ -40,7 +35,7 @@ index 89ea345..acbd5e2 100644
@@ -3,9 +3,14 @@
set(SENTRY_BACKEND @SENTRY_BACKEND@)
set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@)

+include(CMakeFindDependencyMacro)
+if("@SENTRY_LINK_PTHREAD@")
+ find_dependency(Threads)
Expand All @@ -55,7 +50,7 @@ index 89ea345..acbd5e2 100644
endif()
@@ -14,7 +19,5 @@ endif()
include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake")

if(SENTRY_TRANSPORT STREQUAL "curl" AND NOT @BUILD_SHARED_LIBS@)
- find_package(CURL REQUIRED)
- set_property(TARGET sentry::sentry APPEND
Expand Down
6 changes: 3 additions & 3 deletions ports/sentry-native/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/getsentry/sentry-native/releases/download/0.5.4/sentry-native.zip"
FILENAME "sentry-native-0.5.4.zip"
SHA512 847771de9e8a0fda5e1a35131d25459a117fc41c2e827bc369d249cc6f8a195f1e8e9280ca68c24b5d3c51b91060cd5d528e529d9672332c58c63817ad8a1f3a
URLS "https://github.com/getsentry/sentry-native/releases/download/0.6.0/sentry-native.zip"
FILENAME "sentry-native-0.6.0.zip"
SHA512 e41d3661679ba7ba1cc58059ce86f6fb1a93fb580d2f8e77d6f2a09988fe62f18f3636e13e324a643f736aa891aa2312100740ace043c2e542d4e6b546b61014
)

vcpkg_extract_source_archive(
Expand Down
2 changes: 1 addition & 1 deletion ports/sentry-native/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sentry-native",
"version": "0.5.4",
"version": "0.6.0",
"description": "Sentry SDK for C, C++ and native applications.",
"homepage": "https://sentry.io/",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7089,7 +7089,7 @@
"port-version": 2
},
"sentry-native": {
"baseline": "0.5.4",
"baseline": "0.6.0",
"port-version": 0
},
"septag-dmon": {
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sentry-native.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4c8485e46d8fe7b95d8e3cd0e3423ef80b328c8f",
"version": "0.6.0",
"port-version": 0
},
{
"git-tree": "b230da8becc701f07efd5f68cba93fcf4b9be02b",
"version": "0.5.4",
Expand Down

0 comments on commit e96a58f

Please sign in to comment.