summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch26
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb1
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 @@
1From 46f0abc66c1d78c60a0415c5cb46852ef3bfa9bb Mon Sep 17 00:00:00 2001
2From: Nico Weber <thakis@chromium.org>
3Date: Sat, 8 Feb 2020 21:26:53 -0500
4Subject: [PATCH] Fix compile error emitted by trunk clang
5
6../../third_party/perfetto/src/tracing/core/virtual_destructors.cc:33:35:
7error: destructor cannot be declared using a type alias
8 'perfetto::TracingService::ConsumerEndpoint' (aka
9 'perfetto::ConsumerEndpoint') of the class name
10TracingService::ConsumerEndpoint::~ConsumerEndpoint() = default;
11
12Bug: chromium:1050372
13Change-Id: Icc1a8cca06b72ee3322924dc0825ebb62086f730
14--- a/chromium/third_party/perfetto/src/tracing/core/virtual_destructors.cc
15+++ b/chromium/third_party/perfetto/src/tracing/core/virtual_destructors.cc
16@@ -30,8 +30,8 @@ namespace perfetto {
17 Consumer::~Consumer() = default;
18 Producer::~Producer() = default;
19 TracingService::~TracingService() = default;
20-TracingService::ConsumerEndpoint::~ConsumerEndpoint() = default;
21-TracingService::ProducerEndpoint::~ProducerEndpoint() = default;
22+ConsumerEndpoint::~ConsumerEndpoint() = default;
23+ProducerEndpoint::~ProducerEndpoint() = default;
24 SharedMemory::~SharedMemory() = default;
25 SharedMemory::Factory::~Factory() = default;
26 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 += " \
176 file://chromium/0013-chromium-Fix-bison-3.7.patch;patchdir=src/3rdparty \ 176 file://chromium/0013-chromium-Fix-bison-3.7.patch;patchdir=src/3rdparty \
177 file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ 177 file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \
178 file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \ 178 file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \
179 file://chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch;patchdir=src/3rdparty \
179" 180"
180 181
181# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based 182# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based