Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[qt-webengine] Fix building with vs2017 #12494

Merged
merged 4 commits into from
Aug 1, 2020
Merged

[qt-webengine] Fix building with vs2017 #12494

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e51f6a6
[qt5-webengine] fix vs2017 builds. closes #12477
Neumann-A Jul 20, 2020
ed36b43
remove skip from ci baseline to test changes.
Neumann-A Jul 20, 2020
17eb343
add src/3rdparty/ subdir to patch
Neumann-A Jul 20, 2020
7aa64f9
put webengine back to skip. patch was succesfully applied
Neumann-A Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/qt5-webengine/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 3 deletions ports/qt5-webengine/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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")
Expand Down
12 changes: 12 additions & 0 deletions ports/qt5-webengine/vs2017.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 2 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,7 +1446,8 @@ 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
qt5-webengine:x64-windows=skip
# 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
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
qt5-webengine:x86-windows=skip
# Static builds of qt5-webengine are not supported by the port itself
qt5-webengine:x64-windows-static=skip
Expand Down