mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:35:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[qt5-webengine] Fix error LNK1218: warning treated as error (#29827)

Browse Source 
Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
This commit is contained in:
Cheney Wang 2023-02-27 12:02:46 -08:00 committed by GitHub
parent 8cdff13a6e
commit 6382d0d6cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ports/qt5-webengine/common.pri.patch
View File

@ -1,9 +1,18 @@
diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
#latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri index cf990c7..5af9edf 100644
index 97d39535c..dc09da43a 100644 --- a/src/buildtools/config/common.pri
--- a/src/buildtools/config/common.pri
+++ b/src/buildtools/config/common.pri +++ b/src/buildtools/config/common.pri
@@ -57,5 +57,5 @@ @@ -26,6 +26,7 @@ gn_args += \
skia_use_dawn=false \
toolkit_views=false \
treat_warnings_as_errors=false \
+ fatal_linker_warnings=false \
use_allocator_shim=false \
use_allocator=\"none\" \
use_custom_libcxx=false \
@@ -56,7 +57,7 @@ greaterThan(QMAKE_JUMBO_MERGE_LIMIT,0) {
}
precompile_header { precompile_header {
- gn_args += enable_precompiled_headers=true - gn_args += enable_precompiled_headers=true
+ gn_args += enable_precompiled_headers=false + gn_args += enable_precompiled_headers=false

2
ports/qt5-webengine/portfile.cmake
View File

@ -14,7 +14,7 @@ message(STATUS "${PORT} requires a lot of free disk space (>100GB), ram (>8 GB)
if(NOT VCPKG_TARGET_IS_WINDOWS) if(NOT VCPKG_TARGET_IS_WINDOWS)
message(STATUS "If ${PORT} directly fails ${PORT} might require additional prerequisites on Linux and OSX. Please check the configure logs.\n") message(STATUS "If ${PORT} directly fails ${PORT} might require additional prerequisites on Linux and OSX. Please check the configure logs.\n")
endif() endif()
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake")
vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(FLEX)
vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(BISON)

1
ports/qt5-webengine/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "qt5-webengine", "name": "qt5-webengine",
"version": "5.15.8", "version": "5.15.8",
"port-version": 1,
"description": "Qt5 webengine Module;", "description": "Qt5 webengine Module;",
"license": null, "license": null,
"supports": "!static", "supports": "!static",

2
versions/baseline.json
View File

@ -6442,7 +6442,7 @@
}, },
"qt5-webengine": { "qt5-webengine": {
"baseline": "5.15.8", "baseline": "5.15.8",
"port-version": 0 "port-version": 1
}, },
"qt5-webglplugin": { "qt5-webglplugin": {
"baseline": "5.15.8", "baseline": "5.15.8",

5
versions/q-/qt5-webengine.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "4cb036e21b5fa8db1033739c264a6bf2936960db",
"version": "5.15.8",
"port-version": 1
},
{ {
"git-tree": "7c7e6f9fad061be671094152174725a4dc68ae0b", "git-tree": "7c7e6f9fad061be671094152174725a4dc68ae0b",
"version": "5.15.8", "version": "5.15.8",