commit: cce023e39dd7138573d426d5d407a17dde3986f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 23:32:55 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 23:32:55 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cce023e3
dev-qt/qtwebengine: Drop obsolete patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.15.2_p20210521-gcc11.patch | 74 ----------------------
...ne-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch | 72 ---------------------
...gine-5.15.2_p20210824-breakpad-glibc-2.34.patch | 72 ---------------------
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 3 -
4 files changed, 221 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
deleted file mode 100644
index 0014ec13..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git
a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
-index 013f1dfb2..3ce63c192 100644
---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
-+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
-@@ -9,6 +9,7 @@
-
- #include "libANGLE/HandleAllocator.h"
-
-+#include <limits>
- #include <algorithm>
- #include <functional>
-
-diff --git
a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
-index be91def6b..73f202356 100644
----
a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
-+++
b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
-@@ -245,7 +245,7 @@ static void
AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) {
- }
-
- GType ax_platform_atk_hyperlink_get_type() {
-- static volatile gsize type_volatile = 0;
-+ static gsize type_volatile = 0;
-
- AXPlatformNodeAuraLinux::EnsureGTypeInit();
-
-diff --git
a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
-index 04125c6fd..6c64e5d8e 100644
----
a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
-+++
b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
-@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /*
class_data */) {
- GType GetType() {
- AXPlatformNodeAuraLinux::EnsureGTypeInit();
-
-- static volatile gsize type_volatile = 0;
-+ static gsize type_volatile = 0;
- if (g_once_init_enter(&type_volatile)) {
- static const GTypeInfo type_info = {
- sizeof(AXPlatformNodeAuraLinuxClass), // class_size
-diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
-index c663a2074..38a342484 100644
---- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
-+++ b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
-@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass*
klass) {
- }
-
- GType GtkKeyBindingsHandler::HandlerGetType() {
-- static volatile gsize type_id_volatile = 0;
-+ static gsize type_id_volatile = 0;
- if (g_once_init_enter(&type_id_volatile)) {
- GType type_id = g_type_register_static_simple(
- GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"),
----
a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
-+++
b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
-@@ -2,6 +2,7 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include <cstddef>
- #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
-
- #include <stdint.h>
-diff --git
a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
-index 657a3c96b..ad641a082 100644
----
a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
-+++
b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include <cstddef>
-+
- #include "components/bookmarks/browser/base_bookmark_model_observer.h"
-
- namespace bookmarks {
diff --git
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
deleted file mode 100644
index dfaa634b..00000000
---
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 78b1bcff4d9b977313e9ea15068168e1b11f5ba1 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Wed, 4 Aug 2021 19:08:03 +0200
-Subject: [PATCH] chromium: abseil-cpp: fix build with glibc-2.34
-
-* backport a fix from upstream abseil-cpp:
-
https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9
-
- to fix:
-
-[97/24505] CXX
obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
-FAILED:
obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
-/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++
-m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time
--sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot
-MMD -MF
obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o.d
-DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD
-DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911
-DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DABSL_ALLOCATOR_NOTHROW=1
-Igen -I../../../../git/src/3rdparty/chromium
-I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp
-fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-prote
ctor -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread
-m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer
-g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized
-Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments
-Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers
-Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti
--sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing
-Wno-class-memaccess -Wno-attributes -Wno-class-memaccess
-Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type
-Wno-deprecated-copy -c
../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
-o
obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
-../../../../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:138:32:
error: no matching function for call to 'max(long int, int)'
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) &
~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from
../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
- from
../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5:
note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&,
const _Tp&)'
- 254 | max(const _Tp& __a, const _Tp& __b)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5:
note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32:
note: deduced conflicting types for parameter 'const _Tp' ('long int' and
'int')
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) &
~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from
../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
- from
../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5:
note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp&
std::max(const _Tp&, const _Tp&, _Compare)'
- 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5:
note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32:
note: deduced conflicting types for parameter 'const _Tp' ('long int' and
'int')
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) &
~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from
../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from
../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5:
note: candidate: 'template<class _Tp> constexpr _Tp
std::max(std::initializer_list<_Tp>)'
- 3461 | max(initializer_list<_Tp> __l)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5:
note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32:
note: mismatched types 'std::initializer_list<_Tp>' and 'long int'
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) &
~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from
../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from
../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5:
note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp
std::max(std::initializer_list<_Tp>, _Compare)'
- 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5:
note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32:
note: mismatched types 'std::initializer_list<_Tp>' and 'long int'
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) &
~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- .../abseil-cpp/absl/debugging/failure_signal_handler.cc | 2 +-
- 1 file changed, 1 insertion(+), 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 5d13bdbbbd1..150a43f2660 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,7 @@ 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/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
deleted file mode 100644
index b91c239a..00000000
---
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Wed, 4 Aug 2021 19:11:06 +0200
-Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34
-
-* fixes:
-[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o
-FAILED: obj/third_party/breakpad/client/exception_handler.o
-/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++
-m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time
--sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot
-MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV
-DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911
-DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0
-I../../../../git/src/3rdparty/chromium/third_party/breakpad
-I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src
-I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client
-I../../../../git/
src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include
-Igen -I../../../../git/src/3rdparty/chromium
-I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src
-fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector
-fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64
-O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1
-fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized
-Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments
-Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers
-Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti
--sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing
-Wno-class-memaccess -Wno-attributes -Wno-class-memaccess
-Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type
-Wno-deprecated-copy -c
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad
/src/client/linux/handler/exception_handler.cc -o
obj/third_party/breakpad/client/exception_handler.o
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:
In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()':
-../../../../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);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
- from
../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
- from
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
- from
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5:
note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&,
const _Tp&)'
- 254 | max(const _Tp& __a, const _Tp& __b)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5:
note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49:
note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long
int')
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from
../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
- from
../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
- from
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
- from
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5:
note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp&
std::max(const _Tp&, const _Tp&, _Compare)'
- 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5:
note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49:
note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long
int')
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from
../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5:
note: candidate: 'template<class _Tp> constexpr _Tp
std::max(std::initializer_list<_Tp>)'
- 3461 | max(initializer_list<_Tp> __l)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5:
note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49:
note: mismatched types 'std::initializer_list<_Tp>' and 'int'
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from
../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from
../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5:
note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp
std::max(std::initializer_list<_Tp>, _Compare)'
- 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5:
note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49:
note: mismatched types 'std::initializer_list<_Tp>' and 'int'
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- .../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/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.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 336099a8..61b7a1f3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -104,9 +104,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" #
downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream
snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
- "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug
811312
- "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug
811312
)
pkg_preinst() {
