[qtwebengine] Fix error C2275 and C2672 in MSVC (#38895)

microsoft · May 25, 2024 · 91ce506 · 91ce506
1 parent bb73c2e
commit 91ce506
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/ports/qtwebengine/fix-error2275-2672.patch b/ports/qtwebengine/fix-error2275-2672.patch
@@ -0,0 +1,13 @@
+diff --git a/src/3rdparty/chromium/v8/src/compiler/backend/instruction-selector.cc b/src/3rdparty/chromium/v8/src/compiler/backend/instruction-selector.cc
+index ce06089..61534f1 100644
+--- a/src/3rdparty/chromium/v8/src/compiler/backend/instruction-selector.cc
++++ b/src/3rdparty/chromium/v8/src/compiler/backend/instruction-selector.cc
+@@ -875,7 +875,7 @@ class InstructionSelectorT<Adapter>::CachedStateValuesBuilder {
+   InstructionSelectorT<Adapter>::CachedStateValues* Build(Zone* zone) {
+     DCHECK(CanCache());
+     DCHECK(values_->nested_count() == nested_start_);
+-    return zone->New<InstructionSelectorT<Adapter>::CachedStateValues>(
++    return zone->New<typename InstructionSelectorT<Adapter>::CachedStateValues>(
+         zone, values_, values_start_, inputs_, inputs_start_);
+   }
+
diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake
@@ -3,6 +3,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
 set(${PORT}_PATCHES 
       "clang-cl.patch"
+      "fix-error2275-2672.patch"
 )
 
 set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict webenginedriver)

diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "x86-windows is not within the upstream support matrix of Qt6",
   "name": "qtwebengine",
   "version": "6.7.0",
+  "port-version": 1,
   "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7486,7 +7486,7 @@
     },
     "qtwebengine": {
       "baseline": "6.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "qtwebsockets": {
       "baseline": "6.7.0",

diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e12b173a87772bc006536e461d503caea8177b69",
+      "version": "6.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "100603c883257132007e43ace417903c75e99d94",
       "version": "6.7.0",