3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

[qt5-webengine] Fix x64-linux-dynamic build error (#30412)

Browse Source
This commit is contained in:
Pat Wang 2023-03-29 05:53:36 +08:00 committed by GitHub
parent ef34901399
commit d9fdfc073e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/qt5-webengine/build_3.patch Normal file
View 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 {

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

@ -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})

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

@ -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",

2
versions/baseline.json
View File

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

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

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