[sentry-native] update to 0.7.0 (#36088)

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
microsoft · Jan 11, 2024 · 9d62695 · 9d62695
1 parent 491be10
commit 9d62695
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 61 deletions.
diff --git a/ports/sentry-native/fix-config-cmake.patch b/ports/sentry-native/fix-config-cmake.patch
@@ -1,59 +1,43 @@
-diff --git a/external/crashpad/crashpad-config.cmake.in b/external/crashpad/crashpad-config.cmake.in
-index 846797d..d7c4ae6 100644
---- a/external/crashpad/crashpad-config.cmake.in
-+++ 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)
-+elseif(0)
-     find_package(ZLIB REQUIRED)
-     target_include_directories(crashpad::zlib INTERFACE ${ZLIB_INCLUDE_DIRS})
-     target_compile_definitions(crashpad::zlib INTERFACE ${ZLIB_COMPILE_DEFINITIONS})
-diff --git a/external/crashpad/third_party/zlib/CMakeLists.txt b/external/crashpad/third_party/zlib/CMakeLists.txt
-index eeb449f..59a6ff1 100644
---- a/external/crashpad/third_party/zlib/CMakeLists.txt
-+++ b/external/crashpad/third_party/zlib/CMakeLists.txt
-@@ -1,11 +1,10 @@
- if(CRASHPAD_ZLIB_SYSTEM)
-     add_library(crashpad_zlib INTERFACE)
-     target_compile_definitions(crashpad_zlib INTERFACE
-         ZLIB_CONST
-         CRASHPAD_ZLIB_SOURCE_SYSTEM
--        $<BUILD_INTERFACE:${ZLIB_COMPILE_DEFINITIONS}>
-     )
-     target_link_libraries(crashpad_zlib INTERFACE ZLIB::ZLIB)
- else()
-     add_library(crashpad_zlib STATIC
-         zlib/adler32.c
 diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in
-index 89ea345..acbd5e2 100644
+index 70ce7d3..796d428 100644
 --- a/sentry-config.cmake.in
 +++ b/sentry-config.cmake.in
-@@ -3,9 +3,14 @@
- set(SENTRY_BACKEND @SENTRY_BACKEND@)
- set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@)
+@@ -1,5 +1,7 @@
+ @PACKAGE_INIT@
 
 +include(CMakeFindDependencyMacro)
-+if("@SENTRY_LINK_PTHREAD@")
-+	find_dependency(Threads)
-+endif()
 +
- if(SENTRY_BACKEND STREQUAL "crashpad")
- 	if(@SENTRY_CRASHPAD_SYSTEM@)
--		find_package(crashpad REQUIRED)
-+		find_dependency(crashpad)
- 	else()
- 		include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake")
+ set(SENTRY_BACKEND @SENTRY_BACKEND@)
+ set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@)
+ set(SENTRY_BUILD_SHARED_LIBS @SENTRY_BUILD_SHARED_LIBS@)
+@@ -8,14 +10,14 @@ set(SENTRY_LINK_PTHREAD @SENTRY_LINK_PTHREAD@)
+ if(SENTRY_BACKEND STREQUAL "crashpad" AND NOT SENTRY_BUILD_SHARED_LIBS)
+ 	include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake")
+ 	if(NOT MSVC AND NOT SENTRY_BUILD_SHARED_LIBS)
+-		find_package(ZLIB REQUIRED)
++		find_depenency(ZLIB)
  	endif()
-@@ -14,7 +19,5 @@ endif()
+ endif()
+
+ if(SENTRY_BACKEND STREQUAL "breakpad" AND NOT SENTRY_BUILD_SHARED_LIBS)
+ 	set(SENTRY_BREAKPAD_SYSTEM @SENTRY_BREAKPAD_SYSTEM@)
+ 	if(SENTRY_BREAKPAD_SYSTEM)
+-		find_package(PkgConfig REQUIRED)
++		find_dependency(PkgConfig)
+ 		pkg_check_modules(BREAKPAD REQUIRED IMPORTED_TARGET breakpad-client)
+ 	endif()
+ endif()
+@@ -23,11 +25,9 @@ endif()
  include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake")
 
- if(SENTRY_TRANSPORT STREQUAL "curl" AND NOT @BUILD_SHARED_LIBS@)
+ if(SENTRY_TRANSPORT STREQUAL "curl" AND (NOT @BUILD_SHARED_LIBS@ OR NOT SENTRY_BUILD_SHARED_LIBS))
 -	find_package(CURL REQUIRED)
 -	set_property(TARGET sentry::sentry APPEND
 -		PROPERTY INTERFACE_LINK_LIBRARIES ${CURL_LIBRARIES})
 +	find_dependency(CURL)
  endif()
+
+ if(SENTRY_LINK_PTHREAD AND NOT SENTRY_BUILD_SHARED_LIBS)
+-	find_package(Threads REQUIRED)
++	find_dependency(Threads)
+ endif()
diff --git a/ports/sentry-native/fix-warningC5105.patch b/ports/sentry-native/fix-warningC5105.patch
diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake
@@ -1,15 +1,14 @@
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip"
     FILENAME "sentry-native-${VERSION}.zip"
-    SHA512 fb2c03c9e3662078e4475390b785760ede1a156713fdfdba2cc8979148a9b4788203c4f923f2b59fcd1fcfa6a4ff77613484186b2a99a4e16100e24d7fc765ae
+    SHA512 745e2a4590df5412ab62ec6bb32efa7674423d4f0466f4ead9d327d6b0f9308ee8ae328b4beac00b31b34cf88d1dc0a102e81363b4a4a0395e98fcb0758c0551
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     NO_REMOVE_ONE_LEVEL
     PATCHES
-        fix-warningC5105.patch
         fix-config-cmake.patch
 )
 file(REMOVE_RECURSE "${SOURCE_PATH}/external/crashpad/third_party/zlib/zlib")

diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-native",
-  "version": "0.6.7",
+  "version": "0.7.0",
   "description": "Sentry SDK for C, C++ and native applications.",
   "homepage": "https://sentry.io/",
   "license": "MIT",
@@ -27,6 +27,12 @@
         "Cf. https://github.com/getsentry/sentry-native#compile-time-options"
       ],
       "dependencies": [
+        {
+          "$comment": "pkgcong is used by the breakpad backend.",
+          "name": "pkgconf",
+          "host": true,
+          "platform": "!android & !ios"
+        },
         {
           "$comment": "zlib is used by the crashpad backend.",
           "name": "zlib",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7813,7 +7813,7 @@
       "port-version": 1
     },
     "sentry-native": {
-      "baseline": "0.6.7",
+      "baseline": "0.7.0",
       "port-version": 0
     },
     "septag-dmon": {

diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5b7467839d13128952c0f944197f8d2fcbc7a763",
+      "version": "0.7.0",
+      "port-version": 0
+    },
     {
       "git-tree": "095696cc8cbe39b017311226154e23b909318ef1",
       "version": "0.6.7",