[breakpad] update to 2023.01.27

microsoft · Nov 9, 2023 · d2ef324 · d2ef324
1 parent fe1e9f5
commit d2ef324
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 12 deletions.
diff --git a/ports/breakpad/CMakeLists.txt b/ports/breakpad/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.8)
 project(breakpad CXX)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_definitions(
@@ -102,6 +102,7 @@ list(APPEND TARGETS libbreakpad_client)
 
 if(INSTALL_TOOLS)
     if(LINUX)
+        find_package(ZLIB)
         add_executable(microdump_stackwalk
                 src/processor/microdump_stackwalk.cc)
         target_link_libraries(microdump_stackwalk PRIVATE libbreakpad libbreakpad_client)
@@ -150,7 +151,7 @@ if(INSTALL_TOOLS)
             src/common/linux/memory_mapped_file.cc
             src/common/linux/safe_readlink.cc
             src/tools/linux/dump_syms/dump_syms.cc)
-        target_link_libraries(dump_syms PRIVATE libbreakpad_client)
+        target_link_libraries(dump_syms PRIVATE libbreakpad_client ZLIB::ZLIB)
         install(TARGETS dump_syms DESTINATION bin)
 
         add_executable(minidump-2-core

diff --git a/ports/breakpad/fix-const-char.patch b/ports/breakpad/fix-const-char.patch
@@ -0,0 +1,14 @@
+diff --git a/src/processor/disassembler_objdump.cc b/src/processor/disassembler_objdump.cc
+index dfe10d58..26be029c 100644
+--- a/src/processor/disassembler_objdump.cc
++++ b/src/processor/disassembler_objdump.cc
+@@ -85,7 +85,7 @@ ScopedTmpFile::~ScopedTmpFile() {
+ }
+
+ bool ScopedTmpFile::Create() {
+-  fd_ = mkstemp(path_.data());
++  fd_ = mkstemp(const_cast<char*>(path_.data()));
+   if (fd_ < 0) {
+     unlink(path_.c_str());
+     fd_ = 0;
+
diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake
@@ -3,10 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/breakpad
-    REF v2022.07.12
-    SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f
+    REF v2023.01.27
+    SHA512 c6802c55653289780232b20e2abc0458c49f3cdff108c3ddfd6e40a2f378da34adbc158548e9c88cbfdbba9526477da9b68c2c45e205231e2802fe533b6bd6a4
     HEAD_REF master
     PATCHES
+        fix-const-char.patch
         fix-unique_ptr.patch
 )
 
@@ -38,6 +39,10 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/client/linux/data" "${CURRENT_PACKAGES_DIR}/include/client/linux/sender")
 
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/breakpad/breakpad-config.cmake" "include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)
+")
+
 if("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES microdump_stackwalk minidump_dump minidump_stackwalk core2md pid2md dump_syms minidump-2-core minidump_upload sym_upload core_handler AUTO_CLEAN)
 endif()

diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "breakpad",
-  "version-date": "2022-07-12",
-  "port-version": 6,
+  "version-date": "2023-01-27",
   "description": "a set of client and server components which implement a crash-reporting system.",
   "homepage": "https://github.com/google/breakpad",
   "license": "BSD-3-Clause",
@@ -24,7 +23,10 @@
   "features": {
     "tools": {
       "description": "Build breakpad tools",
-      "supports": "linux"
+      "supports": "linux",
+      "dependencies": [
+        "zlib"
+      ]
     }
   }
 }
diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "a244c96e6e67d802de17045cb395c0f11e0b3aa4",
-      "version-date": "2022-07-12",
-      "port-version": 6
+      "git-tree": "c53ec06e9733af0449e17bac0a8291e01c4a5f0a",
+      "version-date": "2023-01-27",
+      "port-version": 0
     },
     {
       "git-tree": "a451811c203f1ec086288b40dd4571d97bb7033e",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1313,8 +1313,8 @@
       "port-version": 1
     },
     "breakpad": {
-      "baseline": "2022-07-12",
-      "port-version": 6
+      "baseline": "2023-01-27",
+      "port-version": 0
     },
     "brigand": {
       "baseline": "1.3.0",