diff --git a/ports/crashpad/fix-stdint.patch b/ports/crashpad/fix-stdint.patch deleted file mode 100644 index 219a91c092..0000000000 --- a/ports/crashpad/fix-stdint.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/base/logging.h b/base/logging.h -index a123535..a87de3d 100644 ---- a/base/logging.h -+++ b/base/logging.h -@@ -7,7 +7,7 @@ - - #include - #include -- -+#include - #include - #include - #include -diff --git a/base/strings/utf_string_conversion_utils.h b/base/strings/utf_string_conversion_utils.h -index ed99a23..0ba3fea 100644 ---- a/base/strings/utf_string_conversion_utils.h -+++ b/base/strings/utf_string_conversion_utils.h -@@ -6,7 +6,7 @@ - #define MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_ - - #include -- -+#include - namespace base { - - inline bool IsValidCodepoint(uint32_t code_point) { diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index c1f326453e..fbd6b97c44 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://chromium.googlesource.com/crashpad/crashpad - REF 261679b3d2f3336d8531ed38e110254c3e2d1c10 + REF 7e0af1d4d45b526f01677e74a56f4a951b70517d ) vcpkg_find_acquire_program(PYTHON3) @@ -18,21 +18,17 @@ function(checkout_in_path PATH URL REF) OUT_SOURCE_PATH DEP_SOURCE_PATH URL "${URL}" REF "${REF}" - PATCHES - "${PATCH_FILE}" ) file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") endfunction() # mini_chromium contains the toolchains and build configuration -set(PATCH_FILE "fix-stdint.patch") checkout_in_path( "${SOURCE_PATH}/third_party/mini_chromium/mini_chromium" "https://chromium.googlesource.com/chromium/mini_chromium" - "5654edb4225bcad13901155c819febb5748e502b" + "dce72d97d1c2e9beb5e206c6a05a702269794ca3" ) -set(PATCH_FILE "") if(VCPKG_TARGET_IS_LINUX) # fetch lss diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index 93287930f8..32d3b02432 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,7 +1,6 @@ { "name": "crashpad", - "version-date": "2022-09-05", - "port-version": 6, + "version-date": "2024-04-11", "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." diff --git a/versions/baseline.json b/versions/baseline.json index 11fd5c57e7..4e34434860 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1989,8 +1989,8 @@ "port-version": 2 }, "crashpad": { - "baseline": "2022-09-05", - "port-version": 6 + "baseline": "2024-04-11", + "port-version": 0 }, "crashrpt": { "baseline": "1.4.3", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 554afe865c..d428288ab9 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faece66eb2a9a6f95f5a11c7f4ebd3cefd70d54f", + "version-date": "2024-04-11", + "port-version": 0 + }, { "git-tree": "d3d6e9473bb3047d0ba5db163765218b013809c1", "version-date": "2022-09-05",