rpm/libqt5-qtwebengine
SHA256
1
0
Fork 0
forked from pool/libqt5-qtwebengine
Code Pull Requests Activity

Accepting request 911548 from KDE:Qt:5.15

Browse Source 
- Add patch to fix build with glibc 2.34 (boo#1189095)
  * 0001-Fix-build-with-glibc-2.34.patch (forwarded request 911404 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/911548
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=71
This commit is contained in:
Richard Brown 2021-08-16 08:05:39 +00:00 committed by Git OBS Bridge
commit 2036167cb8
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-Fix-build-with-glibc-2.34.patch Normal file
View File

@ -0,0 +1,40 @@
From 6dc7ed884091eb373f72d53f2b87371cd899378e Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Wed, 11 Aug 2021 11:39:59 +0200
Subject: [PATCH] Fix build with glibc 2.34
---
.../abseil-cpp/absl/debugging/failure_signal_handler.cc | 3 ++-
.../breakpad/src/client/linux/handler/exception_handler.cc | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
index 5d13bdbbb..2ed137b58 100644
--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
@@ -135,7 +135,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.
diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
index ca353c409..2e43ba6fc 100644
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+++ b/src/3rdparty/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.
--
2.32.0

6
libqt5-qtwebengine.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 4 15:23:24 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Add patch to fix build with glibc 2.34 (boo#1189095)
* 0001-Fix-build-with-glibc-2.34.patch
-------------------------------------------------------------------
Thu Jun 24 16:39:27 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

2
libqt5-qtwebengine.spec
View File

@ -52,6 +52,8 @@ Patch3: sandbox-statx-futex_time64.patch
Patch4: rtc-dont-use-h264.patch
# PATCH-FIX-UPSTREAM
Patch5: chromium-glibc-2.33.patch
# PATCH-FIX-UPSTREAM
Patch6: 0001-Fix-build-with-glibc-2.34.patch
# http://www.chromium.org/blink not ported to PowerPC
ExcludeArch: ppc ppc64 ppc64le s390 s390x
# Try to fix i586 MemoryErrors with rpmlint