3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 02:11:58 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lily Wang 2024-05-24 19:24:17 -07:00 committed by GitHub
parent bb73c2eb7f
commit 91ce5065d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/qtwebengine/fix-error2275-2672.patch Normal file
View File

@ -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_);
}

1
ports/qtwebengine/portfile.cmake
View File

@ -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)

1
ports/qtwebengine/vcpkg.json
View File

@ -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,

2
versions/baseline.json
View File

@ -7486,7 +7486,7 @@
},
"qtwebengine": {
"baseline": "6.7.0",
"port-version": 0
"port-version": 1
},
"qtwebsockets": {
"baseline": "6.7.0",

5
versions/q-/qtwebengine.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e12b173a87772bc006536e461d503caea8177b69",
"version": "6.7.0",
"port-version": 1
},
{
"git-tree": "100603c883257132007e43ace417903c75e99d94",
"version": "6.7.0",