From 4282e515bb7ffbbfa6a24b6963d8091d5acf25bf Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Mon, 2 Oct 2023 13:10:15 +0200 Subject: [PATCH] chore: update crashpad 2023 09 28 (#891) --- CHANGELOG.md | 5 +++++ external/crashpad | 2 +- scripts/install-llvm-mingw.ps1 | 1 + src/sentry_sync.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c6dc3b07..a808c3df4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,14 @@ ## Unreleased +**Fixes**: + +- Use a more up-to-date version of `mini_chromium` as a `crashpad` dependency, which fixes a build error on some systems. ([#891](https://github.com/getsentry/sentry-native/pull/891), [crashpad#88](https://github.com/getsentry/crashpad/pull/88)) + **Internal**: - Updated `libunwindstack` to 2023-09-13. ([#884](https://github.com/getsentry/sentry-native/pull/884), [libunwindstack-ndk#8](https://github.com/getsentry/libunwindstack-ndk/pull/8)) +- Updated `crashpad` to 2023-09-28. ([#891](https://github.com/getsentry/sentry-native/pull/891), [crashpad#88](https://github.com/getsentry/crashpad/pull/88)) **Thank you**: diff --git a/external/crashpad b/external/crashpad index 432ff49ec..f37da0f96 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit 432ff49ecccc1cdebf1a7646007bb0594ac3481f +Subproject commit f37da0f96ac60e919c0db6091d40000450ce7d6a diff --git a/scripts/install-llvm-mingw.ps1 b/scripts/install-llvm-mingw.ps1 index a81acaf4d..835c884f6 100755 --- a/scripts/install-llvm-mingw.ps1 +++ b/scripts/install-llvm-mingw.ps1 @@ -49,6 +49,7 @@ New-Item -ItemType Directory -Force -Path "${NINJA_INSTALL_PATH}" Expand-Archive -LiteralPath "${NINJA_DL_PATH}" -DestinationPath "${NINJA_INSTALL_PATH}" # Export the NINJA executable path echo "NINJA_INSTALL_PATH=${NINJA_INSTALL_PATH}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append +echo "PATH=${NINJA_INSTALL_PATH};$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append # Add CMAKE_DEFINES echo "CMAKE_DEFINES=-DCMAKE_C_COMPILER=${env:MINGW_PKG_PREFIX}-gcc -DCMAKE_CXX_COMPILER=${env:MINGW_PKG_PREFIX}-g++ -DCMAKE_RC_COMPILER=${env:MINGW_PKG_PREFIX}-windres -DCMAKE_ASM_MASM_COMPILER=${env:MINGW_ASM_MASM_COMPILER} -GNinja" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append diff --git a/src/sentry_sync.c b/src/sentry_sync.c index 3e4c1940b..bcc44b374 100644 --- a/src/sentry_sync.c +++ b/src/sentry_sync.c @@ -21,7 +21,7 @@ typedef struct { # pragma pack(pop) sentry_threadid_t -sentry__thread_get_current_threadid() +sentry__thread_get_current_threadid(void) { return GetCurrentThread(); }