CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtwebengine: update revision

Browse Source 
Includes compilation fix for harfbuzz-3.0.0:
error: 'hb_subset' was not declared in this scope; did you mean 'hb_set_set'?

Change-Id: Ieb01f3787eed72c34e178b62eff012fafedb8d9a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2021-10-26 08:54:16 +03:00
parent c3389d194c
commit d13153f426
4 changed files with 2 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-qt/qt6/qt6-git.inc
View File

@ -53,7 +53,7 @@ SRCREV_qttranslations = "16679c8e9ba469629b3b04f4f63fc4559dccfa1a"
SRCREV_qtvirtualkeyboard = "3435f0254dfadce2187bf2d54089909e488a9bca"
SRCREV_qtwayland = "a3433db666218394db2b84500418a6d7aa1f6dc4"
SRCREV_qtwebchannel = "5340bc6c3aba51e815431e35557216c716d74c76"
SRCREV_qtwebengine = "69baa6b0b9f2fe77f032804ee2376a9b0d6fedfa"
SRCREV_qtwebengine-chromium = "202e34476e934633b3c2e4679a53c4b0847364a8"
SRCREV_qtwebengine = "974bc6b7d7110df50d6cc46e7eaea12742b9ff66"
SRCREV_qtwebengine-chromium = "6ae16282af47ef14f698d93559dbb0a095f0475d"
SRCREV_qtwebsockets = "2a4983369532c55f1960beb2251ed3567a30080e"
SRCREV_qtwebview = "1e8b6ab2ca4a1422a8b05d64e132e4eb70e8bc77"

2
recipes-qt/qt6/qtwebengine.inc
View File

@ -41,8 +41,6 @@ SRC_URI += " \
SRC_URI += " \
file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \
file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
file://chromium/0003-abseil-cpp-fix-build-with-glibc-2.34.patch;patchdir=src/3rdparty \
file://chromium/0004-breakpad-fix-build-with-glibc-2.34.patch;patchdir=src/3rdparty \
"
SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium"

34
recipes-qt/qt6/qtwebengine/chromium/0003-abseil-cpp-fix-build-with-glibc-2.34.patch
View File

@ -1,34 +0,0 @@
From 5f7bc5a9ed2429705c37ac176a385ce7ec100d33 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 17 Sep 2021 07:55:21 +0300
Subject: [PATCH] abseil-cpp: fix build with glibc-2.34
Backport upstream fix for:
../../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc: In function 'bool absl::SetupAlternateStackOnce()':
../../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:139:32: error: no matching function for call to 'max(long int, int)'
size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
~~~~~~~~^~~~~~~~~~~~~~~~~
Caused by SIGSTCKZ no longer being compile time constant in glibc-2.34.
https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9
Change-Id: I88611684c25ffbc9d8a27a02ca55b906098b48a8
---
.../abseil-cpp/absl/debugging/failure_signal_handler.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc b/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
index a9ed6ef9648..3ddebd74ecf 100644
--- a/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
+++ b/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
@@ -136,7 +136,8 @@ static bool SetupAlternateStackOnce() {
#else
const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
#endif
- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ size_t stack_size =
+ (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
#if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
// Account for sanitizer instrumentation requiring additional stack space.

30
recipes-qt/qt6/qtwebengine/chromium/0004-breakpad-fix-build-with-glibc-2.34.patch
View File

@ -1,30 +0,0 @@
From c30c5ef4cdd53cac45572ac91e81f04e2fec6e64 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 17 Sep 2021 08:00:38 +0300
Subject: [PATCH] breakpad: fix build with glibc-2.34
Fix compilation error:
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)'
141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
| ~~~~~~~~^~~~~~~~~~~~~~~~~
Caused by SIGSTCKZ no longer being compile time constant in glibc-2.34.
Change-Id: I19e6f848208144e6d2abfa36e5a62edf28f0bfd4
---
.../breakpad/src/client/linux/handler/exception_handler.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
index ca353c40997..2e43ba6fc04 100644
--- a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
// the alternative stack. Ensure that the size of the alternative stack is
// large enough.
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ);
// Only set an alternative stack if there isn't already one, or if the current
// one is too small.