mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 16:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[qt-webengine] Fix building with vs2017 (#12494)

Browse Source 
* [qt5-webengine] fix vs2017 builds. closes #12477

* remove skip from ci baseline to test changes.

* add src/3rdparty/ subdir to patch

* put webengine back to skip. patch was succesfully applied
This commit is contained in:
Alexander Neumann 2020-08-01 22:48:12 +02:00 committed by GitHub
parent f225ba822b
commit f7dcd675d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/qt5-webengine/CONTROL
View File

@ -1,5 +1,6 @@
Source: qt5-webengine
Version: 5.15.0
Port-Version: 1
Description: Qt5 webengine Module;
Build-Depends: qt5-base[core], qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows)
Supports: !static

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

@ -10,8 +10,6 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
endif()
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
vcpkg_find_acquire_program(FLEX)
vcpkg_find_acquire_program(BISON)
vcpkg_find_acquire_program(GPERF)
@ -38,7 +36,10 @@ vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}")
vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
set(PATCHES common.pri.patch gl.patch build.patch)
set(PATCHES common.pri.patch
gl.patch
build.patch
vs2017.patch)
if(NOT VCPKG_TARGET_IS_WINDOWS)
list(APPEND CORE_OPTIONS "BUILD_OPTIONS" "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")

12
ports/qt5-webengine/vs2017.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/systrace/systrace_trace_parser.cc b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/systrace/systrace_trace_parser.cc
index 33d5cb1f6f6..1ba53aee4b3 100644
--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/systrace/systrace_trace_parser.cc
+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/systrace/systrace_trace_parser.cc
@@ -26,6 +26,7 @@
#include "src/trace_processor/slice_tracker.h"
#include "src/trace_processor/track_tracker.h"
+#include <cctype>
#include <inttypes.h>
#include <string>
#include <unordered_map>

1
scripts/ci.baseline.txt
View File

@ -1451,6 +1451,7 @@ qt5-webengine:x64-osx=fail
# Fail due to outdated protoc headers.
# D:\buildtrees\qt5-webengine\x64-windows-dbg\src\core\debug\gen\net/third_party/quiche/src/quic/core/proto/cached_network_parameters.pb.h(17):
# fatal error C1189: #error: This file was generated by an older version of protoc which is
# Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg.
qt5-webengine:x64-windows=skip
qt5-webengine:x86-windows=skip
# Static builds of qt5-webengine are not supported by the port itself