diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2022-06-14 10:21:27 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2022-07-05 18:01:56 +0200 |
commit | 1e0b66913bd5dd24b06b4aceb69e6e1f83e361b5 (patch) | |
tree | ef128d68dd549944b5ee43f6b56b8419c4b851bf | |
parent | 213e62ec7e3dd978adf7072397c65e43b38abd89 (diff) |
qtwebengine: upgrade to latest chromium from 87-based branch
* contains useful fix to resolve:
https://github.com/meta-qt5/meta-qt5/pull/475
qtwebengine-chromium $ git log --oneline caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7..ecc2bb74f1f7140fc52650042299be18e826b27b
ecc2bb74f1f [Backport] CVE-2022-0796: Use after free in Media
a7a23ccc69e [Backport] Linux sandbox: ENOSYS for some statx syscalls
7857ff290ab FIXUP: Workaround MSVC2022 ICE in constexpr functions
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index aac6701b..ab3e1204 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -167,7 +167,7 @@ SRC_URI:append:libc-musl = "\ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc -# 87-based-glibc.meta-qt5.8 +# 87-based-glibc.meta-qt5.9 SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ @@ -184,7 +184,7 @@ SRC_URI += " \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based -# 87-based.meta-qt5.8 +# 87-based.meta-qt5.9 SRC_URI:append:libc-musl = "\ file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ @@ -200,7 +200,8 @@ SRC_URI:append:libc-musl = "\ " SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505" -SRCREV_chromium = "caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7" +# this is 3 commits ahead of what submodule in 5.15.10 uses (caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7), but contains useful fix: +SRCREV_chromium = "ecc2bb74f1f7140fc52650042299be18e826b27b" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" |