From e96a58ff6dc8bd2e7aaf66dc20bcec32daf7e615 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Wed, 15 Feb 2023 18:46:16 +0100 Subject: [PATCH] [sentry-native] update to 0.6.0 (#29653) Signed-off-by: Vitalii Koshura --- ports/sentry-native/fix-config-cmake.patch | 15 +++++---------- ports/sentry-native/portfile.cmake | 6 +++--- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ports/sentry-native/fix-config-cmake.patch b/ports/sentry-native/fix-config-cmake.patch index e8d4a0ebf8..34aa2405e8 100644 --- a/ports/sentry-native/fix-config-cmake.patch +++ b/ports/sentry-native/fix-config-cmake.patch @@ -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) @@ -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 ";" "$" GENEX_ZLIB_LIBRARIES "${ZLIB_LIBRARIES}") -- target_include_directories(crashpad_zlib INTERFACE -- $ -- ) target_compile_definitions(crashpad_zlib INTERFACE ZLIB_CONST CRASHPAD_ZLIB_SOURCE_SYSTEM - $ ) -- target_link_libraries(crashpad_zlib INTERFACE $) -+ 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 @@ -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) @@ -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 diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index b59ce942f2..ccfd99e6de 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -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( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 3966df6a8c..b68dbb9cc7 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index c3eb23c176..edeae8480a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7089,7 +7089,7 @@ "port-version": 2 }, "sentry-native": { - "baseline": "0.5.4", + "baseline": "0.6.0", "port-version": 0 }, "septag-dmon": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 0476d7f0ad..79574bb0cf 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c8485e46d8fe7b95d8e3cd0e3423ef80b328c8f", + "version": "0.6.0", + "port-version": 0 + }, { "git-tree": "b230da8becc701f07efd5f68cba93fcf4b9be02b", "version": "0.5.4",