[vcpkg] Upgrade GN dependency

ports/skia/portfile.cmake

@@ -1,8 +1,7 @@
 vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
     URL https://skia.googlesource.com/skia.git
-    REF fb0b35fed5580d49392df7ce9374551b348fffbf
-    PATCHES add-missing-tuple.patch
+    REF 1f2435f46b48a19b3818df20085af685119cb8e0
 )
 
 function(checkout_in_path PATH URL REF)

ports/skia/vcpkg.json

@@ -1,14 +1,15 @@
 {
   "name": "skia",
-  "version-date": "2020-05-18",
-  "port-version": 7,
+  "version-date": "2022-02-03",
+  "port-version": 8,
   "description": [
     "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.",
     "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.",
     "Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source."
   ],
   "homepage": "https://skia.org",
-  "supports": "x64 & (osx | windows)",
+  "license": " BSD-3-Clause",
+  "supports": "(x64 & (osx | windows)) | (arm64 & osx)",
   "dependencies": [
     "expat",
     {

ports/v8/build.patch

@@ -1,16 +1,16 @@
 diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
-index 1904a2559..e66586c88 100644
+index b9f0e2e97..eb731b125 100644
 --- a/config/compiler/BUILD.gn
 +++ b/config/compiler/BUILD.gn
-@@ -1571,6 +1571,7 @@ config("default_warnings") {
+@@ -1489,6 +1489,7 @@ config("default_warnings") {
        # Disables.
        "-Wno-missing-field-initializers",  # "struct foo f = {0};"
        "-Wno-unused-parameter",  # Unused function parameters.
 +      "-Wno-invalid-offsetof", # Use of "conditionally-supported" offsetof in c++17
      ]
    }
 
-@@ -1987,8 +1988,17 @@ config("no_incompatible_pointer_warnings") {
+@@ -1925,8 +1926,17 @@ config("no_incompatible_pointer_warnings") {
  # Shared settings for both "optimize" and "optimize_max" configs.
  # IMPORTANT: On Windows "/O1" and "/O2" must go before the common flags.
  if (is_win) {
@@ -138,7 +138,7 @@ index 5adf70cc3..dab159f98 100755
    # JSON formatter prints GN compatible lists when everything is a list of
    # strings.
 diff --git a/config/linux/pkg_config.gni b/config/linux/pkg_config.gni
-index 428e44ac0..a0d2175ee 100644
+index 635fd8dde..026102624 100644
 --- a/config/linux/pkg_config.gni
 +++ b/config/linux/pkg_config.gni
 @@ -45,6 +45,9 @@ declare_args() {
@@ -151,7 +151,7 @@ index 428e44ac0..a0d2175ee 100644
  }
 
  pkg_config_script = "//build/config/linux/pkg-config.py"
-@@ -87,6 +90,17 @@ if (host_pkg_config != "") {
+@@ -88,6 +91,17 @@ if (host_pkg_config != "") {
    host_pkg_config_args = pkg_config_args
  }
 

ports/v8/portfile.cmake

@@ -71,41 +71,41 @@ endfunction()
 vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
     URL https://chromium.googlesource.com/v8/v8.git
-    REF 7d3d62c91f69a702e5aa54c6b4dbbaa883683717
+    REF 1adc3b1ecc7191c4be01dd0958c6367bb1b5cc08
     PATCHES ${CURRENT_PORT_DIR}/v8.patch
 )
 
 message(STATUS "Fetching submodules")
 v8_fetch(
         DESTINATION build
         URL https://chromium.googlesource.com/chromium/src/build.git
-        REF fd86d60f33cbc794537c4da2ef7e298d7f81138e 
+        REF 1c49f5582e4ebd601793ce7551c4273996fef26e 
         SOURCE ${SOURCE_PATH}
         PATCHES ${CURRENT_PORT_DIR}/build.patch)
 v8_fetch(
         DESTINATION third_party/zlib
         URL https://chromium.googlesource.com/chromium/src/third_party/zlib.git
-        REF 156be8c52f80cde343088b4a69a80579101b6e67
+        REF fc5cfd78a357d5bb7735a58f383634faaafe706a
         SOURCE ${SOURCE_PATH})
 v8_fetch(
         DESTINATION base/trace_event/common
         URL https://chromium.googlesource.com/chromium/src/base/trace_event/common.git
-        REF dab187b372fc17e51f5b9fad8201813d0aed5129
+        REF d115b033c4e53666b535cbd1985ffe60badad082
         SOURCE ${SOURCE_PATH})
 v8_fetch(
         DESTINATION third_party/googletest/src
         URL https://chromium.googlesource.com/external/github.com/google/googletest.git
-        REF 10b1902d893ea8cc43c69541d70868f91af3646b
+        REF 25ad42aabeaba6227f37795cdd2752e128e83827
         SOURCE ${SOURCE_PATH})
 v8_fetch(
         DESTINATION third_party/jinja2
         URL https://chromium.googlesource.com/chromium/src/third_party/jinja2.git
-        REF b41863e42637544c2941b574c7877d3e1f663e25
+        REF ee69aa00ee8536f61db6a451f3858745cf587de6
         SOURCE ${SOURCE_PATH})
 v8_fetch(
         DESTINATION third_party/markupsafe
         URL https://chromium.googlesource.com/chromium/src/third_party/markupsafe.git
-        REF 8f45f5cfa0009d2a70589bcda0349b8cb2b72783
+        REF 1b882ef6372b58bfd55a3285f37ed801be9137cd
         SOURCE ${SOURCE_PATH})
 
 vcpkg_execute_required_process(

ports/v8/v8.patch

@@ -1,8 +1,8 @@
 diff --git a/BUILD.gn b/BUILD.gn
-index d2bfb6129d..c5ab18ee44 100644
+index 0da77bb0ae..3f88c6eab1 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5366,6 +5366,7 @@ if (is_component_build) {
+@@ -5983,6 +5983,7 @@ if (is_component_build) {
 
      public_deps = [
        ":v8_base",
@@ -11,10 +11,10 @@ index d2bfb6129d..c5ab18ee44 100644
      ]
 
 diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
-index 72b8fbc8a8..3ebfc23f1f 100644
+index 3b59f2a90b..a8f2f10da7 100644
 --- a/src/codegen/code-stub-assembler.h
 +++ b/src/codegen/code-stub-assembler.h
-@@ -303,7 +303,7 @@ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol };
+@@ -313,7 +313,7 @@ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol };
  // it's possible to add JavaScript-specific useful CodeAssembler "macros"
  // without modifying files in the compiler directory (and requiring a review
  // from a compiler directory OWNER).
@@ -24,10 +24,10 @@ index 72b8fbc8a8..3ebfc23f1f 100644
        public TorqueGeneratedExportedMacrosAssembler {
   public:
 diff --git a/src/common/globals.h b/src/common/globals.h
-index f51c3210f8..5291285337 100644
+index ea1ce693c6..8e267085bd 100644
 --- a/src/common/globals.h
 +++ b/src/common/globals.h
-@@ -1364,7 +1364,7 @@ class BinaryOperationFeedback {
+@@ -1474,7 +1474,7 @@ class BinaryOperationFeedback {
  // This is distinct from BinaryOperationFeedback on purpose, because the
  // feedback that matters differs greatly as well as the way it is consumed.
  class CompareOperationFeedback {
@@ -36,7 +36,7 @@ index f51c3210f8..5291285337 100644
      kSignedSmallFlag = 1 << 0,
      kOtherNumberFlag = 1 << 1,
      kBooleanFlag = 1 << 2,
-@@ -1378,7 +1378,7 @@ class CompareOperationFeedback {
+@@ -1488,7 +1488,7 @@ class CompareOperationFeedback {
    };
 
   public:
@@ -59,10 +59,10 @@ index 8e1d3d4eae..c55d8329de 100644
    explicit NodeCache(Zone* zone) : map_(zone) {}
    ~NodeCache() = default;
 diff --git a/src/heap/paged-spaces-inl.h b/src/heap/paged-spaces-inl.h
-index e135e30efc..0c055247bc 100644
+index 22b07c7442..81f4d948e2 100644
 --- a/src/heap/paged-spaces-inl.h
 +++ b/src/heap/paged-spaces-inl.h
-@@ -19,7 +19,7 @@ namespace internal {
+@@ -18,7 +18,7 @@ namespace internal {
  // -----------------------------------------------------------------------------
  // PagedSpaceObjectIterator
 
@@ -72,7 +72,7 @@ index e135e30efc..0c055247bc 100644
      HeapObject next_obj = FromCurrentPage();
      if (!next_obj.is_null()) return next_obj;
 diff --git a/src/heap/paged-spaces.h b/src/heap/paged-spaces.h
-index 621d92aa89..a8592a5b4d 100644
+index c3ab87dd8f..686ae84f21 100644
 --- a/src/heap/paged-spaces.h
 +++ b/src/heap/paged-spaces.h
 @@ -45,7 +45,7 @@ class V8_EXPORT_PRIVATE PagedSpaceObjectIterator : public ObjectIterator {
@@ -82,13 +82,13 @@ index 621d92aa89..a8592a5b4d 100644
 -  inline HeapObject Next() override;
 +  HeapObject Next() override;
 
-  private:
-   // Fast (inlined) path of next().
+   // The pointer compression cage base value used for decompression of all
+   // tagged values except references to Code objects.
 diff --git a/src/objects/feedback-vector.cc b/src/objects/feedback-vector.cc
-index a77ea5d265..0cddb92a02 100644
+index accf076828..bb04fefb3a 100644
 --- a/src/objects/feedback-vector.cc
 +++ b/src/objects/feedback-vector.cc
-@@ -114,9 +114,9 @@ Handle<FeedbackMetadata> FeedbackMetadata::New(LocalIsolate* isolate,
+@@ -117,9 +117,9 @@ Handle<FeedbackMetadata> FeedbackMetadata::New(IsolateT* isolate,
    return metadata;
  }
 
@@ -101,10 +101,10 @@ index a77ea5d265..0cddb92a02 100644
 
  bool FeedbackMetadata::SpecDiffersFrom(
 diff --git a/src/objects/fixed-array-inl.h b/src/objects/fixed-array-inl.h
-index cca6d40070..d6d36ff59f 100644
+index 5dea891511..5ae1c7903c 100644
 --- a/src/objects/fixed-array-inl.h
 +++ b/src/objects/fixed-array-inl.h
-@@ -88,7 +88,7 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) {
+@@ -83,7 +83,7 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) {
    return get(isolate, index).IsTheHole(isolate);
  }
 
@@ -114,10 +114,10 @@ index cca6d40070..d6d36ff59f 100644
    DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length()));
    DCHECK(Object(value).IsSmi());
 diff --git a/src/objects/fixed-array.h b/src/objects/fixed-array.h
-index 98c5d8d5b5..bd5303e44c 100644
+index c8f2e19044..c6daddb949 100644
 --- a/src/objects/fixed-array.h
 +++ b/src/objects/fixed-array.h
-@@ -132,7 +132,7 @@ class FixedArray
+@@ -134,7 +134,7 @@ class FixedArray
    inline bool is_the_hole(Isolate* isolate, int index);
 
    // Setter that doesn't need write barrier.
@@ -126,24 +126,11 @@ index 98c5d8d5b5..bd5303e44c 100644
    // Setter with explicit barrier mode.
    inline void set(int index, Object value, WriteBarrierMode mode);
 
-diff --git a/src/snapshot/snapshot-utils.cc b/src/snapshot/snapshot-utils.cc
-index eb2372372c..7defadb4b1 100644
---- a/src/snapshot/snapshot-utils.cc
-+++ b/src/snapshot/snapshot-utils.cc
-@@ -5,7 +5,7 @@
- #include "src/snapshot/snapshot-utils.h"
-
- #include "src/sanitizer/msan.h"
--#include "third_party/zlib/zlib.h"
-+#include "zlib.h"
-
- namespace v8 {
- namespace internal {
 diff --git a/src/wasm/function-body-decoder-impl.h b/src/wasm/function-body-decoder-impl.h
-index d37f718681..3a409e1d76 100644
+index 823c06e74c..87cf57c0e1 100644
 --- a/src/wasm/function-body-decoder-impl.h
 +++ b/src/wasm/function-body-decoder-impl.h
-@@ -2013,7 +2013,7 @@ class WasmDecoder : public Decoder {
+@@ -1930,7 +1930,7 @@ class WasmDecoder : public Decoder {
    }
 
    // TODO(clemensb): This is only used by the interpreter; move there.
@@ -153,10 +140,10 @@ index d37f718681..3a409e1d76 100644
      // Handle "simple" opcodes with a fixed signature first.
      const FunctionSig* sig = WasmOpcodes::Signature(opcode);
 diff --git a/test/cctest/BUILD.gn b/test/cctest/BUILD.gn
-index ffa4e3a136..a279faee9b 100644
+index 58b4bc1d2e..af611fdde0 100644
 --- a/test/cctest/BUILD.gn
 +++ b/test/cctest/BUILD.gn
-@@ -493,6 +493,10 @@ v8_source_set("cctest_sources") {
+@@ -502,6 +502,10 @@ v8_source_set("cctest_sources") {
      # C4309: 'static_cast': truncation of constant value
      cflags += [ "/wd4309" ]
 
@@ -185,7 +172,7 @@ index 2256df1f55..29e27c6af9 100644
    }
 
 diff --git a/tools/v8windbg/BUILD.gn b/tools/v8windbg/BUILD.gn
-index 5618d2d945..71568f1670 100644
+index 5516a6109f..a1c53fceac 100644
 --- a/tools/v8windbg/BUILD.gn
 +++ b/tools/v8windbg/BUILD.gn
 @@ -6,7 +6,7 @@ import("../../gni/v8.gni")

ports/v8/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "v8",
-  "version": "9.1.269.39",
-  "port-version": 2,
+  "version": "10.0.82",
+  "port-version": 1,
   "description": "Google Chrome's JavaScript engine",
   "homepage": "https://v8.dev",
   "supports": "!(arm | arm64 | uwp | osx)",

scripts/cmake/vcpkg_find_acquire_program.cmake

@@ -219,18 +219,23 @@ function(vcpkg_find_acquire_program program)
         set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn")
         if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
             set(supported_on_unix ON)
-            set(program_version "xus7xtaPhpv5vCmKFOnsBVoB-PKmhZvRsSTjbQAuF0MC")
+            set(program_version "pn0ca-NeStGz-RNDkizra1sBBXinS0qK5jj_1KEPjosC")
             set(gn_platform "linux-amd64")
-            set(download_sha512 "871e75d7f3597b74fb99e36bb41fe5a9f8ce8a4d9f167f4729fc6e444807a59f35ec8aca70c2274a99c79d70a1108272be1ad991678a8ceb39e30f77abb13135")
-        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+            set(download_sha512 "45db983a911a5712e42d628ae57bb99f60e0d5663441c7c293f35d368d67f0dabc00ca1acefe66e442a0ce78185aef370d6f26a12966570e773a8adb1799db24")
+        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
             set(supported_on_unix ON)
-            set(program_version "qhxILDNcJ2H44HfHmfiU-XIY3E_SIXvFqLd2wvbIgOoC")
+            set(program_version "Iu2VZFlVbR7MDesBNd6v1Su6heA87GqivlKTLEQhiM4C")
             set(gn_platform "mac-amd64")
-            set(download_sha512 "03ee64cb15bae7fceb412900d470601090bce147cfd45eb9b46683ac1a5dca848465a5d74c55a47df7f0e334d708151249a6d37bb021de74dd48b97ed4a07937")
+            set(download_sha512 "c079ec719ceb9a3daae9ad6b62b183fd125e3bc892c87359d6f5c6ba0407e339382b875e07b0dbf073be82ecdbc2fb168f1eef007b989f1fd00a3285469d6fbe")
+        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+            set(supported_on_unix ON)
+            set(program_version "SdZvfK9NzA-5TcmUzl88Oq_kvWus4HKtGvhDAElYzpEC")
+            set(gn_platform "mac-arm64")
+            set(download_sha512 "4210cb60d60ace57707983f7c802b526ade02d8db4cf1ad26effa70f55d5fd7f56084072c6b2e342ac41b4b46145da4738b6d8b631798798976c41132ae3384d")
         else()
-            set(program_version "qUkAhy9J0P7c5racy-9wB6AHNK_btS18im8S06_ehhwC")
+            set(program_version "9abl61en2UOB5BV1fbxYjqVvdTzQvrFff4HoZvGps64C")
             set(gn_platform "windows-amd64")
-            set(download_sha512 "263e02bd79eee0cb7b664831b7898565c5656a046328d8f187ef7ae2a4d766991d477b190c9b425fcc960ab76f381cd3e396afb85cba7408ca9e74eb32c175db")
+            set(download_sha512 "361d325dc01e26a54ca3396385a30c0c91e159768c2fd56bd684e91ad66ba6f486f0da173a1107eb6a5c795d5d687b94f3c3efb5be87b223bbf657dacf56da17")
         endif()
         set(tool_subdirectory "${program_version}")
         set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}")

versions/baseline.json

@@ -6405,8 +6405,8 @@
       "port-version": 0
     },
     "skia": {
-      "baseline": "2020-05-18",
-      "port-version": 7
+      "baseline": "2022-02-03",
+      "port-version": 8
     },
     "skyr-url": {
       "baseline": "1.13.0",
@@ -7141,8 +7141,8 @@
       "port-version": 3
     },
     "v8": {
-      "baseline": "9.1.269.39",
-      "port-version": 2
+      "baseline": "10.0.82",
+      "port-version": 1
     },
     "valijson": {
       "baseline": "0.6",

versions/s-/skia.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9314cb24a3e315af1319ef37685d0ddf3a8e1ed1",
+      "version-date": "2022-02-03",
+      "port-version": 8
+    },
     {
       "git-tree": "f7b3961a52ea4c43d781a5c8ace67d0ef100cce7",
       "version-date": "2020-05-18",

versions/v-/v8.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "44b80cab066571ce55c1c04f5254f08873a8df40",
+      "version": "10.0.82",
+      "port-version": 1
+    },
     {
       "git-tree": "b245f57cb85bfd7a699e2ceb9628682b39bcc150",
       "version": "9.1.269.39",