diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-10-17 11:10:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 02:10:11 -0700 |
| commit | aa0ffba768684702f04d6c397838365c3b23a053 (patch) | |
| tree | 7275a5954f232cb61c6e19789bc9437eafadab03 /ports/qt5-webengine/vs2017.patch | |
| parent | 32c5722104fc28cd55d166a2c04e1d44906eec68 (diff) | |
| download | vcpkg-aa0ffba768684702f04d6c397838365c3b23a053.tar.gz vcpkg-aa0ffba768684702f04d6c397838365c3b23a053.zip | |
[qt5] Update to 5.15.1 (#13477)
* update everything. Let ci test if just updating is enough
* fix some minor version details.
* remove upstream patch
* add zstdd patch and do not remove zlib since it is required for bootstrapping
* add mqtt hash
* webengine hash
* add fixup pkgconfig to assimp
* add assimp to qt-3d (still requires zlib fix)
* setup pkg-config for qt
* fix psql detection in configure
* fix build details
* fix assimp library nameing
* -rpath option is not available for static builds
* move config log somewhere where CI can catch it.
* move logs only if they exists
* append bzip2 qt-3d
* break qt3d again to get logs
* retry qt3d
* remove qt-3d failure. everything ok now
* add assistent patch for qt5-tools not building qthelp
* remove unnecessary qt5-webengine patches
* Remove PSQL_TYPES
* [qt5-3d] remove irrxml as a assimp dep
* remove unnecessary patch
* fix qt-3d on windows
* fix qt5-3d linux
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/qt5-webengine/vs2017.patch')
| -rw-r--r-- | ports/qt5-webengine/vs2017.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ports/qt5-webengine/vs2017.patch b/ports/qt5-webengine/vs2017.patch deleted file mode 100644 index 07eb79e16..000000000 --- a/ports/qt5-webengine/vs2017.patch +++ /dev/null @@ -1,12 +0,0 @@ -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>
|