diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-08-01 22:48:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 13:48:12 -0700 |
| commit | f7dcd675d08f7a6974893e592e2aee0b7c318bb0 (patch) | |
| tree | 162758b290bd30d8f9f0b79f69e2e64b18a3763b | |
| parent | f225ba822b55a2ba9d3cc2a3c4e0646c8f47f035 (diff) | |
| download | vcpkg-f7dcd675d08f7a6974893e592e2aee0b7c318bb0.tar.gz vcpkg-f7dcd675d08f7a6974893e592e2aee0b7c318bb0.zip | |
[qt-webengine] Fix building with vs2017 (#12494)
* [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
| -rw-r--r-- | ports/qt5-webengine/CONTROL | 1 | ||||
| -rw-r--r-- | ports/qt5-webengine/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/qt5-webengine/vs2017.patch | 12 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
4 files changed, 18 insertions, 3 deletions
diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL index 8dc1dc5a9..a15765241 100644 --- a/ports/qt5-webengine/CONTROL +++ b/ports/qt5-webengine/CONTROL @@ -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
diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 9da6797ca..611a3c7c0 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -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") diff --git a/ports/qt5-webengine/vs2017.patch b/ports/qt5-webengine/vs2017.patch new file mode 100644 index 000000000..07eb79e16 --- /dev/null +++ b/ports/qt5-webengine/vs2017.patch @@ -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>
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c4a4fb370..07dd2428d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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 |