From 668bf87fc5c58d2ba1ef34013f2c4e85e7dd2eff Mon Sep 17 00:00:00 2001
From: Carsten Grimm
 <97085459+carsten-grimm-at-ipolog@users.noreply.github.com>
Date: Fri, 7 Apr 2023 02:27:42 +0200
Subject: [PATCH] [qt5-webengine] fix issue 30006 missing includes for msvc
 (#30612)

* [qt5-webengine] add missing includes in third party libraries

This fixes issue #30006. Newer versions of msvc require more includes than previous versions. To accommodate this change, two missing includes are added to the third party libraries chromium and libxml.

* [qt5-webengine] update port number

* [qt5-webengine] restore LF line endings on patch

* [qt5-webengine] re-run vcpkg x-add-version for qt5-webengine port-version 3
---
 ...h => build_3.with_missing_stdbool_include.patch} | 13 +++++++++----
 ports/qt5-webengine/portfile.cmake                  |  6 ++++--
 ports/qt5-webengine/vcpkg.json                      |  2 +-
 ...ssing-include-in-chromium-ui-accessability.patch | 10 ++++++++++
 versions/baseline.json                              |  2 +-
 versions/q-/qt5-webengine.json                      |  5 +++++
 6 files changed, 30 insertions(+), 8 deletions(-)
 rename ports/qt5-webengine/{build_3.patch => build_3.with_missing_stdbool_include.patch} (65%)
 create mode 100644 ports/qt5-webengine/workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch

diff --git a/ports/qt5-webengine/build_3.patch b/ports/qt5-webengine/build_3.with_missing_stdbool_include.patch
similarity index 65%
rename from ports/qt5-webengine/build_3.patch
rename to ports/qt5-webengine/build_3.with_missing_stdbool_include.patch
index 1775e2e810..985256049f 100644
--- a/ports/qt5-webengine/build_3.patch
+++ b/ports/qt5-webengine/build_3.with_missing_stdbool_include.patch
@@ -1,8 +1,14 @@
-diff --git a/src/3rdparty/chromium/third_party/libxml/src/encoding.c b/src/3rdparty/chromium/third_party/libxml/src/encoding.c
-index c34aca44663..707aea5bc1a 100644
 --- a/src/3rdparty/chromium/third_party/libxml/src/encoding.c
 +++ b/src/3rdparty/chromium/third_party/libxml/src/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+@@ -25,6 +25,7 @@
+ 
+ #include <string.h>
+ #include <limits.h>
++#include <stdbool.h>
+ 
+ #ifdef HAVE_CTYPE_H
+ #include <ctype.h>
+@@ -2004,7 +2005,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
  #ifdef LIBXML_ICU_ENABLED
      else if (handler->uconv_out != NULL) {
          ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
@@ -11,4 +17,3 @@ index c34aca44663..707aea5bc1a 100644
      }
  #endif /* LIBXML_ICU_ENABLED */
      else {
-
diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake
index 550de8f43a..55fea96778 100644
--- a/ports/qt5-webengine/portfile.cmake
+++ b/ports/qt5-webengine/portfile.cmake
@@ -49,8 +49,10 @@ set(PATCHES common.pri.patch
             gl.patch
             build_1.patch
             build_2.patch
-            build_3.patch
-            workaround-msvc2022-ice.patch)
+            build_3.with_missing_stdbool_include.patch
+            workaround-msvc2022-ice.patch
+            workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch
+            )
 
 set(OPTIONS)
 if("proprietary-codecs" IN_LIST FEATURES)
diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json
index 820032ecdd..d2c096df96 100644
--- a/ports/qt5-webengine/vcpkg.json
+++ b/ports/qt5-webengine/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-webengine",
   "version": "5.15.8",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Qt5 webengine Module;",
   "license": null,
   "supports": "!static",
diff --git a/ports/qt5-webengine/workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch b/ports/qt5-webengine/workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch
new file mode 100644
index 0000000000..6841b8bd97
--- /dev/null
+++ b/ports/qt5-webengine/workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/ui/accessibility/ax_table_info.h
++++ b/src/3rdparty/chromium/ui/accessibility/ax_table_info.h
+@@ -9,6 +9,7 @@
+ #include <set>
+ #include <unordered_map>
+ #include <vector>
++#include <string>
+ 
+ #include "base/optional.h"
+ #include "ui/accessibility/ax_export.h"
diff --git a/versions/baseline.json b/versions/baseline.json
index c1c432cbb9..42721c890e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6550,7 +6550,7 @@
     },
     "qt5-webengine": {
       "baseline": "5.15.8",
-      "port-version": 2
+      "port-version": 3
     },
     "qt5-webglplugin": {
       "baseline": "5.15.8",
diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json
index 911edb2e2f..9833b86e6d 100644
--- a/versions/q-/qt5-webengine.json
+++ b/versions/q-/qt5-webengine.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0bc99174795ada551c8bfbae6d829a2a8fd208a8",
+      "version": "5.15.8",
+      "port-version": 3
+    },
     {
       "git-tree": "c4972fb3229687755800c282621e1ef1939f3e66",
       "version": "5.15.8",