mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[qt5-webengine] Fix x64-linux-dynamic build error (#30412)
This commit is contained in:
parent
ef34901399
commit
d9fdfc073e
14
ports/qt5-webengine/build_3.patch
Normal file
14
ports/qt5-webengine/build_3.patch
Normal file
@ -0,0 +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,
|
||||
#ifdef LIBXML_ICU_ENABLED
|
||||
else if (handler->uconv_out != NULL) {
|
||||
ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
|
||||
- TRUE);
|
||||
+ true);
|
||||
}
|
||||
#endif /* LIBXML_ICU_ENABLED */
|
||||
else {
|
||||
|
@ -49,6 +49,7 @@ set(PATCHES common.pri.patch
|
||||
gl.patch
|
||||
build_1.patch
|
||||
build_2.patch
|
||||
build_3.patch
|
||||
workaround-msvc2022-ice.patch)
|
||||
|
||||
set(OPTIONS)
|
||||
@ -56,7 +57,11 @@ if("proprietary-codecs" IN_LIST FEATURES)
|
||||
list(APPEND OPTIONS "-webengine-proprietary-codecs")
|
||||
endif()
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
list(APPEND OPTIONS "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")
|
||||
list(APPEND OPTIONS "-system-webengine-webp" "-system-webengine-icu")
|
||||
vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig")
|
||||
vcpkg_host_path_list(PREPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include")
|
||||
vcpkg_host_path_list(PREPEND ENV{C_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include")
|
||||
vcpkg_host_path_list(PREPEND ENV{CPLUS_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include")
|
||||
endif()
|
||||
|
||||
qt_submodule_installation(PATCHES ${PATCHES} BUILD_OPTIONS ${OPTIONS})
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "qt5-webengine",
|
||||
"version": "5.15.8",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Qt5 webengine Module;",
|
||||
"license": null,
|
||||
"supports": "!static",
|
||||
|
@ -6526,7 +6526,7 @@
|
||||
},
|
||||
"qt5-webengine": {
|
||||
"baseline": "5.15.8",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"qt5-webglplugin": {
|
||||
"baseline": "5.15.8",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c4972fb3229687755800c282621e1ef1939f3e66",
|
||||
"version": "5.15.8",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "4cb036e21b5fa8db1033739c264a6bf2936960db",
|
||||
"version": "5.15.8",
|
||||
|
Loading…
x
Reference in New Issue
Block a user