From 44c0684f46cd933400418999681dd427bc9b09b3 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Thu, 28 Sep 2023 17:23:35 +0200 Subject: [PATCH 01/12] chore: update crashpad 2023-09-28 --- external/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/crashpad b/external/crashpad index 432ff49ecc..a9f52498ac 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit 432ff49ecccc1cdebf1a7646007bb0594ac3481f +Subproject commit a9f52498ac128edb6a0f39a8458d6eb05c0bb8a1 From 7eed36a33b1930650b7df0f3268e755c42af43ad Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Thu, 28 Sep 2023 18:16:48 +0200 Subject: [PATCH 02/12] Update the update --- external/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/crashpad b/external/crashpad index a9f52498ac..0e7a4f6443 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit a9f52498ac128edb6a0f39a8458d6eb05c0bb8a1 +Subproject commit 0e7a4f64430bb6c2821cbaf9bb4eca91b2ac0b28 From 0edd35871cd8dcc13c8e4e16e41e0fe0eca45504 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 29 Sep 2023 16:15:58 +0200 Subject: [PATCH 03/12] Update crashpad submodule --- external/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/crashpad b/external/crashpad index 0e7a4f6443..695d159ff2 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit 0e7a4f64430bb6c2821cbaf9bb4eca91b2ac0b28 +Subproject commit 695d159ff203e4dea32d31ef928cc4848911ddc1 From 227f33a455128289cfa78ddedc023595c9a0e3cc Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 29 Sep 2023 16:24:26 +0200 Subject: [PATCH 04/12] Update crashpad submodule --- external/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/crashpad b/external/crashpad index 695d159ff2..bd37fea5d7 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit 695d159ff203e4dea32d31ef928cc4848911ddc1 +Subproject commit bd37fea5d70c3d052ae3b683c6102f036a71a18b From 297a50c8c9a6ee6287daac2006969129f68e2351 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 29 Sep 2023 16:30:09 +0200 Subject: [PATCH 05/12] Update crashpad submodule --- external/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/crashpad b/external/crashpad index bd37fea5d7..b601eb4b07 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit bd37fea5d70c3d052ae3b683c6102f036a71a18b +Subproject commit b601eb4b0754998925d8b3823189cb5666c939f1 From 2c355f37c685bd065efffbd6852d3e5aece8ea2e Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 29 Sep 2023 16:35:58 +0200 Subject: [PATCH 06/12] Update crashpad submodule --- external/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/crashpad b/external/crashpad index b601eb4b07..3299fb2874 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit b601eb4b0754998925d8b3823189cb5666c939f1 +Subproject commit 3299fb2874f7325020aa9a480f1aa237b8a06fb7 From b84182fcc35684cb5bf83a7531e461d74348cb04 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 29 Sep 2023 16:38:14 +0200 Subject: [PATCH 07/12] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c6dc3b070..a228bc8c53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ **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**: From eeaa64c839cc63e50ba9b7d357d748c6758eec6b Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Sat, 30 Sep 2023 10:11:50 +0200 Subject: [PATCH 08/12] Update crashpad submodule --- external/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/crashpad b/external/crashpad index 3299fb2874..dbe03a5272 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit 3299fb2874f7325020aa9a480f1aa237b8a06fb7 +Subproject commit dbe03a5272909b57dd750eaa75a238737498dc90 From 5c76114dc2f0193096b810a5eb09c04cc6051262 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Mon, 2 Oct 2023 10:57:03 +0200 Subject: [PATCH 09/12] Update crashpad submodule --- external/crashpad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/crashpad b/external/crashpad index dbe03a5272..f37da0f96a 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit dbe03a5272909b57dd750eaa75a238737498dc90 +Subproject commit f37da0f96ac60e919c0db6091d40000450ce7d6a From 9da90763173c2299dd7103ab3b15ab5f1a7f275e Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Mon, 2 Oct 2023 11:36:29 +0200 Subject: [PATCH 10/12] Export ninja to PATH --- scripts/install-llvm-mingw.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install-llvm-mingw.ps1 b/scripts/install-llvm-mingw.ps1 index a81acaf4db..835c884f6a 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 From 5acae74c0927a395bb137f4cfb54b3ece3e63d86 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Mon, 2 Oct 2023 11:48:23 +0200 Subject: [PATCH 11/12] Fix another empty C function parameter list --- src/sentry_sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry_sync.c b/src/sentry_sync.c index 3e4c1940b6..bcc44b374f 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(); } From 7a590896242460c10648ad300635319ebd7df2f3 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Mon, 2 Oct 2023 13:09:43 +0200 Subject: [PATCH 12/12] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a228bc8c53..a808c3df44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 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))