mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 11:21:12 +08:00
[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
This commit is contained in:
parent
073df7fb2d
commit
668bf87fc5
@ -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 {
|
||||
|
@ -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)
|
||||
|
@ -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",
|
||||
|
@ -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"
|
@ -6550,7 +6550,7 @@
|
||||
},
|
||||
"qt5-webengine": {
|
||||
"baseline": "5.15.8",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"qt5-webglplugin": {
|
||||
"baseline": "5.15.8",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0bc99174795ada551c8bfbae6d829a2a8fd208a8",
|
||||
"version": "5.15.8",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "c4972fb3229687755800c282621e1ef1939f3e66",
|
||||
"version": "5.15.8",
|
||||
|
Loading…
x
Reference in New Issue
Block a user