diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-01-20 21:55:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 12:55:41 -0800 |
| commit | 8e926cc06c3b52056926697b87fc350af7e66d69 (patch) | |
| tree | a22c33d961a95d9e8c267e1d3d08dc194d5b8703 /ports/qt5-webengine/build_2.patch | |
| parent | a8a07972dbd6a835329f31133fb83b3f4723cb55 (diff) | |
| download | vcpkg-8e926cc06c3b52056926697b87fc350af7e66d69.tar.gz vcpkg-8e926cc06c3b52056926697b87fc350af7e66d69.zip | |
[qt5] Update to 5.15.2 (#14678)
* [qt5] Update to 5.15.2
(mqtt currently missing git tag)
* deactivate update of ports
* update version
* reduce port version
* fix typo
* fix patch for linux missing pthread
* fix qt5-tools
* fix qt5-webengine
* add xcb-util to linux provisioning script
* fix version numbers
* fix other typo
* remove new hashes file
* fix latest version info
* switch to vcpkg_from_git
adjust vcpkg_from_git to handle tags.
add OUT_REF for vcpkg_from_git to enable scriptable update of ports
* regenerate docs
* [vcpkg_from_git] new options TAG and OUT_REF
- TAG github tag to checkout
- OUT_REF github commit id related to tag or ref
(useable for automatic updates of ports if used with a version tag)
* Apply suggestions from code review
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* additional changes due to CR
* regenerate docs
* Remove 'Port-Version:0' from qt5-location
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
* add all those versions
* fix versions
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Diffstat (limited to 'ports/qt5-webengine/build_2.patch')
| -rw-r--r-- | ports/qt5-webengine/build_2.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/ports/qt5-webengine/build_2.patch b/ports/qt5-webengine/build_2.patch new file mode 100644 index 000000000..7a4622516 --- /dev/null +++ b/ports/qt5-webengine/build_2.patch @@ -0,0 +1,29 @@ +diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +index 59dbfad04..134357395 100644 +--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h ++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +@@ -74,7 +74,7 @@ class CircularQueue { + return queue_->Get(pos_); + } + +- const T* operator->() const { ++ T* operator->() const { + #if PERFETTO_DCHECK_IS_ON() + PERFETTO_DCHECK(generation_ == queue_->generation()); + #endif +@@ -82,13 +82,13 @@ class CircularQueue { + } + + T& operator*() { return *(operator->()); } +- const T& operator*() const { return *(operator->()); } ++ T& operator*() const { return *(operator->()); } + + value_type& operator[](difference_type i) { + return *(*this + i); + } + +- const value_type& operator[](difference_type i) const { ++ value_type& operator[](difference_type i) const { + return *(*this + i); + } + |