diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-11-21 21:19:56 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-01-22 11:55:49 +0100 |
| commit | 83ab966e790dcf0ecd9a8eddb9521e606080dc98 (patch) | |
| tree | 245981a0975910b8d0589d7ce3cc35f3c1bfd7a7 | |
| parent | 217f87c1feea202ce7134e5a0a980beafb1aab32 (diff) | |
qtwebengine: Fix build with clang-11
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch | 26 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch new file mode 100644 index 00000000..f722cb99 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch @@ -0,0 +1,26 @@ +From 46f0abc66c1d78c60a0415c5cb46852ef3bfa9bb Mon Sep 17 00:00:00 2001 +From: Nico Weber <thakis@chromium.org> +Date: Sat, 8 Feb 2020 21:26:53 -0500 +Subject: [PATCH] Fix compile error emitted by trunk clang + +../../third_party/perfetto/src/tracing/core/virtual_destructors.cc:33:35: +error: destructor cannot be declared using a type alias + 'perfetto::TracingService::ConsumerEndpoint' (aka + 'perfetto::ConsumerEndpoint') of the class name +TracingService::ConsumerEndpoint::~ConsumerEndpoint() = default; + +Bug: chromium:1050372 +Change-Id: Icc1a8cca06b72ee3322924dc0825ebb62086f730 +--- a/chromium/third_party/perfetto/src/tracing/core/virtual_destructors.cc ++++ b/chromium/third_party/perfetto/src/tracing/core/virtual_destructors.cc +@@ -30,8 +30,8 @@ namespace perfetto { + Consumer::~Consumer() = default; + Producer::~Producer() = default; + TracingService::~TracingService() = default; +-TracingService::ConsumerEndpoint::~ConsumerEndpoint() = default; +-TracingService::ProducerEndpoint::~ProducerEndpoint() = default; ++ConsumerEndpoint::~ConsumerEndpoint() = default; ++ProducerEndpoint::~ProducerEndpoint() = default; + SharedMemory::~SharedMemory() = default; + SharedMemory::Factory::~Factory() = default; + SharedMemoryArbiter::~SharedMemoryArbiter() = default; diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 6d6318b0..f87d96e8 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -176,6 +176,7 @@ SRC_URI += " \ file://chromium/0013-chromium-Fix-bison-3.7.patch;patchdir=src/3rdparty \ file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \ + file://chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch;patchdir=src/3rdparty \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based |