Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
Date: Fri, 24 Dec 2021 23:33:07
Message-Id: 1640388775.cce023e39dd7138573d426d5d407a17dde3986f0.asturm@gentoo
1 commit: cce023e39dd7138573d426d5d407a17dde3986f0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 24 23:32:55 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 24 23:32:55 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cce023e3
7
8 dev-qt/qtwebengine: Drop obsolete patches
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../files/qtwebengine-5.15.2_p20210521-gcc11.patch | 74 ----------------------
14 ...ne-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch | 72 ---------------------
15 ...gine-5.15.2_p20210824-breakpad-glibc-2.34.patch | 72 ---------------------
16 dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 3 -
17 4 files changed, 221 deletions(-)
18
19 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
20 deleted file mode 100644
21 index 0014ec13..00000000
22 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
23 +++ /dev/null
24 @@ -1,74 +0,0 @@
25 -diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
26 -index 013f1dfb2..3ce63c192 100644
27 ---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
28 -+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
29 -@@ -9,6 +9,7 @@
30 -
31 - #include "libANGLE/HandleAllocator.h"
32 -
33 -+#include <limits>
34 - #include <algorithm>
35 - #include <functional>
36 -
37 -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
38 -index be91def6b..73f202356 100644
39 ---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
40 -+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
41 -@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) {
42 - }
43 -
44 - GType ax_platform_atk_hyperlink_get_type() {
45 -- static volatile gsize type_volatile = 0;
46 -+ static gsize type_volatile = 0;
47 -
48 - AXPlatformNodeAuraLinux::EnsureGTypeInit();
49 -
50 -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
51 -index 04125c6fd..6c64e5d8e 100644
52 ---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
53 -+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
54 -@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) {
55 - GType GetType() {
56 - AXPlatformNodeAuraLinux::EnsureGTypeInit();
57 -
58 -- static volatile gsize type_volatile = 0;
59 -+ static gsize type_volatile = 0;
60 - if (g_once_init_enter(&type_volatile)) {
61 - static const GTypeInfo type_info = {
62 - sizeof(AXPlatformNodeAuraLinuxClass), // class_size
63 -diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
64 -index c663a2074..38a342484 100644
65 ---- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
66 -+++ b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
67 -@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) {
68 - }
69 -
70 - GType GtkKeyBindingsHandler::HandlerGetType() {
71 -- static volatile gsize type_id_volatile = 0;
72 -+ static gsize type_id_volatile = 0;
73 - if (g_once_init_enter(&type_id_volatile)) {
74 - GType type_id = g_type_register_static_simple(
75 - GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"),
76 ---- a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
77 -+++ b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
78 -@@ -2,6 +2,7 @@
79 - // Use of this source code is governed by a BSD-style license that can be
80 - // found in the LICENSE file.
81 -
82 -+#include <cstddef>
83 - #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
84 -
85 - #include <stdint.h>
86 -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
87 -index 657a3c96b..ad641a082 100644
88 ---- a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
89 -+++ b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
90 -@@ -2,6 +2,8 @@
91 - // Use of this source code is governed by a BSD-style license that can be
92 - // found in the LICENSE file.
93 -
94 -+#include <cstddef>
95 -+
96 - #include "components/bookmarks/browser/base_bookmark_model_observer.h"
97 -
98 - namespace bookmarks {
99
100 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
101 deleted file mode 100644
102 index dfaa634b..00000000
103 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
104 +++ /dev/null
105 @@ -1,72 +0,0 @@
106 -From 78b1bcff4d9b977313e9ea15068168e1b11f5ba1 Mon Sep 17 00:00:00 2001
107 -From: Martin Jansa <Martin.Jansa@×××××.com>
108 -Date: Wed, 4 Aug 2021 19:08:03 +0200
109 -Subject: [PATCH] chromium: abseil-cpp: fix build with glibc-2.34
110 -
111 -* backport a fix from upstream abseil-cpp:
112 - https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9
113 -
114 - to fix:
115 -
116 -[97/24505] CXX obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
117 -FAILED: obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
118 -/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
119 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
120 -../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc: In function 'bool absl::SetupAlternateStackOnce()':
121 -../../../../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)'
122 - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
123 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
124 -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
125 - from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
126 -../../../../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&)'
127 - 254 | max(const _Tp& __a, const _Tp& __b)
128 - | ^~~
129 -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
130 -../../../../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')
131 - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
132 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
133 -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
134 - from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
135 -../../../../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)'
136 - 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
137 - | ^~~
138 -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
139 -../../../../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')
140 - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
141 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
142 -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
143 - from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
144 -../../../../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>)'
145 - 3461 | max(initializer_list<_Tp> __l)
146 - | ^~~
147 -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
148 -../../../../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'
149 - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
150 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
151 -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
152 - from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
153 -../../../../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)'
154 - 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
155 - | ^~~
156 -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
157 -../../../../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'
158 - 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
159 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
160 -
161 -Signed-off-by: Martin Jansa <Martin.Jansa@×××××.com>
162 ----
163 - .../abseil-cpp/absl/debugging/failure_signal_handler.cc | 2 +-
164 - 1 file changed, 1 insertion(+), 1 deletion(-)
165 -
166 -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
167 -index 5d13bdbbbd1..150a43f2660 100644
168 ---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
169 -+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
170 -@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
171 - #else
172 - const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
173 - #endif
174 -- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
175 -+ size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
176 - #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
177 - defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
178 - // Account for sanitizer instrumentation requiring additional stack space.
179
180 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
181 deleted file mode 100644
182 index b91c239a..00000000
183 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
184 +++ /dev/null
185 @@ -1,72 +0,0 @@
186 -From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001
187 -From: Martin Jansa <Martin.Jansa@×××××.com>
188 -Date: Wed, 4 Aug 2021 19:11:06 +0200
189 -Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34
190 -
191 -* fixes:
192 -[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o
193 -FAILED: obj/third_party/breakpad/client/exception_handler.o
194 -/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/
195 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
196 /src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o
197 -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()':
198 -../../../../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)'
199 - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
200 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
201 -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
202 - from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
203 - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
204 - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
205 -../../../../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&)'
206 - 254 | max(const _Tp& __a, const _Tp& __b)
207 - | ^~~
208 -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
209 -../../../../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')
210 - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
211 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
212 -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
213 - from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
214 - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
215 - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
216 -../../../../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)'
217 - 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
218 - | ^~~
219 -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
220 -../../../../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')
221 - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
222 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
223 -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
224 - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
225 -../../../../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>)'
226 - 3461 | max(initializer_list<_Tp> __l)
227 - | ^~~
228 -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
229 -../../../../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'
230 - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
231 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
232 -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
233 - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
234 -../../../../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)'
235 - 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
236 - | ^~~
237 -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
238 -../../../../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'
239 - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
240 - | ~~~~~~~~^~~~~~~~~~~~~~~~~
241 -
242 -Signed-off-by: Martin Jansa <Martin.Jansa@×××××.com>
243 ----
244 - .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +-
245 - 1 file changed, 1 insertion(+), 1 deletion(-)
246 -
247 -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
248 -index ca353c40997..2e43ba6fc04 100644
249 ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
250 -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
251 -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
252 - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
253 - // the alternative stack. Ensure that the size of the alternative stack is
254 - // large enough.
255 -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
256 -+ static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ);
257 -
258 - // Only set an alternative stack if there isn't already one, or if the current
259 - // one is too small.
260
261 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
262 index 336099a8..61b7a1f3 100644
263 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
264 +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
265 @@ -104,9 +104,6 @@ PATCHES=(
266 "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
267 "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
268 "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
269 - "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
270 - "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
271 - "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
272 )
273
274 pkg_preinst() {