diff --git a/ports/crashpad/fix-stdint.patch b/ports/crashpad/fix-stdint.patch new file mode 100644 index 0000000000..219a91c092 --- /dev/null +++ b/ports/crashpad/fix-stdint.patch @@ -0,0 +1,26 @@ +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 b370f22a40..c1f326453e 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -18,17 +18,21 @@ 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" ) +set(PATCH_FILE "") if(VCPKG_TARGET_IS_LINUX) # fetch lss diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index 1045e79291..c07a4cbe52 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "crashpad", "version-date": "2022-09-05", - "port-version": 4, + "port-version": 5, "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." @@ -10,6 +10,7 @@ "license": "Apache-2.0", "supports": "linux | osx | (windows & !uwp)", "dependencies": [ + "curl", { "name": "vcpkg-cmake-get-vars", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index e2eced3b5d..9f0b438e2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1986,7 +1986,7 @@ }, "crashpad": { "baseline": "2022-09-05", - "port-version": 4 + "port-version": 5 }, "crashrpt": { "baseline": "1.4.3", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 72aa3bf041..82a22ac3a7 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7161b19eece4ad2643d6b2baafdb5fd6ec57572", + "version-date": "2022-09-05", + "port-version": 5 + }, { "git-tree": "63c757af964d6d69f6abdeb0a3849889ad3531a9", "version-date": "2022-09-05",