From 6382d0d6cc0e756a47ef10068ccf2945d5a827c2 Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:02:46 -0800
Subject: [PATCH] [qt5-webengine] Fix error LNK1218: warning treated as error
 (#29827)

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
---
 ports/qt5-webengine/common.pri.patch | 17 +++++++++++++----
 ports/qt5-webengine/portfile.cmake   |  2 +-
 ports/qt5-webengine/vcpkg.json       |  1 +
 versions/baseline.json               |  2 +-
 versions/q-/qt5-webengine.json       |  5 +++++
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ports/qt5-webengine/common.pri.patch b/ports/qt5-webengine/common.pri.patch
index ad58ab9e14a..74327ac23d2 100644
--- a/ports/qt5-webengine/common.pri.patch
+++ b/ports/qt5-webengine/common.pri.patch
@@ -1,9 +1,18 @@
 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 97d39535c..dc09da43a 100644
---- a/src/buildtools/config/common.pri	
+index cf990c7..5af9edf 100644
+--- a/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 {
 -    gn_args += enable_precompiled_headers=true
 +    gn_args += enable_precompiled_headers=false
diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake
index 842b7ae4666..c2d7bf463a5 100644
--- a/ports/qt5-webengine/portfile.cmake
+++ b/ports/qt5-webengine/portfile.cmake
@@ -14,7 +14,7 @@ message(STATUS "${PORT} requires a lot of free disk space (>100GB), ram (>8 GB)
 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")
 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(BISON)
diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json
index 774a13054b3..5ec737c0c1a 100644
--- a/ports/qt5-webengine/vcpkg.json
+++ b/ports/qt5-webengine/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5-webengine",
   "version": "5.15.8",
+  "port-version": 1,
   "description": "Qt5 webengine Module;",
   "license": null,
   "supports": "!static",
diff --git a/versions/baseline.json b/versions/baseline.json
index 064fd4c19d6..0466b3c3638 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6442,7 +6442,7 @@
     },
     "qt5-webengine": {
       "baseline": "5.15.8",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-webglplugin": {
       "baseline": "5.15.8",
diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json
index 72c078a22f0..3294d7ab424 100644
--- a/versions/q-/qt5-webengine.json
+++ b/versions/q-/qt5-webengine.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4cb036e21b5fa8db1033739c264a6bf2936960db",
+      "version": "5.15.8",
+      "port-version": 1
+    },
     {
       "git-tree": "7c7e6f9fad061be671094152174725a4dc68ae0b",
       "version": "5.15.8",