diff options
-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 | 3 |
2 files changed, 1 insertions, 28 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 deleted file mode 100644 index f722cb99..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 46f0abc66c1d78c60a0415c5cb46852ef3bfa9bb Mon Sep 17 00:00:00 2001 | ||
2 | From: Nico Weber <thakis@chromium.org> | ||
3 | Date: Sat, 8 Feb 2020 21:26:53 -0500 | ||
4 | Subject: [PATCH] Fix compile error emitted by trunk clang | ||
5 | |||
6 | ../../third_party/perfetto/src/tracing/core/virtual_destructors.cc:33:35: | ||
7 | error: destructor cannot be declared using a type alias | ||
8 | 'perfetto::TracingService::ConsumerEndpoint' (aka | ||
9 | 'perfetto::ConsumerEndpoint') of the class name | ||
10 | TracingService::ConsumerEndpoint::~ConsumerEndpoint() = default; | ||
11 | |||
12 | Bug: chromium:1050372 | ||
13 | Change-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 6ba8ba4a..0c34c209 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -177,7 +177,6 @@ SRC_URI += " \ | |||
177 | file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ | 177 | file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ |
178 | file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ | 178 | file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ |
179 | file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \ | 179 | file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \ |
180 | file://chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch;patchdir=src/3rdparty \ | ||
181 | " | 180 | " |
182 | 181 | ||
183 | # 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 |
@@ -199,7 +198,7 @@ SRC_URI_append_libc-musl = "\ | |||
199 | " | 198 | " |
200 | 199 | ||
201 | SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc" | 200 | SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc" |
202 | SRCREV_chromium = "fb6ab5e483876298235be1c6a6013b426c82b759" | 201 | SRCREV_chromium = "f5a93d251cca15cb24a3acacd2fc0f645513c56d" |
203 | SRCREV = "${SRCREV_qtwebengine}" | 202 | SRCREV = "${SRCREV_qtwebengine}" |
204 | 203 | ||
205 | SRCREV_FORMAT = "qtwebengine_chromium" | 204 | SRCREV_FORMAT = "qtwebengine_chromium" |