From ee78cb01e4336b6282214f68c99fe285301e6181 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Wed, 12 Jun 2024 17:47:30 +0200 Subject: [PATCH] [sentry-native] update to 0.7.6 Signed-off-by: Vitalii Koshura --- ports/sentry-native/fix-config-cmake.patch | 36 ++++--------------- ports/sentry-native/fix-find-dependency.patch | 33 +++++++++++++++++ ports/sentry-native/fix-usage-runtime.patch | 15 +------- ports/sentry-native/portfile.cmake | 3 +- ports/sentry-native/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/s-/sentry-native.json | 5 +++ 7 files changed, 51 insertions(+), 48 deletions(-) create mode 100644 ports/sentry-native/fix-find-dependency.patch diff --git a/ports/sentry-native/fix-config-cmake.patch b/ports/sentry-native/fix-config-cmake.patch index 4b4fd1a1c74f25..027270c68fd655 100644 --- 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-find-dependency.patch b/ports/sentry-native/fix-find-dependency.patch new file mode 100644 index 00000000000000..ec6575b18c5e21 --- /dev/null +++ b/ports/sentry-native/fix-find-dependency.patch @@ -0,0 +1,33 @@ +diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in +index 1e3871f..e38b0c7 100644 +--- a/sentry-config.cmake.in ++++ b/sentry-config.cmake.in +@@ -9,14 +9,14 @@ set(SENTRY_LINK_PTHREAD @SENTRY_LINK_PTHREAD@) + if(SENTRY_BACKEND STREQUAL "crashpad") + include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake") + if(NOT SENTRY_BUILD_SHARED_LIBS) +- find_dependency(ZLIB REQUIRED) ++ find_dependency(ZLIB) + 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_dependency(PkgConfig REQUIRED) ++ find_dependency(PkgConfig) + pkg_check_modules(BREAKPAD REQUIRED IMPORTED_TARGET breakpad-client) + endif() + endif() +@@ -24,9 +24,9 @@ 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_dependency(CURL REQUIRED) ++ find_dependency(CURL) + endif() + + if(SENTRY_LINK_PTHREAD AND NOT SENTRY_BUILD_SHARED_LIBS) +- find_dependency(Threads REQUIRED) ++ find_dependency(Threads) + endif() diff --git a/ports/sentry-native/fix-usage-runtime.patch b/ports/sentry-native/fix-usage-runtime.patch index 96a1e7bbbb76d6..889be752d536a0 100644 --- a/ports/sentry-native/fix-usage-runtime.patch +++ b/ports/sentry-native/fix-usage-runtime.patch @@ -5,22 +5,9 @@ index be0e544..b0d44af 100644 @@ -89,7 +89,7 @@ if(NOT IOS) main.cc ) - + - if(LINUX) + if(LINUX AND BUILD_SHARED_LIBS) target_sources(crashpad_handler PRIVATE ../client/pthread_create_linux.cc ) -diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in -index 8840f5d..af3e84c 100644 ---- a/sentry-config.cmake.in -+++ b/sentry-config.cmake.in -@@ -9,7 +9,7 @@ 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) -+ if(NOT SENTRY_BUILD_SHARED_LIBS) - find_dependency(ZLIB) - endif() - endif() diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 5e7b3641aa0f8d..6b58bc3131b852 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/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 8165eb0186092e1120e16015928cf39e14e4b5af94c2e87411b062da8c2930e85eb690087bc7b4f87b81761c54a841b071622a409f53bf7f09f857372895f8bb + SHA512 92bdbc6edeeb687b30e654e011a1b45abf3ff0b8e2fe22025889550bcadfde50a6895a9539136c02a298013f6890faf41f30f9e2b0f8e2af8d0661edf0083fb3 ) vcpkg_extract_source_archive( @@ -12,6 +12,7 @@ vcpkg_extract_source_archive( fix-config-cmake.patch fix-crashpad-wer.patch fix-usage-runtime.patch + fix-find-dependency.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 index 7b7d281b282f5c..0010f7fac37aac 100644 --- 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 index 67a4e94286f85e..3872291eb489d2 100644 --- 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 index 97161fe9aa20ef..478563a5142007 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1f62e4b208a45ed18abea06b7221fb3c16291c9", + "version": "0.7.6", + "port-version": 0 + }, { "git-tree": "b7ec5e8b622f2026bb79fd536c893742ff48afa0", "version": "0.7.5",