diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2021-01-21 12:15:41 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-01-22 17:49:57 +0100 |
| commit | 39599c2c05432e4ab5a9310d4dd4f17b27a260b1 (patch) | |
| tree | f8ccf81124dc509e1881b95344aab1367292b7f8 | |
| parent | 280487f20bca829527a597d6263b0344a01917ac (diff) | |
Update qtwebengine-chromium
Newer hash from 83-based branch.
Change-Id: I3e944e8bf9ced2311569f298016a168c1336dc26
| -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 @@ -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 6ba8ba4a..0c34c209 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -177,7 +177,6 @@ SRC_URI += " \ file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.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 @@ -199,7 +198,7 @@ SRC_URI_append_libc-musl = "\ " SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc" -SRCREV_chromium = "fb6ab5e483876298235be1c6a6013b426c82b759" +SRCREV_chromium = "f5a93d251cca15cb24a3acacd2fc0f645513c56d" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" |