[skia,crashpad,zeroc-ice,vcpkg-tool-gn] New vcpkg-tool-gn and update …

…of several ports (#24066)

ports/chromium-base/vcpkg.json

@@ -1,8 +1,15 @@
 {
   "name": "chromium-base",
-  "version-string": "86.0.4199.1",
-  "port-version": 3,
+  "version": "86.0.4199.1",
+  "port-version": 4,
   "description": "Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.",
   "homepage": "https://chromium.googlesource.com/chromium/src",
-  "supports": "x64 & (osx | windows | linux) & !uwp"
+  "license": "BSD-3-Clause",
+  "supports": "x64 & (osx | windows | linux) & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-tool-gn",
+      "host": true
+    }
+  ]
 }

ports/crashpad/portfile.cmake

@@ -3,9 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
     URL https://chromium.googlesource.com/crashpad/crashpad
-    REF 9a31d3f8e9815774026a753a1ff6155347cd549f
+    REF 68aba08c48bb428b7b159b3371163f86e8d5a126
 )
 
+vcpkg_find_acquire_program(PYTHON3)
+vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"")
+
 function(checkout_in_path PATH URL REF)
     if(EXISTS "${PATH}")
         return()
@@ -24,7 +27,7 @@ endfunction()
 checkout_in_path(
     "${SOURCE_PATH}/third_party/mini_chromium/mini_chromium"
     "https://chromium.googlesource.com/chromium/mini_chromium"
-    "c426ff98e1d9e9d59777fe8b883a5c0ceeca9ca3"
+    "5654edb4225bcad13901155c819febb5748e502b"
 )
 
 function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
@@ -119,6 +122,9 @@ file(REMOVE_RECURSE
 configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in"
         "${CURRENT_PACKAGES_DIR}/share/${PORT}/crashpadConfig.cmake" @ONLY)
 
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/build")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/util/mach/__pycache__")
+
 vcpkg_copy_pdbs()
 file(INSTALL "${SOURCE_PATH}/LICENSE"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"

ports/crashpad/vcpkg.json

@@ -1,14 +1,18 @@
 {
   "name": "crashpad",
-  "version-date": "2020-03-18",
-  "port-version": 2,
+  "version-date": "2022-04-16",
   "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."
   ],
   "homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md",
-  "supports": "x64 & (osx | windows)",
+  "license": "Apache-2.0",
+  "supports": "osx | windows",
   "dependencies": [
+    {
+      "name": "vcpkg-tool-gn",
+      "host": true
+    },
     "zlib"
   ]
 }

ports/skia/dawn_use_vcpkg_spirv.patch

@@ -0,0 +1,13 @@
+diff --git a/src/dawn_native/BUILD.gn b/src/dawn_native/BUILD.gn
+index f73bfe24..e37792a0 100644
+--- a/src/dawn_native/BUILD.gn
++++ b/src/dawn_native/BUILD.gn
+@@ -145,7 +145,7 @@ source_set("dawn_native_sources") {
+     ":dawn_native_headers",
+     ":dawn_native_utils_gen",
+     "${dawn_root}/src/common",
+-    "${dawn_root}/third_party/gn/spirv_cross:spirv_cross",
++    "//third_party/spirv-cross:spirv_cross",
+     "${dawn_spirv_tools_dir}:spvtools_opt",
+     "${dawn_spirv_tools_dir}:spvtools_val",
+     "${dawn_tint_dir}/src:libtint",

ports/skia/fontconfig.gn

@@ -0,0 +1,10 @@
+import("../third_party.gni")
+
+ system("fontconfig") {
+   include_dirs = @_INCLUDES@
+   if(is_debug) {
+     libs = @_LIBS_DBG@
+   } else {
+     libs = @_LIBS_REL@
+   }
+ }