[sentry-native] update to 0.7.6

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
microsoft · Jun 12, 2024 · dabad9f · dabad9f
1 parent eb0f108
commit dabad9f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 61 deletions.
diff --git a/ports/sentry-native/fix-config-cmake.patch b/ports/sentry-native/fix-config-cmake.patch
@@ -2,42 +2,20 @@ diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in
 index 70ce7d3..796d428 100644
 --- a/sentry-config.cmake.in
 +++ b/sentry-config.cmake.in
-@@ -1,5 +1,7 @@
- @PACKAGE_INIT@
+@@ -9,7 +9,7 @@ set(SENTRY_LINK_PTHREAD @SENTRY_LINK_PTHREAD@)
 
-+include(CMakeFindDependencyMacro)
-+
- 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)
+ if(SENTRY_BACKEND STREQUAL "crashpad")
  	include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake")
- 	if(NOT MSVC AND NOT SENTRY_BUILD_SHARED_LIBS)
--		find_package(ZLIB REQUIRED)
-+		find_dependency(ZLIB)
+-	if(NOT MSVC AND NOT SENTRY_BUILD_SHARED_LIBS)
++	if(NOT SENTRY_BUILD_SHARED_LIBS)
+ 		find_dependency(ZLIB REQUIRED)
  	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()
+@@ -23,7 +23,5 @@ endif()
  include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake")
 
  if(SENTRY_TRANSPORT STREQUAL "curl" AND (NOT @BUILD_SHARED_LIBS@ OR NOT SENTRY_BUILD_SHARED_LIBS))
--	find_package(CURL REQUIRED)
+ 	find_dependency(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-usage-runtime.patch b/ports/sentry-native/fix-usage-runtime.patch
diff --git 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/${VERSION}/sentry-native.zip"
     FILENAME "sentry-native-${VERSION}.zip"
-    SHA512 8165eb0186092e1120e16015928cf39e14e4b5af94c2e87411b062da8c2930e85eb690087bc7b4f87b81761c54a841b071622a409f53bf7f09f857372895f8bb
+    SHA512 92bdbc6edeeb687b30e654e011a1b45abf3ff0b8e2fe22025889550bcadfde50a6895a9539136c02a298013f6890faf41f30f9e2b0f8e2af8d0661edf0083fb3
 )
 
 vcpkg_extract_source_archive(
@@ -11,7 +11,6 @@ vcpkg_extract_source_archive(
     PATCHES
         fix-config-cmake.patch
         fix-crashpad-wer.patch
-        fix-usage-runtime.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,7 +1,6 @@
 {
   "name": "sentry-native",
-  "version": "0.7.5",
-  "port-version": 1,
+  "version": "0.7.6",
   "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
@@ -8045,8 +8045,8 @@
       "port-version": 0
     },
     "sentry-native": {
-      "baseline": "0.7.5",
-      "port-version": 1
+      "baseline": "0.7.6",
+      "port-version": 0
     },
     "septag-dmon": {
       "baseline": "2022-02-08",

diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d97813155a50466d97faf744699a2a2a48a5b9e5",
+      "version": "0.7.6",
+      "port-version": 0
+    },
     {
       "git-tree": "b7ec5e8b622f2026bb79fd536c893742ff48afa0",
       "version": "0.7.5",