* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2016-11-09 19:49 Aric Belsito
0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2016-11-09 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 0b8ca591583ef3662a2e1509f67e49fe2680a59a
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 9 19:45:23 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 9 19:45:23 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0b8ca591
dev-qt/qtwebengine: Add stable and unstable.
5.7.0 is still a work in progress. The patches are mostly adapted from
voidlinux/chromium patches.
dev-qt/qtwebengine/Manifest | 13 +++
.../files/qtwebengine-5.6.0-musl-execinfo.patch | 78 ++++++++++++++++
.../files/qtwebengine-5.6.0-musl-mallinfo.patch | 32 +++++++
.../files/qtwebengine-5.6.0-musl-off_t.patch | 11 +++
.../files/qtwebengine-5.6.0-musl-resolver.patch | 60 ++++++++++++
.../files/qtwebengine-5.6.0-musl-sandbox.patch | 12 +++
.../files/qtwebengine-5.6.0-musl-siginfo.patch | 18 ++++
.../files/qtwebengine-5.6.0-musl-stack.patch | 31 +++++++
.../files/qtwebengine-5.6.0-musl-sysctl.patch | 11 +++
dev-qt/qtwebengine/metadata.xml | 26 ++++++
dev-qt/qtwebengine/qtwebengine-5.6.1.ebuild | 103 +++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild | 103 +++++++++++++++++++++
12 files changed, 498 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
new file mode 100644
index 0000000..9d87ef0
--- /dev/null
+++ b/dev-qt/qtwebengine/Manifest
@@ -0,0 +1,13 @@
+AUX qtwebengine-5.6.0-musl-execinfo.patch 3083 SHA256 a91a0e002ac79559b1ded87044f530408d0ab662c61ccea8aa971a25504fa260 SHA512 3a0c5db26b748b5a2218dbc0a153a4da1806e5752b50d3114e7cb1897101ceb3cc785ff453e906056b7e1ff7498b5735d8db9bebbbf43fa8a489f5fb19042377 WHIRLPOOL a7ddfd98c2e36c21a10408a51ef6a4d5797636e4ba74ed2477a763319c3b9d01ae3b4731dedba3cb72d80c6b0a1956703a472a579c4a1286b285ac15a8db7521
+AUX qtwebengine-5.6.0-musl-mallinfo.patch 1343 SHA256 b3168887df02c15f91d4d827f98adc77b4d8ebaf1eeee6c75308f65a2b465f62 SHA512 631a554e0c2aee47768cea0627b0f918f293df231a70dcf26caa93c87a46d61960dab4dffe42351a3e010810ab0f273fe02710bc4f2c71e9f595c9e5ea109c05 WHIRLPOOL b51c35d6526066a85aca5111d1f77acecb0a3e5ba3f8a743bb5c1639346d428ed48e91e1968bd53636b1be087daa56032571ba640211b2e5997caaa609ff0587
+AUX qtwebengine-5.6.0-musl-off_t.patch 627 SHA256 328d193b7994bd4d80d1cad08e24fa5c44405e374a23570c5f217a078e6b59d1 SHA512 82dd29bdf97a8ed18773cc503b0426e4ca57129adb04a34ce3eb069862df7b838e75941600cc5c4f69456d1f04a8ccca81533a05762e9cd16c84d0c941ee89a6 WHIRLPOOL 9475f2276ab2ad4d4d09924254ef27b490993af1f63cdc01e3cdce48f76876d0a37fe8cce7694c2e0aff8f07cf9fa9ea886fa3f79a926ddffb4040ffecb1d431
+AUX qtwebengine-5.6.0-musl-resolver.patch 2575 SHA256 7a1f86eebf8f0c949a051a3569ff27e344bbafe515b6fc4965bdbf63e978b263 SHA512 752af1be984255c9124ca71f180939c77a10fc461a1d2c78d185e4b94e72daffd7046f02fd78086ef1b33db17c9bc978b5fb1db6753a6853450b7b3d77c63562 WHIRLPOOL c85ef6e5e45566114a7caa1ef05d4fb21d173a3b5939db1234b3bbf36ab89beb4f753830a5d414916574500742157b3094ecf5b2e92bb1e8a103df11ae144a64
+AUX qtwebengine-5.6.0-musl-sandbox.patch 843 SHA256 632177e9e36713ef528165229b363f5ed9495c6c64effd42c799a9d4d1811040 SHA512 c8ee9ae67394d971f82f33cc6cbeba85598ad079caf014d7bba268283084fb0022bb0a4f2d254a6ba13478ad2cc4181d540ed696017ad19402de7bfdd3baafe8 WHIRLPOOL ec9b327f55c9c17e6f969515ddcdbe1d3e817303d775dcfc21b5687b355806237c311f46ac65173d99f7d65cc3f9c7f2f2cb84c654f157bcac100725e50947d4
+AUX qtwebengine-5.6.0-musl-siginfo.patch 666 SHA256 42c3119595738e1e4757bee83d9774982d6265f14cb216dcd5100319339ba8c6 SHA512 2fead16e7d7379b622da0e3172905444d9d72d1a53ff080327a3d59f60541c5c076d9b58f110b039da8c9ebc3b5efec53af118e1172efd01886ff9ac2b730d5f WHIRLPOOL 52bb6af4faec65b6d50a810266a814ddcc996eca0a69668fca320d9e1c998ce11f7479de301f3f3957baba0e8d8e799d4b8c60810c37db2419f8e911066075bd
+AUX qtwebengine-5.6.0-musl-stack.patch 1469 SHA256 b2a66152c5f2c72aed97bd0358ee888d410a17c6048cfebc3a6867294e94c291 SHA512 50fd27962fdd2193b45ec334462535008d565a681bd6171d9c8e986e246ec42025e54eecdd8b8cbdaa118d4f6b0d88b73ad6add7c4d59cffc55899264c5b1bfd WHIRLPOOL 604f319f5229f02271e3f12166f5c50d8c2c25d78aebb93917ab333ce15adeded4cbd061afc0af0c1ea9c8bdf3411400c37a15827a31d29420f1787cfe49b97d
+AUX qtwebengine-5.6.0-musl-sysctl.patch 692 SHA256 a66b527eb717a5ad662c8c088540341a206c3c208c7f2fe5a20b71a17f7aacd4 SHA512 22b2380fdb1bec46c8f38d98d55c7fb72dca85859c6ae822f4b7aa441ea996dee12e11653c6f156575a1779437690d64b6101052ef12716e2dfbe046d0962b9a WHIRLPOOL d63e725ed25ffd8a219d97d1790ecf8bf44417c224ace98a5af743b84314914f50e8208fa5358fe31818fe865b01cb55e8841d879438a29bed30ff099b6e0e90
+DIST qtwebengine-opensource-src-5.6.1-1.tar.xz 143729228 SHA256 c80e90237bb7bd52a3fa843415c17a8e8e6d779b65efd1393472f24f8642e04c SHA512 4612221fafd16c2d5ce38965bb264d2577b20b1c342792f34729e8a26978e9e430dc1425291530dfad254be5b3b42ebdafdec084c5d25edb23fc61bb3f71ac6f WHIRLPOOL dc05495c1afe755e51961c314b3305b43add7eee149816a0be3ab22b9a2ae10b54ebf5ca2861eaf8768e619c44533b35bd94645e12f94eb39cb5b9c8b19c1667
+DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e
+EBUILD qtwebengine-5.6.1.ebuild 2399 SHA256 cf87e113dd9b731ab1a2c7ab6e2b94bf54a041d0d890725a7c48c0073447442c SHA512 f31ea3257a6153bfbd9a3ab9ed2ad7b4703ab7c76305be6b41451123b02537aaab07ca13967c586cbb76e1c9f989c03ec50c774443be8a6acd6d0ac37ea6fa32 WHIRLPOOL 14f86450d5c323d12592876bd9e7fc9c8cdfced1473415c41e17e15c89a3ed43818aa9db9ec49486bfbfb600c8ab03bf4a7333445a359b124ece4fcd6146f1a5
+EBUILD qtwebengine-5.6.2.ebuild 2402 SHA256 f0f1538be1af933089d9840ebf5a3fcf5feb53157eb248af5a4a26810c94cbf3 SHA512 a85bfe1f11a1e440d3d19e743c9305f784782836f19ec98ae363331683528f1bf0f8a42a0955c98055108de5762a2499aeeb9e27969c0ae3c7548e268b6be62f WHIRLPOOL 91c3028e85f65d571130683ef0a16dece6486ae5e7c749a3ca8c1b3f67c747e7121953c4a9a48b7f08dc3c95023d3f050197b82367978e1f66cbd348f5931084
+MISC metadata.xml 871 SHA256 1ecf17250e1d38e8f4facd8799f66f07ffdaade07f6afac35b5c0ad09687c346 SHA512 18a992c67d1a0260255226452bafb17485f1e0782eed1c031da8404055186c9b6e410e74d2d9bcd4105431ad4e2c6acd5ce1759201009e5dfc2285c72e53df87 WHIRLPOOL 74e04078eaf03693c25e89fe51f4a6785ac91c92db7b049bdd7a0e179f13ae9b31264332b5bbdcca60e1c799c1751a32756b76baca5426820f4a7a01adc6ca98
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-execinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-execinfo.patch
new file mode 100644
index 0000000..0ef84e4
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-execinfo.patch
@@ -0,0 +1,78 @@
+--- qtwebengine/src/3rdparty/chromium/third_party/webrtc/base/checks.cc 2016-03-03 15:48:36.000000000 +0100
++++ qtwebengine/src/3rdparty/chromium/third_party/webrtc/base/checks.cc 2016-03-17 01:56:11.685588906 +0100
+@@ -16,7 +16,7 @@
+ #include <cstdio>
+ #include <cstdlib>
+
+-#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
++#if defined(__GLIBC__) && defined(__GLIBCXX__) && !defined(__UCLIBC__)
+ #include <cxxabi.h>
+ #include <execinfo.h>
+ #endif
+@@ -55,7 +55,7 @@
+ // to get usable symbols on Linux. This is copied from V8. Chromium has a more
+ // advanced stace trace system; also more difficult to copy.
+ void DumpBacktrace() {
+-#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
++#if defined(__GLIBC__) && defined(__GLIBCXX__) && !defined(__UCLIBC__)
+ void* trace[100];
+ int size = backtrace(trace, sizeof(trace) / sizeof(*trace));
+ char** symbols = backtrace_symbols(trace, size);
+--- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2016-03-03 15:48:36.000000000 +0100
++++ qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2016-03-17 02:23:45.442708132 +0100
+@@ -22,7 +22,7 @@
+ #if defined(__GLIBCXX__)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__)
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #include <execinfo.h>
+ #endif
+
+@@ -169,7 +169,7 @@
+
+ handler->HandleOutput("\n");
+ }
+-#elif !defined(__UCLIBC__)
++#elif defined(__GLIBC__) && !defined(__UCLIBC__)
+ bool printed = false;
+
+ // Below part is async-signal unsafe (uses malloc), so execute it only
+@@ -738,7 +738,7 @@
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+
+-#if !defined(__UCLIBC__)
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ // Though the backtrace API man page does not list any possible negative
+ // return values, we take no chance.
+ count_ = base::saturated_cast<size_t>(backtrace(trace_, arraysize(trace_)));
+--- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/Assertions.cpp 2016-03-03 15:48:36.000000000 +0100
++++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/Assertions.cpp 2016-03-17 05:47:32.637589639 +0100
+@@ -61,7 +61,7 @@
+ #define HAVE_ISDEBUGGERPRESENT 1
+ #endif
+
+-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
++#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__) && defined(__GLIBC__))
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+ #include <execinfo.h>
+@@ -222,7 +222,7 @@
+
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
++#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__) && defined(__GLIBC__))
+ *size = backtrace(stack, *size);
+ #elif OS(WIN)
+ // The CaptureStackBackTrace function is available in XP, but it is not defined
+@@ -260,7 +260,7 @@
+ : m_name(0)
+ , m_cxaDemangled(0)
+ {
+-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
++#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__) && defined(__GLIBC__))
+ Dl_info info;
+ if (!dladdr(addr, &info) || !info.dli_sname)
+ return;
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-mallinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-mallinfo.patch
new file mode 100644
index 0000000..170064b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-mallinfo.patch
@@ -0,0 +1,32 @@
+In musl libc there is no struct mallinfo and no function mallinf()
+
+--- qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2015-06-05 04:52:18.502230985 +0200
++++ qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2015-06-05 04:52:06.712231020 +0200
+@@ -15,7 +15,7 @@
+
+ namespace content {
+
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
+ size_t GetMemoryUsageKB() {
+ struct mallinfo minfo = mallinfo();
+ uint64_t mem_usage =
+--- qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-03-03 15:48:36.000000000 +0100
++++ qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-03-17 05:09:41.409425897 +0100
+@@ -29,6 +29,7 @@
+ // Called at trace dump point time. Creates a snapshot the memory counters for
+ // the current process.
+ bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
++#if defined(__GLIBC__)
+ struct mallinfo info = mallinfo();
+ DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
+
+@@ -46,7 +47,7 @@
+ MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects);
+ inner_dump->AddScalar(MemoryAllocatorDump::kNameSize,
+ MemoryAllocatorDump::kUnitsBytes, info.uordblks);
+-
++#endif
+ return true;
+ }
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-off_t.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-off_t.patch
new file mode 100644
index 0000000..f5e8748
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-off_t.patch
@@ -0,0 +1,11 @@
+diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h
+--- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h 2016-07-28 18:44:48.921463425 -0700
++++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h 2016-07-29 12:44:27.881928176 -0700
+@@ -22,6 +22,7 @@
+ #else
+ #include <arpa/inet.h>
++#include <sys/types.h>
+ #include <stdint.h>
+ #endif
+
+ #include <algorithm>
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-resolver.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-resolver.patch
new file mode 100644
index 0000000..8e171bb
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-resolver.patch
@@ -0,0 +1,60 @@
+diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/base/dns_reloader.cc qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/base/dns_reloader.cc
+--- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/base/dns_reloader.cc 2016-07-28 17:16:00.113559841 -0700
++++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/base/dns_reloader.cc 2016-07-28 17:41:45.640212588 -0700
+@@ -8,6 +8,9 @@
+ !defined(OS_ANDROID)
+
+ #include <resolv.h>
++#if defined(OS_LINUX) && !defined(__GLIBC__)
++#include "net/dns/resolv_compat.h"
++#endif
+
+ #include "base/basictypes.h"
+ #include "base/lazy_instance.h"
+diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+--- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-07-28 17:16:00.187560625 -0700
++++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-07-28 17:41:45.640212588 -0700
+@@ -25,6 +25,10 @@
+ #include "net/dns/notify_watcher_mac.h"
+ #include "net/dns/serial_worker.h"
+
++#if defined(OS_LINUX) && !defined(__GLIBC__)
++#include "net/dns/resolv_compat.h"
++#endif
++
+ #if defined(OS_MACOSX) && !defined(OS_IOS)
+ #include "net/dns/dns_config_watcher_mac.h"
+ #endif
+diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/resolv_compat.h qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/resolv_compat.h
+--- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/resolv_compat.h 1969-12-31 16:00:00.000000000 -0800
++++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/resolv_compat.h 2016-07-28 17:43:07.714089231 -0700
+@@ -0,0 +1,29 @@
++#if !defined(__GLIBC__)
++/***************************************************************************
++ * resolv_compat.h
++ *
++ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
++ * Note: res_init() is actually deprecated according to
++ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
++ **************************************************************************/
++#include <string.h>
++
++static inline int res_ninit(res_state statp)
++{
++ int rc = res_init();
++ if (statp != &_res) {
++ memcpy(statp, &_res, sizeof(*statp));
++ }
++ return rc;
++}
++
++static inline int res_nclose(res_state statp)
++{
++ if (!statp)
++ return -1;
++ if (statp != &_res) {
++ memset(statp, 0, sizeof(*statp));
++ }
++ return 0;
++}
++#endif
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sandbox.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sandbox.patch
new file mode 100644
index 0000000..1de8a2d
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sandbox.patch
@@ -0,0 +1,12 @@
+diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+--- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h 2016-07-28 17:15:59.433552637 -0700
++++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h 2016-07-28 17:17:39.275610371 -0700
+@@ -5,7 +5,7 @@
+ #ifndef SANDBOX_LINUX_BPF_DSL_SECCOMP_MACROS_H_
+ #define SANDBOX_LINUX_BPF_DSL_SECCOMP_MACROS_H_
+
+-#include <sys/cdefs.h>
++#include <sys/types.h>
+ // Old Bionic versions do not have sys/user.h. The if can be removed once we no
+ // longer need to support these old Bionic versions.
+ // All x86_64 builds use a new enough bionic to have sys/user.h.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-siginfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-siginfo.patch
new file mode 100644
index 0000000..fe760be
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-siginfo.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-02-17 05:57:43.000000000 +0100
++++ qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-06-03 08:20:25.032716427 +0200
+@@ -22,6 +22,11 @@
+ #include "sandbox/linux/services/android_ucontext.h"
+ #endif
+
++// musl libc defines siginfo_t __si_fields instead of _sifields
++#if !defined(__GLIBC__)
++#define _sifields __si_fields
++#endif
++
+ namespace {
+
+ const int kCapacityIncrement = 20;
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-stack.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-stack.patch
new file mode 100644
index 0000000..7c72417
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-stack.patch
@@ -0,0 +1,31 @@
+--- qtwebengine/src/3rdparty/chromium/base/threading/platform_thread_linux.cc 2016-03-03 15:48:36.000000000 +0100
++++ qtwebengine/src/3rdparty/chromium/base/threading/platform_thread_linux.cc 2016-03-17 06:31:13.832778611 +0100
+@@ -109,7 +109,7 @@
+
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
+- return 0;
++ return 1 << 21;
+ #else
+ // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+ // default stack size isn't enough for some browser tests.
+--- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 2016-03-03 15:48:36.000000000 +0100
++++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 2016-03-17 06:31:13.832778611 +0100
+@@ -67,7 +67,7 @@
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+
+-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+ // pthread_getattr_np() can fail if the thread is not invoked by
+ // pthread_create() (e.g., the main thread of webkit_unit_tests).
+ // In this case, this method returns 0 and the caller must handle it.
+@@ -114,7 +114,7 @@
+
+ void* StackFrameDepth::getStackStart()
+ {
+-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+ pthread_attr_t attr;
+ int error;
+ #if OS(FREEBSD)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sysctl.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sysctl.patch
new file mode 100644
index 0000000..8647043
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sysctl.patch
@@ -0,0 +1,11 @@
+diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c
+--- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c 2016-07-28 18:44:47.582449126 -0700
++++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c 2016-07-29 12:05:34.463048187 -0700
+@@ -38,7 +38,6 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
new file mode 100644
index 0000000..881cc17
--- /dev/null
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <use>
+ <flag name="geolocation">Enable physical position determination
+ via <pkg>dev-qt/qtpositioning</pkg></flag>
+ <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
+ instead of bundled.</flag>
+ <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
+ instead of bundled.</flag>
+ <flag name="widgets">Enable QtWidgets support</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://bugreports.qt.io/</bugs-to>
+ <doc>http://doc.qt.io/</doc>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Qt API.
+ </subslots>
+ </slots>
+</pkgmetadata>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.1.ebuild
new file mode 100644
index 0000000..0e2c4e8
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="amd64 x86"
+fi
+
+IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+
+RDEPEND="
+ app-arch/snappy
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtwebchannel-${PV}[qml]
+ dev-libs/expat
+ dev-libs/jsoncpp:=
+ dev-libs/libevent:=
+ dev-libs/libxml2
+ dev-libs/libxslt
+ media-libs/alsa-lib
+ media-libs/flac
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ >=media-libs/libvpx-1.4:=
+ media-libs/libwebp:=
+ media-libs/mesa
+ media-libs/opus
+ media-libs/speex
+ net-libs/libsrtp:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/libcap
+ sys-libs/zlib[minizip]
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ system-ffmpeg? ( =media-video/ffmpeg-2*:0= )
+ system-icu? ( dev-libs/icu:= )
+ widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ sys-devel/bison
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.6.0-musl-execinfo.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-mallinfo.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-off_t.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-resolver.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-sandbox.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-siginfo.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-stack.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-sysctl.patch"
+)
+
+src_prepare() {
+ qt_use_disable_mod geolocation positioning \
+ src/core/core_common.pri \
+ src/core/core_gyp_generator.pro
+
+ qt_use_disable_mod widgets widgets src/src.pro
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+
+ local myqmakeargs=(
+ $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
new file mode 100644
index 0000000..b50b4b8
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+
+RDEPEND="
+ app-arch/snappy
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtwebchannel-${PV}[qml]
+ dev-libs/expat
+ dev-libs/jsoncpp:=
+ dev-libs/libevent:=
+ dev-libs/libxml2
+ dev-libs/libxslt
+ media-libs/alsa-lib
+ media-libs/flac
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ >=media-libs/libvpx-1.5:=[svc]
+ media-libs/libwebp:=
+ media-libs/mesa
+ media-libs/opus
+ media-libs/speex
+ net-libs/libsrtp:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/libcap
+ sys-libs/zlib[minizip]
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-icu? ( dev-libs/icu:= )
+ widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ sys-devel/bison
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.6.0-musl-execinfo.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-mallinfo.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-off_t.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-resolver.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-sandbox.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-siginfo.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-stack.patch"
+ "${FILESDIR}/${PN}-5.6.0-musl-sysctl.patch"
+)
+
+src_prepare() {
+ qt_use_disable_mod geolocation positioning \
+ src/core/core_common.pri \
+ src/core/core_gyp_generator.pro
+
+ qt_use_disable_mod widgets widgets src/src.pro
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+
+ local myqmakeargs=(
+ $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
+ )
+ qt5-build_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2016-12-06 8:01 Aric Belsito
0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2016-12-06 8:01 UTC (permalink / raw
To: gentoo-commits
commit: f5e3b46ec8b4e5bcbdb84b2fe41fa85f272ea2fd
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Dec 6 07:59:38 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Dec 6 07:59:38 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f5e3b46e
dev-qt/qtwebengine: Add 5.7.0
Sync with upstream.
(Took a while to accumulate all of the patches for this to work)
dev-qt/qtwebengine/Manifest | 15 ++-
.../qtwebengine-5.7.0-fix-system-ffmpeg.patch | 13 +++
.../qtwebengine/files/qtwebengine-5.7.0-gcc6.patch | 106 +++++++++++++++++++++
.../files/qtwebengine-5.7.0-icu58.patch | 51 ++++++++++
.../files/qtwebengine-5.7.0-musl-mallinfo.patch | 24 +++++
.../qtwebengine-5.7.0-musl-pthread-setname.patch | 25 +++++
.../files/qtwebengine-5.7.0-musl-resolver.patch | 60 ++++++++++++
.../files/qtwebengine-5.7.0-musl-sandbox.patch | 66 +++++++++++++
.../files/qtwebengine-5.7.0-undef-madv_free.patch | 33 +++++++
.../files/qtwebengine-paxmark-mksnapshot.patch | 46 +++++++++
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild | 20 +++-
...ngine-5.6.2.ebuild => qtwebengine-5.7.0.ebuild} | 35 +++++--
13 files changed, 483 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9d87ef0..61054c1 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -6,8 +6,19 @@ AUX qtwebengine-5.6.0-musl-sandbox.patch 843 SHA256 632177e9e36713ef528165229b36
AUX qtwebengine-5.6.0-musl-siginfo.patch 666 SHA256 42c3119595738e1e4757bee83d9774982d6265f14cb216dcd5100319339ba8c6 SHA512 2fead16e7d7379b622da0e3172905444d9d72d1a53ff080327a3d59f60541c5c076d9b58f110b039da8c9ebc3b5efec53af118e1172efd01886ff9ac2b730d5f WHIRLPOOL 52bb6af4faec65b6d50a810266a814ddcc996eca0a69668fca320d9e1c998ce11f7479de301f3f3957baba0e8d8e799d4b8c60810c37db2419f8e911066075bd
AUX qtwebengine-5.6.0-musl-stack.patch 1469 SHA256 b2a66152c5f2c72aed97bd0358ee888d410a17c6048cfebc3a6867294e94c291 SHA512 50fd27962fdd2193b45ec334462535008d565a681bd6171d9c8e986e246ec42025e54eecdd8b8cbdaa118d4f6b0d88b73ad6add7c4d59cffc55899264c5b1bfd WHIRLPOOL 604f319f5229f02271e3f12166f5c50d8c2c25d78aebb93917ab333ce15adeded4cbd061afc0af0c1ea9c8bdf3411400c37a15827a31d29420f1787cfe49b97d
AUX qtwebengine-5.6.0-musl-sysctl.patch 692 SHA256 a66b527eb717a5ad662c8c088540341a206c3c208c7f2fe5a20b71a17f7aacd4 SHA512 22b2380fdb1bec46c8f38d98d55c7fb72dca85859c6ae822f4b7aa441ea996dee12e11653c6f156575a1779437690d64b6101052ef12716e2dfbe046d0962b9a WHIRLPOOL d63e725ed25ffd8a219d97d1790ecf8bf44417c224ace98a5af743b84314914f50e8208fa5358fe31818fe865b01cb55e8841d879438a29bed30ff099b6e0e90
+AUX qtwebengine-5.7.0-fix-system-ffmpeg.patch 953 SHA256 046d2d09cb50a5b580a445edaf4545481e3575c30c1ba3197182f1e0f71e6478 SHA512 7fe43758f0f20ce1d4952d36773fede8def13c60dc4ac01186ef0d1b79055f02151a89e94c61b6dbe5e0a0560e53e3a27c2f40aaba181704b752b3618b3f3b9f WHIRLPOOL 64a566562652e4c7754a634de5ea4f4d64fe54033223157645d5efb64a0784a0e45c00785c4fa30f95adfeb9c830189f5796465b94ee834b04b11c3f871ad1e7
+AUX qtwebengine-5.7.0-gcc6.patch 3967 SHA256 1f97985725bc1dd46602045c83c4ba67f593ac2a1fda1db8d8e8848baaf26608 SHA512 badeeb698ba2b5a9d02c4f0812d4d4557f1549e25b8eba321553c208e36054407f75450ca335884a7ee544e02847914b0d743b0a7687af1d5aa00fd29890ecfc WHIRLPOOL 385c917ad1c11e5b84f06320898b85f4078f95b8e254c3c67e9820756b232fca65675338307a3ee9d81d6acb1f52c4f4fafca5f09ce3cd914ace9b5173e160ca
+AUX qtwebengine-5.7.0-icu58.patch 3126 SHA256 0e9eaae292efd47c76a05e0380ffe8cc2f353f1a55fc1bf180a5313a529ab8cb SHA512 573741564c85dfa8df1f8b89f075214067f4892d9cc4280d986709c4438823a82ab1eb752b39fdae4e0321a0ae30479fce2ecacb4d35f197bc3699ee24583d67 WHIRLPOOL 79b02ab132b3dd56f70b6d8cb828605abbd27d33862556d1c22196c2b34ce7a9b0ff31dcc5d48b28f75a74888d96327cb572fdaca92284dd89ec4e2c23bbf6e7
+AUX qtwebengine-5.7.0-musl-mallinfo.patch 1522 SHA256 aa151b81bc4b744b9b8d9fae7fe1b1efcec60946c33d0608f297171b30d5bfea SHA512 ccf2a354a4d521385bf9edb73cc48ada146de2790b9c54d244a4498aeeb80965f230cfa698867630197f791021ff04407aaaffd3e06e40efebf54750a7e90afc WHIRLPOOL 53711f00cda7d09a9913ec07181a3378e27748a92175af1ed5e46a6b45566802f69412a07fb032198159c290b98ae084c088bd854d655ee985942baf1dc7c8a1
+AUX qtwebengine-5.7.0-musl-pthread-setname.patch 1173 SHA256 a18740a277fd9379ee57da1af203248efb23c429173d6ffad486da699fcbfc8c SHA512 da3baa6981b8897cf7dd30dc8d8889d2e3d23dc85bf4c27f9ea43c978be74ea380dba1362a3e131d810bd120013c8c6652cba0c5a56537b4a5aa89f7bec2479c WHIRLPOOL 21fbb93fef680b4c8610fb2de843f51274dc198714e12102f706db6f98e3cfb9f760001bf06a1bafa0fe3441849dce1b39553fbc85d6767be4a4c2ff496242a0
+AUX qtwebengine-5.7.0-musl-resolver.patch 2568 SHA256 07a3ee87d509e8dc963b8d60c5168a8dd615be7488c5aa23c1f993922ff38b96 SHA512 8913b0daf060f9f3ed7fb3e69f3108992d078394e9a3e1a02f0d7668bcbb8cb7f8df715b7b3463f2ac35765a2fafe2ae8407669ecdf84405b9a3cc90bf845891 WHIRLPOOL df4ed38e8dfe407c430ce58a2006192345b35952be209ef51fb6661070ba96f86a9b60c180ac7374beb4780546c230b2d7dbbb59cc054c2d34fb0d33f9d8b42a
+AUX qtwebengine-5.7.0-musl-sandbox.patch 3185 SHA256 b4e616a6159a237e4ee0455e45e75c95702314f1ae42bfd3068a92ba1575ac01 SHA512 80a3c5eddf29cdf9beac3cd4e0c3d450ab32d85dbe794d2055d0abe0e1242db0fc69a44df7cf250d3ecf9a93a7e1d15d460a1d2409e65ceae1ac5c189f055918 WHIRLPOOL 6d4e1b055ce739e5b9f7d0235a7b628a52aebe03014e8f09e83968b2d1ddbb614ee00e4f8ffa792c6305822e759bd24265f1b63c5fae78834da6c1dcbb123305
+AUX qtwebengine-5.7.0-undef-madv_free.patch 1132 SHA256 2490dcbad1ec31a7eadf872ce0e63cbf9c12f8b9fa65f2f8b030274e283c0198 SHA512 1f581749438b07df03f8123957b31d2749a702c00dae06d5c4ab8bd9a4a3d9f14ee0457f5fa9221e7b1d0dc4eac8965990336140f09787df4e46757165b1e22e WHIRLPOOL 0c4404fd40e5fa3fdc55c11bac0f76843fb174b1048d24b0b934d0ecbe664ff7b04f03c09a1cb08df0a30622adcd515e837cbabee77c699eeecc87785f3ec354
+AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256 540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 WHIRLPOOL d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb
DIST qtwebengine-opensource-src-5.6.1-1.tar.xz 143729228 SHA256 c80e90237bb7bd52a3fa843415c17a8e8e6d779b65efd1393472f24f8642e04c SHA512 4612221fafd16c2d5ce38965bb264d2577b20b1c342792f34729e8a26978e9e430dc1425291530dfad254be5b3b42ebdafdec084c5d25edb23fc61bb3f71ac6f WHIRLPOOL dc05495c1afe755e51961c314b3305b43add7eee149816a0be3ab22b9a2ae10b54ebf5ca2861eaf8768e619c44533b35bd94645e12f94eb39cb5b9c8b19c1667
DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e
+DIST qtwebengine-opensource-src-5.7.0.tar.xz 165709640 SHA256 985762fff5cd8a1a0d2a644a4a51238676898685f9ff1a78c3f2800025d6dc5d SHA512 8f010ea8d7047880c0bc941749a4172deae0f363ff25e00412291ad2bb243ac4c51031403eae0bba11b4f42c3e3d414858d29e3a3fb0459703dcaaff9b7133cd WHIRLPOOL 112f80f8cc279d743641095f47512a95d43286c1fe32c678a5ada810a7da12b1ef6e4483401e1a08c32d7e0d6e23369c65fbaeeee5f9a4bc34e330f59359e648
EBUILD qtwebengine-5.6.1.ebuild 2399 SHA256 cf87e113dd9b731ab1a2c7ab6e2b94bf54a041d0d890725a7c48c0073447442c SHA512 f31ea3257a6153bfbd9a3ab9ed2ad7b4703ab7c76305be6b41451123b02537aaab07ca13967c586cbb76e1c9f989c03ec50c774443be8a6acd6d0ac37ea6fa32 WHIRLPOOL 14f86450d5c323d12592876bd9e7fc9c8cdfced1473415c41e17e15c89a3ed43818aa9db9ec49486bfbfb600c8ab03bf4a7333445a359b124ece4fcd6146f1a5
-EBUILD qtwebengine-5.6.2.ebuild 2402 SHA256 f0f1538be1af933089d9840ebf5a3fcf5feb53157eb248af5a4a26810c94cbf3 SHA512 a85bfe1f11a1e440d3d19e743c9305f784782836f19ec98ae363331683528f1bf0f8a42a0955c98055108de5762a2499aeeb9e27969c0ae3c7548e268b6be62f WHIRLPOOL 91c3028e85f65d571130683ef0a16dece6486ae5e7c749a3ca8c1b3f67c747e7121953c4a9a48b7f08dc3c95023d3f050197b82367978e1f66cbd348f5931084
-MISC metadata.xml 871 SHA256 1ecf17250e1d38e8f4facd8799f66f07ffdaade07f6afac35b5c0ad09687c346 SHA512 18a992c67d1a0260255226452bafb17485f1e0782eed1c031da8404055186c9b6e410e74d2d9bcd4105431ad4e2c6acd5ce1759201009e5dfc2285c72e53df87 WHIRLPOOL 74e04078eaf03693c25e89fe51f4a6785ac91c92db7b049bdd7a0e179f13ae9b31264332b5bbdcca60e1c799c1751a32756b76baca5426820f4a7a01adc6ca98
+EBUILD qtwebengine-5.6.2.ebuild 2779 SHA256 882e1a4a73498fd8512292950cb54b21d4dcb7b4b93db33be1152cd8c19e40d9 SHA512 0afbd02907494f78821208c361e9f47d1bdbc23e67d53a3ab6b1ee93aac2d50bcb0cea5e334c0f9f31e8cdb274995273666d795924f1a18dd889104588435642 WHIRLPOOL 38658acff380c65b30e2d5127a25eb73e012618196e6e95418bd5178544a1f6d29024a83f7d7339e57345d854960351d65d1776bf7981236075b0204aa491a8f
+EBUILD qtwebengine-5.7.0.ebuild 3022 SHA256 31c40dfe70ba0fe129b87e999270c825c50a2edd5ee5c86fadf3c4085e88f816 SHA512 4dcf2d5e2629b9a3d94e6e4a58736bd722e6c0be91795ec2950bd9e7cd15247671afc1c4656a17e857840907305a0da9ae762dfb8c3797ed2714301494f8ffc5 WHIRLPOOL 51015b24cb6a5a712f65f1a5f302464726109e53d1fbd5f040ee05bd73621b695d69350acaa62499958c038fc3f2109e90069fdd8f58e006f995f66a5fba7b4a
+MISC metadata.xml 947 SHA256 15083351c49bbcf033829248688471002ca7990644535e1228c5f29396839026 SHA512 a53fa56d2922b8abb2b10193ebc3cb61923697d9c1ddbb583f0d06886dc357604c192cbbbc2849a976be189a41473069b1931434d057b9c9d5b91c7333680224 WHIRLPOOL 7db472885a977071531059312cb171ceffe119900e68bf20a6de6aca9d90336b21067a47e71e80e2d79fc54193b0aa276d74e96b98d3001e58be3c7d0840f8a8
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch
new file mode 100644
index 0000000..71881e0
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch
@@ -0,0 +1,13 @@
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:01:20.929772871 -0800
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:02:18.879462854 -0800
+@@ -24,7 +24,9 @@
+ // Disable deprecated features which result in spammy compile warnings. This
+ // list of defines must mirror those in the 'defines' section of BUILD.gn file &
+ // ffmpeg.gyp file or the headers below will generate different structures!
++#if !defined(USE_SYSTEM_FFMPEG)
+ #define FF_API_CONVERGENCE_DURATION 0
++#endif
+ // Upstream libavcodec/utils.c still uses the deprecated
+ // av_dup_packet(), causing deprecation warnings.
+ // The normal fix for such things is to disable the feature as below,
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch
new file mode 100644
index 0000000..2cc53e6
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch
@@ -0,0 +1,106 @@
+From cffcf22082879939bbcfa89e88057beda829a0a7 Mon Sep 17 00:00:00 2001
+From: David Faure <david.faure@kdab.com>
+Date: Sat, 3 Sep 2016 18:01:40 +0200
+Subject: gcc6: set -fno-delete-null-pointer-checks for all files
+
+Not just v8, as v8_no_delete_null_pointer_checks does.
+This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer
+which also compares this with null.
+
+I'll remove v8_no_delete_null_pointer_checks in a later commit
+to avoid a temporary breakage until qtwebengine is updated.
+
+Change-Id: I8782fadc8fab125b5394bd60857e70c6ae75f9b0
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit c42f53ec3ca90bfd98577988462ed51464feebe3)
+---
+ chromium/build/common.gypi | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi
+index b6a0284..d768ab3 100644
+--- a/src/3rdparty/chromium/build/common.gypi
++++ b/src/3rdparty/chromium/build/common.gypi
+@@ -4702,6 +4706,9 @@
+ '-Wl,--disable-new-dtags',
+ ],
+ }],
++ [ 'no_delete_null_pointer_checks==1', {
++ 'cflags_cc': [ '-fno-delete-null-pointer-checks' ],
++ }],
+ ['clang==0', {
+ 'target_conditions': [
+ ['_toolset=="target"', {
+--
+cgit v1.0-4-g1e03
+
+From ae73e50e7d8c1371ed293c10150646a2719f4598 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+Date: Wed, 14 Sep 2016 17:40:50 +0200
+Subject: FIXUP: gcc6: set -fno-delete-null-pointer-checks for all files
+
+Set a default and pull in the value from configuration, and
+remove the old v8 only version.
+
+Change-Id: Ica9f971baa28c717178eb2acd074607424792e1d
+Reviewed-by: David Faure <david.faure@kdab.com>
+---
+ chromium/build/common.gypi | 4 ++++
+ chromium/v8/build/toolchain.gypi | 7 -------
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi
+index d768ab3..8a1df22 100644
+--- a/src/3rdparty/chromium/build/common.gypi
++++ b/src/3rdparty/chromium/build/common.gypi
+@@ -727,6 +727,9 @@
+ # By default include non-appstore-compliant code.
+ 'appstore_compliant_code%': 0,
+
++ # Enable this to turn off the delete-null-pointer-checks optimization in GCC 6+
++ 'no_delete_null_pointer_checks%': 0,
++
+ 'conditions': [
+ # A flag for POSIX platforms
+ ['OS=="win"', {
+@@ -1271,6 +1274,7 @@
+ 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)',
+ 'proprietary_codecs%': '<(proprietary_codecs)',
+ 'appstore_compliant_code%': '<(appstore_compliant_code)',
++ 'no_delete_null_pointer_checks%': '<(no_delete_null_pointer_checks)',
+ 'use_goma%': '<(use_goma)',
+ 'gomadir%': '<(gomadir)',
+ 'use_lto%': '<(use_lto)',
+--
+cgit v1.0-4-g1e03
+
+From d6c8a2cf8fa374e6d1c0a578391b57112c047fa4 Mon Sep 17 00:00:00 2001
+From: David Faure <david.faure@kdab.com>
+Date: Mon, 5 Sep 2016 15:25:02 +0200
+Subject: Enable -fno_delete_null_pointer_checks for g++ 6 on all of chromium
+
+This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer
+which also compares this with null.
+
+Change-Id: I85d69432a0d7eeb0d8df8f395821880e36180dcc
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ src/core/config/linux.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
+index 9264932..a318e17 100644
+--- a/src/core/config/linux.pri
++++ b/src/core/config/linux.pri
+@@ -29,6 +29,8 @@ use?(nss) {
+ use_openssl_certs=1
+ }
+
++gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += no_delete_null_pointer_checks=1
++
+ contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1
+ contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
+ contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
+--
+cgit v1.0-4-g1e03
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch
new file mode 100644
index 0000000..ced5367
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch
@@ -0,0 +1,51 @@
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:07:38.680665385 -0800
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:12:17.564001354 -0800
+@@ -26,6 +26,9 @@
+ #include "wtf/StdLibExtras.h"
+ #include "wtf/text/CharacterNames.h"
+
++#include <unicode/uchar.h>
++#include <unicode/uvernum.h>
++
+ namespace blink {
+
+ unsigned numGraphemeClusters(const String& string)
+@@ -122,13 +125,18 @@
+ { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL
+ };
+
++#if U_ICU_VERSION_MAJOR_NUM >= 58
++#define BA_LB_COUNT (U_LB_COUNT - 3)
++#else
++#define BA_LB_COUNT U_LB_COUNT
++#endif
+ // Line breaking table for CSS word-break: break-all. This table differs from
+ // asciiLineBreakTable in:
+ // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking
+ // Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties
+ // - 1 indicates additional break opportunities. 0 indicates to fallback to
+ // normal line break, not "prohibit break."
+-static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = {
++static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = {
+ // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI
+ { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX
+ { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI
+@@ -178,7 +186,7 @@
+ #undef AL
+
+ static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent");
+-static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
++static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
+
+ static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh)
+ {
+@@ -209,7 +217,7 @@
+
+ static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak)
+ {
+- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) {
++ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) {
+ const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
+ return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
+ }
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-mallinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-mallinfo.patch
new file mode 100644
index 0000000..43ddac5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-mallinfo.patch
@@ -0,0 +1,24 @@
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-10-06 22:02:53.540968618 -0700
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-10-06 22:07:22.631008903 -0700
+@@ -61,7 +61,7 @@
+ // fixed quantum, so the excess region will not be resident.
+ // See crrev.com/1531463004 for detailed explanation.
+ resident_size = stats.max_size_in_use;
+-#else
++#elif defined(__GLIBC__)
+ struct mallinfo info = mallinfo();
+ DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
+
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/content/child/content_child_helpers.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/content/child/content_child_helpers.cc
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/content/child/content_child_helpers.cc 2016-10-06 22:03:03.098035960 -0700
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/content/child/content_child_helpers.cc 2016-10-06 22:06:05.905348789 -0700
+@@ -18,7 +18,7 @@
+
+ namespace content {
+
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
+ size_t GetMemoryUsageKB() {
+ struct mallinfo minfo = mallinfo();
+ uint64_t mem_usage =
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-pthread-setname.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-pthread-setname.patch
new file mode 100644
index 0000000..a984f97
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-pthread-setname.patch
@@ -0,0 +1,25 @@
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c 2016-10-07 08:13:22.385902742 -0700
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c 2016-10-07 08:14:48.045335758 -0700
+@@ -37,6 +37,9 @@
+ #if defined(__Userspace_os_FreeBSD)
+ #include <pthread_np.h>
+ #endif
++#if defined(__Userspace_os_Linux) && !defined(__GLIBC__)
++#include <sys/prctl.h>
++#endif
+
+ #if defined(__Userspace_os_Windows)
+ /* Adapter to translate Unix thread start routines to Windows thread start
+@@ -72,7 +75,11 @@
+ pthread_setname_np(name);
+ #endif
+ #if defined(__Userspace_os_Linux)
++#if defined(__GLIBC__)
+ pthread_setname_np(pthread_self(), name);
++#else
++ prctl(PR_SET_NAME, name);
++#endif
+ #endif
+ #if defined(__Userspace_os_FreeBSD)
+ pthread_set_name_np(pthread_self(), name);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-resolver.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-resolver.patch
new file mode 100644
index 0000000..b6bdec5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-resolver.patch
@@ -0,0 +1,60 @@
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-10-06 21:21:24.505574899 -0700
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-10-06 21:26:35.597302630 -0700
+@@ -25,6 +25,10 @@
+ #include "net/dns/notify_watcher_mac.h"
+ #include "net/dns/serial_worker.h"
+
++#if defined(OS_LINUX) && !defined(__GLIBC__)
++#include "net/dns/resolv_compat.h"
++#endif
++
+ #if defined(OS_MACOSX) && !defined(OS_IOS)
+ #include "net/dns/dns_config_watcher_mac.h"
+ #endif
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/dns_reloader.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/dns_reloader.cc
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-10-06 21:21:24.506574908 -0700
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-10-06 21:27:43.025896377 -0700
+@@ -8,6 +8,9 @@
+ !defined(OS_ANDROID)
+
+ #include <resolv.h>
++#if defined(OS_LINUX) && !defined(__GLIBC__)
++#include "net/dns/resolv_compat.h"
++#endif
+
+ #include "base/lazy_instance.h"
+ #include "base/logging.h"
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/resolv_compat.h qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/resolv_compat.h
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/resolv_compat.h 1969-12-31 16:00:00.000000000 -0800
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/resolv_compat.h 2016-10-06 21:26:35.597302630 -0700
+@@ -0,0 +1,29 @@
++#if !defined(__GLIBC__)
++/***************************************************************************
++ * resolv_compat.h
++ *
++ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
++ * Note: res_init() is actually deprecated according to
++ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
++ **************************************************************************/
++#include <string.h>
++
++static inline int res_ninit(res_state statp)
++{
++ int rc = res_init();
++ if (statp != &_res) {
++ memcpy(statp, &_res, sizeof(*statp));
++ }
++ return rc;
++}
++
++static inline int res_nclose(res_state statp)
++{
++ if (!statp)
++ return -1;
++ if (statp != &_res) {
++ memset(statp, 0, sizeof(*statp));
++ }
++ return 0;
++}
++#endif
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-sandbox.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-sandbox.patch
new file mode 100644
index 0000000..e6c71d1
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-sandbox.patch
@@ -0,0 +1,66 @@
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2016-10-07 20:26:54.170418460 -0700
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2016-10-07 20:28:30.342515797 -0700
+@@ -116,21 +116,13 @@
+ const Arg<unsigned long> flags(0);
+
+ // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+- CLONE_SIGHAND | CLONE_THREAD |
+- CLONE_SYSVSEM;
+- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
++ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++ CLONE_THREAD | CLONE_SYSVSEM;
++ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++ CLONE_DETACHED;
++ const BoolExpr thread_clone_ok = (flags & ~safe) == required;
+
+- const uint64_t kGlibcPthreadFlags =
+- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
+- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
+- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
+-
+- const BoolExpr android_test =
+- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
+- flags == kGlibcPthreadFlags);
+-
+- return If(IsAndroid() ? android_test : glibc_test, Allow())
++ return If(thread_clone_ok, Allow())
+ .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
+ .Else(CrashSIGSYSClone());
+ }
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2016-10-07 20:26:54.169418448 -0700
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2016-10-07 20:29:16.430041661 -0700
+@@ -414,6 +414,7 @@
+ case __NR_epoll_create:
+ case __NR_epoll_wait:
+ #endif
++ case __NR_epoll_pwait:
+ case __NR_epoll_create1:
+ case __NR_epoll_ctl:
+ return true;
+@@ -421,7 +422,6 @@
+ #if defined(__x86_64__)
+ case __NR_epoll_ctl_old:
+ #endif
+- case __NR_epoll_pwait:
+ #if defined(__x86_64__)
+ case __NR_epoll_wait_old:
+ #endif
+@@ -494,6 +494,7 @@
+ case __NR_mlock:
+ case __NR_munlock:
+ case __NR_munmap:
++ case __NR_mremap:
+ return true;
+ case __NR_madvise:
+ case __NR_mincore:
+@@ -509,7 +510,6 @@
+ case __NR_modify_ldt:
+ #endif
+ case __NR_mprotect:
+- case __NR_mremap:
+ case __NR_msync:
+ case __NR_munlockall:
+ case __NR_readahead:
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
new file mode 100644
index 0000000..193e713
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
@@ -0,0 +1,33 @@
+From fa8cdb3a32c377b6290d0a92d2522186bcd48293 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+Date: Tue, 9 Aug 2016 16:21:29 +0200
+Subject: Do not depend on Linux 4.5
+
+Avoid using MADV_FREE that was only recently added to Linux. It will fail when
+run on older Linux kernels.
+
+Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0
+Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
+---
+ chromium/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
+index 12c9a7b..1639013 100644
+--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
+@@ -39,6 +39,11 @@
+
+ #include <sys/mman.h>
+
++#if OS(LINUX) && defined(MADV_FREE)
++// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
++#undef MADV_FREE
++#endif
++
+ #ifndef MADV_FREE
+ #define MADV_FREE MADV_DONTNEED
+ #endif
+--
+cgit v1.0-4-g1e03
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
new file mode 100644
index 0000000..c71cedc
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
@@ -0,0 +1,46 @@
+--- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-03-04 01:48:36.000000000 +1100
++++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-05-01 19:15:44.052770543 +1000
+@@ -33,6 +33,7 @@
+ 'embed_script%': "",
+ 'v8_extra_library_files%': [],
+ 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+ 'remove_v8base_debug_symbols%': 0,
+ },
+ 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
+@@ -1913,7 +1914,7 @@
+ ]
+ },
+ {
+- 'target_name': 'mksnapshot',
++ 'target_name': 'mksnapshot_u',
+ 'type': 'executable',
+ 'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'],
+ 'include_dirs+': [
+@@ -1936,5 +1937,26 @@
+ }],
+ ],
+ },
++ {
++ 'target_name': 'mksnapshot',
++ 'type': 'executable',
++ 'dependencies': ['mksnapshot_u'],
++ 'actions': [
++ {
++ 'action_name': 'paxmark_m_mksnapshot',
++ 'inputs': [
++ '<(mksnapshot_u_exec)',
++ ],
++ 'outputs': [
++ '<(mksnapshot_exec)',
++ ],
++ 'action': [
++ 'sh',
++ '-c',
++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)',
++ ],
++ },
++ ],
++ },
+ ],
+ }
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 881cc17..9c08bb1 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="geolocation">Enable physical position determination
via <pkg>dev-qt/qtpositioning</pkg></flag>
+ <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
instead of bundled.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
index b50b4b8..0aa8ce0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp:=
+ net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
@@ -68,6 +68,7 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
+ pax_kernel? ( sys-apps/elfix )
"
PATCHES=(
@@ -82,6 +83,13 @@ PATCHES=(
)
src_prepare() {
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+
+ if use system-icu; then
+ # ensuire build against system headers - bug #601264
+ rm -r src/3rdparty/chromium/third_party/icu/source || die
+ fi
+
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
@@ -101,3 +109,9 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
similarity index 70%
copy from dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
copy to dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
index b50b4b8..8fffc94 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -35,12 +35,12 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
+ >=media-libs/libvpx-1.4:=
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp:=
+ net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
@@ -68,20 +68,35 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
+ pax_kernel? ( sys-apps/elfix )
"
PATCHES=(
+ "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
+ "${FILESDIR}/${PN}-5.7.0-gcc6.patch"
+ "${FILESDIR}/${PN}-5.7.0-icu58.patch"
+ "${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch"
+
+ # musl patches
"${FILESDIR}/${PN}-5.6.0-musl-execinfo.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-mallinfo.patch"
+ "${FILESDIR}/${PN}-5.7.0-musl-mallinfo.patch"
"${FILESDIR}/${PN}-5.6.0-musl-off_t.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-resolver.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-sandbox.patch"
+ "${FILESDIR}/${PN}-5.7.0-musl-pthread-setname.patch"
+ "${FILESDIR}/${PN}-5.7.0-musl-resolver.patch"
+ "${FILESDIR}/${PN}-5.7.0-musl-sandbox.patch"
"${FILESDIR}/${PN}-5.6.0-musl-siginfo.patch"
"${FILESDIR}/${PN}-5.6.0-musl-stack.patch"
"${FILESDIR}/${PN}-5.6.0-musl-sysctl.patch"
)
src_prepare() {
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+
+ if use system-icu; then
+ # ensuire build against system headers - bug #601264
+ rm -r src/3rdparty/chromium/third_party/icu/source || die
+ fi
+
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
@@ -101,3 +116,9 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2016-12-14 21:19 Aric Belsito
0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2016-12-14 21:19 UTC (permalink / raw
To: gentoo-commits
commit: ca2bacfa4ce2b28b10decef259e5be5512dc7567
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Dec 14 21:19:20 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Dec 14 21:19:20 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ca2bacfa
dev-qt/qtwebengine: Version bump to 5.7.1
Sync with tree.
dev-qt/qtwebengine/Manifest | 8 +-
.../qtwebengine/files/qtwebengine-5.7.0-gcc6.patch | 106 ---------------------
.../files/qtwebengine-5.7.0-undef-madv_free.patch | 33 -------
dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild | 2 +-
...ngine-5.7.0.ebuild => qtwebengine-5.7.1.ebuild} | 7 +-
5 files changed, 7 insertions(+), 149 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 61054c1..4a3f03f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,18 +7,16 @@ AUX qtwebengine-5.6.0-musl-siginfo.patch 666 SHA256 42c3119595738e1e4757bee83d97
AUX qtwebengine-5.6.0-musl-stack.patch 1469 SHA256 b2a66152c5f2c72aed97bd0358ee888d410a17c6048cfebc3a6867294e94c291 SHA512 50fd27962fdd2193b45ec334462535008d565a681bd6171d9c8e986e246ec42025e54eecdd8b8cbdaa118d4f6b0d88b73ad6add7c4d59cffc55899264c5b1bfd WHIRLPOOL 604f319f5229f02271e3f12166f5c50d8c2c25d78aebb93917ab333ce15adeded4cbd061afc0af0c1ea9c8bdf3411400c37a15827a31d29420f1787cfe49b97d
AUX qtwebengine-5.6.0-musl-sysctl.patch 692 SHA256 a66b527eb717a5ad662c8c088540341a206c3c208c7f2fe5a20b71a17f7aacd4 SHA512 22b2380fdb1bec46c8f38d98d55c7fb72dca85859c6ae822f4b7aa441ea996dee12e11653c6f156575a1779437690d64b6101052ef12716e2dfbe046d0962b9a WHIRLPOOL d63e725ed25ffd8a219d97d1790ecf8bf44417c224ace98a5af743b84314914f50e8208fa5358fe31818fe865b01cb55e8841d879438a29bed30ff099b6e0e90
AUX qtwebengine-5.7.0-fix-system-ffmpeg.patch 953 SHA256 046d2d09cb50a5b580a445edaf4545481e3575c30c1ba3197182f1e0f71e6478 SHA512 7fe43758f0f20ce1d4952d36773fede8def13c60dc4ac01186ef0d1b79055f02151a89e94c61b6dbe5e0a0560e53e3a27c2f40aaba181704b752b3618b3f3b9f WHIRLPOOL 64a566562652e4c7754a634de5ea4f4d64fe54033223157645d5efb64a0784a0e45c00785c4fa30f95adfeb9c830189f5796465b94ee834b04b11c3f871ad1e7
-AUX qtwebengine-5.7.0-gcc6.patch 3967 SHA256 1f97985725bc1dd46602045c83c4ba67f593ac2a1fda1db8d8e8848baaf26608 SHA512 badeeb698ba2b5a9d02c4f0812d4d4557f1549e25b8eba321553c208e36054407f75450ca335884a7ee544e02847914b0d743b0a7687af1d5aa00fd29890ecfc WHIRLPOOL 385c917ad1c11e5b84f06320898b85f4078f95b8e254c3c67e9820756b232fca65675338307a3ee9d81d6acb1f52c4f4fafca5f09ce3cd914ace9b5173e160ca
AUX qtwebengine-5.7.0-icu58.patch 3126 SHA256 0e9eaae292efd47c76a05e0380ffe8cc2f353f1a55fc1bf180a5313a529ab8cb SHA512 573741564c85dfa8df1f8b89f075214067f4892d9cc4280d986709c4438823a82ab1eb752b39fdae4e0321a0ae30479fce2ecacb4d35f197bc3699ee24583d67 WHIRLPOOL 79b02ab132b3dd56f70b6d8cb828605abbd27d33862556d1c22196c2b34ce7a9b0ff31dcc5d48b28f75a74888d96327cb572fdaca92284dd89ec4e2c23bbf6e7
AUX qtwebengine-5.7.0-musl-mallinfo.patch 1522 SHA256 aa151b81bc4b744b9b8d9fae7fe1b1efcec60946c33d0608f297171b30d5bfea SHA512 ccf2a354a4d521385bf9edb73cc48ada146de2790b9c54d244a4498aeeb80965f230cfa698867630197f791021ff04407aaaffd3e06e40efebf54750a7e90afc WHIRLPOOL 53711f00cda7d09a9913ec07181a3378e27748a92175af1ed5e46a6b45566802f69412a07fb032198159c290b98ae084c088bd854d655ee985942baf1dc7c8a1
AUX qtwebengine-5.7.0-musl-pthread-setname.patch 1173 SHA256 a18740a277fd9379ee57da1af203248efb23c429173d6ffad486da699fcbfc8c SHA512 da3baa6981b8897cf7dd30dc8d8889d2e3d23dc85bf4c27f9ea43c978be74ea380dba1362a3e131d810bd120013c8c6652cba0c5a56537b4a5aa89f7bec2479c WHIRLPOOL 21fbb93fef680b4c8610fb2de843f51274dc198714e12102f706db6f98e3cfb9f760001bf06a1bafa0fe3441849dce1b39553fbc85d6767be4a4c2ff496242a0
AUX qtwebengine-5.7.0-musl-resolver.patch 2568 SHA256 07a3ee87d509e8dc963b8d60c5168a8dd615be7488c5aa23c1f993922ff38b96 SHA512 8913b0daf060f9f3ed7fb3e69f3108992d078394e9a3e1a02f0d7668bcbb8cb7f8df715b7b3463f2ac35765a2fafe2ae8407669ecdf84405b9a3cc90bf845891 WHIRLPOOL df4ed38e8dfe407c430ce58a2006192345b35952be209ef51fb6661070ba96f86a9b60c180ac7374beb4780546c230b2d7dbbb59cc054c2d34fb0d33f9d8b42a
AUX qtwebengine-5.7.0-musl-sandbox.patch 3185 SHA256 b4e616a6159a237e4ee0455e45e75c95702314f1ae42bfd3068a92ba1575ac01 SHA512 80a3c5eddf29cdf9beac3cd4e0c3d450ab32d85dbe794d2055d0abe0e1242db0fc69a44df7cf250d3ecf9a93a7e1d15d460a1d2409e65ceae1ac5c189f055918 WHIRLPOOL 6d4e1b055ce739e5b9f7d0235a7b628a52aebe03014e8f09e83968b2d1ddbb614ee00e4f8ffa792c6305822e759bd24265f1b63c5fae78834da6c1dcbb123305
-AUX qtwebengine-5.7.0-undef-madv_free.patch 1132 SHA256 2490dcbad1ec31a7eadf872ce0e63cbf9c12f8b9fa65f2f8b030274e283c0198 SHA512 1f581749438b07df03f8123957b31d2749a702c00dae06d5c4ab8bd9a4a3d9f14ee0457f5fa9221e7b1d0dc4eac8965990336140f09787df4e46757165b1e22e WHIRLPOOL 0c4404fd40e5fa3fdc55c11bac0f76843fb174b1048d24b0b934d0ecbe664ff7b04f03c09a1cb08df0a30622adcd515e837cbabee77c699eeecc87785f3ec354
AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256 540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 WHIRLPOOL d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb
DIST qtwebengine-opensource-src-5.6.1-1.tar.xz 143729228 SHA256 c80e90237bb7bd52a3fa843415c17a8e8e6d779b65efd1393472f24f8642e04c SHA512 4612221fafd16c2d5ce38965bb264d2577b20b1c342792f34729e8a26978e9e430dc1425291530dfad254be5b3b42ebdafdec084c5d25edb23fc61bb3f71ac6f WHIRLPOOL dc05495c1afe755e51961c314b3305b43add7eee149816a0be3ab22b9a2ae10b54ebf5ca2861eaf8768e619c44533b35bd94645e12f94eb39cb5b9c8b19c1667
DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e
-DIST qtwebengine-opensource-src-5.7.0.tar.xz 165709640 SHA256 985762fff5cd8a1a0d2a644a4a51238676898685f9ff1a78c3f2800025d6dc5d SHA512 8f010ea8d7047880c0bc941749a4172deae0f363ff25e00412291ad2bb243ac4c51031403eae0bba11b4f42c3e3d414858d29e3a3fb0459703dcaaff9b7133cd WHIRLPOOL 112f80f8cc279d743641095f47512a95d43286c1fe32c678a5ada810a7da12b1ef6e4483401e1a08c32d7e0d6e23369c65fbaeeee5f9a4bc34e330f59359e648
+DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104
EBUILD qtwebengine-5.6.1.ebuild 2399 SHA256 cf87e113dd9b731ab1a2c7ab6e2b94bf54a041d0d890725a7c48c0073447442c SHA512 f31ea3257a6153bfbd9a3ab9ed2ad7b4703ab7c76305be6b41451123b02537aaab07ca13967c586cbb76e1c9f989c03ec50c774443be8a6acd6d0ac37ea6fa32 WHIRLPOOL 14f86450d5c323d12592876bd9e7fc9c8cdfced1473415c41e17e15c89a3ed43818aa9db9ec49486bfbfb600c8ab03bf4a7333445a359b124ece4fcd6146f1a5
-EBUILD qtwebengine-5.6.2.ebuild 2779 SHA256 882e1a4a73498fd8512292950cb54b21d4dcb7b4b93db33be1152cd8c19e40d9 SHA512 0afbd02907494f78821208c361e9f47d1bdbc23e67d53a3ab6b1ee93aac2d50bcb0cea5e334c0f9f31e8cdb274995273666d795924f1a18dd889104588435642 WHIRLPOOL 38658acff380c65b30e2d5127a25eb73e012618196e6e95418bd5178544a1f6d29024a83f7d7339e57345d854960351d65d1776bf7981236075b0204aa491a8f
-EBUILD qtwebengine-5.7.0.ebuild 3022 SHA256 31c40dfe70ba0fe129b87e999270c825c50a2edd5ee5c86fadf3c4085e88f816 SHA512 4dcf2d5e2629b9a3d94e6e4a58736bd722e6c0be91795ec2950bd9e7cd15247671afc1c4656a17e857840907305a0da9ae762dfb8c3797ed2714301494f8ffc5 WHIRLPOOL 51015b24cb6a5a712f65f1a5f302464726109e53d1fbd5f040ee05bd73621b695d69350acaa62499958c038fc3f2109e90069fdd8f58e006f995f66a5fba7b4a
+EBUILD qtwebengine-5.6.2.ebuild 2777 SHA256 07361fec84110219e75705e7ff956c3af2b00d2c8497a5abe1bb3b120d39b713 SHA512 b05bc93a46830581ce6b4ad7a37186211ba60fd1a54419fadab1918ebd4e988cc0caf68f2bd48f4fc3d6967a9665663453e644ee3d7e8cfff7f4ccc6063ac482 WHIRLPOOL 0664cab57e74c79688899c91e8d682161199ae74c266b17f3ecc94df56e6954ae45808c773259c9e1d9feaa4858627c3c8a0827fbcea8627ffab0538d1c66c68
+EBUILD qtwebengine-5.7.1.ebuild 2960 SHA256 8ac92f83542209773a821f696bfaf2f60406d5c300d7f2b58124902e02472bac SHA512 dc42e272f3db72c1e2b8db228cf00c5d83c3ff4f2d5e9e4296f1ad5551a499bdc1ec672815ff1f03ac02e575babe7d1d45f8db8d82f13eafff96efb87e5b2d50 WHIRLPOOL 923a4a68cc95b6c11ea3bf3dd74d47cc6a08980a999acd98d08320028b743f63145d80edd6f2906c878b5a65c521a42ab4b7caf40d006a522ce76812989f9cb2
MISC metadata.xml 947 SHA256 15083351c49bbcf033829248688471002ca7990644535e1228c5f29396839026 SHA512 a53fa56d2922b8abb2b10193ebc3cb61923697d9c1ddbb583f0d06886dc357604c192cbbbc2849a976be189a41473069b1931434d057b9c9d5b91c7333680224 WHIRLPOOL 7db472885a977071531059312cb171ceffe119900e68bf20a6de6aca9d90336b21067a47e71e80e2d79fc54193b0aa276d74e96b98d3001e58be3c7d0840f8a8
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch
deleted file mode 100644
index 2cc53e6..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-gcc6.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From cffcf22082879939bbcfa89e88057beda829a0a7 Mon Sep 17 00:00:00 2001
-From: David Faure <david.faure@kdab.com>
-Date: Sat, 3 Sep 2016 18:01:40 +0200
-Subject: gcc6: set -fno-delete-null-pointer-checks for all files
-
-Not just v8, as v8_no_delete_null_pointer_checks does.
-This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer
-which also compares this with null.
-
-I'll remove v8_no_delete_null_pointer_checks in a later commit
-to avoid a temporary breakage until qtwebengine is updated.
-
-Change-Id: I8782fadc8fab125b5394bd60857e70c6ae75f9b0
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-(cherry picked from commit c42f53ec3ca90bfd98577988462ed51464feebe3)
----
- chromium/build/common.gypi | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi
-index b6a0284..d768ab3 100644
---- a/src/3rdparty/chromium/build/common.gypi
-+++ b/src/3rdparty/chromium/build/common.gypi
-@@ -4702,6 +4706,9 @@
- '-Wl,--disable-new-dtags',
- ],
- }],
-+ [ 'no_delete_null_pointer_checks==1', {
-+ 'cflags_cc': [ '-fno-delete-null-pointer-checks' ],
-+ }],
- ['clang==0', {
- 'target_conditions': [
- ['_toolset=="target"', {
---
-cgit v1.0-4-g1e03
-
-From ae73e50e7d8c1371ed293c10150646a2719f4598 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-Date: Wed, 14 Sep 2016 17:40:50 +0200
-Subject: FIXUP: gcc6: set -fno-delete-null-pointer-checks for all files
-
-Set a default and pull in the value from configuration, and
-remove the old v8 only version.
-
-Change-Id: Ica9f971baa28c717178eb2acd074607424792e1d
-Reviewed-by: David Faure <david.faure@kdab.com>
----
- chromium/build/common.gypi | 4 ++++
- chromium/v8/build/toolchain.gypi | 7 -------
- 2 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi
-index d768ab3..8a1df22 100644
---- a/src/3rdparty/chromium/build/common.gypi
-+++ b/src/3rdparty/chromium/build/common.gypi
-@@ -727,6 +727,9 @@
- # By default include non-appstore-compliant code.
- 'appstore_compliant_code%': 0,
-
-+ # Enable this to turn off the delete-null-pointer-checks optimization in GCC 6+
-+ 'no_delete_null_pointer_checks%': 0,
-+
- 'conditions': [
- # A flag for POSIX platforms
- ['OS=="win"', {
-@@ -1271,6 +1274,7 @@
- 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)',
- 'proprietary_codecs%': '<(proprietary_codecs)',
- 'appstore_compliant_code%': '<(appstore_compliant_code)',
-+ 'no_delete_null_pointer_checks%': '<(no_delete_null_pointer_checks)',
- 'use_goma%': '<(use_goma)',
- 'gomadir%': '<(gomadir)',
- 'use_lto%': '<(use_lto)',
---
-cgit v1.0-4-g1e03
-
-From d6c8a2cf8fa374e6d1c0a578391b57112c047fa4 Mon Sep 17 00:00:00 2001
-From: David Faure <david.faure@kdab.com>
-Date: Mon, 5 Sep 2016 15:25:02 +0200
-Subject: Enable -fno_delete_null_pointer_checks for g++ 6 on all of chromium
-
-This is necessary e.g. for PaintLayer::enclosingSelfPaintingLayer
-which also compares this with null.
-
-Change-Id: I85d69432a0d7eeb0d8df8f395821880e36180dcc
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- src/core/config/linux.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 9264932..a318e17 100644
---- a/src/core/config/linux.pri
-+++ b/src/core/config/linux.pri
-@@ -29,6 +29,8 @@ use?(nss) {
- use_openssl_certs=1
- }
-
-+gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += no_delete_null_pointer_checks=1
-+
- contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1
- contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
- contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
---
-cgit v1.0-4-g1e03
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
deleted file mode 100644
index 193e713..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fa8cdb3a32c377b6290d0a92d2522186bcd48293 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-Date: Tue, 9 Aug 2016 16:21:29 +0200
-Subject: Do not depend on Linux 4.5
-
-Avoid using MADV_FREE that was only recently added to Linux. It will fail when
-run on older Linux kernels.
-
-Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0
-Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
----
- chromium/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-index 12c9a7b..1639013 100644
---- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-@@ -39,6 +39,11 @@
-
- #include <sys/mman.h>
-
-+#if OS(LINUX) && defined(MADV_FREE)
-+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif
---
-cgit v1.0-4-g1e03
-
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
index 0aa8ce0..37d4b0e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
@@ -9,7 +9,7 @@ inherit pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild
similarity index 94%
rename from dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild
index 8fffc94..875f5b3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild
@@ -29,13 +29,14 @@ RDEPEND="
dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
+ dev-libs/protobuf:=
media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4:=
+ >=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
@@ -73,9 +74,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
- "${FILESDIR}/${PN}-5.7.0-gcc6.patch"
"${FILESDIR}/${PN}-5.7.0-icu58.patch"
- "${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch"
# musl patches
"${FILESDIR}/${PN}-5.6.0-musl-execinfo.patch"
@@ -93,7 +92,7 @@ src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
if use system-icu; then
- # ensuire build against system headers - bug #601264
+ # ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
fi
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2017-02-06 15:23 Aric Belsito
0 siblings, 0 replies; 10+ messages in thread
From: Aric Belsito @ 2017-02-06 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 335e511b88543c3a11c441244eafe7197d7b7bca
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Feb 6 15:23:03 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Feb 6 15:23:03 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=335e511b
dev-qt/qtwebengine: Version bump to 5.7.1-r1
dev-qt/qtwebengine/Manifest | 3 ++-
.../qtwebengine-5.7.1-fix-audio-detection.patch | 23 ++++++++++++++++++++++
...ne-5.7.1.ebuild => qtwebengine-5.7.1-r1.ebuild} | 10 +++++++---
3 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4a3f03f..c441af2 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -12,11 +12,12 @@ AUX qtwebengine-5.7.0-musl-mallinfo.patch 1522 SHA256 aa151b81bc4b744b9b8d9fae7f
AUX qtwebengine-5.7.0-musl-pthread-setname.patch 1173 SHA256 a18740a277fd9379ee57da1af203248efb23c429173d6ffad486da699fcbfc8c SHA512 da3baa6981b8897cf7dd30dc8d8889d2e3d23dc85bf4c27f9ea43c978be74ea380dba1362a3e131d810bd120013c8c6652cba0c5a56537b4a5aa89f7bec2479c WHIRLPOOL 21fbb93fef680b4c8610fb2de843f51274dc198714e12102f706db6f98e3cfb9f760001bf06a1bafa0fe3441849dce1b39553fbc85d6767be4a4c2ff496242a0
AUX qtwebengine-5.7.0-musl-resolver.patch 2568 SHA256 07a3ee87d509e8dc963b8d60c5168a8dd615be7488c5aa23c1f993922ff38b96 SHA512 8913b0daf060f9f3ed7fb3e69f3108992d078394e9a3e1a02f0d7668bcbb8cb7f8df715b7b3463f2ac35765a2fafe2ae8407669ecdf84405b9a3cc90bf845891 WHIRLPOOL df4ed38e8dfe407c430ce58a2006192345b35952be209ef51fb6661070ba96f86a9b60c180ac7374beb4780546c230b2d7dbbb59cc054c2d34fb0d33f9d8b42a
AUX qtwebengine-5.7.0-musl-sandbox.patch 3185 SHA256 b4e616a6159a237e4ee0455e45e75c95702314f1ae42bfd3068a92ba1575ac01 SHA512 80a3c5eddf29cdf9beac3cd4e0c3d450ab32d85dbe794d2055d0abe0e1242db0fc69a44df7cf250d3ecf9a93a7e1d15d460a1d2409e65ceae1ac5c189f055918 WHIRLPOOL 6d4e1b055ce739e5b9f7d0235a7b628a52aebe03014e8f09e83968b2d1ddbb614ee00e4f8ffa792c6305822e759bd24265f1b63c5fae78834da6c1dcbb123305
+AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 SHA256 3cc298a3fdeecf4a339bad39ac9bc63201c02b87fceb32e4c06e3004a6197103 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c WHIRLPOOL 41dd2c3b574939d2a3b25f1758502cb473dd29f3046360c4ff38098246c959f95d6628ab832b318874d7cbe3a088ca119e2c03cd1dd04009fab75ec3bb1f51c0
AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256 540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 WHIRLPOOL d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb
DIST qtwebengine-opensource-src-5.6.1-1.tar.xz 143729228 SHA256 c80e90237bb7bd52a3fa843415c17a8e8e6d779b65efd1393472f24f8642e04c SHA512 4612221fafd16c2d5ce38965bb264d2577b20b1c342792f34729e8a26978e9e430dc1425291530dfad254be5b3b42ebdafdec084c5d25edb23fc61bb3f71ac6f WHIRLPOOL dc05495c1afe755e51961c314b3305b43add7eee149816a0be3ab22b9a2ae10b54ebf5ca2861eaf8768e619c44533b35bd94645e12f94eb39cb5b9c8b19c1667
DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e
DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104
EBUILD qtwebengine-5.6.1.ebuild 2399 SHA256 cf87e113dd9b731ab1a2c7ab6e2b94bf54a041d0d890725a7c48c0073447442c SHA512 f31ea3257a6153bfbd9a3ab9ed2ad7b4703ab7c76305be6b41451123b02537aaab07ca13967c586cbb76e1c9f989c03ec50c774443be8a6acd6d0ac37ea6fa32 WHIRLPOOL 14f86450d5c323d12592876bd9e7fc9c8cdfced1473415c41e17e15c89a3ed43818aa9db9ec49486bfbfb600c8ab03bf4a7333445a359b124ece4fcd6146f1a5
EBUILD qtwebengine-5.6.2.ebuild 2777 SHA256 07361fec84110219e75705e7ff956c3af2b00d2c8497a5abe1bb3b120d39b713 SHA512 b05bc93a46830581ce6b4ad7a37186211ba60fd1a54419fadab1918ebd4e988cc0caf68f2bd48f4fc3d6967a9665663453e644ee3d7e8cfff7f4ccc6063ac482 WHIRLPOOL 0664cab57e74c79688899c91e8d682161199ae74c266b17f3ecc94df56e6954ae45808c773259c9e1d9feaa4858627c3c8a0827fbcea8627ffab0538d1c66c68
-EBUILD qtwebengine-5.7.1.ebuild 2960 SHA256 8ac92f83542209773a821f696bfaf2f60406d5c300d7f2b58124902e02472bac SHA512 dc42e272f3db72c1e2b8db228cf00c5d83c3ff4f2d5e9e4296f1ad5551a499bdc1ec672815ff1f03ac02e575babe7d1d45f8db8d82f13eafff96efb87e5b2d50 WHIRLPOOL 923a4a68cc95b6c11ea3bf3dd74d47cc6a08980a999acd98d08320028b743f63145d80edd6f2906c878b5a65c521a42ab4b7caf40d006a522ce76812989f9cb2
+EBUILD qtwebengine-5.7.1-r1.ebuild 3187 SHA256 6c44469f721ae0bfe2aebff143b647cbf3cbab19d26136e41f8373a4bfa51858 SHA512 b4685c605b30d5b6848edd800bea0dc7da2f23e5c6d479a936beb58142c30a7098e365996e73564be96dff40d0e6369a597562e4a782f4c4320831542ad86475 WHIRLPOOL 4aebc905fd19e37c9b58dffe384221e571387e723e1646e5d30a28fc80405fc2eecb3ebd28b40be4f8f8b3cd8c017d09d124aab803b996e62db607647ecb9bf8
MISC metadata.xml 947 SHA256 15083351c49bbcf033829248688471002ca7990644535e1228c5f29396839026 SHA512 a53fa56d2922b8abb2b10193ebc3cb61923697d9c1ddbb583f0d06886dc357604c192cbbbc2849a976be189a41473069b1931434d057b9c9d5b91c7333680224 WHIRLPOOL 7db472885a977071531059312cb171ceffe119900e68bf20a6de6aca9d90336b21067a47e71e80e2d79fc54193b0aa276d74e96b98d3001e58be3c7d0840f8a8
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch
new file mode 100644
index 0000000..597554e
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch
@@ -0,0 +1,23 @@
+# dev-qt/qtwebengine: Fix detecting audio backends.
+
+# The upstream change doesn't really work for us, so we'll make
+# it work with us.
+# Gentoo-Bug: https://bugs.gentoo.org/603498
+
+--- /src/core/config/linux.pri 2016-12-23 00:05:41.057955774 +0200
++++ /src/core/config/linux.pri 2016-12-23 00:09:39.000573909 +0200
+@@ -35,12 +35,12 @@
+ contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
+ contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
+ contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
+-contains(QT_CONFIG, pulseaudio) {
++use?(pulseaudio) {
+ GYP_CONFIG += use_pulseaudio=1
+ } else {
+ GYP_CONFIG += use_pulseaudio=0
+ }
+-contains(QT_CONFIG, alsa) {
++use?(alsa) {
+ GYP_CONFIG += use_alsa=1
+ } else {
+ GYP_CONFIG += use_alsa=0
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
similarity index 88%
rename from dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
index 875f5b3..60a818c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -30,7 +30,6 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
- media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
media-libs/freetype
@@ -58,7 +57,9 @@ RDEPEND="
x11-libs/libXrender
x11-libs/libXScrnSaver
x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
@@ -73,6 +74,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
+ "${FILESDIR}/${PN}-5.7.1-fix-audio-detection.patch"
"${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
"${FILESDIR}/${PN}-5.7.0-icu58.patch"
@@ -109,7 +111,9 @@ src_configure() {
export NINJA_PATH=/usr/bin/ninja
local myqmakeargs=(
+ $(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '')
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex pulseaudio 'WEBENGINE_CONFIG+=use_pulseaudio' '')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
)
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2017-11-02 0:56 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2017-11-02 0:56 UTC (permalink / raw
To: gentoo-commits
commit: 25bedf5e48648d9e002d0d64d168a08876c101ee
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 2 00:54:31 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov 2 00:54:31 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=25bedf5e
dev-qt/qtwebengine: sync up with the tree
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-qt/qtwebengine/Manifest | 5 -
.../files/qtwebengine-5.6.0-musl-mallinfo.patch | 32 ------
.../files/qtwebengine-5.6.0-musl-resolver.patch | 60 -----------
.../files/qtwebengine-5.6.0-musl-sandbox.patch | 12 ---
dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild | 116 ---------------------
5 files changed, 225 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 733cd01..91c8baa 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,8 +1,5 @@
AUX qtwebengine-5.6.0-musl-execinfo.patch 3083 SHA256 a91a0e002ac79559b1ded87044f530408d0ab662c61ccea8aa971a25504fa260 SHA512 3a0c5db26b748b5a2218dbc0a153a4da1806e5752b50d3114e7cb1897101ceb3cc785ff453e906056b7e1ff7498b5735d8db9bebbbf43fa8a489f5fb19042377 WHIRLPOOL a7ddfd98c2e36c21a10408a51ef6a4d5797636e4ba74ed2477a763319c3b9d01ae3b4731dedba3cb72d80c6b0a1956703a472a579c4a1286b285ac15a8db7521
-AUX qtwebengine-5.6.0-musl-mallinfo.patch 1343 SHA256 b3168887df02c15f91d4d827f98adc77b4d8ebaf1eeee6c75308f65a2b465f62 SHA512 631a554e0c2aee47768cea0627b0f918f293df231a70dcf26caa93c87a46d61960dab4dffe42351a3e010810ab0f273fe02710bc4f2c71e9f595c9e5ea109c05 WHIRLPOOL b51c35d6526066a85aca5111d1f77acecb0a3e5ba3f8a743bb5c1639346d428ed48e91e1968bd53636b1be087daa56032571ba640211b2e5997caaa609ff0587
AUX qtwebengine-5.6.0-musl-off_t.patch 627 SHA256 328d193b7994bd4d80d1cad08e24fa5c44405e374a23570c5f217a078e6b59d1 SHA512 82dd29bdf97a8ed18773cc503b0426e4ca57129adb04a34ce3eb069862df7b838e75941600cc5c4f69456d1f04a8ccca81533a05762e9cd16c84d0c941ee89a6 WHIRLPOOL 9475f2276ab2ad4d4d09924254ef27b490993af1f63cdc01e3cdce48f76876d0a37fe8cce7694c2e0aff8f07cf9fa9ea886fa3f79a926ddffb4040ffecb1d431
-AUX qtwebengine-5.6.0-musl-resolver.patch 2575 SHA256 7a1f86eebf8f0c949a051a3569ff27e344bbafe515b6fc4965bdbf63e978b263 SHA512 752af1be984255c9124ca71f180939c77a10fc461a1d2c78d185e4b94e72daffd7046f02fd78086ef1b33db17c9bc978b5fb1db6753a6853450b7b3d77c63562 WHIRLPOOL c85ef6e5e45566114a7caa1ef05d4fb21d173a3b5939db1234b3bbf36ab89beb4f753830a5d414916574500742157b3094ecf5b2e92bb1e8a103df11ae144a64
-AUX qtwebengine-5.6.0-musl-sandbox.patch 843 SHA256 632177e9e36713ef528165229b363f5ed9495c6c64effd42c799a9d4d1811040 SHA512 c8ee9ae67394d971f82f33cc6cbeba85598ad079caf014d7bba268283084fb0022bb0a4f2d254a6ba13478ad2cc4181d540ed696017ad19402de7bfdd3baafe8 WHIRLPOOL ec9b327f55c9c17e6f969515ddcdbe1d3e817303d775dcfc21b5687b355806237c311f46ac65173d99f7d65cc3f9c7f2f2cb84c654f157bcac100725e50947d4
AUX qtwebengine-5.6.0-musl-siginfo.patch 666 SHA256 42c3119595738e1e4757bee83d9774982d6265f14cb216dcd5100319339ba8c6 SHA512 2fead16e7d7379b622da0e3172905444d9d72d1a53ff080327a3d59f60541c5c076d9b58f110b039da8c9ebc3b5efec53af118e1172efd01886ff9ac2b730d5f WHIRLPOOL 52bb6af4faec65b6d50a810266a814ddcc996eca0a69668fca320d9e1c998ce11f7479de301f3f3957baba0e8d8e799d4b8c60810c37db2419f8e911066075bd
AUX qtwebengine-5.6.0-musl-stack.patch 1469 SHA256 b2a66152c5f2c72aed97bd0358ee888d410a17c6048cfebc3a6867294e94c291 SHA512 50fd27962fdd2193b45ec334462535008d565a681bd6171d9c8e986e246ec42025e54eecdd8b8cbdaa118d4f6b0d88b73ad6add7c4d59cffc55899264c5b1bfd WHIRLPOOL 604f319f5229f02271e3f12166f5c50d8c2c25d78aebb93917ab333ce15adeded4cbd061afc0af0c1ea9c8bdf3411400c37a15827a31d29420f1787cfe49b97d
AUX qtwebengine-5.6.0-musl-sysctl.patch 692 SHA256 a66b527eb717a5ad662c8c088540341a206c3c208c7f2fe5a20b71a17f7aacd4 SHA512 22b2380fdb1bec46c8f38d98d55c7fb72dca85859c6ae822f4b7aa441ea996dee12e11653c6f156575a1779437690d64b6101052ef12716e2dfbe046d0962b9a WHIRLPOOL d63e725ed25ffd8a219d97d1790ecf8bf44417c224ace98a5af743b84314914f50e8208fa5358fe31818fe865b01cb55e8841d879438a29bed30ff099b6e0e90
@@ -15,8 +12,6 @@ AUX qtwebengine-5.7.0-musl-sandbox.patch 3185 SHA256 b4e616a6159a237e4ee0455e45e
AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 SHA256 3cc298a3fdeecf4a339bad39ac9bc63201c02b87fceb32e4c06e3004a6197103 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c WHIRLPOOL 41dd2c3b574939d2a3b25f1758502cb473dd29f3046360c4ff38098246c959f95d6628ab832b318874d7cbe3a088ca119e2c03cd1dd04009fab75ec3bb1f51c0
AUX qtwebengine-5.7.1-gcc-7.patch 5612 SHA256 2afa904ea3c349e4721073a4d8325a4be69ddbf39ae18a7d4456abe09920f36f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a WHIRLPOOL 015dadbcfad837710a674ebf0fd6014878f27206262c4c61fe9c054a830555e771d5e7414bc5486b1de6409bec23a4f8f4ad6b29dd4c9e8a3acfd4d6e1d3500e
AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256 540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 WHIRLPOOL d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb
-DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e
DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104
-EBUILD qtwebengine-5.6.2-r1.ebuild 2771 SHA256 cb31b7f0d2c16ecbc5071966b8816e778b0cbc0a05bc5a51e1cae94f34ea9898 SHA512 79bb304b684773e396f8466abcbe8f25b6a88ebb21ea6228e6c2bfb36ee742e2ade592951904277aac64aace45194b82096593405d5876cf98853f49fed03240 WHIRLPOOL 4090f2720258577264fe5d8122c40f522cd52cd4a0124d1bca64d3ba47d614d8a94eb1ae52e2f6d2b39e8be00a7302d8cc3478a154f2fcc8c51c50f510f2dd50
EBUILD qtwebengine-5.7.1-r2.ebuild 3489 SHA256 476ee0af565e67830c0648e44fb94c46dfb6031e4d408b183968237097947c7f SHA512 ef2ba3bd658ab30dc37316fe674f08640f4f6131bec3aba3dfd6f89cb3b2d0257b9a2dc7f94630934dc937ef66d453baa9bdb5ba857cbb070abf663f90a6ec2f WHIRLPOOL d5858458636ea08f6d696a25ecc317279597213e45b8ea32c4b97259dcee2397e42742e04433e9fafc92f66f52d99e057d14aed7dbf2f56ffb58b6d6a1b7cf55
MISC metadata.xml 948 SHA256 4890ca8aaf167f11623fa965dfc11f031ea777a16ce92282caa9e83a2c2f1fa4 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85 WHIRLPOOL 73f94a6f3ffc150b65a7fd3f68aaf82a536e25eeb3fde1be7f28fe601fea6674fe9b394bcd2136897fcb9cdca265280d4d085b86387714c7bd9daabde3f21e19
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-mallinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-mallinfo.patch
deleted file mode 100644
index 170064b..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-mallinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-In musl libc there is no struct mallinfo and no function mallinf()
-
---- qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2015-06-05 04:52:18.502230985 +0200
-+++ qtwebengine/src/3rdparty/chromium/content/child/content_child_helpers.cc 2015-06-05 04:52:06.712231020 +0200
-@@ -15,7 +15,7 @@
-
- namespace content {
-
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
- size_t GetMemoryUsageKB() {
- struct mallinfo minfo = mallinfo();
- uint64_t mem_usage =
---- qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-03-03 15:48:36.000000000 +0100
-+++ qtwebengine/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-03-17 05:09:41.409425897 +0100
-@@ -29,6 +29,7 @@
- // Called at trace dump point time. Creates a snapshot the memory counters for
- // the current process.
- bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
-+#if defined(__GLIBC__)
- struct mallinfo info = mallinfo();
- DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
-
-@@ -46,7 +47,7 @@
- MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects);
- inner_dump->AddScalar(MemoryAllocatorDump::kNameSize,
- MemoryAllocatorDump::kUnitsBytes, info.uordblks);
--
-+#endif
- return true;
- }
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-resolver.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-resolver.patch
deleted file mode 100644
index 8e171bb..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-resolver.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/base/dns_reloader.cc qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/base/dns_reloader.cc
---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/base/dns_reloader.cc 2016-07-28 17:16:00.113559841 -0700
-+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/base/dns_reloader.cc 2016-07-28 17:41:45.640212588 -0700
-@@ -8,6 +8,9 @@
- !defined(OS_ANDROID)
-
- #include <resolv.h>
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#include "net/dns/resolv_compat.h"
-+#endif
-
- #include "base/basictypes.h"
- #include "base/lazy_instance.h"
-diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-07-28 17:16:00.187560625 -0700
-+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-07-28 17:41:45.640212588 -0700
-@@ -25,6 +25,10 @@
- #include "net/dns/notify_watcher_mac.h"
- #include "net/dns/serial_worker.h"
-
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#include "net/dns/resolv_compat.h"
-+#endif
-+
- #if defined(OS_MACOSX) && !defined(OS_IOS)
- #include "net/dns/dns_config_watcher_mac.h"
- #endif
-diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/resolv_compat.h qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/resolv_compat.h
---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/net/dns/resolv_compat.h 1969-12-31 16:00:00.000000000 -0800
-+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/net/dns/resolv_compat.h 2016-07-28 17:43:07.714089231 -0700
-@@ -0,0 +1,29 @@
-+#if !defined(__GLIBC__)
-+/***************************************************************************
-+ * resolv_compat.h
-+ *
-+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
-+ * Note: res_init() is actually deprecated according to
-+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
-+ **************************************************************************/
-+#include <string.h>
-+
-+static inline int res_ninit(res_state statp)
-+{
-+ int rc = res_init();
-+ if (statp != &_res) {
-+ memcpy(statp, &_res, sizeof(*statp));
-+ }
-+ return rc;
-+}
-+
-+static inline int res_nclose(res_state statp)
-+{
-+ if (!statp)
-+ return -1;
-+ if (statp != &_res) {
-+ memset(statp, 0, sizeof(*statp));
-+ }
-+ return 0;
-+}
-+#endif
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sandbox.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sandbox.patch
deleted file mode 100644
index 1de8a2d..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sandbox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h 2016-07-28 17:15:59.433552637 -0700
-+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h 2016-07-28 17:17:39.275610371 -0700
-@@ -5,7 +5,7 @@
- #ifndef SANDBOX_LINUX_BPF_DSL_SECCOMP_MACROS_H_
- #define SANDBOX_LINUX_BPF_DSL_SECCOMP_MACROS_H_
-
--#include <sys/cdefs.h>
-+#include <sys/types.h>
- // Old Bionic versions do not have sys/user.h. The if can be removed once we no
- // longer need to support these old Bionic versions.
- // All x86_64 builds use a new enough bionic to have sys/user.h.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild
deleted file mode 100644
index 3a1a505..0000000
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 x86"
-fi
-
-IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
-
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtwebchannel-${PV}[qml]
- dev-libs/expat
- dev-libs/jsoncpp:=
- dev-libs/libevent:=
- dev-libs/libxml2
- dev-libs/libxslt
- media-libs/alsa-lib
- media-libs/flac
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
- media-libs/libwebp:=
- media-libs/mesa
- media-libs/opus
- media-libs/speex
- net-libs/libsrtp:0=
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/libcap
- sys-libs/zlib[minizip]
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( dev-libs/icu:= )
- widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.6.0-musl-execinfo.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-mallinfo.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-off_t.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-resolver.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-sandbox.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-siginfo.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-stack.patch"
- "${FILESDIR}/${PN}-5.6.0-musl-sysctl.patch"
-)
-
-src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
-
- if use system-icu; then
- # ensure build against system headers - bug #601264
- rm -r src/3rdparty/chromium/third_party/icu/source || die
- fi
-
- qt_use_disable_mod geolocation positioning \
- src/core/core_common.pri \
- src/core/core_gyp_generator.pro
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
-
- local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2022-07-22 20:20 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2022-07-22 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 4ccb7169843c3122811f929e205e3f7ca2b2f61e
Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Thu Jul 21 18:42:14 2022 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 20:19:12 2022 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4ccb7169
dev-qt/qtwebengine: Depend on libbsd for cdefs
sys/cdefs.h is not available in musl. Use the one in libbsd.
See: https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I-get-error-messages-about-%3Ccode%3Esys/cdefs.h%3C/code%3E
Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../qtwebengine-5.15.5_p20220618-bsd-cdefs.h.patch | 707 +++++++++++++++++++++
.../qtwebengine-5.15.5_p20220618.ebuild | 2 +
2 files changed, 709 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-bsd-cdefs.h.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-bsd-cdefs.h.patch
new file mode 100644
index 00000000..512bcfe2
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-bsd-cdefs.h.patch
@@ -0,0 +1,707 @@
+From 86947e9ceb65bc260c8ae3af137c57a6d2874124 Mon Sep 17 00:00:00 2001
+From: Your Name <you@example.com>
+Date: Thu, 21 Jul 2022 20:11:45 +0200
+Subject: [PATCH] ugly hack bsd cdefs.h
+
+---
+ src/3rdparty/chromium/base/allocator/allocator_shim_internals.h | 2 +-
+ src/3rdparty/chromium/base/mac/close_nocancel.cc | 2 +-
+ src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h | 2 +-
+ .../breakpad/breakpad/src/common/android/include/stab.h | 2 +-
+ .../breakpad/breakpad/src/common/android/include/sys/procfs.h | 2 +-
+ .../third_party/crashpad/crashpad/compat/android/sys/mman.h | 2 +-
+ .../third_party/crashpad/crashpad/compat/linux/sys/ptrace.h | 2 +-
+ .../chromium/third_party/libsync/src/include/sync/sync.h | 2 +-
+ .../third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp | 2 +-
+ .../tcmalloc/chromium/src/libc_override_gcc_and_weak.h | 2 +-
+ .../tcmalloc/vendor/src/libc_override_gcc_and_weak.h | 2 +-
+ .../third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h | 2 +-
+ .../third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c | 2 +-
+ .../usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h | 2 +-
+ 50 files changed, 50 insertions(+), 50 deletions(-)
+
+diff --git a/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h b/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h
+index da1e5a6f9..225627428 100644
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h
+@@ -9,7 +9,7 @@
+
+ #if defined(__GNUC__)
+
+-#include <sys/cdefs.h> // for __THROW
++#include <bsd/sys/cdefs.h> // for __THROW
+
+ #ifndef __THROW // Not a glibc system
+ #ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead
+diff --git a/src/3rdparty/chromium/base/mac/close_nocancel.cc b/src/3rdparty/chromium/base/mac/close_nocancel.cc
+index 8971e731c..c25fe6d00 100644
+--- a/src/3rdparty/chromium/base/mac/close_nocancel.cc
++++ b/src/3rdparty/chromium/base/mac/close_nocancel.cc
+@@ -34,7 +34,7 @@
+ // is resolved from libsyscall. By linking with this version of close prior to
+ // the libsyscall version, close's implementation is overridden.
+
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ #include <unistd.h>
+
+ // If the non-cancelable variants of all system calls have already been
+diff --git a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
+index db2ad9027..66d677a59 100644
+--- a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
++++ b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
+@@ -28,7 +28,7 @@
+ * These routines provide access to the systems DNS configuration
+ */
+
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h
+index cd9290215..4f40814a3 100644
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h
+@@ -30,7 +30,7 @@
+ #ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H
+ #define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H
+
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+
+ #ifdef __BIONIC_HAVE_STAB_H
+ #include <stab.h>
+diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h
+index 185124364..5b325800a 100644
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h
+@@ -37,7 +37,7 @@
+ #else
+
+ #include <asm/ptrace.h>
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ #if defined (__mips__)
+ #include <sys/types.h>
+ #endif
+diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h
+index 5e7cd69f1..ccb1d5edb 100644
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h
+@@ -18,7 +18,7 @@
+ #include_next <sys/mman.h>
+
+ #include <android/api-level.h>
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+
+ // There’s no mmap() wrapper compatible with a 64-bit off_t for 32-bit code
+ // until API 21 (Android 5.0/“Lollipop”). A custom mmap() wrapper is provided
+diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+index f8be372cc..1f71f816c 100644
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,7 @@
+
+ #include_next <sys/ptrace.h>
+
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+diff --git a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+index 50ed0ac57..118e78fd8 100644
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,7 +19,7 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ #include <stdint.h>
+
+ #include <linux/types.h>
+diff --git a/src/3rdparty/chromium/third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp b/src/3rdparty/chromium/third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp
+index 77d0c93a6..497e0ef4f 100644
+--- a/src/3rdparty/chromium/third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp
++++ b/src/3rdparty/chromium/third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp
+@@ -1 +1 @@
+-/**************** BEGIN GUSI CONFIGURATION ****************************\r *\r * GUSI Configuration section generated by GUSI Configurator\r * last modified: Wed Oct 31 17:07:45 2001\r *\r * This section will be overwritten by the next run of Configurator.\r */\r\r#define GUSI_SOURCE\r#include <GUSIConfig.h>\r#include <sys/cdefs.h>\r\r/* Declarations of Socket Factories */\r\r__BEGIN_DECLS\rvoid GUSIwithInetSockets();\rvoid GUSIwithLocalSockets();\rvoid GUSIwithMTInetSockets();\rvoid GUSIwithMTTcpSockets();\rvoid GUSIwithMTUdpSockets();\rvoid GUSIwithOTInetSockets();\rvoid GUSIwithOTTcpSockets();\rvoid GUSIwithOTUdpSockets();\rvoid GUSIwithPPCSockets();\rvoid GUSISetupFactories();\r__END_DECLS\r\r/* Configure Socket Factories */\r\rvoid GUSISetupFactories()\r{\r#ifdef GUSISetupFactories_BeginHook\r GUSISetupFactories_BeginHook\r#endif\r GUSIwithInetSockets();\r#ifdef GUSISetupFactories_EndHook\r GUSISetupFactories_EndHook\r#endif\r}\r\r/* Declarations of File Devices */\r\r__BEGIN_DECLS\rvoid GUSIwithNullSockets();\rvoid GUSI
SetupDevices();\r__END_DECLS\r\r/* Configure File Devices */\r\rvoid GUSISetupDevices()\r{\r#ifdef GUSISetupDevices_BeginHook\r GUSISetupDevices_BeginHook\r#endif\r GUSIwithNullSockets();\r#ifdef GUSISetupDevices_EndHook\r GUSISetupDevices_EndHook\r#endif\r}\r\r#ifndef __cplusplus\r#error GUSISetupConfig() needs to be written in C++\r#endif\r\rGUSIConfiguration::FileSuffix sSuffices[] = {\r "", '????', '????'\r};\r\rextern "C" void GUSISetupConfig()\r{\r GUSIConfiguration * config =\r GUSIConfiguration::CreateInstance(GUSIConfiguration::kNoResource);\r\r config->ConfigureDefaultTypeCreator('TEXT', 'CWIE');\r config->ConfigureSuffices(\r sizeof(sSuffices)/sizeof(GUSIConfiguration::FileSuffix)-1, sSuffices);\r}\r\r/**************** END GUSI CONFIGURATION *************************/
+\ No newline at end of file
++/**************** BEGIN GUSI CONFIGURATION ****************************\r *\r * GUSI Configuration section generated by GUSI Configurator\r * last modified: Wed Oct 31 17:07:45 2001\r *\r * This section will be overwritten by the next run of Configurator.\r */\r\r#define GUSI_SOURCE\r#include <GUSIConfig.h>\r#include <bsd/sys/cdefs.h>\r\r/* Declarations of Socket Factories */\r\r__BEGIN_DECLS\rvoid GUSIwithInetSockets();\rvoid GUSIwithLocalSockets();\rvoid GUSIwithMTInetSockets();\rvoid GUSIwithMTTcpSockets();\rvoid GUSIwithMTUdpSockets();\rvoid GUSIwithOTInetSockets();\rvoid GUSIwithOTTcpSockets();\rvoid GUSIwithOTUdpSockets();\rvoid GUSIwithPPCSockets();\rvoid GUSISetupFactories();\r__END_DECLS\r\r/* Configure Socket Factories */\r\rvoid GUSISetupFactories()\r{\r#ifdef GUSISetupFactories_BeginHook\r GUSISetupFactories_BeginHook\r#endif\r GUSIwithInetSockets();\r#ifdef GUSISetupFactories_EndHook\r GUSISetupFactories_EndHook\r#endif\r}\r\r/* Declarations of File Devices */\r\r__BEGIN_DECLS\rvoid GUSIwithNullSockets();\rvoid
GUSISetupDevices();\r__END_DECLS\r\r/* Configure File Devices */\r\rvoid GUSISetupDevices()\r{\r#ifdef GUSISetupDevices_BeginHook\r GUSISetupDevices_BeginHook\r#endif\r GUSIwithNullSockets();\r#ifdef GUSISetupDevices_EndHook\r GUSISetupDevices_EndHook\r#endif\r}\r\r#ifndef __cplusplus\r#error GUSISetupConfig() needs to be written in C++\r#endif\r\rGUSIConfiguration::FileSuffix sSuffices[] = {\r "", '????', '????'\r};\r\rextern "C" void GUSISetupConfig()\r{\r GUSIConfiguration * config =\r GUSIConfiguration::CreateInstance(GUSIConfiguration::kNoResource);\r\r config->ConfigureDefaultTypeCreator('TEXT', 'CWIE');\r config->ConfigureSuffices(\r sizeof(sSuffices)/sizeof(GUSIConfiguration::FileSuffix)-1, sSuffices);\r}\r\r/**************** END GUSI CONFIGURATION *************************/
+\ No newline at end of file
+diff --git a/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h b/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
+index 687516467..dae35a660 100644
+--- a/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
++++ b/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
+@@ -40,7 +40,7 @@
+ #define TCMALLOC_LIBC_OVERRIDE_GCC_AND_WEAK_INL_H_
+
+ #ifdef HAVE_SYS_CDEFS_H
+-#include <sys/cdefs.h> // for __THROW
++#include <bsd/sys/cdefs.h> // for __THROW
+ #endif
+ #include <gperftools/tcmalloc.h>
+
+diff --git a/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h b/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h
+index 687516467..dae35a660 100644
+--- a/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h
++++ b/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h
+@@ -40,7 +40,7 @@
+ #define TCMALLOC_LIBC_OVERRIDE_GCC_AND_WEAK_INL_H_
+
+ #ifdef HAVE_SYS_CDEFS_H
+-#include <sys/cdefs.h> // for __THROW
++#include <bsd/sys/cdefs.h> // for __THROW
+ #endif
+ #include <gperftools/tcmalloc.h>
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
+index 8d8bf31fe..fb485c1db 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp.h 356357 2020-01-04 20:33:12Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c
+index 81e2acfd5..fcd8c4d91 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 363194 2020-07-14 20:32:50Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h
+index e171a0b56..e27f0b227 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.h 362377 2020-06-19 12:35:29Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c
+index 3a8fac073..96b5e9eb4 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.c 362054 2020-06-11 13:34:09Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h
+index 3dc5a59e2..661f83f83 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.h 338749 2018-09-18 10:53:07Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c
+index 40e308f8f..c61080b42 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_bsd_addr.c 358080 2020-02-18 19:41:55Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h
+index 05d1b3fee..7dd880962 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_bsd_addr.h 353480 2019-10-13 18:17:08Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h
+index 81fd8530d..bcb15ec40 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h
+@@ -31,7 +31,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c
+index dcf629857..8fdaa164d 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_cc_functions.c 359405 2020-03-28 20:25:45Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h
+index b932d7f19..a1593b38e 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_constants.h 363440 2020-07-23 01:35:24Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c
+index 0b5a06e06..f58b6e81c 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_crc32.c 362498 2020-06-22 14:36:14Z tuexen $");
+
+ #include "opt_sctp.h"
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h
+index 5e76ff21b..17e637cf8 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_crc32.h 362338 2020-06-18 19:32:34Z markj $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h
+index 602921d0e..9b400c43f 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_header.h 309682 2016-12-07 19:30:59Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c
+index 806f63092..e10815938 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 363440 2020-07-23 01:35:24Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h
+index 829a014f2..bba0a8e18 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.h 361116 2020-05-16 19:26:39Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
+index 4a9460827..90b3d64f7 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 368622 2020-12-13 23:51:51Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h
+index 55a174bae..de0fbca2e 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.h 326672 2017-12-07 22:19:08Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h
+index 0aed34770..d8cd7312b 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h
+@@ -34,7 +34,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h
+index e01b95777..0ade152e8 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_os.h 361872 2020-06-06 18:20:09Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c
+index 21424b694..c1c25258a 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 364937 2020-08-28 20:05:18Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h
+index 4849c2b49..852e8b9ce 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_output.h 362054 2020-06-11 13:34:09Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c
+index f439c78eb..18548ebc6 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 366248 2020-09-29 09:36:06Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h
+index 73b32549b..db42d0177 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.h 362106 2020-06-12 16:31:13Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c
+index 8581f515f..b8b88a183 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.c 362054 2020-06-11 13:34:09Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h
+index 7e1c5ecee..c044fad64 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.h 309607 2016-12-06 10:21:25Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h
+index d535ee463..3d9461adf 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c
+index fad42467c..6ccb790b0 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c
+@@ -29,7 +29,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_ss_functions.c 362173 2020-06-14 09:50:00Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h
+index 1f5f153e9..aa44aa560 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_structs.h 364268 2020-08-16 11:50:37Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c
+index 91068118e..d2e7b3021 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_sysctl.c 361934 2020-06-08 20:23:20Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h
+index eb888338c..3853d7994 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_sysctl.h 361895 2020-06-07 14:39:20Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c
+index ad062b35e..487a50446 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 362054 2020-06-11 13:34:09Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h
+index ee1c49308..8cd544261 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.h 359195 2020-03-21 16:12:19Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
+index 6298f9334..e5a1f7d55 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_uio.h 362473 2020-06-21 23:12:56Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c
+index 78d795cc1..a9c09fdc1 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_usrreq.c 364353 2020-08-18 19:25:03Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h
+index d2433d607..d3bdfb205 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_var.h 363323 2020-07-19 12:34:19Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c
+index f050610ab..6d8366195 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 364268 2020-08-16 11:50:37Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h
+index 764616950..736fb070c 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet/sctputil.h 364268 2020-08-16 11:50:37Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c
+index 1fc81daa8..1cffa6c57 100644
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 361895 2020-06-07 14:39:20Z tuexen $");
+ #endif
+
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h
+index 56a6c3af3..8bbb4301d 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h
+@@ -33,7 +33,7 @@
+ */
+
+ #if defined(__FreeBSD__) && !defined(__Userspace__)
+-#include <sys/cdefs.h>
++#include <bsd/sys/cdefs.h>
+ __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_var.h 317457 2017-04-26 19:26:40Z tuexen $");
+ #endif
+
+--
+2.35.1
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index 9140a814..7e94c98e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
dev-libs/expat
+ dev-libs/libbsd
dev-libs/libevent:=
dev-libs/libxml2[icu]
dev-libs/libxslt
@@ -125,6 +126,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.15.5_p20220618-backtrace-execinfo.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-pvalloc-patch.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-linux-stack_util-stackstart.patch
+ "${FILESDIR}"/${PN}-5.15.5_p20220618-bsd-cdefs.h.patch
## runtime
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-sandbox.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-sandbox-syscall-x86_64.patch
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2022-07-22 20:20 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2022-07-22 20:20 UTC (permalink / raw
To: gentoo-commits
commit: aaae3c4b10e9370b57eb86100a14d2472117b5cd
Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Thu Jul 21 23:03:15 2022 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 20:19:12 2022 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=aaae3c4b
dev-qt/qtwebengine: Correct __*_DECLS usage
Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../qtwebengine-5.15.5_p20220618-bsd-cdefs.h.patch | 707 ---------------------
...ngine-5.15.5_p20220618-remove-decls-usage.patch | 116 ++++
.../qtwebengine-5.15.5_p20220618.ebuild | 3 +-
3 files changed, 117 insertions(+), 709 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-bsd-cdefs.h.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-bsd-cdefs.h.patch
deleted file mode 100644
index 512bcfe2..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-bsd-cdefs.h.patch
+++ /dev/null
@@ -1,707 +0,0 @@
-From 86947e9ceb65bc260c8ae3af137c57a6d2874124 Mon Sep 17 00:00:00 2001
-From: Your Name <you@example.com>
-Date: Thu, 21 Jul 2022 20:11:45 +0200
-Subject: [PATCH] ugly hack bsd cdefs.h
-
----
- src/3rdparty/chromium/base/allocator/allocator_shim_internals.h | 2 +-
- src/3rdparty/chromium/base/mac/close_nocancel.cc | 2 +-
- src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h | 2 +-
- .../breakpad/breakpad/src/common/android/include/stab.h | 2 +-
- .../breakpad/breakpad/src/common/android/include/sys/procfs.h | 2 +-
- .../third_party/crashpad/crashpad/compat/android/sys/mman.h | 2 +-
- .../third_party/crashpad/crashpad/compat/linux/sys/ptrace.h | 2 +-
- .../chromium/third_party/libsync/src/include/sync/sync.h | 2 +-
- .../third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp | 2 +-
- .../tcmalloc/chromium/src/libc_override_gcc_and_weak.h | 2 +-
- .../tcmalloc/vendor/src/libc_override_gcc_and_weak.h | 2 +-
- .../third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h | 2 +-
- .../third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c | 2 +-
- .../usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h | 2 +-
- 50 files changed, 50 insertions(+), 50 deletions(-)
-
-diff --git a/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h b/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h
-index da1e5a6f9..225627428 100644
---- a/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h
-+++ b/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h
-@@ -9,7 +9,7 @@
-
- #if defined(__GNUC__)
-
--#include <sys/cdefs.h> // for __THROW
-+#include <bsd/sys/cdefs.h> // for __THROW
-
- #ifndef __THROW // Not a glibc system
- #ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead
-diff --git a/src/3rdparty/chromium/base/mac/close_nocancel.cc b/src/3rdparty/chromium/base/mac/close_nocancel.cc
-index 8971e731c..c25fe6d00 100644
---- a/src/3rdparty/chromium/base/mac/close_nocancel.cc
-+++ b/src/3rdparty/chromium/base/mac/close_nocancel.cc
-@@ -34,7 +34,7 @@
- // is resolved from libsyscall. By linking with this version of close prior to
- // the libsyscall version, close's implementation is overridden.
-
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- #include <unistd.h>
-
- // If the non-cancelable variants of all system calls have already been
-diff --git a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
-index db2ad9027..66d677a59 100644
---- a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
-+++ b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
-@@ -28,7 +28,7 @@
- * These routines provide access to the systems DNS configuration
- */
-
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- #include <stdint.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h
-index cd9290215..4f40814a3 100644
---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h
-+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h
-@@ -30,7 +30,7 @@
- #ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H
- #define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H
-
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
-
- #ifdef __BIONIC_HAVE_STAB_H
- #include <stab.h>
-diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h
-index 185124364..5b325800a 100644
---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h
-+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h
-@@ -37,7 +37,7 @@
- #else
-
- #include <asm/ptrace.h>
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- #if defined (__mips__)
- #include <sys/types.h>
- #endif
-diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h
-index 5e7cd69f1..ccb1d5edb 100644
---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h
-+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h
-@@ -18,7 +18,7 @@
- #include_next <sys/mman.h>
-
- #include <android/api-level.h>
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
-
- // There’s no mmap() wrapper compatible with a 64-bit off_t for 32-bit code
- // until API 21 (Android 5.0/“Lollipop”). A custom mmap() wrapper is provided
-diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-index f8be372cc..1f71f816c 100644
---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-@@ -17,7 +17,7 @@
-
- #include_next <sys/ptrace.h>
-
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
-
- // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
- #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
-diff --git a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
-index 50ed0ac57..118e78fd8 100644
---- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
-+++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
-@@ -19,7 +19,7 @@
- #ifndef __SYS_CORE_SYNC_H
- #define __SYS_CORE_SYNC_H
-
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- #include <stdint.h>
-
- #include <linux/types.h>
-diff --git a/src/3rdparty/chromium/third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp b/src/3rdparty/chromium/third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp
-index 77d0c93a6..497e0ef4f 100644
---- a/src/3rdparty/chromium/third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp
-+++ b/src/3rdparty/chromium/third_party/libxml/src/macos/src/libxml2_GUSIConfig.cp
-@@ -1 +1 @@
--/**************** BEGIN GUSI CONFIGURATION ****************************\r *\r * GUSI Configuration section generated by GUSI Configurator\r * last modified: Wed Oct 31 17:07:45 2001\r *\r * This section will be overwritten by the next run of Configurator.\r */\r\r#define GUSI_SOURCE\r#include <GUSIConfig.h>\r#include <sys/cdefs.h>\r\r/* Declarations of Socket Factories */\r\r__BEGIN_DECLS\rvoid GUSIwithInetSockets();\rvoid GUSIwithLocalSockets();\rvoid GUSIwithMTInetSockets();\rvoid GUSIwithMTTcpSockets();\rvoid GUSIwithMTUdpSockets();\rvoid GUSIwithOTInetSockets();\rvoid GUSIwithOTTcpSockets();\rvoid GUSIwithOTUdpSockets();\rvoid GUSIwithPPCSockets();\rvoid GUSISetupFactories();\r__END_DECLS\r\r/* Configure Socket Factories */\r\rvoid GUSISetupFactories()\r{\r#ifdef GUSISetupFactories_BeginHook\r GUSISetupFactories_BeginHook\r#endif\r GUSIwithInetSockets();\r#ifdef GUSISetupFactories_EndHook\r GUSISetupFactories_EndHook\r#endif\r}\r\r/* Declarations of File Devices */\r\r__BEGIN_DECLS\rvoid GUSIwithNullSockets();\rvoid GUSI
SetupDevices();\r__END_DECLS\r\r/* Configure File Devices */\r\rvoid GUSISetupDevices()\r{\r#ifdef GUSISetupDevices_BeginHook\r GUSISetupDevices_BeginHook\r#endif\r GUSIwithNullSockets();\r#ifdef GUSISetupDevices_EndHook\r GUSISetupDevices_EndHook\r#endif\r}\r\r#ifndef __cplusplus\r#error GUSISetupConfig() needs to be written in C++\r#endif\r\rGUSIConfiguration::FileSuffix sSuffices[] = {\r "", '????', '????'\r};\r\rextern "C" void GUSISetupConfig()\r{\r GUSIConfiguration * config =\r GUSIConfiguration::CreateInstance(GUSIConfiguration::kNoResource);\r\r config->ConfigureDefaultTypeCreator('TEXT', 'CWIE');\r config->ConfigureSuffices(\r sizeof(sSuffices)/sizeof(GUSIConfiguration::FileSuffix)-1, sSuffices);\r}\r\r/**************** END GUSI CONFIGURATION *************************/
-\ No newline at end of file
-+/**************** BEGIN GUSI CONFIGURATION ****************************\r *\r * GUSI Configuration section generated by GUSI Configurator\r * last modified: Wed Oct 31 17:07:45 2001\r *\r * This section will be overwritten by the next run of Configurator.\r */\r\r#define GUSI_SOURCE\r#include <GUSIConfig.h>\r#include <bsd/sys/cdefs.h>\r\r/* Declarations of Socket Factories */\r\r__BEGIN_DECLS\rvoid GUSIwithInetSockets();\rvoid GUSIwithLocalSockets();\rvoid GUSIwithMTInetSockets();\rvoid GUSIwithMTTcpSockets();\rvoid GUSIwithMTUdpSockets();\rvoid GUSIwithOTInetSockets();\rvoid GUSIwithOTTcpSockets();\rvoid GUSIwithOTUdpSockets();\rvoid GUSIwithPPCSockets();\rvoid GUSISetupFactories();\r__END_DECLS\r\r/* Configure Socket Factories */\r\rvoid GUSISetupFactories()\r{\r#ifdef GUSISetupFactories_BeginHook\r GUSISetupFactories_BeginHook\r#endif\r GUSIwithInetSockets();\r#ifdef GUSISetupFactories_EndHook\r GUSISetupFactories_EndHook\r#endif\r}\r\r/* Declarations of File Devices */\r\r__BEGIN_DECLS\rvoid GUSIwithNullSockets();\rvoid
GUSISetupDevices();\r__END_DECLS\r\r/* Configure File Devices */\r\rvoid GUSISetupDevices()\r{\r#ifdef GUSISetupDevices_BeginHook\r GUSISetupDevices_BeginHook\r#endif\r GUSIwithNullSockets();\r#ifdef GUSISetupDevices_EndHook\r GUSISetupDevices_EndHook\r#endif\r}\r\r#ifndef __cplusplus\r#error GUSISetupConfig() needs to be written in C++\r#endif\r\rGUSIConfiguration::FileSuffix sSuffices[] = {\r "", '????', '????'\r};\r\rextern "C" void GUSISetupConfig()\r{\r GUSIConfiguration * config =\r GUSIConfiguration::CreateInstance(GUSIConfiguration::kNoResource);\r\r config->ConfigureDefaultTypeCreator('TEXT', 'CWIE');\r config->ConfigureSuffices(\r sizeof(sSuffices)/sizeof(GUSIConfiguration::FileSuffix)-1, sSuffices);\r}\r\r/**************** END GUSI CONFIGURATION *************************/
-\ No newline at end of file
-diff --git a/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h b/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
-index 687516467..dae35a660 100644
---- a/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
-+++ b/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
-@@ -40,7 +40,7 @@
- #define TCMALLOC_LIBC_OVERRIDE_GCC_AND_WEAK_INL_H_
-
- #ifdef HAVE_SYS_CDEFS_H
--#include <sys/cdefs.h> // for __THROW
-+#include <bsd/sys/cdefs.h> // for __THROW
- #endif
- #include <gperftools/tcmalloc.h>
-
-diff --git a/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h b/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h
-index 687516467..dae35a660 100644
---- a/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h
-+++ b/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h
-@@ -40,7 +40,7 @@
- #define TCMALLOC_LIBC_OVERRIDE_GCC_AND_WEAK_INL_H_
-
- #ifdef HAVE_SYS_CDEFS_H
--#include <sys/cdefs.h> // for __THROW
-+#include <bsd/sys/cdefs.h> // for __THROW
- #endif
- #include <gperftools/tcmalloc.h>
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
-index 8d8bf31fe..fb485c1db 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp.h 356357 2020-01-04 20:33:12Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c
-index 81e2acfd5..fcd8c4d91 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 363194 2020-07-14 20:32:50Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h
-index e171a0b56..e27f0b227 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.h 362377 2020-06-19 12:35:29Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c
-index 3a8fac073..96b5e9eb4 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.c 362054 2020-06-11 13:34:09Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h
-index 3dc5a59e2..661f83f83 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.h 338749 2018-09-18 10:53:07Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c
-index 40e308f8f..c61080b42 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_bsd_addr.c 358080 2020-02-18 19:41:55Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h
-index 05d1b3fee..7dd880962 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_bsd_addr.h 353480 2019-10-13 18:17:08Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h
-index 81fd8530d..bcb15ec40 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h
-@@ -31,7 +31,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD$");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c
-index dcf629857..8fdaa164d 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_cc_functions.c 359405 2020-03-28 20:25:45Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h
-index b932d7f19..a1593b38e 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_constants.h 363440 2020-07-23 01:35:24Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c
-index 0b5a06e06..f58b6e81c 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_crc32.c 362498 2020-06-22 14:36:14Z tuexen $");
-
- #include "opt_sctp.h"
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h
-index 5e76ff21b..17e637cf8 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_crc32.h 362338 2020-06-18 19:32:34Z markj $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h
-index 602921d0e..9b400c43f 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_header.h 309682 2016-12-07 19:30:59Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c
-index 806f63092..e10815938 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 363440 2020-07-23 01:35:24Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h
-index 829a014f2..bba0a8e18 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.h 361116 2020-05-16 19:26:39Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
-index 4a9460827..90b3d64f7 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 368622 2020-12-13 23:51:51Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h
-index 55a174bae..de0fbca2e 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.h 326672 2017-12-07 22:19:08Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h
-index 0aed34770..d8cd7312b 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h
-@@ -34,7 +34,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD$");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h
-index e01b95777..0ade152e8 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_os.h 361872 2020-06-06 18:20:09Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c
-index 21424b694..c1c25258a 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 364937 2020-08-28 20:05:18Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h
-index 4849c2b49..852e8b9ce 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_output.h 362054 2020-06-11 13:34:09Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c
-index f439c78eb..18548ebc6 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 366248 2020-09-29 09:36:06Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h
-index 73b32549b..db42d0177 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.h 362106 2020-06-12 16:31:13Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c
-index 8581f515f..b8b88a183 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.c 362054 2020-06-11 13:34:09Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h
-index 7e1c5ecee..c044fad64 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.h 309607 2016-12-06 10:21:25Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h
-index d535ee463..3d9461adf 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD$");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c
-index fad42467c..6ccb790b0 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c
-@@ -29,7 +29,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_ss_functions.c 362173 2020-06-14 09:50:00Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h
-index 1f5f153e9..aa44aa560 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_structs.h 364268 2020-08-16 11:50:37Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c
-index 91068118e..d2e7b3021 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_sysctl.c 361934 2020-06-08 20:23:20Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h
-index eb888338c..3853d7994 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_sysctl.h 361895 2020-06-07 14:39:20Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c
-index ad062b35e..487a50446 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 362054 2020-06-11 13:34:09Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h
-index ee1c49308..8cd544261 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.h 359195 2020-03-21 16:12:19Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
-index 6298f9334..e5a1f7d55 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_uio.h 362473 2020-06-21 23:12:56Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c
-index 78d795cc1..a9c09fdc1 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_usrreq.c 364353 2020-08-18 19:25:03Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h
-index d2433d607..d3bdfb205 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_var.h 363323 2020-07-19 12:34:19Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c
-index f050610ab..6d8366195 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 364268 2020-08-16 11:50:37Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h
-index 764616950..736fb070c 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctputil.h 364268 2020-08-16 11:50:37Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c
-index 1fc81daa8..1cffa6c57 100644
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 361895 2020-06-07 14:39:20Z tuexen $");
- #endif
-
-diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h
-index 56a6c3af3..8bbb4301d 100755
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+#include <bsd/sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_var.h 317457 2017-04-26 19:26:40Z tuexen $");
- #endif
-
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-decls-usage.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-decls-usage.patch
new file mode 100644
index 00000000..3dfa65d8
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-decls-usage.patch
@@ -0,0 +1,116 @@
+https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I-get-error-messages-about-%3Ccode%3Esys/cdefs.h%3C/code%3E
+"The bug is in the application that uses this internal glibc header. This header is not intended to be used by any program"
+
+sys/cdefs.h does not exist in musl libc, this breaks bundled Chromium.
+
+---
+ src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h | 8 ++++++--
+ .../chromium/third_party/libsync/src/include/sync/sync.h | 8 ++++++--
+ src/3rdparty/chromium/third_party/libsync/src/sw_sync.h | 8 ++++++--
+ .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h | 8 ++++++--
+ 4 files changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
+index db2ad9027..4840f0ae9 100644
+--- a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
++++ b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
+@@ -91,7 +91,9 @@ typedef struct {
+ #pragma pack()
+
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /*
+ * DNS configuration access APIs
+@@ -109,6 +111,8 @@ void
+ _dns_configuration_ack (dns_config_t *config,
+ const char *bundle_id);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* __DNSINFO_H__ */
+diff --git a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+index 50ed0ac57..91dfd5d69 100644
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -24,7 +24,9 @@
+
+ #include <linux/types.h>
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ struct sync_legacy_merge_data {
+ int32_t fd2;
+@@ -158,6 +160,8 @@ struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info,
+ struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* __SYS_CORE_SYNC_H */
+diff --git a/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h b/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h
+index fda1c4c57..395c38072 100644
+--- a/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h
+@@ -19,7 +19,9 @@
+ #ifndef __SYS_CORE_SW_SYNC_H
+ #define __SYS_CORE_SW_SYNC_H
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /*
+ * sw_sync is mainly intended for testing and should not be compiled into
+@@ -30,6 +32,8 @@ int sw_sync_timeline_create(void);
+ int sw_sync_timeline_inc(int fd, unsigned count);
+ int sw_sync_fence_create(int fd, const char *name, unsigned value);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* __SYS_CORE_SW_SYNC_H */
+diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
+index 6298f9334..d688d9d75 100755
+--- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
++++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
+@@ -1317,7 +1317,9 @@ sctp_sorecvmsg(struct socket *so,
+ */
+ #if !(defined(_KERNEL)) && !(defined(__Userspace__))
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ int sctp_peeloff(int, sctp_assoc_t);
+ int sctp_bindx(int, struct sockaddr *, int, int);
+ int sctp_connectx(int, const struct sockaddr *, int, sctp_assoc_t *);
+@@ -1355,7 +1357,9 @@ ssize_t sctp_sendv(int, const struct iovec *, int, struct sockaddr *,
+
+ ssize_t sctp_recvv(int, const struct iovec *, int, struct sockaddr *,
+ socklen_t *, void *, socklen_t *, unsigned int *, int *);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* !_KERNEL */
+ #endif /* !__sctp_uio_h__ */
+--
+2.35.1
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index 2a79e254..dc41ceaf 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -40,7 +40,6 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
dev-libs/expat
- dev-libs/libbsd
dev-libs/libevent:=
dev-libs/libxml2[icu]
dev-libs/libxslt
@@ -126,7 +125,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.15.5_p20220618-backtrace-execinfo.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-pvalloc-patch.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-linux-stack_util-stackstart.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-bsd-cdefs.h.patch
+ "${FILESDIR}"/${PN}-5.15.5_p20220618-remove-decls-usage.patch
## runtime
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-sandbox.patch
)
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2022-07-22 20:20 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2022-07-22 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 2623a4492efa09a923611e34aab3463dab023d0b
Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Thu Jul 21 22:13:37 2022 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 20:19:12 2022 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2623a449
dev-qt/qtwebengine: remove sandbox-syscall patch
This is an unnecessary (and a weird patch).
Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
...e-5.15.5_p20220618-sandbox-syscall-x86_64.patch | 27 ----------------------
.../qtwebengine-5.15.5_p20220618.ebuild | 2 --
2 files changed, 29 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-sandbox-syscall-x86_64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-sandbox-syscall-x86_64.patch
deleted file mode 100644
index acdc4322..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-sandbox-syscall-x86_64.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ce3c2cee2d0da85dc1a1d9ebc8ebad8dde05c10a Mon Sep 17 00:00:00 2001
-From: Your Name <you@example.com>
-Date: Wed, 20 Jul 2022 18:07:19 +0200
-Subject: [PATCH 1/2] sandbox syscall x86_64
-
----
- .../sandbox/linux/system_headers/x86_64_linux_syscalls.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-index e618c6237..c1f6bccf6 100644
---- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1350,6 +1350,10 @@
- #define __NR_rseq 334
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #if !defined(__NR_pidfd_send_signal)
- #define __NR_pidfd_send_signal 424
- #endif
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index 7e94c98e..2a79e254 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -129,8 +129,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.15.5_p20220618-bsd-cdefs.h.patch
## runtime
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-sandbox.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-sandbox-syscall-x86_64.patch
- # "${FILESDIR}"/nasm.patch
)
qtwebengine_check-reqs() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2023-07-08 5:29 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-07-08 5:29 UTC (permalink / raw
To: gentoo-commits
commit: 3c3b356a62beef9feb5aedfa67f93ef38509b139
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sat Jun 17 21:05:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 8 05:29:26 2023 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3c3b356a
dev-qt/qtwebengine: Add qt6, bump qt5 version
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/musl/pull/481
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 6 +-
.../qtwebengine-5.15.10_p20230505-clang-16.patch | 10 +
.../qtwebengine-5.15.10_p20230505-musl-lfs64.patch | 37 +++
...qtwebengine-5.15.2-disable-fatal-warnings.patch | 12 -
...ine-5.15.2_p20210224-chromium-87-v8-icu68.patch | 192 --------------
.../qtwebengine-5.15.2_p20210224-disable-git.patch | 15 --
...gine-5.15.2_p20211015-pdfium-system-lcms2.patch | 79 ------
.../qtwebengine-5.15.3_p20220329-clang14.patch | 42 ----
.../qtwebengine-5.15.3_p20220406-ffmpeg5.patch | 169 -------------
...webengine-5.15.3_p20220406-gcc12-includes.patch | 32 ---
| 10 -
...gine-5.15.5_p20220618-fixup-CVE-2022-0796.patch | 48 ----
.../files/qtwebengine-6.5.1-clang-libc++.patch | 11 +
...bengine-6.5.1-musl-canonicalize-file-name.patch | 16 ++
.../files/qtwebengine-6.5.1-musl-close.patch | 33 +++
.../files/qtwebengine-6.5.1-musl-crashpad.patch | 13 +
...gine-6.5.1-musl-default-pthread-stacksize.patch | 23 ++
...twebengine-6.5.1-musl-disable-glibc-check.patch | 21 ++
...qtwebengine-6.5.1-musl-fix-narrowing-cast.patch | 44 ++++
.../files/qtwebengine-6.5.1-musl-lfs64.patch | 37 +++
.../files/qtwebengine-6.5.1-musl-mallinfo.patch | 75 ++++++
.../qtwebengine-6.5.1-musl-missing-includes.patch | 22 ++
.../files/qtwebengine-6.5.1-musl-no-execinfo.patch | 98 ++++++++
...qtwebengine-6.5.1-musl-remove-decls-usage.patch | 122 +++++++++
.../files/qtwebengine-6.5.1-musl-resolve.patch | 66 +++++
.../files/qtwebengine-6.5.1-musl-sandbox.patch | 97 ++++++++
.../files/qtwebengine-6.5.1-musl-stat.patch | 14 ++
.../files/qtwebengine-6.5.1-musl-systypes.patch | 11 +
...qtwebengine-6.5.1-musl-temp-retry-failure.patch | 21 ++
.../qtwebengine-6.5.1-musl-wtf-stacksize.patch | 22 ++
...ine-6.5.1-normalise-clipboard-permissions.patch | 99 ++++++++
dev-qt/qtwebengine/metadata.xml | 2 -
...ebuild => qtwebengine-5.15.10_p20230505.ebuild} | 58 ++---
....ebuild => qtwebengine-5.15.9_p20230505.ebuild} | 54 ++--
dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild | 275 +++++++++++++++++++++
35 files changed, 1216 insertions(+), 670 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 282326e1..6cbfc321 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,4 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
-DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
-DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
+DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
+DIST qtwebengine-5.15.9_p20230505.tar.xz 298713240 BLAKE2B 835e93a0b33e7294d72571c9031524a0e3002100e36433501cc83bac91646b788c1030ee9ce90edce39c6ee2ee61a1d697e021b6346804d3be0f0b930e6084d0 SHA512 61d16399a7d8f5c135c5c097c2dcb7ebeccfe7e31769e950443ffa8178f55ad22d90307b7bd2b2ebdcb3ee0dd2064266159c27da4fc5b35ddac346ca9f336cc1
+DIST qtwebengine-everywhere-src-6.5.1.tar.xz 412377436 BLAKE2B 1ff179daf1433246b931558f52f1cf193eff4a1d646e6f6037a40fe85fa28cf944b7f361fd68cb01b1247680d376762c2c5317be125f5b24cc08e4bbfa6f0def SHA512 68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-clang-16.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-clang-16.patch
new file mode 100644
index 00000000..d6460de7
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-clang-16.patch
@@ -0,0 +1,10 @@
+--- qtwebengine-5.15.8_p20230313-orig/src/3rdparty/chromium/build/config/compiler/BUILD.gn 2022-05-13 03:17:44.000000000 +1000
++++ qtwebengine-5.15.8_p20230313/src/3rdparty/chromium/build/config/compiler/BUILD.gn 2023-04-06 18:09:53.528885245 +1000
+@@ -318,6 +318,7 @@
+ "-Wno-parentheses-equality",
+ "-Wno-tautological-compare",
+ "-Wno-thread-safety-attributes",
++ "-Wno-enum-constexpr-conversion"
+ ]
+ }
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-musl-lfs64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-musl-lfs64.patch
new file mode 100644
index 00000000..ba796896
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-musl-lfs64.patch
@@ -0,0 +1,37 @@
+--- a/src/3rdparty/gn/base/files/file.h
++++ b/src/3rdparty/gn/base/files/file.h
+@@ -26,7 +26,7 @@ namespace base {
+ defined(OS_ANDROID) && __ANDROID_API__ < 21
+ typedef struct stat stat_wrapper_t;
+ #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+-typedef struct stat64 stat_wrapper_t;
++typedef struct stat stat_wrapper_t;
+ #endif
+
+ // Thin wrapper around an OS-level file.
+--- a/src/3rdparty/gn/base/files/file_posix.cc
++++ b/src/3rdparty/gn/base/files/file_posix.cc
+@@ -32,7 +32,7 @@ int CallFstat(int fd, stat_wrapper_t* sb
+ }
+ #else
+ int CallFstat(int fd, stat_wrapper_t* sb) {
+- return fstat64(fd, sb);
++ return fstat(fd, sb);
+ }
+ #endif
+
+--- a/src/3rdparty/gn/base/files/file_util_posix.cc
++++ b/src/3rdparty/gn/base/files/file_util_posix.cc
+@@ -70,10 +70,10 @@ int CallLstat(const char* path, stat_wra
+ }
+ #else
+ int CallStat(const char* path, stat_wrapper_t* sb) {
+- return stat64(path, sb);
++ return stat(path, sb);
+ }
+ int CallLstat(const char* path, stat_wrapper_t* sb) {
+- return lstat64(path, sb);
++ return lstat(path, sb);
+ }
+ #endif
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
deleted file mode 100644
index b0f5f3d3..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
-index cf990c79..910a88ca 100644
---- a/src/buildtools/config/common.pri
-+++ b/src/buildtools/config/common.pri
-@@ -26,6 +26,7 @@ gn_args += \
- skia_use_dawn=false \
- toolkit_views=false \
- treat_warnings_as_errors=false \
-+ fatal_linker_warnings=false \
- use_allocator_shim=false \
- use_allocator=\"none\" \
- use_custom_libcxx=false \
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
deleted file mode 100644
index a6856975..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Tue, 03 Nov 2020 23:20:37 -0800
-Subject: [PATCH] Update to ICU68-1
-
-ICU68-1 change the output skeleton format. So we need to change
-resolvedOptions code for 68 migration.
-
-Chromium roll
-https://chromium-review.googlesource.com/c/chromium/src/+/2474093
-
-Bug: v8:10945
-Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431
-Commit-Queue: Frank Tang <ftang@chromium.org>
-Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-Reviewed-by: Shu-yu Guo <syg@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#70972}
-
-(ported to work with <ICU-68.1 and rebased chromium)
----
-
-diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-index 45b0eab..d18b133 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-@@ -389,17 +389,20 @@ Handle<String> CurrencySignString(Isolate* isolate,
- Handle<String> UnitDisplayString(Isolate* isolate,
- const icu::UnicodeString& skeleton) {
- // Ex: skeleton as
-- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name"
-+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name".
-+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-full-name"
- if (skeleton.indexOf("unit-width-full-name") >= 0) {
- return ReadOnlyRoots(isolate).long_string_handle();
- }
- // Ex: skeleton as
-- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
-+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
-+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-narrow".
- if (skeleton.indexOf("unit-width-narrow") >= 0) {
- return ReadOnlyRoots(isolate).narrow_string_handle();
- }
- // Ex: skeleton as
-- // "measure-unit/length-foot .### rounding-mode-half-up"
-+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up"
-+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
- return ReadOnlyRoots(isolate).short_string_handle();
- }
-
-@@ -422,7 +425,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& skeleton) {
- return Notation::COMPACT;
- }
- // Ex: skeleton as
-- // "measure-unit/length-foot .### rounding-mode-half-up"
-+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up"
-+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
- return Notation::STANDARD;
- }
-
-@@ -562,14 +566,23 @@ namespace {
-
- // Ex: percent .### rounding-mode-half-up
- // Special case for "percent"
--// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
--// rounding-mode-half-up" should return "kilometer-per-unit".
--// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
--// "year".
-+// <ICU-68.1:
-+// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
-+// rounding-mode-half-up" should return "kilometer-per-unit".
-+// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
-+// >=ICU-68.1:
-+// Ex: "unit/milliliter-per-acre .### rounding-mode-half-up"
-+// should return "milliliter-per-acre".
-+// Ex: "unit/year .### rounding-mode-half-up" should return
-+// "year".
- std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
- std::string str;
- str = skeleton.toUTF8String<std::string>(str);
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- std::string search("measure-unit/");
-+#else
-+ std::string search("unit/");
-+#endif
- size_t begin = str.find(search);
- if (begin == str.npos) {
- // Special case for "percent".
-@@ -578,20 +591,41 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
- }
- return "";
- }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- // Skip the type (ex: "length").
- // "measure-unit/length-kilometer per-measure-unit/duration-hour"
- // b
- begin = str.find("-", begin + search.size());
-+#else
-+ // Ex:
-+ // "unit/acre .### rounding-mode-half-up"
-+ // b
-+ // Ex:
-+ // "unit/milliliter-per-acre .### rounding-mode-half-up"
-+ // b
-+ begin += search.size();
-+#endif
- if (begin == str.npos) {
- return "";
- }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- begin++; // Skip the '-'.
-+#endif
- // Find the end of the subtype.
- size_t end = str.find(" ", begin);
-- // "measure-unit/length-kilometer per-measure-unit/duration-hour"
-- // b e
-+ // <ICU-68.1:
-+ // "measure-unit/length-kilometer per-measure-unit/duration-hour"
-+ // b e
-+ // >=ICU-68.1:
-+ // Ex:
-+ // "unit/acre .### rounding-mode-half-up"
-+ // b e
-+ // Ex:
-+ // "unit/milliliter-per-acre .### rounding-mode-half-up"
-+ // b e
- if (end == str.npos) {
- end = str.size();
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- return str.substr(begin, end - begin);
- }
- // "measure-unit/length-kilometer per-measure-unit/duration-hour"
-@@ -625,17 +659,36 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
- // "measure-unit/length-kilometer per-measure-unit/duration-hour"
- // [result ] b e
- return result + "-per-" + str.substr(begin, end - begin);
-+#else
-+ }
-+ return str.substr(begin, end - begin);
-+#endif
- }
-
- Style StyleFromSkeleton(const icu::UnicodeString& skeleton) {
- if (skeleton.indexOf("currency/") >= 0) {
- return Style::CURRENCY;
- }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- if (skeleton.indexOf("measure-unit/") >= 0) {
- if (skeleton.indexOf("scale/100") >= 0 &&
- skeleton.indexOf("measure-unit/concentr-percent") >= 0) {
-+#else
-+ if (skeleton.indexOf("percent") >= 0) {
-+ // percent precision-integer rounding-mode-half-up scale/100
-+ if (skeleton.indexOf("scale/100") >= 0) {
-+#endif
- return Style::PERCENT;
-+#if U_ICU_VERSION_MAJOR_NUM >= 68
-+ } else {
-+ return Style::UNIT;
-+#endif
- }
-+#if U_ICU_VERSION_MAJOR_NUM >= 68
-+ }
-+ // Before ICU68: "measure-unit/", since ICU68 "unit/"
-+ if (skeleton.indexOf("unit/") >= 0) {
-+#endif
- return Style::UNIT;
- }
- return Style::DECIMAL;
-diff --git a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc
-index 267343aaae..64d56a1c12 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc
-@@ -195,9 +195,18 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New(
- }
- }
-
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- icu::DecimalFormat* decimal_format =
- static_cast<icu::DecimalFormat*>(number_format);
- decimal_format->setMinimumGroupingDigits(-2);
-+#else
-+ if (number_format->getDynamicClassID() ==
-+ icu::DecimalFormat::getStaticClassID()) {
-+ icu::DecimalFormat* decimal_format =
-+ static_cast<icu::DecimalFormat*>(number_format);
-+ decimal_format->setMinimumGroupingDigits(-2);
-+ }
-+#endif
-
- // Change UDISPCTX_CAPITALIZATION_NONE to other values if
- // ECMA402 later include option to change capitalization.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch
deleted file mode 100644
index c31e8970..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-generate_gni.sh: update_readme() runs git at the end of process, prevent it.
-
-Thanks-to: Georgy Yakovlev <gyakovlev@gentoo.org>
-
---- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-07 12:51:49.438514897 +0100
-+++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-21 16:23:38.375724515 +0100
-@@ -519,8 +519,3 @@
-
- gn format --in-place $BASE_DIR/BUILD.gn
- gn format --in-place $BASE_DIR/libvpx_srcs.gni
--
--cd $BASE_DIR/$LIBVPX_SRC_DIR
--update_readme
--
--cd $BASE_DIR
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
deleted file mode 100644
index b3c2ffb3..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Use system lcms2
-Author: Sandro Knauß <hefee@debian.org>
-Origin: Debian
-Forwarded: https://bugreports.qt.io/browse/QTBUG-61746
-Reviewed-by: Sandro Knauß <hefee@debian.org>
-Last-Update: 2021-03-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
-@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths
- }
- }
-
--config("fx_lcms2_warnings") {
-- visibility = [ ":*" ]
-- if (is_clang) {
-- cflags = [
-- # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
-- # library doesn't appear to have this problem.
-- "-Wno-missing-braces",
-- ]
-- }
-+import("//build/shim_headers.gni")
-+
-+shim_headers("lcms2_shim") {
-+ root_path = "lcms/include"
-+ headers = [
-+ "lcms2.h",
-+ "lcms2_plugin.h",
-+ ]
- }
-
- source_set("fx_lcms2") {
-- configs -= [ "//build/config/compiler:chromium_code" ]
-- configs += [
-- "//build/config/compiler:no_chromium_code",
-- "//build/config/sanitizers:cfi_icall_generalize_pointers",
-- ":pdfium_third_party_config",
--
-- # Must be after no_chromium_code for warning flags to be ordered correctly.
-- ":fx_lcms2_warnings",
-- ]
-- sources = [
-- "lcms/include/lcms2.h",
-- "lcms/include/lcms2_plugin.h",
-- "lcms/src/cmsalpha.c",
-- "lcms/src/cmscam02.c",
-- "lcms/src/cmscgats.c",
-- "lcms/src/cmscnvrt.c",
-- "lcms/src/cmserr.c",
-- "lcms/src/cmsgamma.c",
-- "lcms/src/cmsgmt.c",
-- "lcms/src/cmshalf.c",
-- "lcms/src/cmsintrp.c",
-- "lcms/src/cmsio0.c",
-- "lcms/src/cmsio1.c",
-- "lcms/src/cmslut.c",
-- "lcms/src/cmsmd5.c",
-- "lcms/src/cmsmtrx.c",
-- "lcms/src/cmsnamed.c",
-- "lcms/src/cmsopt.c",
-- "lcms/src/cmspack.c",
-- "lcms/src/cmspcs.c",
-- "lcms/src/cmsplugin.c",
-- "lcms/src/cmsps2.c",
-- "lcms/src/cmssamp.c",
-- "lcms/src/cmssm.c",
-- "lcms/src/cmstypes.c",
-- "lcms/src/cmsvirt.c",
-- "lcms/src/cmswtpnt.c",
-- "lcms/src/cmsxform.c",
-- ]
-- deps = [ "../core/fxcrt" ]
-+ deps = [ ":lcms2_shim" ]
-+ libs = ["lcms2"]
- }
-
- if (!build_with_chromium) {
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
deleted file mode 100644
index c1a98d09..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0825e7bc64e47d87e1f1026cc80c933550f114f5 Mon Sep 17 00:00:00 2001
-From: Dimitry Andric <dim@FreeBSD.org>
-Date: Mon, 14 Feb 2022 13:55:25 +0100
-Subject: www/qt5-webengine: fix build with clang 14
-
-Fixes compile error:
-
-In file included from gen/third_party/blink/renderer/platform/platform_jumbo_63.cc:8:
-src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:122:15: error: anonymous non-C-compatible type given name for linkage purposes by typedef declaration after its linkage was computed; add a tag name here to establish linkage prior to definition
-typedef struct {
- ^
- UTextWithBuffer
-src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:123:3: note: type is not C-compatible due to this member declaration
- DISALLOW_NEW();
- ^~~~~~~~~~~~~~
-src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h:40:2: note: expanded from macro 'DISALLOW_NEW'
- public: \
- ^~~~~~~
-src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:126:3: note: type is given name 'UTextWithBuffer' for linkage purposes by this typedef declaration
-} UTextWithBuffer;
- ^
-
-PR: 261949
-Approved by: adridg (maintainer)
-MFH: 2022Q1
-
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
-@@ -119,11 +119,11 @@ enum TextContext { kNoContext, kPriorContext, kPrimary
-
- const int kTextBufferCapacity = 16;
-
--typedef struct {
-+struct UTextWithBuffer {
- DISALLOW_NEW();
- UText text;
- UChar buffer[kTextBufferCapacity];
--} UTextWithBuffer;
-+};
-
- static inline int64_t TextPinIndex(int64_t& index, int64_t limit) {
- if (index < 0)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
deleted file mode 100644
index 15c19266..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 05f6ffbbce0a2aad01dc05d682cbe4a1ec44fad5 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Tue, 25 Jan 2022 10:51:58 +0000
-Subject: [PATCH] Fix build with ffmpeg 5
-
----
- chromium/media/ffmpeg/ffmpeg_common.h | 1 +
- chromium/media/filters/audio_file_reader.cc | 2 +-
- chromium/media/filters/ffmpeg_audio_decoder.cc | 2 +-
- chromium/media/filters/ffmpeg_demuxer.cc | 12 ++++++------
- chromium/media/filters/ffmpeg_glue.cc | 4 ----
- chromium/media/filters/ffmpeg_video_decoder.cc | 2 +-
- chromium/media/filters/media_file_checker.cc | 2 +-
- .../video_coding/codecs/h264/h264_decoder_impl.cc | 2 +-
- 8 files changed, 12 insertions(+), 15 deletions(-)
-
-diff --git a/chromium/media/ffmpeg/ffmpeg_common.h b/chromium/media/ffmpeg/ffmpeg_common.h
-index 2734a485cbd..70b1877a43c 100644
---- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
-+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
-@@ -29,6 +29,7 @@ extern "C" {
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
-+#include <libavutil/channel_layout.h>
- #include <libavutil/imgutils.h>
- #include <libavutil/log.h>
- #include <libavutil/mastering_display_metadata.h>
-diff --git a/chromium/media/filters/audio_file_reader.cc b/chromium/media/filters/audio_file_reader.cc
-index cb81d920def..bd73908d0ca 100644
---- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc
-+++ b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
-@@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() {
- }
-
- bool AudioFileReader::OpenDecoder() {
-- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
- if (codec) {
- // MP3 decodes to S16P which we don't support, tell it to use S16 instead.
- if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P)
-diff --git a/chromium/media/filters/ffmpeg_audio_decoder.cc b/chromium/media/filters/ffmpeg_audio_decoder.cc
-index 0d825ed791b..72fac6167ef 100644
---- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
-+++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
-@@ -329,7 +329,7 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
- }
- }
-
-- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
- if (!codec ||
- avcodec_open2(codec_context_.get(), codec, &codec_options) < 0) {
- DLOG(ERROR) << "Could not initialize audio decoder: "
-diff --git a/chromium/media/filters/ffmpeg_demuxer.cc b/chromium/media/filters/ffmpeg_demuxer.cc
-index d34db63f3ef..427565b00c1 100644
---- a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
-+++ b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
-@@ -98,12 +98,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
-
- // Next try to use the first DTS value, for codecs where we know PTS == DTS
- // (excludes all H26x codecs). The start time must be returned in PTS.
-- if (stream->first_dts != kNoFFmpegTimestamp &&
-+ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
- stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
- stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
- stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
- const base::TimeDelta first_pts =
-- ConvertFromTimeBase(stream->time_base, stream->first_dts);
-+ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
- if (first_pts < start_time)
- start_time = first_pts;
- }
-@@ -408,11 +408,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- scoped_refptr<DecoderBuffer> buffer;
-
- if (type() == DemuxerStream::TEXT) {
-- int id_size = 0;
-+ size_t id_size = 0;
- uint8_t* id_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
-
-- int settings_size = 0;
-+ size_t settings_size = 0;
- uint8_t* settings_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
-
-@@ -424,7 +424,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
- side_data.data(), side_data.size());
- } else {
-- int side_data_size = 0;
-+ size_t side_data_size = 0;
- uint8_t* side_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
-
-@@ -485,7 +485,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- packet->size - data_offset);
- }
-
-- int skip_samples_size = 0;
-+ size_t skip_samples_size = 0;
- const uint32_t* skip_samples_ptr =
- reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
-diff --git a/chromium/media/filters/ffmpeg_glue.cc b/chromium/media/filters/ffmpeg_glue.cc
-index 0ef3521473d..8483ecc348f 100644
---- a/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
-+++ b/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
-@@ -59,7 +59,6 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) {
- }
-
- void FFmpegGlue::InitializeFFmpeg() {
-- av_register_all();
- }
-
- static void LogContainer(bool is_local_file,
-@@ -95,9 +94,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
- // Enable fast, but inaccurate seeks for MP3.
- format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
-
-- // Ensures we can read out various metadata bits like vp8 alpha.
-- format_context_->flags |= AVFMT_FLAG_KEEP_SIDE_DATA;
--
- // Ensures format parsing errors will bail out. From an audit on 11/2017, all
- // instances were real failures. Solves bugs like http://crbug.com/710791.
- format_context_->error_recognition |= AV_EF_EXPLODE;
-diff --git a/chromium/media/filters/ffmpeg_video_decoder.cc b/chromium/media/filters/ffmpeg_video_decoder.cc
-index ef12477ee89..7996606f5f9 100644
---- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
-+++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
-@@ -391,7 +391,7 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
- if (decode_nalus_)
- codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
-
-- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
- if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
- ReleaseFFmpegResources();
- return false;
-diff --git a/chromium/media/filters/media_file_checker.cc b/chromium/media/filters/media_file_checker.cc
-index 59c2a2fc618..1a9872c7acb 100644
---- a/src/3rdparty/chromium/media/filters/media_file_checker.cc
-+++ b/src/3rdparty/chromium/media/filters/media_file_checker.cc
-@@ -68,7 +68,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
- auto context = AVStreamToAVCodecContext(format_context->streams[i]);
- if (!context)
- continue;
-- AVCodec* codec = avcodec_find_decoder(cp->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
- if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
- auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
- stream_contexts[i] = {std::move(context), std::move(loop)};
-diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-index 9002b874611..d12fade8b63 100644
---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-@@ -203,7 +203,7 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings,
- // a pointer |this|.
- av_context_->opaque = this;
-
-- AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
- if (!codec) {
- // This is an indication that FFmpeg has not been initialized or it has not
- // been compiled/initialized with the correct set of codecs.
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
deleted file mode 100644
index cd476564..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtwebengine/0001-skia-Some-includes-to-fix-build-with-GCC-12.patch?expand=1
-https://bugs.gentoo.org/840326
-
-From 68799a1e0815b20ca59ce354a55280399257a201 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Fri, 25 Mar 2022 15:29:28 +0100
-Subject: [PATCH] skia: Some includes to fix build with GCC 12
-
-Those includes got introduced upstream for other reasons and fixed building
-with GCC 12 as a side effect.
---- a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
-+++ b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
-@@ -12,6 +12,8 @@
- #include "include/core/SkScalar.h"
- #include "include/core/SkTypes.h"
-
-+#include <array>
-+
- /** \file SkColor.h
-
- Types, consts, functions, and macros for colors.
---- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-@@ -8,6 +8,8 @@
-
- #include "include/utils/SkParse.h"
-
-+#include <algorithm> // std::lower_bound
-+
- static constexpr const char* gColorNames[] = {
- "aliceblue",
- "antiquewhite",
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
deleted file mode 100644
index a319f521..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/core/gn_run.pro
-+++ b/src/core/gn_run.pro
-@@ -64,6 +64,7 @@
- }
- } else {
- gn_args+= "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\""
-+ gn_args += $$(EXTRA_GN)
- gn_args = $$system_quote($$gn_args)
- gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
- gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args --root=$$gn_src_root
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch
deleted file mode 100644
index c38bf1bd..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7e11d69b957595a172a3eb60db17141daed29d63 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Mon, 20 Jun 2022 17:19:58 +0200
-Subject: Fixup: CVE-2022-0796: Use after free in Media
-
-Commit ecc2bb74f1f accidentally introduced a build break due to an
-apparent typo.
-
-This fixes it.
-
-Change-Id: I746c6f10ecd2b212b847a291677e24e527d6b922
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- chromium/content/renderer/media/batching_media_log.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
-index b68535aea42..a28d426878f 100644
---- a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
-+++ b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
-@@ -72,18 +72,18 @@ class CONTENT_EXPORT BatchingMediaLog : public media::MediaLog {
- // guarantees provided by MediaLog, since SendQueuedMediaEvents must also
- // be synchronized with respect to AddEvent.
- mutable base::Lock lock_;
-- const base::TickClock* tick_clock_ GUARDED_BY(LOCK);
-- base::TimeTicks last_ipc_send_time_ GUARDED_BY(LOCK);
-- std::vector<media::MediaLogRecord> queued_media_events_ GUARDED_BY(LOCK);
-+ const base::TickClock* tick_clock_ GUARDED_BY(lock_);
-+ base::TimeTicks last_ipc_send_time_ GUARDED_BY(lock_);
-+ std::vector<media::MediaLogRecord> queued_media_events_ GUARDED_BY(lock_);
-
- // impl for sending queued events.
-- std::vector<std::unique_ptr<EventHandler>> event_handlers_ GUARDED_BY(LOCK);
-+ std::vector<std::unique_ptr<EventHandler>> event_handlers_ GUARDED_BY(lock_);
-
- // For enforcing max 1 pending send.
-- bool ipc_send_pending_ GUARDED_BY(LOCK);
-+ bool ipc_send_pending_ GUARDED_BY(lock_);
-
- // Limits the number of events we send over IPC to one.
-- std::unique_ptr<media::MediaLogRecord> last_duration_changed_event_ GUARDED_BY(LOCK);
-+ std::unique_ptr<media::MediaLogRecord> last_duration_changed_event_ GUARDED_BY(lock_);
-
- // Holds the earliest MEDIA_ERROR_LOG_ENTRY event added to this log. This is
- // most likely to contain the most specific information available describing
---
-cgit v1.2.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-clang-libc++.patch
new file mode 100644
index 00000000..ac9c4db9
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-clang-libc++.patch
@@ -0,0 +1,11 @@
+--- a/src/gn/CMakeLists.txt
++++ b/src/gn/CMakeLists.txt
+@@ -46,6 +46,7 @@ add_custom_command(
+ --ld ${GN_LINKER}
+ --ar ${CMAKE_AR}
+ --qt-version "${QT_REPO_MODULE_VERSION}.qtwebengine.qt.io"
++ --no-static-libstdc++
+ $<$<PLATFORM_ID:Darwin>:--isysroot>
+ $<$<PLATFORM_ID:Darwin>:${CMAKE_OSX_SYSROOT}>
+ COMMAND Ninja::ninja -C ${GN_BINARY_DIR}/$<CONFIG> ${GN_EXECUTABLE}
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-canonicalize-file-name.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-canonicalize-file-name.patch
new file mode 100644
index 00000000..c192269a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-canonicalize-file-name.patch
@@ -0,0 +1,16 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0010-canonicalize-file-name.patch
+
+no canonicalize_file_name on musl. funnily, the file using this says this is
+not portable, but avoids the nonportability of realpath(path, NULL);
+
+--- a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
++++ b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
+@@ -139,7 +139,7 @@
+ #define HAVE_ACCESS 1
+
+ /* Define to 1 if you have the `canonicalize_file_name' function. */
+-#define HAVE_CANONICALIZE_FILE_NAME 1
++/* #define HAVE_CANONICALIZE_FILE_NAME 1 */
+
+ /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
+ /* #undef HAVE_CPU_TO_LE16 */
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-close.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-close.patch
new file mode 100644
index 00000000..208ab64f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-close.patch
@@ -0,0 +1,33 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0009-close.patch
+
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -7,6 +7,7 @@
+ #include <algorithm>
+ #include <array>
+ #include <atomic>
++#include <dlfcn.h>
+
+ #include "base/compiler_specific.h"
+ #include "base/debug/stack_trace.h"
+@@ -80,9 +81,18 @@
+
+ extern "C" {
+
+-int __close(int);
+-
+ __attribute__((visibility("default"), noinline)) int close(int fd) {
++ static int (*__close)(int) = nullptr;
++
++ if (__close == nullptr) {
++ __close = (int (*)(int))dlsym(RTLD_NEXT, "close");
++
++ if (__close == nullptr) {
++ RAW_LOG(ERROR, "musl close not found\n");
++ IMMEDIATE_CRASH();
++ }
++ }
++
+ if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+ CrashOnFdOwnershipViolation();
+ return __close(fd);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-crashpad.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-crashpad.patch
new file mode 100644
index 00000000..ed3ca52c
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-crashpad.patch
@@ -0,0 +1,13 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0005-qt-musl-crashpad.patch
+
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -273,7 +273,7 @@ union FloatContext {
+ "Size mismatch");
+ #elif defined(ARCH_CPU_ARMEL)
+ static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch");
+-#if !defined(__GLIBC__)
++#if defined(OS_ANDROID)
+ static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch");
+ #endif
+ #elif defined(ARCH_CPU_ARM64)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-default-pthread-stacksize.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-default-pthread-stacksize.patch
new file mode 100644
index 00000000..f9f63734
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-default-pthread-stacksize.patch
@@ -0,0 +1,23 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -186,7 +186,8 @@
+
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
+- return 0;
++ // use 2mb to avoid running out of space. This is what android uses
++ return 2 * (1 << 20);
+ #else
+ // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+ // default stack size isn't enough for some browser tests.
+--- a/src/3rdparty/chromium/base/threading/platform_thread_unittest.cc.orig
++++ b/src/3rdparty/chromium/base/threading/platform_thread_unittest.cc
+@@ -411,7 +411,7 @@
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
+ !defined(THREAD_SANITIZER)) || \
+ (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER))
+- EXPECT_EQ(0u, stack_size);
++ EXPECT_EQ(2u << 20, stack_size);
+ #else
+ EXPECT_GT(stack_size, 0u);
+ EXPECT_LT(stack_size, 20u * (1 << 20));
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-disable-glibc-check.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-disable-glibc-check.patch
new file mode 100644
index 00000000..ef690267
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-disable-glibc-check.patch
@@ -0,0 +1,21 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/remove-glibc-check.patch
+
+Qt checks if glibc is available and if not disables large part of Qt6WebEngine and thus cripples functionality.
+However these parts work fine with Musl so there is no need to disable them. - Alpine
+
+Just remove the check so it builds again.
+
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -403,11 +403,6 @@ add_check_for_support(
+ CONDITION NOT LINUX OR PkgConfig_FOUND
+ MESSAGE "A pkg-config support is required."
+ )
+-add_check_for_support(
+- MODULES QtWebEngine QtPdf
+- CONDITION NOT LINUX OR TEST_glibc
+- MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+ add_check_for_support(
+ MODULES QtWebEngine QtPdf
+ CONDITION NOT LINUX OR TEST_khr
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-fix-narrowing-cast.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-fix-narrowing-cast.patch
new file mode 100644
index 00000000..e76cc996
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-fix-narrowing-cast.patch
@@ -0,0 +1,44 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -30,7 +30,7 @@
+ case EXT2_SUPER_MAGIC: // Also ext3 and ext4
+ case MSDOS_SUPER_MAGIC:
+ case REISERFS_SUPER_MAGIC:
+- case static_cast<int>(BTRFS_SUPER_MAGIC):
++ case BTRFS_SUPER_MAGIC:
+ case 0x5346544E: // NTFS
+ case 0x58465342: // XFS
+ case 0x3153464A: // JFS
+@@ -40,14 +40,14 @@
+ *type = FILE_SYSTEM_NFS;
+ break;
+ case SMB_SUPER_MAGIC:
+- case static_cast<int>(0xFF534D42): // CIFS
++ case 0xFF534D42: // CIFS
+ *type = FILE_SYSTEM_SMB;
+ break;
+ case CODA_SUPER_MAGIC:
+ *type = FILE_SYSTEM_CODA;
+ break;
+- case static_cast<int>(HUGETLBFS_MAGIC):
+- case static_cast<int>(RAMFS_MAGIC):
++ case HUGETLBFS_MAGIC:
++ case RAMFS_MAGIC:
+ case TMPFS_MAGIC:
+ *type = FILE_SYSTEM_MEMORY;
+ break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@
+ if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+ return false;
+
+ switch (stats.f_type) {
+ case TMPFS_MAGIC:
+- case static_cast<int>(HUGETLBFS_MAGIC):
+- case static_cast<int>(RAMFS_MAGIC):
++ case HUGETLBFS_MAGIC:
++ case RAMFS_MAGIC:
+ return true;
+ }
+ return false;
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-lfs64.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-lfs64.patch
new file mode 100644
index 00000000..55a8785f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-lfs64.patch
@@ -0,0 +1,37 @@
+--- a/src/3rdparty/gn/src/base/files/file.h
++++ b/src/3rdparty/gn/src/base/files/file.h
+@@ -26,7 +26,7 @@ namespace base {
+ defined(OS_ANDROID) && __ANDROID_API__ < 21
+ typedef struct stat stat_wrapper_t;
+ #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+-typedef struct stat64 stat_wrapper_t;
++typedef struct stat stat_wrapper_t;
+ #endif
+
+ // Thin wrapper around an OS-level file.
+--- a/src/3rdparty/gn/src/base/files/file_posix.cc
++++ b/src/3rdparty/gn/src/base/files/file_posix.cc
+@@ -32,7 +32,7 @@ int CallFstat(int fd, stat_wrapper_t* sb
+ }
+ #else
+ int CallFstat(int fd, stat_wrapper_t* sb) {
+- return fstat64(fd, sb);
++ return fstat(fd, sb);
+ }
+ #endif
+
+--- a/src/3rdparty/gn/src/base/files/file_util_posix.cc
++++ b/src/3rdparty/gn/src/base/files/file_util_posix.cc
+@@ -70,10 +70,10 @@ int CallLstat(const char* path, stat_wra
+ }
+ #else
+ int CallStat(const char* path, stat_wrapper_t* sb) {
+- return stat64(path, sb);
++ return stat(path, sb);
+ }
+ int CallLstat(const char* path, stat_wrapper_t* sb) {
+- return lstat64(path, sb);
++ return lstat(path, sb);
+ }
+ #endif
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-mallinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-mallinfo.patch
new file mode 100644
index 00000000..c45e1468
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-mallinfo.patch
@@ -0,0 +1,75 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0003-qt-musl-mallinfo.patch
+
+musl does not implement mallinfo()/mallinfo2()
+(or rather, malloc-ng, musl's allocator, doesn't)
+--
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -185,7 +185,6 @@
+ #define MALLINFO2_FOUND_IN_LIBC
+ struct mallinfo2 info = mallinfo2();
+ #endif
+-#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if !defined(MALLINFO2_FOUND_IN_LIBC)
+ struct mallinfo info = mallinfo();
+ #endif
+@@ -205,6 +204,7 @@
+ sys_alloc_dump->AddScalar(MemoryAllocatorDump::kNameSize,
+ MemoryAllocatorDump::kUnitsBytes, info.uordblks);
+ }
++#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ }
+ #endif
+
+@@ -339,7 +340,7 @@
+ &allocated_objects_count);
+ #elif BUILDFLAG(IS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
+ &allocated_objects_size, &allocated_objects_count);
+ #endif
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@
+
+ #endif // !BUILDFLAG(IS_FUCHSIA)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+ namespace {
+
+ size_t GetMallocUsageMallinfo() {
+@@ -123,7 +123,7 @@
+ }
+
+ } // namespace
+-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
++#endif // (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) ||
+ // BUILDFLAG(IS_ANDROID)
+
+ size_t ProcessMetrics::GetMallocUsage() {
+@@ -131,9 +131,9 @@
+ malloc_statistics_t stats = {0};
+ malloc_zone_statistics(nullptr, &stats);
+ return stats.size_in_use;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+ return GetMallocUsageMallinfo();
+-#elif BUILDFLAG(IS_FUCHSIA)
++#else
+ // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+ return 0;
+ #endif
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
+@@ -717,7 +717,7 @@
+
+ #endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if 0
+ SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW {
+ base::SimplePartitionStatsDumper allocator_dumper;
+ Allocator()->DumpStats("malloc", true, &allocator_dumper);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-missing-includes.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-missing-includes.patch
new file mode 100644
index 00000000..697867a5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-missing-includes.patch
@@ -0,0 +1,22 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0014-missing-includes.patch
+
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.h
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.h
+@@ -13,6 +13,7 @@
+
+ #include <string>
+ #include <vector>
++#include <sys/types.h>
+
+ #include "sandbox/linux/system_headers/capability.h"
+ #include "sandbox/sandbox_export.h"
+--- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
++++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
+@@ -2,6 +2,7 @@
+ #define QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
+
+ #include <stddef.h>
++#include <inttypes.h>
+
+ #include <functional>
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-no-execinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-no-execinfo.patch
new file mode 100644
index 00000000..2a16bf39
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-no-execinfo.patch
@@ -0,0 +1,98 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0006-no-execinfo.patch
+
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+
+@@ -89,7 +89,7 @@
+ // Note: code in this function is NOT async-signal safe (std::string uses
+ // malloc internally).
+
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ std::string::size_type search_from = 0;
+ while (search_from < text->size()) {
+ // Look for the start of a mangled symbol, from search_from.
+@@ -136,7 +136,7 @@
+ virtual ~BacktraceOutputHandler() = default;
+ };
+
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+ // This should be more than enough to store a 64-bit number in hex:
+ // 16 hex digits + 1 for null-terminator.
+@@ -839,7 +839,7 @@
+ // If we do not have unwind tables, then try tracing using frame pointers.
+ return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+ count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+ // Though the backtrace API man page does not list any possible negative
+ // return values, we take no chance.
+ return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ PrintBacktraceOutputHandler handler;
+ ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+ const char* prefix_string) const {
+ StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc
++++ b/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc
+@@ -11,7 +11,9 @@
+
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+
+ #include <vector>
+
+@@ -96,7 +98,7 @@
+ }
+
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+ char** names = backtrace_symbols(&address, 1);
+ const char* name = names[0];
+ // The array of names is malloc'ed. However, each name string is static
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -251,7 +253,9 @@
+ }
+
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+ OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+
+ std::string StackTrace::ToString() const {
+@@ -281,7 +281,7 @@
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+ std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+ return stream.str();
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-remove-decls-usage.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-remove-decls-usage.patch
new file mode 100644
index 00000000..7145a066
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-remove-decls-usage.patch
@@ -0,0 +1,122 @@
+diff -upr a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_internals.h b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_internals.h
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_internals.h 2023-06-17 02:09:34.375431959 +0000
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_internals.h 2023-06-17 02:40:16.075431600 +0000
+@@ -9,10 +9,6 @@
+
+ #if defined(__GNUC__)
+
+-#if BUILDFLAG(IS_POSIX)
+-#include <sys/cdefs.h> // for __THROW
+-#endif
+-
+ #ifndef __THROW // Not a glibc system
+ #ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead
+ #define __THROW _NOEXCEPT
+diff -upr a/src/3rdparty/chromium/base/mac/close_nocancel.cc b/src/3rdparty/chromium/base/mac/close_nocancel.cc
+--- a/src/3rdparty/chromium/base/mac/close_nocancel.cc 2023-06-17 02:09:34.382098624 +0000
++++ b/src/3rdparty/chromium/base/mac/close_nocancel.cc 2023-06-17 02:40:39.528764926 +0000
+@@ -34,7 +34,6 @@
+ // is resolved from libsyscall. By linking with this version of close prior to
+ // the libsyscall version, close's implementation is overridden.
+
+-#include <sys/cdefs.h>
+ #include <unistd.h>
+
+ // If the non-cancelable variants of all system calls have already been
+diff -upr a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
+--- a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h 2023-06-17 02:09:35.038765298 +0000
++++ b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h 2023-06-17 02:36:09.195431519 +0000
+@@ -28,7 +28,6 @@
+ * These routines provide access to the systems DNS configuration
+ */
+
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -91,7 +90,9 @@ typedef struct {
+ #pragma pack()
+
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /*
+ * DNS configuration access APIs
+@@ -109,6 +110,8 @@ void
+ _dns_configuration_ack (dns_config_t *config,
+ const char *bundle_id);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* __DNSINFO_H__ */
+diff -upr a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h 2023-06-17 02:09:35.308765297 +0000
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h 2023-06-17 02:40:53.098764952 +0000
+@@ -17,8 +17,6 @@
+
+ #include_next <sys/ptrace.h>
+
+-#include <sys/cdefs.h>
+-
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+ defined(__GLIBC__)
+diff -upr a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h 2023-06-17 02:09:35.815431964 +0000
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h 2023-06-17 02:35:08.408764861 +0000
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+
+ #include <linux/types.h>
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ struct sync_legacy_merge_data {
+ int32_t fd2;
+@@ -158,6 +159,8 @@ struct sync_pt_info *sync_pt_info(struct
+ struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* __SYS_CORE_SYNC_H */
+diff -upr a/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h b/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h
+--- a/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h 2023-06-17 02:09:35.815431964 +0000
++++ b/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h 2023-06-17 02:36:58.752098226 +0000
+@@ -19,7 +19,9 @@
+ #ifndef __SYS_CORE_SW_SYNC_H
+ #define __SYS_CORE_SW_SYNC_H
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /*
+ * sw_sync is mainly intended for testing and should not be compiled into
+@@ -30,6 +32,8 @@ int sw_sync_timeline_create(void);
+ int sw_sync_timeline_inc(int fd, unsigned count);
+ int sw_sync_fence_create(int fd, const char *name, unsigned value);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* __SYS_CORE_SW_SYNC_H */
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-resolve.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-resolve.patch
new file mode 100644
index 00000000..0931a2d3
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-resolve.patch
@@ -0,0 +1,66 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0004-qt-musl-resolve.patch
+
+--- a/src/3rdparty/chromium/net/dns/public/scoped_res_state.cc
++++ b/src/3rdparty/chromium/net/dns/public/scoped_res_state.cc
+@@ -13,7 +13,7 @@
+ namespace net {
+
+ ScopedResState::ScopedResState() {
+-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(_GNU_SOURCE)
+ // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+ // res_init behaves the same way.
+ memset(&_res, 0, sizeof(_res));
+@@ -25,16 +25,8 @@
+ }
+
+ ScopedResState::~ScopedResState() {
+-#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
+-
+- // Prefer res_ndestroy where available.
+-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
+- res_ndestroy(&res_);
+-#else
+- res_nclose(&res_);
+-#endif // BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
+-
+-#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
++ // musl res_init() doesn't actually do anything
++ // no destruction is necessary as no memory has been allocated
+ }
+
+ bool ScopedResState::IsValid() const {
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -6,8 +6,7 @@
+
+ #include "build/build_config.h"
+
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
+- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
++#if defined(__GLIBC__)
+
+ #include <resolv.h>
+
+--- a/src/3rdparty/chromium/net/dns/host_resolver_system_task.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_system_task.cc
+@@ -310,8 +310,7 @@
+ }
+
+ void EnsureSystemHostResolverCallReady() {
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
+- !BUILDFLAG(IS_ANDROID)
++#if defined(__GLIBC__)
+ EnsureDnsReloaderInit();
+ #elif BUILDFLAG(IS_WIN)
+ EnsureWinsockInit();
+@@ -396,8 +396,7 @@
+ base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+ base::BlockingType::WILL_BLOCK);
+
+-#if BUILDFLAG(IS_POSIX) && \
+- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID))
++#if defined(__GLIBC__)
+ DnsReloaderMaybeReload();
+ #endif
+ auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-sandbox.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-sandbox.patch
new file mode 100644
index 00000000..b1a5647b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-sandbox.patch
@@ -0,0 +1,97 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0007-musl-sandbox.patch
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -139,21 +139,11 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+ const Arg<unsigned long> flags(0);
+-
+- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+- CLONE_SIGHAND | CLONE_THREAD |
+- CLONE_SYSVSEM;
+- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
+-
+- const uint64_t kGlibcPthreadFlags =
+- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
+- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
+- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
+-
+- const BoolExpr android_test =
+- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
+- flags == kGlibcPthreadFlags);
++ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++ CLONE_THREAD | CLONE_SYSVSEM;
++ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++ CLONE_DETACHED;
++ const BoolExpr thread_clone_ok = (flags&~safe)==required;
+
+ // The following two flags are the two important flags in any vfork-emulating
+ // clone call. EPERM any clone call that contains both of them.
+@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+ AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
+ (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
+
+- return If(IsAndroid() ? android_test : glibc_test, Allow())
++ return If(thread_clone_ok, Allow())
+ .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+ .Else(CrashSIGSYSClone());
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+ #if defined(__i386__)
+ case __NR_waitpid:
+ #endif
++ case __NR_set_tid_address:
+ return true;
+ case __NR_clone: // Should be parameter-restricted.
+ case __NR_setns: // Privileged.
+@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+ case __NR_set_thread_area:
+ #endif
+- case __NR_set_tid_address:
+ case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+ case __NR_vfork:
+@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
+ case __NR_mlock:
+ case __NR_munlock:
+ case __NR_munmap:
++ case __NR_mremap:
++ case __NR_membarrier:
+ return true;
+ case __NR_madvise:
+ case __NR_mincore:
+@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
+ case __NR_modify_ldt:
+ #endif
+ case __NR_mprotect:
+- case __NR_mremap:
+ case __NR_msync:
+ case __NR_munlockall:
+ case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -10,6 +10,7 @@
+ #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+
+ #include "build/build_config.h"
++#include <sys/syscall.h>
+
+ #if defined(__x86_64__)
+ #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h"
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -94,6 +94,9 @@
+ case __NR_pwrite64:
+ case __NR_sched_get_priority_max:
+ case __NR_sched_get_priority_min:
++ case __NR_sched_getparam:
++ case __NR_sched_getscheduler:
++ case __NR_sched_setscheduler:
+ case __NR_sysinfo:
+ case __NR_times:
+ case __NR_uname:
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-stat.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-stat.patch
new file mode 100644
index 00000000..5d80a8c7
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-stat.patch
@@ -0,0 +1,14 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0008-musl-stat.patch
+
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+
+ #if BUILDFLAG(IS_BSD) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_NACL) || \
+- BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21)
++ BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21) || \
++ (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-systypes.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-systypes.patch
new file mode 100644
index 00000000..f4e71e93
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-systypes.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/base/third_party/symbolize/symbolize.h
++++ b/src/3rdparty/chromium/base/third_party/symbolize/symbolize.h
+@@ -58,6 +58,8 @@
+ #include "config.h"
+ #include "glog/logging.h"
+
++#include <sys/types.h>
++
+ #ifdef HAVE_SYMBOLIZE
+
+ #if defined(__ELF__) // defined by gcc
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-temp-retry-failure.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-temp-retry-failure.patch
new file mode 100644
index 00000000..23940dd8
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-temp-retry-failure.patch
@@ -0,0 +1,21 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0002-temp-failure-retry.patch
+
+random glibc macro
+
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -11,6 +11,14 @@
+ #include <stdbool.h>
+ #include <sys/types.h>
+
++// Some additional functions
++# define TEMP_FAILURE_RETRY(expression) \
++ (__extension__ \
++ ({ long int __result; \
++ do __result = (long int) (expression); \
++ while (__result == -1L && errno == EINTR); \
++ __result; }))
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-wtf-stacksize.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-wtf-stacksize.patch
new file mode 100644
index 00000000..fd7b4fa2
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-wtf-stacksize.patch
@@ -0,0 +1,22 @@
+https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0011-wtf-stacksize.patch
+
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+
+-#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+ BUILDFLAG(IS_FUCHSIA)
+ // pthread_getattr_np() can fail if the thread is not invoked by
+ // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@
+ }
+
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+ BUILDFLAG(IS_FUCHSIA)
+ pthread_attr_t attr;
+ int error;
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch
new file mode 100644
index 00000000..7caf2020
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch
@@ -0,0 +1,99 @@
+Qt Upstream: https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=6.5&id=281174f5e010d819a49562b48b2c2067255a41c6
+
+From 281174f5e010d819a49562b48b2c2067255a41c6 Mon Sep 17 00:00:00 2001
+From: Szabolcs David <davidsz@inf.u-szeged.hu>
+Date: Fri, 19 May 2023 01:00:41 +0200
+Subject: Normalize clipboard permissions
+
+Handle clipboard read and write permissions the same way everywhere.
+
+Fixes: QTBUG-113579
+Change-Id: If1f271e8591c54f4ee2f935486502df19d5f6b3e
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit 79e4a37668a9176373e81fe4fc8dfe29f6c8c37b)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+ src/core/permission_manager_qt.cpp | 46 +++++++++++++++++++-------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp
+index 9d98c0592..28e1c981d 100644
+--- a/src/core/permission_manager_qt.cpp
++++ b/src/core/permission_manager_qt.cpp
+@@ -84,6 +84,22 @@ static blink::mojom::PermissionStatus toBlink(ProfileAdapter::PermissionState re
+ }
+ }
+
++static blink::mojom::PermissionStatus getStatusFromSettings(blink::PermissionType type, WebEngineSettings *settings)
++{
++ switch (type) {
++ case blink::PermissionType::CLIPBOARD_READ_WRITE:
++ if (!settings->testAttribute(QWebEngineSettings::JavascriptCanPaste))
++ return blink::mojom::PermissionStatus::DENIED;
++ Q_FALLTHROUGH();
++ case blink::PermissionType::CLIPBOARD_SANITIZED_WRITE:
++ if (!settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard))
++ return blink::mojom::PermissionStatus::DENIED;
++ return blink::mojom::PermissionStatus::GRANTED;
++ default:
++ return blink::mojom::PermissionStatus::ASK;
++ }
++}
++
+ PermissionManagerQt::PermissionManagerQt()
+ : m_requestIdCount(0)
+ {
+@@ -179,13 +195,8 @@ void PermissionManagerQt::RequestPermission(blink::PermissionType permission,
+ Q_ASSERT(contentsDelegate);
+
+ ProfileAdapter::PermissionType permissionType = toQt(permission);
+- if (permissionType == ProfileAdapter::ClipboardRead) {
+- WebEngineSettings *settings = contentsDelegate->webEngineSettings();
+- if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)
+- && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste))
+- std::move(callback).Run(blink::mojom::PermissionStatus::GRANTED);
+- else
+- std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
++ if (permissionType == ProfileAdapter::ClipboardRead || permissionType == ProfileAdapter::ClipboardWrite) {
++ std::move(callback).Run(getStatusFromSettings(permission, contentsDelegate->webEngineSettings()));
+ return;
+ } else if (!canRequestPermissionFor(permissionType)) {
+ std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
+@@ -220,14 +231,9 @@ void PermissionManagerQt::RequestPermissions(const std::vector<blink::Permission
+ const ProfileAdapter::PermissionType permissionType = toQt(permission);
+ if (permissionType == ProfileAdapter::UnsupportedPermission)
+ result.push_back(blink::mojom::PermissionStatus::DENIED);
+- else if (permissionType == ProfileAdapter::ClipboardRead) {
+- WebEngineSettings *settings = contentsDelegate->webEngineSettings();
+- if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)
+- && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste))
+- result.push_back(blink::mojom::PermissionStatus::GRANTED);
+- else
+- result.push_back(blink::mojom::PermissionStatus::DENIED);
+- } else {
++ else if (permissionType == ProfileAdapter::ClipboardRead || permissionType == ProfileAdapter::ClipboardWrite)
++ result.push_back(getStatusFromSettings(permission, contentsDelegate->webEngineSettings()));
++ else {
+ answerable = false;
+ break;
+ }
+@@ -280,14 +286,8 @@ blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForCurren
+ permission == blink::PermissionType::CLIPBOARD_SANITIZED_WRITE) {
+ WebContentsDelegateQt *delegate = static_cast<WebContentsDelegateQt *>(
+ content::WebContents::FromRenderFrameHost(render_frame_host)->GetDelegate());
+- if (!delegate->webEngineSettings()->testAttribute(
+- QWebEngineSettings::JavascriptCanAccessClipboard))
+- return blink::mojom::PermissionStatus::DENIED;
+- if (permission == blink::PermissionType::CLIPBOARD_READ_WRITE
+- && !delegate->webEngineSettings()->testAttribute(
+- QWebEngineSettings::JavascriptCanPaste))
+- return blink::mojom::PermissionStatus::DENIED;
+- return blink::mojom::PermissionStatus::GRANTED;
++ Q_ASSERT(delegate);
++ return getStatusFromSettings(permission, delegate->webEngineSettings());
+ }
+
+ return GetPermissionStatus(
+--
+cgit v1.2.3
+
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index cbcf0f7a..f447332f 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -14,8 +14,6 @@
<flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="jumbo-build">Combine source files to speed up build process.</flag>
- <flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
- <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
</use>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild
similarity index 80%
copy from dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
copy to dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild
index 83bf6999..8447fc5e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
@@ -11,10 +11,10 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
HOMEPAGE="https://www.qt.io/"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
- S="${WORKDIR}/${P}"
+ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P/10_p/9_p}.tar.xz"
+ S="${WORKDIR}/${P/10_p/9_p}"
QT5_BUILD_DIR="${S}_build"
fi
else
@@ -27,11 +27,10 @@ else
fi
# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.8_p20230313-patchset.tar.xz
ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -80,9 +79,8 @@ RDEPEND="
designer? ( =dev-qt/designer-${QT5_PV}* )
geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
kerberos? ( virtual/krb5 )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse )
screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
@@ -99,23 +97,13 @@ BDEPEND="${PYTHON_DEPS}
net-libs/nodejs[ssl]
sys-devel/bison
sys-devel/flex
- elibc_musl? ( sys-libs/queue-standalone )
ppc64? ( >=dev-util/gn-0.1807 )
"
PATCHES=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.3_p20220505-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_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
- "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
- "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
- "${FILESDIR}/${P}-fixup-CVE-2022-0796.patch" # bug 853097
-
- # for musl libc
+ "${WORKDIR}/${PN}-5.15.8_p20230313-patchset"
+
+ # Patches for musl support
"${FILESDIR}"/${PN}-5.15.5_p20220618-qmake-remove-glibc-check.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mallinfo.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mojo-strncpy.patch
@@ -125,8 +113,13 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.15.5_p20220618-linux-stack_util-stackstart.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-remove-decls-usage.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-msghdr-padding-initlist.patch
+ "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-canonicalize-filename.patch
+ "${FILESDIR}"/${PN}-5.15.10_p20230505-musl-lfs64.patch
## runtime
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-sandbox.patch
+
+ # Patch for clang 16 fix
+ "${FILESDIR}"/${PN}-5.15.10_p20230505-clang-16.patch
)
qtwebengine_check-reqs() {
@@ -181,10 +174,9 @@ src_unpack() {
}
src_prepare() {
- # Using a conditional patch here since QMake is deprecated
- # by CMake in Qt6. A build system change would be prettier but
- # this works just as well right now.
- use elibc_musl && PATCHES+=( "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-canonicalize-filename.patch )
+ # upstreamed, but not spinning new patchset just yet
+ rm "${WORKDIR}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.patch || die
+
if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
@@ -218,12 +210,10 @@ src_prepare() {
fi
# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
- if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- fi
-
- if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
+ if tc-is-clang ; then
+ if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ fi
fi
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
@@ -272,7 +262,7 @@ src_configure() {
$(qt_use kerberos webengine-kerberos)
$(qt_use pulseaudio)
$(usex screencast -webengine-webrtc-pipewire '')
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ -qt-ffmpeg # bug 831487
$(qt_use system-icu webengine-icu)
)
qt5-build_src_configure
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
similarity index 81%
rename from dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
index 83bf6999..c46842d7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
@@ -11,7 +11,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
HOMEPAGE="https://www.qt.io/"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
@@ -27,11 +27,10 @@ else
fi
# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.8_p20230313-patchset.tar.xz
ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -80,9 +79,8 @@ RDEPEND="
designer? ( =dev-qt/designer-${QT5_PV}* )
geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
kerberos? ( virtual/krb5 )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse )
screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
@@ -99,23 +97,13 @@ BDEPEND="${PYTHON_DEPS}
net-libs/nodejs[ssl]
sys-devel/bison
sys-devel/flex
- elibc_musl? ( sys-libs/queue-standalone )
ppc64? ( >=dev-util/gn-0.1807 )
"
PATCHES=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.3_p20220505-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_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
- "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
- "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
- "${FILESDIR}/${P}-fixup-CVE-2022-0796.patch" # bug 853097
-
- # for musl libc
+ "${WORKDIR}/${PN}-5.15.8_p20230313-patchset"
+
+ # Patches for musl support
"${FILESDIR}"/${PN}-5.15.5_p20220618-qmake-remove-glibc-check.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mallinfo.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mojo-strncpy.patch
@@ -125,8 +113,13 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.15.5_p20220618-linux-stack_util-stackstart.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-remove-decls-usage.patch
"${FILESDIR}"/${PN}-5.15.5_p20220618-msghdr-padding-initlist.patch
+ "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-canonicalize-filename.patch
+ "${FILESDIR}"/${PN}-5.15.10_p20230505-musl-lfs64.patch
## runtime
"${FILESDIR}"/${PN}-5.15.5_p20220618-musl-sandbox.patch
+
+ # Patch for clang 16 fix
+ "${FILESDIR}"/${PN}-5.15.10_p20230505-clang-16.patch
)
qtwebengine_check-reqs() {
@@ -181,10 +174,9 @@ src_unpack() {
}
src_prepare() {
- # Using a conditional patch here since QMake is deprecated
- # by CMake in Qt6. A build system change would be prettier but
- # this works just as well right now.
- use elibc_musl && PATCHES+=( "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-canonicalize-filename.patch )
+ # upstreamed, but not spinning new patchset just yet
+ rm "${WORKDIR}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.patch || die
+
if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
@@ -218,12 +210,10 @@ src_prepare() {
fi
# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
- if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- fi
-
- if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
+ if tc-is-clang ; then
+ if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ fi
fi
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
@@ -272,7 +262,7 @@ src_configure() {
$(qt_use kerberos webengine-kerberos)
$(qt_use pulseaudio)
$(usex screencast -webengine-webrtc-pipewire '')
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ -qt-ffmpeg # bug 831487
$(qt_use system-icu webengine-icu)
)
qt5-build_src_configure
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild
new file mode 100644
index 00000000..59c53e8d
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild
@@ -0,0 +1,275 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+CHROMIUM_VER="108.0.5359.181"
+CHROMIUM_PATCHES_VER="112.0.5615.138"
+
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+ +system-icu widgets
+"
+REQUIRED_USE="designer? ( widgets )"
+
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/re2:=
+ =dev-qt/qtdeclarative-${PV}*
+ =dev-qt/qtwebchannel-${PV}*
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ >=media-libs/libvpx-1.5:=[svc(+)]
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib[minizip]
+ virtual/libudev
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libxcb:=
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libxshmfence:=
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ geolocation? ( =dev-qt/qtpositioning-${PV}* )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
+ widgets? (
+ =dev-qt/qtbase-${PV}*[widgets]
+ )
+"
+DEPEND="${RDEPEND}
+ media-libs/libglvnd
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-6.5.1-normalise-clipboard-permissions.patch"
+
+ # Patches for musl support
+ "${FILESDIR}/${PN}-6.5.1-musl-disable-glibc-check.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-temp-retry-failure.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-mallinfo.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-crashpad.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-no-execinfo.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-resolve.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-stat.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-close.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-canonicalize-file-name.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-wtf-stacksize.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-missing-includes.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-default-pthread-stacksize.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-fix-narrowing-cast.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-systypes.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-lfs64.patch"
+ "${FILESDIR}/${PN}-6.5.1-musl-remove-decls-usage.patch"
+ ## runtime
+ "${FILESDIR}/${PN}-6.5.1-musl-sandbox.patch"
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ # bug #307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+ ewarn "You may experience really long compilation times and/or increased memory usage."
+ ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+ fi
+ eshopts_pop
+
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ # (check-reqs added for bug #570534)
+ #
+ # Estimate the amount of RAM required
+ # Multiplier is *10 because Bash doesn't do floating point maths.
+ # Let's crudely assume ~2GB per compiler job for GCC.
+ local multiplier=20
+
+ # And call it ~1.5GB for Clang.
+ if tc-is-clang ; then
+ multiplier=15
+ fi
+
+ local CHECKREQS_DISK_BUILD="7G"
+ local CHECKREQS_DISK_USR="150M"
+ if ! has "distcc" ${FEATURES} ; then
+ # bug #830661
+ # Not super realistic to come up with good estimates for distcc right now
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
+ elog "list of backports is impossible to evaluate, but always bound to be behind"
+ elog "Chromium's release schedule."
+ elog "In addition, various online services may deny service based on an outdated"
+ elog "user agent version (and/or other checks). Google is already known to do so."
+ elog
+ elog "tldr: Your web browsing experience will be compromised."
+}
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+ ewarn "You may experience really long compilation times and/or increased memory usage."
+ ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT6_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
+ if tc-is-clang ; then
+ if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
+ eapply "${FILESDIR}/${PN}-6.5.1-clang-libc++.patch"
+ fi
+ fi
+
+ # bug 620444 - ensure local headers are used
+ find . -type f -name "*.pr[fio]" -exec \
+ sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
+
+ if use system-icu; then
+ # Sanity check to ensure that bundled copy of ICU is not used.
+ # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+ # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+ # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+ local file
+ while read file; do
+ echo "#error This file should not be used!" > "${file}" || die
+ done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+ fi
+
+ qt6-build_src_prepare
+}
+
+src_configure() {
+ export NINJA_PATH="${BROOT}"/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local mycmakeargs=(
+ #-DQT_FEATURE_accessibility=off
+ #-DQT_FEATURE_force_asserts=off
+ #-DQT_FEATURE_opengl=off
+ #-DQT_FEATURE_printer=off
+ -DQT_FEATURE_qtpdf_build=off
+ -DQT_FEATURE_qtpdf_quick_build=off
+ -DQT_FEATURE_qtpdf_widgets_build=off
+ -DQT_FEATURE_qtwebengine_build=on
+ -DQT_FEATURE_qtwebengine_quick_build=on
+ -DQT_FEATURE_qtwebengine_widgets_build=on
+ #-DQT_FEATURE_ssl=off
+ #-DQT_FEATURE_static=off
+ #-DQT_FEATURE_system_zlib=off
+ #-DQT_FEATURE_system_png=off
+ #-DQT_FEATURE_system_jpeg=off
+ #-DQT_FEATURE_system_freetype=off
+ #-DQT_FEATURE_system_harfbuzz=off
+ #-DQT_FEATURE_use_gold_linker=off
+ #-DQT_FEATURE_use_lld_linker=off
+ -DQT_FEATURE_webengine_embedded_build=off
+ -DQT_FEATURE_webengine_extensions=on
+ #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+ -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
+ -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
+ #-DQT_FEATURE_webengine_jumbo_file_merge_limit
+ -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
+ -DQT_FEATURE_webengine_native_spellchecker=off
+ -DQT_FEATURE_webengine_ozone_x11=on
+ -DQT_FEATURE_webengine_pepper_plugins=on
+ -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
+ -DQT_FEATURE_webengine_printing_and_pdf=on
+ -DQT_FEATURE_webengine_sanitizer=on
+ -DQT_FEATURE_webengine_spellchecker=on
+ -DQT_FEATURE_webengine_system_opus=on
+ -DQT_FEATURE_webengine_system_libwebp=on
+ -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
+ -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
+ -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
+ -DQT_FEATURE_webengine_system_libevent=on
+ -DQT_FEATURE_webengine_system_libopenjpeg2=on
+ -DQT_FEATURE_webengine_system_libpci=on
+ -DQT_FEATURE_webengine_system_libpng=on
+ -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
+ -DQT_FEATURE_webengine_system_zlib=on
+ -DQT_FEATURE_webengine_webchannel=on
+ -DQT_FEATURE_webengine_webrtc=on
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
+ #-DQT_FEATURE_xcb=off
+ )
+
+ qt6-build_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2025-08-28 7:36 Petr Vaněk
0 siblings, 0 replies; 10+ messages in thread
From: Petr Vaněk @ 2025-08-28 7:36 UTC (permalink / raw
To: gentoo-commits
commit: f35a70b679a777e3d7b3df71897ede556ba51678
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 28 07:34:01 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Aug 28 07:34:01 2025 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f35a70b6
dev-qt/qtwebengine: treeclean
::gentoo works fine. All three versions here are broken due to missing
dependencies.
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 4 -
.../qtwebengine-5.15.10_p20230505-clang-16.patch | 10 -
.../qtwebengine-5.15.10_p20230505-musl-lfs64.patch | 37 --
.../files/qtwebengine-5.15.2-enable-ppc64.patch | 37 --
...qtwebengine-5.15.2_p20210521-clang-libc++.patch | 10 -
...ngine-5.15.5_p20220618-backtrace-execinfo.patch | 123 ----
...5.5_p20220618-linux-stack_util-stackstart.patch | 31 -
...-5.15.5_p20220618-msghdr-padding-initlist.patch | 45 --
...15.5_p20220618-musl-canonicalize-filename.patch | 15 -
...twebengine-5.15.5_p20220618-musl-mallinfo.patch | 58 --
...engine-5.15.5_p20220618-musl-mojo-strncpy.patch | 21 -
...ngine-5.15.5_p20220618-musl-resolv-compat.patch | 80 ---
...qtwebengine-5.15.5_p20220618-musl-sandbox.patch | 111 ----
...twebengine-5.15.5_p20220618-pvalloc-patch.patch | 29 -
...5.15.5_p20220618-qmake-remove-glibc-check.patch | 81 ---
...ngine-5.15.5_p20220618-remove-decls-usage.patch | 628 ---------------------
.../files/qtwebengine-6.5.1-clang-libc++.patch | 11 -
...bengine-6.5.1-musl-canonicalize-file-name.patch | 16 -
.../files/qtwebengine-6.5.1-musl-close.patch | 33 --
.../files/qtwebengine-6.5.1-musl-crashpad.patch | 13 -
...gine-6.5.1-musl-default-pthread-stacksize.patch | 23 -
...twebengine-6.5.1-musl-disable-glibc-check.patch | 21 -
...qtwebengine-6.5.1-musl-fix-narrowing-cast.patch | 44 --
.../files/qtwebengine-6.5.1-musl-lfs64.patch | 37 --
.../files/qtwebengine-6.5.1-musl-mallinfo.patch | 75 ---
.../qtwebengine-6.5.1-musl-missing-includes.patch | 22 -
.../files/qtwebengine-6.5.1-musl-no-execinfo.patch | 98 ----
...qtwebengine-6.5.1-musl-remove-decls-usage.patch | 122 ----
.../files/qtwebengine-6.5.1-musl-resolve.patch | 66 ---
.../files/qtwebengine-6.5.1-musl-sandbox.patch | 97 ----
.../files/qtwebengine-6.5.1-musl-stat.patch | 14 -
.../files/qtwebengine-6.5.1-musl-systypes.patch | 11 -
...qtwebengine-6.5.1-musl-temp-retry-failure.patch | 21 -
.../qtwebengine-6.5.1-musl-wtf-stacksize.patch | 22 -
...ine-6.5.1-normalise-clipboard-permissions.patch | 99 ----
dev-qt/qtwebengine/metadata.xml | 29 -
.../qtwebengine-5.15.10_p20230505.ebuild | 289 ----------
.../qtwebengine-5.15.9_p20230505.ebuild | 289 ----------
dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild | 275 ---------
39 files changed, 3047 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
deleted file mode 100644
index 6cbfc321..00000000
--- a/dev-qt/qtwebengine/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
-DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
-DIST qtwebengine-5.15.9_p20230505.tar.xz 298713240 BLAKE2B 835e93a0b33e7294d72571c9031524a0e3002100e36433501cc83bac91646b788c1030ee9ce90edce39c6ee2ee61a1d697e021b6346804d3be0f0b930e6084d0 SHA512 61d16399a7d8f5c135c5c097c2dcb7ebeccfe7e31769e950443ffa8178f55ad22d90307b7bd2b2ebdcb3ee0dd2064266159c27da4fc5b35ddac346ca9f336cc1
-DIST qtwebengine-everywhere-src-6.5.1.tar.xz 412377436 BLAKE2B 1ff179daf1433246b931558f52f1cf193eff4a1d646e6f6037a40fe85fa28cf944b7f361fd68cb01b1247680d376762c2c5317be125f5b24cc08e4bbfa6f0def SHA512 68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-clang-16.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-clang-16.patch
deleted file mode 100644
index d6460de7..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-clang-16.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qtwebengine-5.15.8_p20230313-orig/src/3rdparty/chromium/build/config/compiler/BUILD.gn 2022-05-13 03:17:44.000000000 +1000
-+++ qtwebengine-5.15.8_p20230313/src/3rdparty/chromium/build/config/compiler/BUILD.gn 2023-04-06 18:09:53.528885245 +1000
-@@ -318,6 +318,7 @@
- "-Wno-parentheses-equality",
- "-Wno-tautological-compare",
- "-Wno-thread-safety-attributes",
-+ "-Wno-enum-constexpr-conversion"
- ]
- }
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-musl-lfs64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-musl-lfs64.patch
deleted file mode 100644
index ba796896..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230505-musl-lfs64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/3rdparty/gn/base/files/file.h
-+++ b/src/3rdparty/gn/base/files/file.h
-@@ -26,7 +26,7 @@ namespace base {
- defined(OS_ANDROID) && __ANDROID_API__ < 21
- typedef struct stat stat_wrapper_t;
- #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
--typedef struct stat64 stat_wrapper_t;
-+typedef struct stat stat_wrapper_t;
- #endif
-
- // Thin wrapper around an OS-level file.
---- a/src/3rdparty/gn/base/files/file_posix.cc
-+++ b/src/3rdparty/gn/base/files/file_posix.cc
-@@ -32,7 +32,7 @@ int CallFstat(int fd, stat_wrapper_t* sb
- }
- #else
- int CallFstat(int fd, stat_wrapper_t* sb) {
-- return fstat64(fd, sb);
-+ return fstat(fd, sb);
- }
- #endif
-
---- a/src/3rdparty/gn/base/files/file_util_posix.cc
-+++ b/src/3rdparty/gn/base/files/file_util_posix.cc
-@@ -70,10 +70,10 @@ int CallLstat(const char* path, stat_wra
- }
- #else
- int CallStat(const char* path, stat_wrapper_t* sb) {
-- return stat64(path, sb);
-+ return stat(path, sb);
- }
- int CallLstat(const char* path, stat_wrapper_t* sb) {
-- return lstat64(path, sb);
-+ return lstat(path, sb);
- }
- #endif
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
deleted file mode 100644
index 4fb19ccd..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 18 Jan 2020 23:52:55 +0100
-Subject: [PATCH 1/3] Enable ppc64 builds
-
----
- configure.pri | 1 +
- mkspecs/features/functions.prf | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configure.pri b/configure.pri
-index 3a144e3f8..cabe8b24a 100644
---- a/configure.pri 2021-02-24 10:45:58.000000000 +0100
-+++ - 2021-03-07 21:18:43.124754796 +0100
-@@ -144,6 +144,7 @@
- contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
- contains(QT_ARCH, "mips"): return(true)
- contains(QT_ARCH, "mips64"): return(true)
-+ contains(QT_ARCH, "power64"): return(true)
- qtLog("Architecture not supported.")
- return(false)
- }
-diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index 512e2523b..e31123654 100644
---- a/mkspecs/features/functions.prf 2021-02-24 10:45:58.000000000 +0100
-+++ - 2021-03-07 21:19:21.345036293 +0100
-@@ -107,6 +107,7 @@
- contains(qtArch, "mips"): return(mipsel)
- contains(qtArch, "mips64"): return(mips64el)
- contains(qtArch, "mips64el"): return(mips64el)
-+ contains(qtArch, "power64"): return(ppc64)
- return(unknown)
- }
-
---
-2.26.0
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch
deleted file mode 100644
index fdcc7879..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/buildtools/gn.pro
-+++ b/src/buildtools/gn.pro
-@@ -25,6 +25,7 @@
- msvc:!clang_cl: gn_gen_args += --use-lto
-
- gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args
-+ gn_configure += --no-static-libstdc++
- macos {
- gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\"
- }
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-backtrace-execinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-backtrace-execinfo.patch
deleted file mode 100644
index 88e5565c..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-backtrace-execinfo.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-execinfo.patch
-
-The backtrace api is not available in musl libc. This can be added with
-libexecinfo but that needs changes in the build system. As qmake is being swapped
-for CMake in Qt6 it makes sense to just check for glibc
-
----
- src/3rdparty/chromium/base/debug/stack_trace.cc | 4 ++--
- .../chromium/base/debug/stack_trace_posix.cc | 16 ++++++++--------
- src/3rdparty/chromium/base/logging.cc | 2 +-
- 3 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/3rdparty/chromium/base/debug/stack_trace.cc b/src/3rdparty/chromium/base/debug/stack_trace.cc
-index f5e2dbba1..f0bb80ad0 100644
---- a/src/3rdparty/chromium/base/debug/stack_trace.cc
-+++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
-@@ -225,14 +225,14 @@ std::string StackTrace::ToString() const {
- }
- std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
- std::stringstream stream;
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- OutputToStreamWithPrefix(&stream, prefix_string);
- #endif
- return stream.str();
- }
-
- std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
--#if !defined(__UCLIBC__) & !defined(_AIX)
-+#if defined(__GLIBC__) & !defined(_AIX)
- s.OutputToStream(&os);
- #else
- os << "StackTrace::OutputToStream not implemented.";
-diff --git a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
-index 6a1531e13..0b2b2e6a6 100644
---- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
-+++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
-@@ -27,7 +27,7 @@
- #if !defined(USE_SYMBOLIZE)
- #include <cxxabi.h>
- #endif
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- #include <execinfo.h>
- #endif
-
-@@ -88,7 +88,7 @@ void DemangleSymbols(std::string* text) {
- // Note: code in this function is NOT async-signal safe (std::string uses
- // malloc internally).
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- std::string::size_type search_from = 0;
- while (search_from < text->size()) {
- // Look for the start of a mangled symbol, from search_from.
-@@ -123,7 +123,7 @@ void DemangleSymbols(std::string* text) {
- search_from = mangled_start + 2;
- }
- }
--#endif // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif // defined(__GLIBC__) && !defined(_AIX)
- }
- #endif // !defined(USE_SYMBOLIZE)
-
-@@ -135,7 +135,7 @@ class BacktraceOutputHandler {
- virtual ~BacktraceOutputHandler() = default;
- };
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
- // This should be more than enough to store a 64-bit number in hex:
- // 16 hex digits + 1 for null-terminator.
-@@ -218,7 +218,7 @@ void ProcessBacktrace(void* const* trace,
- }
- #endif // defined(USE_SYMBOLIZE)
- }
--#endif // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif // defined(__GLIBC__) && !defined(_AIX)
-
- void PrintToStderr(const char* output) {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
-@@ -834,7 +834,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- // Though the backtrace API man page does not list any possible negative
- // return values, we take no chance.
- return base::saturated_cast<size_t>(backtrace(trace, count));
-@@ -847,13 +847,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- PrintBacktraceOutputHandler handler;
- ProcessBacktrace(trace_, count_, prefix_string, &handler);
- #endif
- }
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
- const char* prefix_string) const {
- StreamBacktraceOutputHandler handler(os);
-diff --git a/src/3rdparty/chromium/base/logging.cc b/src/3rdparty/chromium/base/logging.cc
-index b5cf2c493..4be936d32 100644
---- a/src/3rdparty/chromium/base/logging.cc
-+++ b/src/3rdparty/chromium/base/logging.cc
-@@ -548,7 +548,7 @@ LogMessage::LogMessage(const char* file, int line, const char* condition)
-
- LogMessage::~LogMessage() {
- size_t stack_start = stream_.tellp();
--#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
-+#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
- !defined(OS_AIX)
- if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
- // Include a stack trace on a fatal, unless a debugger is attached.
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-linux-stack_util-stackstart.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-linux-stack_util-stackstart.patch
deleted file mode 100644
index 8c7424ad..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-linux-stack_util-stackstart.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-stackstart.patch?id=65f58742e6e669c7d0f5b23c0764f4f73661980b
-
----
- .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
-index 71b901f40..f33aba04b 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
- // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
- // correctly for the main thread.
-
--#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
- defined(OS_FUCHSIA)
- // pthread_getattr_np() can fail if the thread is not invoked by
- // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
- }
-
- void* GetStackStart() {
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
- defined(OS_FUCHSIA)
- pthread_attr_t attr;
- int error;
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-msghdr-padding-initlist.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-msghdr-padding-initlist.patch
deleted file mode 100644
index 16158fd9..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-msghdr-padding-initlist.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 91fcf20ad6923db94a228faa1cf3bcdcaa5f8cbc Mon Sep 17 00:00:00 2001
-From: Alfred Persson Forsberg <cat@catcream.org>
-Date: Tue, 26 Jul 2022 20:53:11 +0200
-Subject: [PATCH] Don't use initializer list for msghdr
-
-msghdr is defined with padding in musl libc. Using an initializer list
-will set an int padding (5th element) to nullptr and break the build
-because of implicit conversion error from ptr to int.
-
-https://git.musl-libc.org/cgit/musl/tree/include/sys/socket.h#n22
-https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/bits/socket.h;h=4f1f810ea1d9bf00ff428e4e7c49a52c71620775;hb=6488f4d00653b489e7969c0a489dc665c26514a8#l262
-
-Signed-off-by: Alfred Persson Forsberg <cat@catcream.org>
----
- .../chromium/net/socket/udp_socket_posix.cc | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
-index 71265568b..58b2b1cbf 100644
---- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
-+++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
-@@ -1151,8 +1151,18 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
- for (auto& buffer : buffers)
- msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
- msgvec->reserve(buffers.size());
-- for (size_t j = 0; j < buffers.size(); j++)
-- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
-+ for (size_t j = 0; j < buffers.size(); j++) {
-+ struct msghdr msg;
-+ msg.msg_name = nullptr;
-+ msg.msg_namelen = 0;
-+ msg.msg_iov = &msg_iov[j];
-+ msg.msg_iovlen = 1;
-+ msg.msg_control = 0;
-+ msg.msg_controllen = 0;
-+ msg.msg_flags = 0;
-+
-+ msgvec->push_back({msg, 0});
-+ }
- int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
- SendResult send_result(0, 0, std::move(buffers));
- if (result < 0) {
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-canonicalize-filename.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-canonicalize-filename.patch
deleted file mode 100644
index 9a27db6d..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-canonicalize-filename.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/nasm.patch
-
-diff --git a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
-index 7eb7c20ff..3bdc2eb39 100644
---- a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
-+++ b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
-@@ -139,7 +139,7 @@
- #define HAVE_ACCESS 1
-
- /* Define to 1 if you have the `canonicalize_file_name' function. */
--#define HAVE_CANONICALIZE_FILE_NAME 1
-+// #define HAVE_CANONICALIZE_FILE_NAME 1
-
- /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
- /* #undef HAVE_CPU_TO_LE16 */
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mallinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mallinfo.patch
deleted file mode 100644
index 4f8e5ce6..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mallinfo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-mallinfo.patch
-
-musl does not support mallinfo, this patch changes OS_LINUX check to include
-checking for glibc too.
-
-Could probably be done in build system but not done because of Qt6 moving to CMake.
-
----
- src/3rdparty/chromium/base/process/process_metrics_posix.cc | 4 ++--
- .../chromium/base/trace_event/malloc_dump_provider.cc | 4 +++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/3rdparty/chromium/base/process/process_metrics_posix.cc b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
-index 9d12c427b..9030de9f6 100644
---- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
-+++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
-@@ -119,14 +119,14 @@ size_t ProcessMetrics::GetMallocUsage() {
- malloc_statistics_t stats = {0};
- malloc_zone_statistics(nullptr, &stats);
- return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
- struct mallinfo minfo = mallinfo();
- #if BUILDFLAG(USE_TCMALLOC)
- return minfo.uordblks;
- #else
- return minfo.hblkhd + minfo.arena;
- #endif
--#elif defined(OS_FUCHSIA)
-+#else //if defined(OS_FUCHSIA) // also musl doesn't do this.
- // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
- return 0;
- #endif
-diff --git a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
-index c327f4865..2717eca5a 100644
---- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
-+++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
-@@ -132,7 +132,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
- }
- #elif defined(OS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
--#else
-+#elif defined(__GLIBC__)
- struct mallinfo info = mallinfo();
- // In case of Android's jemalloc |arena| is 0 and the outer pages size is
- // reported by |hblkhd|. In case of dlmalloc the total is given by
-@@ -142,6 +142,8 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
-
- // Total allocated space is given by |uordblks|.
- allocated_objects_size = info.uordblks;
-+#else
-+ // musl libc does not support mallinfo()
- #endif
-
- MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mojo-strncpy.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mojo-strncpy.patch
deleted file mode 100644
index b228f21c..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-mojo-strncpy.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-strncpy is not defined without including string.h
-
----
- .../mojo/public/cpp/platform/named_platform_channel_posix.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc b/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc
-index 9082ac4da..d039ff83a 100644
---- a/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc
-+++ b/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc
-@@ -8,6 +8,7 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
-+#include <string.h>
-
- #include "base/files/file_util.h"
- #include "base/files/scoped_file.h"
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-resolv-compat.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-resolv-compat.patch
deleted file mode 100644
index fbf1d36e..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-resolv-compat.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-resolve.patch
-
-A better method would be to check for these functions in the build system
-but as QMake is getting replaced by CMake in Qt6 I did not bother.
-
----
- .../net/dns/dns_config_service_posix.cc | 4 +++
- src/3rdparty/chromium/net/dns/dns_reloader.cc | 4 +++
- src/3rdparty/chromium/net/dns/resolv_compat.h | 29 +++++++++++++++++++
- 3 files changed, 37 insertions(+)
- create mode 100644 src/3rdparty/chromium/net/dns/resolv_compat.h
-
-diff --git a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
-index 5a4aead0a..0e4480d16 100644
---- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
-+++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
-@@ -8,6 +8,10 @@
- #include <string>
- #include <type_traits>
-
-+#if !defined(__GLIBC__)
-+#include "resolv_compat.h"
-+#endif
-+
- #include "base/bind.h"
- #include "base/files/file.h"
- #include "base/files/file_path.h"
-diff --git a/src/3rdparty/chromium/net/dns/dns_reloader.cc b/src/3rdparty/chromium/net/dns/dns_reloader.cc
-index 0672e711a..298489866 100644
---- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
-+++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
-@@ -9,6 +9,10 @@
-
- #include <resolv.h>
-
-+#if !defined(__GLIBC__)
-+#include "resolv_compat.h"
-+#endif
-+
- #include "base/lazy_instance.h"
- #include "base/macros.h"
- #include "base/notreached.h"
-diff --git a/src/3rdparty/chromium/net/dns/resolv_compat.h b/src/3rdparty/chromium/net/dns/resolv_compat.h
-new file mode 100644
-index 000000000..4f0e852a1
---- /dev/null
-+++ b/src/3rdparty/chromium/net/dns/resolv_compat.h
-@@ -0,0 +1,29 @@
-+#if !defined(__GLIBC__)
-+/***************************************************************************
-+ * resolv_compat.h
-+ *
-+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
-+ * Note: res_init() is actually deprecated according to
-+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
-+ **************************************************************************/
-+#include <string.h>
-+
-+static inline int res_ninit(res_state statp)
-+{
-+ int rc = res_init();
-+ if (statp != &_res) {
-+ memcpy(statp, &_res, sizeof(*statp));
-+ }
-+ return rc;
-+}
-+
-+static inline int res_nclose(res_state statp)
-+{
-+ if (!statp)
-+ return -1;
-+ if (statp != &_res) {
-+ memset(statp, 0, sizeof(*statp));
-+ }
-+ return 0;
-+}
-+#endif
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-sandbox.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-sandbox.patch
deleted file mode 100644
index e0d877e0..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-sandbox.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/musl-sandbox.patch
-
-This should be fine for all non-Android platforms.
-TODO: not okay for upstreaming.
-
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/musl-sandbox.patch
-
----
- .../syscall_parameters_restrictions.cc | 22 +++++--------------
- .../linux/seccomp-bpf-helpers/syscall_sets.cc | 5 +++--
- .../policy/linux/bpf_renderer_policy_linux.cc | 4 ++--
- 3 files changed, 11 insertions(+), 20 deletions(-)
-
-diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index 6ae09fb10..57559ee6e 100644
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -127,21 +127,11 @@ namespace sandbox {
- // present (as in newer versions of posix_spawn).
- ResultExpr RestrictCloneToThreadsAndEPERMFork() {
- const Arg<unsigned long> flags(0);
--
-- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
-- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
-- CLONE_SIGHAND | CLONE_THREAD |
-- CLONE_SYSVSEM;
-- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
--
-- const uint64_t kGlibcPthreadFlags =
-- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
-- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
-- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
--
-- const BoolExpr android_test =
-- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
-- flags == kGlibcPthreadFlags);
-+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-+ CLONE_THREAD | CLONE_SYSVSEM;
-+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
-+ CLONE_DETACHED;
-+ const BoolExpr thread_clone_ok = (flags&~safe)==required;
-
- // The following two flags are the two important flags in any vfork-emulating
- // clone call. EPERM any clone call that contains both of them.
-@@ -151,7 +141,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
- AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
- (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
-
-- return If(IsAndroid() ? android_test : glibc_test, Allow())
-+ return If(thread_clone_ok, Allow())
- .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
- .Else(CrashSIGSYSClone());
- }
-diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index d1ea8e99a..cb1ff3042 100644
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -399,6 +399,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__)
- case __NR_waitpid:
- #endif
-+ case __NR_set_tid_address:
- return true;
- case __NR_clone: // Should be parameter-restricted.
- case __NR_setns: // Privileged.
-@@ -411,7 +412,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
- case __NR_set_thread_area:
- #endif
-- case __NR_set_tid_address:
- case __NR_unshare:
- #if !defined(__mips__) && !defined(__aarch64__)
- case __NR_vfork:
-@@ -521,6 +521,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_mlock:
- case __NR_munlock:
- case __NR_munmap:
-+ case __NR_mremap:
-+ case __NR_membarrier:
- return true;
- case __NR_madvise:
- case __NR_mincore:
-@@ -538,7 +540,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_modify_ldt:
- #endif
- case __NR_mprotect:
-- case __NR_mremap:
- case __NR_msync:
- case __NR_munlockall:
- case __NR_readahead:
-diff --git a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-index 9fe9575eb..fa1a946f6 100644
---- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-+++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-@@ -93,11 +93,11 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const {
- case __NR_sysinfo:
- case __NR_times:
- case __NR_uname:
-- return Allow();
-- case __NR_sched_getaffinity:
- case __NR_sched_getparam:
- case __NR_sched_getscheduler:
- case __NR_sched_setscheduler:
-+ return Allow();
-+ case __NR_sched_getaffinity:
- return RestrictSchedTarget(GetPolicyPid(), sysno);
- case __NR_prlimit64:
- // See crbug.com/662450 and setrlimit comment above.
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-pvalloc-patch.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-pvalloc-patch.patch
deleted file mode 100644
index a5126127..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-pvalloc-patch.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-pvalloc.patch
-
-The obsolete function pvalloc() is similar to valloc(), but rounds the size of the allocation up to the next multiple of the system page size. (https://linux.die.net/man/3/pvalloc)
-
-See: https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/qt-musl-pvalloc.patch?id=65f58742e6e669c7d0f5b23c0764f4f73661980b
-
----
- src/core/api/qtbug-61521.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
-index 002a1af22..01c81ac8c 100644
---- a/src/core/api/qtbug-61521.cpp
-+++ b/src/core/api/qtbug-61521.cpp
-@@ -111,7 +111,11 @@ SHIM_HIDDEN void* ShimValloc(size_t size) {
- }
-
- SHIM_HIDDEN void* ShimPvalloc(size_t size) {
-+#if defined(__GLIBC__)
- return pvalloc(size);
-+#else
-+ return valloc((size+4095)&~4095);
-+#endif
- }
-
- SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
---
-2.35.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-qmake-remove-glibc-check.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-qmake-remove-glibc-check.patch
deleted file mode 100644
index 13989724..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-qmake-remove-glibc-check.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/remove-glibc-check.patch
-
-Qt checks if glibc is available and if not disables large part of Qt5WebEngine and thus cripples functionality.
-However these parts work fine with Musl so there is no need to disable them. - Alpine
-
-Just remove the check so it builds again. Since 5.15 is the last version of Qt to be released with this build system it'll be obsolete with Qt6 so there is no real point in fixing this upstream except adding to Qt5PatchCollection.
-
-https://git.alpinelinux.org/aports/tree/community/qt5-qtwebengine/remove-glibc-check.patch
-diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
-index e7f869a1..de18523d 100644
---- a/src/buildtools/config/support.pri
-+++ b/src/buildtools/config/support.pri
-@@ -189,15 +189,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
- return(true)
- }
-
--defineTest(qtwebengine_checkForGlibc) {
-- module = $$1
-- !qtConfig(webengine-system-glibc) {
-- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.")
-- return(false)
-- }
-- return(true)
--}
--
- defineTest(qtwebengine_checkForKhronos) {
- module = $$1
- !qtConfig(webengine-system-khr) {
-diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
-index 88d1790c..8623f6d7 100644
---- a/src/buildtools/configure.json
-+++ b/src/buildtools/configure.json
-@@ -264,18 +264,6 @@
- "label": "system gn",
- "type": "detectGn"
- },
-- "webengine-glibc": {
-- "label": "glibc > 2.16",
-- "type": "compile",
-- "test": {
-- "include": "features.h",
-- "tail": [
-- "#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 17",
-- "#error glibc versions below 2.17 are not supported",
-- "#endif"
-- ]
-- }
-- },
- "webengine-gperf": {
- "label": "gperf",
- "type": "detectGperf"
-@@ -379,7 +367,6 @@
- && (!config.sanitizer || features.webengine-sanitizer)
- && (!config.linux || features.pkg-config)
- && (!config.linux || features.webengine-host-pkg-config)
-- && (!config.linux || features.webengine-system-glibc)
- && (!config.linux || features.webengine-system-khr)
- && (!config.linux || features.webengine-system-nss)
- && (!config.linux || features.webengine-system-dbus)
-@@ -517,11 +504,6 @@
- "condition": "config.unix && !config.darwin && libs.webengine-nss",
- "output": [ "privateFeature" ]
- },
-- "webengine-system-glibc": {
-- "label": "glibc",
-- "condition": "config.linux && tests.webengine-glibc",
-- "output": [ "privateFeature" ]
-- },
- "webengine-system-x11" : {
- "label": "x11",
- "condition": "config.unix && libs.webengine-x11",
-@@ -782,8 +764,7 @@
- "webengine-system-fontconfig",
- "webengine-system-dbus",
- "webengine-system-nss",
-- "webengine-system-khr",
-- "webengine-system-glibc"
-+ "webengine-system-khr"
- ]
- },
- {
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-decls-usage.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-decls-usage.patch
deleted file mode 100644
index 7318a0b0..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-decls-usage.patch
+++ /dev/null
@@ -1,628 +0,0 @@
-https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I-get-error-messages-about-%3Ccode%3Esys/cdefs.h%3C/code%3E
-"The bug is in the application that uses this internal glibc header. This header is not intended to be used by any program"
-
-sys/cdefs.h does not exist in musl libc, this breaks bundled Chromium.
-The only thing QtWebEngine uses cdefs.h for is the __*_DECLS macros, so
-this patch replaces all that with the correct 'extern "C"' code.
-
---- b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
-+++ b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
-@@ -28,7 +28,7 @@
- * These routines provide access to the systems DNS configuration
- */
-
--#include <sys/cdefs.h>
-+
- #include <stdint.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -91,7 +91,9 @@
- #pragma pack()
-
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /*
- * DNS configuration access APIs
-@@ -110,5 +112,7 @@
- const char *bundle_id);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* __DNSINFO_H__ */
---- b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
-+++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
-@@ -19,12 +19,14 @@
- #ifndef __SYS_CORE_SYNC_H
- #define __SYS_CORE_SYNC_H
-
--#include <sys/cdefs.h>
-+
- #include <stdint.h>
-
- #include <linux/types.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- struct sync_legacy_merge_data {
- int32_t fd2;
-@@ -159,5 +161,7 @@
- void sync_fence_info_free(struct sync_fence_info_data *info);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* __SYS_CORE_SYNC_H */
---- a/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h
-+++ b/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h
-@@ -19,7 +19,9 @@
- #ifndef __SYS_CORE_SW_SYNC_H
- #define __SYS_CORE_SW_SYNC_H
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /*
- * sw_sync is mainly intended for testing and should not be compiled into
-@@ -30,6 +32,8 @@ int sw_sync_timeline_create(void);
- int sw_sync_timeline_inc(int fd, unsigned count);
- int sw_sync_fence_create(int fd, const char *name, unsigned value);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* __SYS_CORE_SW_SYNC_H */
---- b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_uio.h 362473 2020-06-21 23:12:56Z tuexen $");
- #endif
-
-@@ -1317,7 +1317,9 @@
- */
- #if !(defined(_KERNEL)) && !(defined(__Userspace__))
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- int sctp_peeloff(int, sctp_assoc_t);
- int sctp_bindx(int, struct sockaddr *, int, int);
- int sctp_connectx(int, const struct sockaddr *, int, sctp_assoc_t *);
-@@ -1355,7 +1357,9 @@
-
- ssize_t sctp_recvv(int, const struct iovec *, int, struct sockaddr *,
- socklen_t *, void *, socklen_t *, unsigned int *, int *);
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* !_KERNEL */
- #endif /* !__sctp_uio_h__ */
---- a/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h
-+++ b/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h
-@@ -9,7 +9,7 @@
-
- #if defined(__GNUC__)
-
--#include <sys/cdefs.h> // for __THROW
-+ // for __THROW
-
- #ifndef __THROW // Not a glibc system
- #ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead
---- a/src/3rdparty/chromium/base/mac/close_nocancel.cc
-+++ b/src/3rdparty/chromium/base/mac/close_nocancel.cc
-@@ -34,7 +34,7 @@
- // is resolved from libsyscall. By linking with this version of close prior to
- // the libsyscall version, close's implementation is overridden.
-
--#include <sys/cdefs.h>
-+
- #include <unistd.h>
-
- // If the non-cancelable variants of all system calls have already been
---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h
-+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h
-@@ -30,7 +30,7 @@
- #ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H
- #define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H
-
--#include <sys/cdefs.h>
-+
-
- #ifdef __BIONIC_HAVE_STAB_H
- #include <stab.h>
---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h
-+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h
-@@ -37,7 +37,7 @@
- #else
-
- #include <asm/ptrace.h>
--#include <sys/cdefs.h>
-+
- #if defined (__mips__)
- #include <sys/types.h>
- #endif
---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h
-+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h
-@@ -18,7 +18,7 @@
- #include_next <sys/mman.h>
-
- #include <android/api-level.h>
--#include <sys/cdefs.h>
-+
-
- // There’s no mmap() wrapper compatible with a 64-bit off_t for 32-bit code
- // until API 21 (Android 5.0/“Lollipop”). A custom mmap() wrapper is provided
---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-@@ -17,7 +17,7 @@
-
- #include_next <sys/ptrace.h>
-
--#include <sys/cdefs.h>
-+
-
- // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
- #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
---- a/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
-+++ b/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
-@@ -40,7 +40,7 @@
- #define TCMALLOC_LIBC_OVERRIDE_GCC_AND_WEAK_INL_H_
-
- #ifdef HAVE_SYS_CDEFS_H
--#include <sys/cdefs.h> // for __THROW
-+ // for __THROW
- #endif
- #include <gperftools/tcmalloc.h>
-
---- a/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h
-+++ b/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h
-@@ -40,7 +40,7 @@
- #define TCMALLOC_LIBC_OVERRIDE_GCC_AND_WEAK_INL_H_
-
- #ifdef HAVE_SYS_CDEFS_H
--#include <sys/cdefs.h> // for __THROW
-+ // for __THROW
- #endif
- #include <gperftools/tcmalloc.h>
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp.h 356357 2020-01-04 20:33:12Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 363194 2020-07-14 20:32:50Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.h 362377 2020-06-19 12:35:29Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.c 362054 2020-06-11 13:34:09Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.h 338749 2018-09-18 10:53:07Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_bsd_addr.c 358080 2020-02-18 19:41:55Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_bsd_addr.h 353480 2019-10-13 18:17:08Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h
-@@ -31,7 +31,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD$");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_cc_functions.c 359405 2020-03-28 20:25:45Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_constants.h 363440 2020-07-23 01:35:24Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_crc32.c 362498 2020-06-22 14:36:14Z tuexen $");
-
- #include "opt_sctp.h"
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_crc32.h 362338 2020-06-18 19:32:34Z markj $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_header.h 309682 2016-12-07 19:30:59Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 363440 2020-07-23 01:35:24Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.h 361116 2020-05-16 19:26:39Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 368622 2020-12-13 23:51:51Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.h 326672 2017-12-07 22:19:08Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h
-@@ -34,7 +34,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD$");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_os.h 361872 2020-06-06 18:20:09Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 364937 2020-08-28 20:05:18Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_output.h 362054 2020-06-11 13:34:09Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 366248 2020-09-29 09:36:06Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.h 362106 2020-06-12 16:31:13Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.c 362054 2020-06-11 13:34:09Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.h 309607 2016-12-06 10:21:25Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD$");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c
-@@ -29,7 +29,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_ss_functions.c 362173 2020-06-14 09:50:00Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_structs.h 364268 2020-08-16 11:50:37Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_sysctl.c 361934 2020-06-08 20:23:20Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_sysctl.h 361895 2020-06-07 14:39:20Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 362054 2020-06-11 13:34:09Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.h 359195 2020-03-21 16:12:19Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_usrreq.c 364353 2020-08-18 19:25:03Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_var.h 363323 2020-07-19 12:34:19Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 364268 2020-08-16 11:50:37Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet/sctputil.h 364268 2020-08-16 11:50:37Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 361895 2020-06-07 14:39:20Z tuexen $");
- #endif
-
---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h
-+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h
-@@ -33,7 +33,7 @@
- */
-
- #if defined(__FreeBSD__) && !defined(__Userspace__)
--#include <sys/cdefs.h>
-+
- __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_var.h 317457 2017-04-26 19:26:40Z tuexen $");
- #endif
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-clang-libc++.patch
deleted file mode 100644
index ac9c4db9..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-clang-libc++.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gn/CMakeLists.txt
-+++ b/src/gn/CMakeLists.txt
-@@ -46,6 +46,7 @@ add_custom_command(
- --ld ${GN_LINKER}
- --ar ${CMAKE_AR}
- --qt-version "${QT_REPO_MODULE_VERSION}.qtwebengine.qt.io"
-+ --no-static-libstdc++
- $<$<PLATFORM_ID:Darwin>:--isysroot>
- $<$<PLATFORM_ID:Darwin>:${CMAKE_OSX_SYSROOT}>
- COMMAND Ninja::ninja -C ${GN_BINARY_DIR}/$<CONFIG> ${GN_EXECUTABLE}
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-canonicalize-file-name.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-canonicalize-file-name.patch
deleted file mode 100644
index c192269a..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-canonicalize-file-name.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0010-canonicalize-file-name.patch
-
-no canonicalize_file_name on musl. funnily, the file using this says this is
-not portable, but avoids the nonportability of realpath(path, NULL);
-
---- a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
-+++ b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
-@@ -139,7 +139,7 @@
- #define HAVE_ACCESS 1
-
- /* Define to 1 if you have the `canonicalize_file_name' function. */
--#define HAVE_CANONICALIZE_FILE_NAME 1
-+/* #define HAVE_CANONICALIZE_FILE_NAME 1 */
-
- /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
- /* #undef HAVE_CPU_TO_LE16 */
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-close.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-close.patch
deleted file mode 100644
index 208ab64f..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-close.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0009-close.patch
-
---- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
-+++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
-@@ -7,6 +7,7 @@
- #include <algorithm>
- #include <array>
- #include <atomic>
-+#include <dlfcn.h>
-
- #include "base/compiler_specific.h"
- #include "base/debug/stack_trace.h"
-@@ -80,9 +81,18 @@
-
- extern "C" {
-
--int __close(int);
--
- __attribute__((visibility("default"), noinline)) int close(int fd) {
-+ static int (*__close)(int) = nullptr;
-+
-+ if (__close == nullptr) {
-+ __close = (int (*)(int))dlsym(RTLD_NEXT, "close");
-+
-+ if (__close == nullptr) {
-+ RAW_LOG(ERROR, "musl close not found\n");
-+ IMMEDIATE_CRASH();
-+ }
-+ }
-+
- if (base::IsFDOwned(fd) && g_is_ownership_enforced)
- CrashOnFdOwnershipViolation();
- return __close(fd);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-crashpad.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-crashpad.patch
deleted file mode 100644
index ed3ca52c..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-crashpad.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0005-qt-musl-crashpad.patch
-
---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -273,7 +273,7 @@ union FloatContext {
- "Size mismatch");
- #elif defined(ARCH_CPU_ARMEL)
- static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch");
--#if !defined(__GLIBC__)
-+#if defined(OS_ANDROID)
- static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch");
- #endif
- #elif defined(ARCH_CPU_ARM64)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-default-pthread-stacksize.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-default-pthread-stacksize.patch
deleted file mode 100644
index f9f63734..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-default-pthread-stacksize.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
-+++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
-@@ -186,7 +186,8 @@
-
- size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
- #if !defined(THREAD_SANITIZER)
-- return 0;
-+ // use 2mb to avoid running out of space. This is what android uses
-+ return 2 * (1 << 20);
- #else
- // ThreadSanitizer bloats the stack heavily. Evidence has been that the
- // default stack size isn't enough for some browser tests.
---- a/src/3rdparty/chromium/base/threading/platform_thread_unittest.cc.orig
-+++ b/src/3rdparty/chromium/base/threading/platform_thread_unittest.cc
-@@ -411,7 +411,7 @@
- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
- !defined(THREAD_SANITIZER)) || \
- (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER))
-- EXPECT_EQ(0u, stack_size);
-+ EXPECT_EQ(2u << 20, stack_size);
- #else
- EXPECT_GT(stack_size, 0u);
- EXPECT_LT(stack_size, 20u * (1 << 20));
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-disable-glibc-check.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-disable-glibc-check.patch
deleted file mode 100644
index ef690267..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-disable-glibc-check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/remove-glibc-check.patch
-
-Qt checks if glibc is available and if not disables large part of Qt6WebEngine and thus cripples functionality.
-However these parts work fine with Musl so there is no need to disable them. - Alpine
-
-Just remove the check so it builds again.
-
---- a/configure.cmake
-+++ b/configure.cmake
-@@ -403,11 +403,6 @@ add_check_for_support(
- CONDITION NOT LINUX OR PkgConfig_FOUND
- MESSAGE "A pkg-config support is required."
- )
--add_check_for_support(
-- MODULES QtWebEngine QtPdf
-- CONDITION NOT LINUX OR TEST_glibc
-- MESSAGE "A suitable version >= 2.17 of glibc is required."
--)
- add_check_for_support(
- MODULES QtWebEngine QtPdf
- CONDITION NOT LINUX OR TEST_khr
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-fix-narrowing-cast.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-fix-narrowing-cast.patch
deleted file mode 100644
index e76cc996..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-fix-narrowing-cast.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/src/3rdparty/chromium/base/files/file_util_linux.cc
-+++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
-@@ -30,7 +30,7 @@
- case EXT2_SUPER_MAGIC: // Also ext3 and ext4
- case MSDOS_SUPER_MAGIC:
- case REISERFS_SUPER_MAGIC:
-- case static_cast<int>(BTRFS_SUPER_MAGIC):
-+ case BTRFS_SUPER_MAGIC:
- case 0x5346544E: // NTFS
- case 0x58465342: // XFS
- case 0x3153464A: // JFS
-@@ -40,14 +40,14 @@
- *type = FILE_SYSTEM_NFS;
- break;
- case SMB_SUPER_MAGIC:
-- case static_cast<int>(0xFF534D42): // CIFS
-+ case 0xFF534D42: // CIFS
- *type = FILE_SYSTEM_SMB;
- break;
- case CODA_SUPER_MAGIC:
- *type = FILE_SYSTEM_CODA;
- break;
-- case static_cast<int>(HUGETLBFS_MAGIC):
-- case static_cast<int>(RAMFS_MAGIC):
-+ case HUGETLBFS_MAGIC:
-+ case RAMFS_MAGIC:
- case TMPFS_MAGIC:
- *type = FILE_SYSTEM_MEMORY;
- break;
---- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
-+++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
-@@ -100,10 +100,10 @@
- if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
- return false;
-
- switch (stats.f_type) {
- case TMPFS_MAGIC:
-- case static_cast<int>(HUGETLBFS_MAGIC):
-- case static_cast<int>(RAMFS_MAGIC):
-+ case HUGETLBFS_MAGIC:
-+ case RAMFS_MAGIC:
- return true;
- }
- return false;
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-lfs64.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-lfs64.patch
deleted file mode 100644
index 55a8785f..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-lfs64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/3rdparty/gn/src/base/files/file.h
-+++ b/src/3rdparty/gn/src/base/files/file.h
-@@ -26,7 +26,7 @@ namespace base {
- defined(OS_ANDROID) && __ANDROID_API__ < 21
- typedef struct stat stat_wrapper_t;
- #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
--typedef struct stat64 stat_wrapper_t;
-+typedef struct stat stat_wrapper_t;
- #endif
-
- // Thin wrapper around an OS-level file.
---- a/src/3rdparty/gn/src/base/files/file_posix.cc
-+++ b/src/3rdparty/gn/src/base/files/file_posix.cc
-@@ -32,7 +32,7 @@ int CallFstat(int fd, stat_wrapper_t* sb
- }
- #else
- int CallFstat(int fd, stat_wrapper_t* sb) {
-- return fstat64(fd, sb);
-+ return fstat(fd, sb);
- }
- #endif
-
---- a/src/3rdparty/gn/src/base/files/file_util_posix.cc
-+++ b/src/3rdparty/gn/src/base/files/file_util_posix.cc
-@@ -70,10 +70,10 @@ int CallLstat(const char* path, stat_wra
- }
- #else
- int CallStat(const char* path, stat_wrapper_t* sb) {
-- return stat64(path, sb);
-+ return stat(path, sb);
- }
- int CallLstat(const char* path, stat_wrapper_t* sb) {
-- return lstat64(path, sb);
-+ return lstat(path, sb);
- }
- #endif
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-mallinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-mallinfo.patch
deleted file mode 100644
index c45e1468..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-mallinfo.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0003-qt-musl-mallinfo.patch
-
-musl does not implement mallinfo()/mallinfo2()
-(or rather, malloc-ng, musl's allocator, doesn't)
---
---- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
-+++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
-@@ -185,7 +185,6 @@
- #define MALLINFO2_FOUND_IN_LIBC
- struct mallinfo2 info = mallinfo2();
- #endif
--#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
- #if !defined(MALLINFO2_FOUND_IN_LIBC)
- struct mallinfo info = mallinfo();
- #endif
-@@ -205,6 +204,7 @@
- sys_alloc_dump->AddScalar(MemoryAllocatorDump::kNameSize,
- MemoryAllocatorDump::kUnitsBytes, info.uordblks);
- }
-+#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
- }
- #endif
-
-@@ -339,7 +340,7 @@
- &allocated_objects_count);
- #elif BUILDFLAG(IS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
--#else
-+#elif defined(__GLIBC__)
- ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
- &allocated_objects_size, &allocated_objects_count);
- #endif
---- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
-+++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
-@@ -105,7 +105,7 @@
-
- #endif // !BUILDFLAG(IS_FUCHSIA)
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
- namespace {
-
- size_t GetMallocUsageMallinfo() {
-@@ -123,7 +123,7 @@
- }
-
- } // namespace
--#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
-+#endif // (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) ||
- // BUILDFLAG(IS_ANDROID)
-
- size_t ProcessMetrics::GetMallocUsage() {
-@@ -131,9 +131,9 @@
- malloc_statistics_t stats = {0};
- malloc_zone_statistics(nullptr, &stats);
- return stats.size_in_use;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
- return GetMallocUsageMallinfo();
--#elif BUILDFLAG(IS_FUCHSIA)
-+#else
- // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
- return 0;
- #endif
---- a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
-+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
-@@ -717,7 +717,7 @@
-
- #endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID)
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if 0
- SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW {
- base::SimplePartitionStatsDumper allocator_dumper;
- Allocator()->DumpStats("malloc", true, &allocator_dumper);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-missing-includes.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-missing-includes.patch
deleted file mode 100644
index 697867a5..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-missing-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0014-missing-includes.patch
-
---- a/src/3rdparty/chromium/sandbox/linux/services/credentials.h
-+++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.h
-@@ -13,6 +13,7 @@
-
- #include <string>
- #include <vector>
-+#include <sys/types.h>
-
- #include "sandbox/linux/system_headers/capability.h"
- #include "sandbox/sandbox_export.h"
---- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
-+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
-@@ -2,6 +2,7 @@
- #define QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
-
- #include <stddef.h>
-+#include <inttypes.h>
-
- #include <functional>
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-no-execinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-no-execinfo.patch
deleted file mode 100644
index 2a16bf39..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-no-execinfo.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0006-no-execinfo.patch
-
---- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
-+++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
-@@ -27,7 +27,7 @@
- #if !defined(USE_SYMBOLIZE)
- #include <cxxabi.h>
- #endif
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- #include <execinfo.h>
- #endif
-
-@@ -89,7 +89,7 @@
- // Note: code in this function is NOT async-signal safe (std::string uses
- // malloc internally).
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- std::string::size_type search_from = 0;
- while (search_from < text->size()) {
- // Look for the start of a mangled symbol, from search_from.
-@@ -136,7 +136,7 @@
- virtual ~BacktraceOutputHandler() = default;
- };
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
- // This should be more than enough to store a 64-bit number in hex:
- // 16 hex digits + 1 for null-terminator.
-@@ -839,7 +839,7 @@
- // If we do not have unwind tables, then try tracing using frame pointers.
- return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
- count, 0);
--#elif !defined(__UCLIBC__) && !defined(_AIX)
-+#elif defined(__GLIBC__) && !defined(_AIX)
- // Though the backtrace API man page does not list any possible negative
- // return values, we take no chance.
- return base::saturated_cast<size_t>(backtrace(trace, count));
-@@ -852,13 +852,13 @@
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- PrintBacktraceOutputHandler handler;
- ProcessBacktrace(trace_, count_, prefix_string, &handler);
- #endif
- }
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
- const char* prefix_string) const {
- StreamBacktraceOutputHandler handler(os);
---- a/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc
-+++ b/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc
-@@ -11,7 +11,9 @@
-
- #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
- #define SYMBOLIZE_FUNCTION
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
-
- #include <vector>
-
-@@ -96,7 +98,7 @@
- }
-
- const char* ExternalReferenceTable::ResolveSymbol(void* address) {
--#ifdef SYMBOLIZE_FUNCTION
-+#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
- char** names = backtrace_symbols(&address, 1);
- const char* name = names[0];
- // The array of names is malloc'ed. However, each name string is static
---- a/src/3rdparty/chromium/base/debug/stack_trace.cc
-+++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
-@@ -251,7 +253,9 @@
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if defined(__GLIBC__) && !defined(_AIX)
- OutputToStreamWithPrefix(os, nullptr);
-+#endif
- }
-
- std::string StackTrace::ToString() const {
-@@ -281,7 +281,7 @@
- }
- std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
- std::stringstream stream;
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- OutputToStreamWithPrefix(&stream, prefix_string);
- #endif
- return stream.str();
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-remove-decls-usage.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-remove-decls-usage.patch
deleted file mode 100644
index 7145a066..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-remove-decls-usage.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -upr a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_internals.h b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_internals.h
---- a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_internals.h 2023-06-17 02:09:34.375431959 +0000
-+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_internals.h 2023-06-17 02:40:16.075431600 +0000
-@@ -9,10 +9,6 @@
-
- #if defined(__GNUC__)
-
--#if BUILDFLAG(IS_POSIX)
--#include <sys/cdefs.h> // for __THROW
--#endif
--
- #ifndef __THROW // Not a glibc system
- #ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead
- #define __THROW _NOEXCEPT
-diff -upr a/src/3rdparty/chromium/base/mac/close_nocancel.cc b/src/3rdparty/chromium/base/mac/close_nocancel.cc
---- a/src/3rdparty/chromium/base/mac/close_nocancel.cc 2023-06-17 02:09:34.382098624 +0000
-+++ b/src/3rdparty/chromium/base/mac/close_nocancel.cc 2023-06-17 02:40:39.528764926 +0000
-@@ -34,7 +34,6 @@
- // is resolved from libsyscall. By linking with this version of close prior to
- // the libsyscall version, close's implementation is overridden.
-
--#include <sys/cdefs.h>
- #include <unistd.h>
-
- // If the non-cancelable variants of all system calls have already been
-diff -upr a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h
---- a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h 2023-06-17 02:09:35.038765298 +0000
-+++ b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h 2023-06-17 02:36:09.195431519 +0000
-@@ -28,7 +28,6 @@
- * These routines provide access to the systems DNS configuration
- */
-
--#include <sys/cdefs.h>
- #include <stdint.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -91,7 +90,9 @@ typedef struct {
- #pragma pack()
-
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /*
- * DNS configuration access APIs
-@@ -109,6 +110,8 @@ void
- _dns_configuration_ack (dns_config_t *config,
- const char *bundle_id);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* __DNSINFO_H__ */
-diff -upr a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h 2023-06-17 02:09:35.308765297 +0000
-+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h 2023-06-17 02:40:53.098764952 +0000
-@@ -17,8 +17,6 @@
-
- #include_next <sys/ptrace.h>
-
--#include <sys/cdefs.h>
--
- // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
- #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
- defined(__GLIBC__)
-diff -upr a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
---- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h 2023-06-17 02:09:35.815431964 +0000
-+++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h 2023-06-17 02:35:08.408764861 +0000
-@@ -19,12 +19,13 @@
- #ifndef __SYS_CORE_SYNC_H
- #define __SYS_CORE_SYNC_H
-
--#include <sys/cdefs.h>
- #include <stdint.h>
-
- #include <linux/types.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- struct sync_legacy_merge_data {
- int32_t fd2;
-@@ -158,6 +159,8 @@ struct sync_pt_info *sync_pt_info(struct
- struct sync_pt_info *itr);
- void sync_fence_info_free(struct sync_fence_info_data *info);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* __SYS_CORE_SYNC_H */
-diff -upr a/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h b/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h
---- a/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h 2023-06-17 02:09:35.815431964 +0000
-+++ b/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h 2023-06-17 02:36:58.752098226 +0000
-@@ -19,7 +19,9 @@
- #ifndef __SYS_CORE_SW_SYNC_H
- #define __SYS_CORE_SW_SYNC_H
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /*
- * sw_sync is mainly intended for testing and should not be compiled into
-@@ -30,6 +32,8 @@ int sw_sync_timeline_create(void);
- int sw_sync_timeline_inc(int fd, unsigned count);
- int sw_sync_fence_create(int fd, const char *name, unsigned value);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* __SYS_CORE_SW_SYNC_H */
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-resolve.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-resolve.patch
deleted file mode 100644
index 0931a2d3..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-resolve.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0004-qt-musl-resolve.patch
-
---- a/src/3rdparty/chromium/net/dns/public/scoped_res_state.cc
-+++ b/src/3rdparty/chromium/net/dns/public/scoped_res_state.cc
-@@ -13,7 +13,7 @@
- namespace net {
-
- ScopedResState::ScopedResState() {
--#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(_GNU_SOURCE)
- // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
- // res_init behaves the same way.
- memset(&_res, 0, sizeof(_res));
-@@ -25,16 +25,8 @@
- }
-
- ScopedResState::~ScopedResState() {
--#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
--
-- // Prefer res_ndestroy where available.
--#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
-- res_ndestroy(&res_);
--#else
-- res_nclose(&res_);
--#endif // BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
--
--#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
-+ // musl res_init() doesn't actually do anything
-+ // no destruction is necessary as no memory has been allocated
- }
-
- bool ScopedResState::IsValid() const {
---- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
-+++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
-@@ -6,8 +6,7 @@
-
- #include "build/build_config.h"
-
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
-- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
-+#if defined(__GLIBC__)
-
- #include <resolv.h>
-
---- a/src/3rdparty/chromium/net/dns/host_resolver_system_task.cc
-+++ b/src/3rdparty/chromium/net/dns/host_resolver_system_task.cc
-@@ -310,8 +310,7 @@
- }
-
- void EnsureSystemHostResolverCallReady() {
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
-- !BUILDFLAG(IS_ANDROID)
-+#if defined(__GLIBC__)
- EnsureDnsReloaderInit();
- #elif BUILDFLAG(IS_WIN)
- EnsureWinsockInit();
-@@ -396,8 +396,7 @@
- base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
- base::BlockingType::WILL_BLOCK);
-
--#if BUILDFLAG(IS_POSIX) && \
-- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID))
-+#if defined(__GLIBC__)
- DnsReloaderMaybeReload();
- #endif
- auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-sandbox.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-sandbox.patch
deleted file mode 100644
index b1a5647b..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-sandbox.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0007-musl-sandbox.patch
-
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -139,21 +139,11 @@ namespace sandbox {
- // present (as in newer versions of posix_spawn).
- ResultExpr RestrictCloneToThreadsAndEPERMFork() {
- const Arg<unsigned long> flags(0);
--
-- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
-- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
-- CLONE_SIGHAND | CLONE_THREAD |
-- CLONE_SYSVSEM;
-- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
--
-- const uint64_t kGlibcPthreadFlags =
-- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
-- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
-- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
--
-- const BoolExpr android_test =
-- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
-- flags == kGlibcPthreadFlags);
-+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-+ CLONE_THREAD | CLONE_SYSVSEM;
-+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
-+ CLONE_DETACHED;
-+ const BoolExpr thread_clone_ok = (flags&~safe)==required;
-
- // The following two flags are the two important flags in any vfork-emulating
- // clone call. EPERM any clone call that contains both of them.
-@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
- AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
- (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
-
-- return If(IsAndroid() ? android_test : glibc_test, Allow())
-+ return If(thread_clone_ok, Allow())
- .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
- .Else(CrashSIGSYSClone());
- }
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__)
- case __NR_waitpid:
- #endif
-+ case __NR_set_tid_address:
- return true;
- case __NR_clone: // Should be parameter-restricted.
- case __NR_setns: // Privileged.
-@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
- case __NR_set_thread_area:
- #endif
-- case __NR_set_tid_address:
- case __NR_unshare:
- #if !defined(__mips__) && !defined(__aarch64__)
- case __NR_vfork:
-@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_mlock:
- case __NR_munlock:
- case __NR_munmap:
-+ case __NR_mremap:
-+ case __NR_membarrier:
- return true;
- case __NR_madvise:
- case __NR_mincore:
-@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_modify_ldt:
- #endif
- case __NR_mprotect:
-- case __NR_mremap:
- case __NR_msync:
- case __NR_munlockall:
- case __NR_readahead:
---- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
-+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
-@@ -10,6 +10,7 @@
- #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
-
- #include "build/build_config.h"
-+#include <sys/syscall.h>
-
- #if defined(__x86_64__)
- #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h"
---- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-+++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-@@ -94,6 +94,9 @@
- case __NR_pwrite64:
- case __NR_sched_get_priority_max:
- case __NR_sched_get_priority_min:
-+ case __NR_sched_getparam:
-+ case __NR_sched_getscheduler:
-+ case __NR_sched_setscheduler:
- case __NR_sysinfo:
- case __NR_times:
- case __NR_uname:
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-stat.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-stat.patch
deleted file mode 100644
index 5d80a8c7..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-stat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0008-musl-stat.patch
-
---- a/src/3rdparty/chromium/base/files/file.h
-+++ b/src/3rdparty/chromium/base/files/file.h
-@@ -19,7 +19,8 @@
- #include "build/build_config.h"
-
- #if BUILDFLAG(IS_BSD) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_NACL) || \
-- BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21)
-+ BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21) || \
-+ (defined(OS_LINUX) && !defined(__GLIBC__))
- struct stat;
- namespace base {
- typedef struct stat stat_wrapper_t;
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-systypes.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-systypes.patch
deleted file mode 100644
index f4e71e93..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-systypes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/3rdparty/chromium/base/third_party/symbolize/symbolize.h
-+++ b/src/3rdparty/chromium/base/third_party/symbolize/symbolize.h
-@@ -58,6 +58,8 @@
- #include "config.h"
- #include "glog/logging.h"
-
-+#include <sys/types.h>
-+
- #ifdef HAVE_SYMBOLIZE
-
- #if defined(__ELF__) // defined by gcc
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-temp-retry-failure.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-temp-retry-failure.patch
deleted file mode 100644
index 23940dd8..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-temp-retry-failure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0002-temp-failure-retry.patch
-
-random glibc macro
-
---- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
-+++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
-@@ -11,6 +11,14 @@
- #include <stdbool.h>
- #include <sys/types.h>
-
-+// Some additional functions
-+# define TEMP_FAILURE_RETRY(expression) \
-+ (__extension__ \
-+ ({ long int __result; \
-+ do __result = (long int) (expression); \
-+ while (__result == -1L && errno == EINTR); \
-+ __result; }))
-+
- // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
- // will prefer certain process types over others. The range for the
- // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-wtf-stacksize.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-wtf-stacksize.patch
deleted file mode 100644
index fd7b4fa2..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-musl-wtf-stacksize.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://git.alpinelinux.org/aports/tree/testing/qt6-qtwebengine/0011-wtf-stacksize.patch
-
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -29,7 +29,7 @@
- // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
- // correctly for the main thread.
-
--#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
- BUILDFLAG(IS_FUCHSIA)
- // pthread_getattr_np() can fail if the thread is not invoked by
- // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -97,7 +97,7 @@
- }
-
- void* GetStackStart() {
--#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
- BUILDFLAG(IS_FUCHSIA)
- pthread_attr_t attr;
- int error;
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch
deleted file mode 100644
index 7caf2020..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.1-normalise-clipboard-permissions.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Qt Upstream: https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=6.5&id=281174f5e010d819a49562b48b2c2067255a41c6
-
-From 281174f5e010d819a49562b48b2c2067255a41c6 Mon Sep 17 00:00:00 2001
-From: Szabolcs David <davidsz@inf.u-szeged.hu>
-Date: Fri, 19 May 2023 01:00:41 +0200
-Subject: Normalize clipboard permissions
-
-Handle clipboard read and write permissions the same way everywhere.
-
-Fixes: QTBUG-113579
-Change-Id: If1f271e8591c54f4ee2f935486502df19d5f6b3e
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-(cherry picked from commit 79e4a37668a9176373e81fe4fc8dfe29f6c8c37b)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/core/permission_manager_qt.cpp | 46 +++++++++++++++++++-------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp
-index 9d98c0592..28e1c981d 100644
---- a/src/core/permission_manager_qt.cpp
-+++ b/src/core/permission_manager_qt.cpp
-@@ -84,6 +84,22 @@ static blink::mojom::PermissionStatus toBlink(ProfileAdapter::PermissionState re
- }
- }
-
-+static blink::mojom::PermissionStatus getStatusFromSettings(blink::PermissionType type, WebEngineSettings *settings)
-+{
-+ switch (type) {
-+ case blink::PermissionType::CLIPBOARD_READ_WRITE:
-+ if (!settings->testAttribute(QWebEngineSettings::JavascriptCanPaste))
-+ return blink::mojom::PermissionStatus::DENIED;
-+ Q_FALLTHROUGH();
-+ case blink::PermissionType::CLIPBOARD_SANITIZED_WRITE:
-+ if (!settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard))
-+ return blink::mojom::PermissionStatus::DENIED;
-+ return blink::mojom::PermissionStatus::GRANTED;
-+ default:
-+ return blink::mojom::PermissionStatus::ASK;
-+ }
-+}
-+
- PermissionManagerQt::PermissionManagerQt()
- : m_requestIdCount(0)
- {
-@@ -179,13 +195,8 @@ void PermissionManagerQt::RequestPermission(blink::PermissionType permission,
- Q_ASSERT(contentsDelegate);
-
- ProfileAdapter::PermissionType permissionType = toQt(permission);
-- if (permissionType == ProfileAdapter::ClipboardRead) {
-- WebEngineSettings *settings = contentsDelegate->webEngineSettings();
-- if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)
-- && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste))
-- std::move(callback).Run(blink::mojom::PermissionStatus::GRANTED);
-- else
-- std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
-+ if (permissionType == ProfileAdapter::ClipboardRead || permissionType == ProfileAdapter::ClipboardWrite) {
-+ std::move(callback).Run(getStatusFromSettings(permission, contentsDelegate->webEngineSettings()));
- return;
- } else if (!canRequestPermissionFor(permissionType)) {
- std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
-@@ -220,14 +231,9 @@ void PermissionManagerQt::RequestPermissions(const std::vector<blink::Permission
- const ProfileAdapter::PermissionType permissionType = toQt(permission);
- if (permissionType == ProfileAdapter::UnsupportedPermission)
- result.push_back(blink::mojom::PermissionStatus::DENIED);
-- else if (permissionType == ProfileAdapter::ClipboardRead) {
-- WebEngineSettings *settings = contentsDelegate->webEngineSettings();
-- if (settings->testAttribute(QWebEngineSettings::JavascriptCanAccessClipboard)
-- && settings->testAttribute(QWebEngineSettings::JavascriptCanPaste))
-- result.push_back(blink::mojom::PermissionStatus::GRANTED);
-- else
-- result.push_back(blink::mojom::PermissionStatus::DENIED);
-- } else {
-+ else if (permissionType == ProfileAdapter::ClipboardRead || permissionType == ProfileAdapter::ClipboardWrite)
-+ result.push_back(getStatusFromSettings(permission, contentsDelegate->webEngineSettings()));
-+ else {
- answerable = false;
- break;
- }
-@@ -280,14 +286,8 @@ blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatusForCurren
- permission == blink::PermissionType::CLIPBOARD_SANITIZED_WRITE) {
- WebContentsDelegateQt *delegate = static_cast<WebContentsDelegateQt *>(
- content::WebContents::FromRenderFrameHost(render_frame_host)->GetDelegate());
-- if (!delegate->webEngineSettings()->testAttribute(
-- QWebEngineSettings::JavascriptCanAccessClipboard))
-- return blink::mojom::PermissionStatus::DENIED;
-- if (permission == blink::PermissionType::CLIPBOARD_READ_WRITE
-- && !delegate->webEngineSettings()->testAttribute(
-- QWebEngineSettings::JavascriptCanPaste))
-- return blink::mojom::PermissionStatus::DENIED;
-- return blink::mojom::PermissionStatus::GRANTED;
-+ Q_ASSERT(delegate);
-+ return getStatusFromSettings(permission, delegate->webEngineSettings());
- }
-
- return GetPermissionStatus(
---
-cgit v1.2.3
-
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
deleted file mode 100644
index f447332f..00000000
--- a/dev-qt/qtwebengine/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>qt@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
- <maintainer type="person">
- <description>ppc64 patchset maintainer</description>
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
- <use>
- <flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
- <flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
- <flag name="jumbo-build">Combine source files to speed up build process.</flag>
- <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
- <flag name="widgets">Enable QtWidgets support</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>https://doc.qt.io/</doc>
- </upstream>
- <slots>
- <subslots>
- Must only be used by packages that are known to use private parts of the Qt API.
- </subslots>
- </slots>
-</pkgmetadata>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild
deleted file mode 100644
index 4a0d45c7..00000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
- if [[ ${PV} == ${QT5_PV}_p* ]]; then
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P/10_p/9_p}.tar.xz"
- S="${WORKDIR}/${P/10_p/9_p}"
- QT5_BUILD_DIR="${S}_build"
- fi
-else
- EGIT_BRANCH="5.15"
- EGIT_REPO_URI=(
- "https://code.qt.io/qt/${QT5_MODULE}.git"
- "https://github.com/qt/${QT5_MODULE}.git"
- )
- inherit git-r3
-fi
-
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.8_p20230313-patchset.tar.xz
- ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/re2:=
- =dev-qt/qtcore-${QT5_PV}*
- =dev-qt/qtdeclarative-${QT5_PV}*
- =dev-qt/qtgui-${QT5_PV}*
- =dev-qt/qtnetwork-${QT5_PV}*
- =dev-qt/qtprintsupport-${QT5_PV}*
- =dev-qt/qtwebchannel-${QT5_PV}*[qml]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc(+)]
- media-libs/libwebp:=
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib[minizip]
- virtual/libudev
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( =dev-qt/designer-${QT5_PV}* )
- geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse )
- screencast? ( media-video/pipewire:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtdeclarative-${QT5_PV}*[widgets]
- =dev-qt/qtwidgets-${QT5_PV}*
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-BDEPEND="${PYTHON_DEPS}
- dev-util/gperf
- dev-build/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
- ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
- "${WORKDIR}/${PN}-5.15.8_p20230313-patchset"
-
- # Patches for musl support
- "${FILESDIR}"/${PN}-5.15.5_p20220618-qmake-remove-glibc-check.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mallinfo.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mojo-strncpy.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-resolv-compat.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-backtrace-execinfo.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-pvalloc-patch.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-linux-stack_util-stackstart.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-remove-decls-usage.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-msghdr-padding-initlist.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-canonicalize-filename.patch
- "${FILESDIR}"/${PN}-5.15.10_p20230505-musl-lfs64.patch
- ## runtime
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-sandbox.patch
-
- # Patch for clang 16 fix
- "${FILESDIR}"/${PN}-5.15.10_p20230505-clang-16.patch
-)
-
-qtwebengine_check-reqs() {
- # bug #307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- fi
- eshopts_pop
-
- [[ ${MERGE_TYPE} == binary ]] && return
-
- # (check-reqs added for bug #570534)
- #
- # Estimate the amount of RAM required
- # Multiplier is *10 because Bash doesn't do floating point maths.
- # Let's crudely assume ~2GB per compiler job for GCC.
- local multiplier=20
-
- # And call it ~1.5GB for Clang.
- if tc-is-clang ; then
- multiplier=15
- fi
-
- local CHECKREQS_DISK_BUILD="7G"
- local CHECKREQS_DISK_USR="150M"
- if ! has "distcc" ${FEATURES} ; then
- # bug #830661
- # Not super realistic to come up with good estimates for distcc right now
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-src_unpack() {
- case ${QT5_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # upstreamed, but not spinning new patchset just yet
- rm "${WORKDIR}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.patch || die
-
- if [[ ${PV} == ${QT5_PV}_p* ]]; then
- # This is made from git, and for some reason will fail w/o .git directories.
- mkdir -p .git src/3rdparty/chromium/.git || die
- fi
- # We need to make sure this integrates well into Qt 5.15.3 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
- sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
-
- # QTBUG-88657 - jumbo-build could still make trouble
- if ! use jumbo-build; then
- sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
- src/buildtools/config/common.pri || die
- fi
-
- # bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | \
- xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
- if use system-icu; then
- # Sanity check to ensure that bundled copy of ICU is not used.
- # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
- # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
- local file
- while read file; do
- echo "#error This file should not be used!" > "${file}" || die
- done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
- fi
-
- # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
- if tc-is-clang ; then
- if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- fi
- fi
-
- qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
- qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-
- # we need to generate ppc64 stuff because upstream does not ship it yet
- if use ppc64; then
- einfo "Patching for ppc64le and generating build files"
- eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
- pushd src/3rdparty/chromium > /dev/null || die
- eapply -p0 "${WORKDIR}/${PN}-ppc64le"
- popd > /dev/null || die
- pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
- mkdir -vp source/config/linux/ppc64 || die
- mkdir -p source/libvpx/test || die
- touch source/libvpx/test/test.mk || die
- # clang-format is used to re-format sources
- # but we'd rather make it a no-op than introduce a clang dependency
- # https://bugs.gentoo.org/849458
- clang-format() { : ; }
- export -f clang-format || die
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -no-build-qtpdf
- -printing-and-pdf
- -system-opus
- -system-webp
- $(qt_use alsa)
- $(qt_use !bindist proprietary-codecs)
- $(qt_use geolocation webengine-geolocation)
- $(qt_use kerberos webengine-kerberos)
- $(qt_use pulseaudio)
- $(usex screencast -webengine-webrtc-pipewire '')
- -qt-ffmpeg # bug 831487
- $(qt_use system-icu webengine-icu)
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 601472
- if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
- fi
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
- elog "with additional security fixes from newer versions. Extensive as it is, the"
- elog "list of backports is impossible to evaluate, but always bound to be behind"
- elog "Chromium's release schedule."
- elog "In addition, various online services may deny service based on an outdated"
- elog "user agent version (and/or other checks). Google is already known to do so."
- elog
- elog "tldr: Your web browsing experience will be compromised."
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
deleted file mode 100644
index 77d6de4b..00000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
- if [[ ${PV} == ${QT5_PV}_p* ]]; then
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
- S="${WORKDIR}/${P}"
- QT5_BUILD_DIR="${S}_build"
- fi
-else
- EGIT_BRANCH="5.15"
- EGIT_REPO_URI=(
- "https://code.qt.io/qt/${QT5_MODULE}.git"
- "https://github.com/qt/${QT5_MODULE}.git"
- )
- inherit git-r3
-fi
-
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.8_p20230313-patchset.tar.xz
- ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/re2:=
- =dev-qt/qtcore-${QT5_PV}*
- =dev-qt/qtdeclarative-${QT5_PV}*
- =dev-qt/qtgui-${QT5_PV}*
- =dev-qt/qtnetwork-${QT5_PV}*
- =dev-qt/qtprintsupport-${QT5_PV}*
- =dev-qt/qtwebchannel-${QT5_PV}*[qml]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc(+)]
- media-libs/libwebp:=
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib[minizip]
- virtual/libudev
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( =dev-qt/designer-${QT5_PV}* )
- geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse )
- screencast? ( media-video/pipewire:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtdeclarative-${QT5_PV}*[widgets]
- =dev-qt/qtwidgets-${QT5_PV}*
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-BDEPEND="${PYTHON_DEPS}
- dev-util/gperf
- dev-build/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
- ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
- "${WORKDIR}/${PN}-5.15.8_p20230313-patchset"
-
- # Patches for musl support
- "${FILESDIR}"/${PN}-5.15.5_p20220618-qmake-remove-glibc-check.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mallinfo.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mojo-strncpy.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-resolv-compat.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-backtrace-execinfo.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-pvalloc-patch.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-linux-stack_util-stackstart.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-remove-decls-usage.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-msghdr-padding-initlist.patch
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-canonicalize-filename.patch
- "${FILESDIR}"/${PN}-5.15.10_p20230505-musl-lfs64.patch
- ## runtime
- "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-sandbox.patch
-
- # Patch for clang 16 fix
- "${FILESDIR}"/${PN}-5.15.10_p20230505-clang-16.patch
-)
-
-qtwebengine_check-reqs() {
- # bug #307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- fi
- eshopts_pop
-
- [[ ${MERGE_TYPE} == binary ]] && return
-
- # (check-reqs added for bug #570534)
- #
- # Estimate the amount of RAM required
- # Multiplier is *10 because Bash doesn't do floating point maths.
- # Let's crudely assume ~2GB per compiler job for GCC.
- local multiplier=20
-
- # And call it ~1.5GB for Clang.
- if tc-is-clang ; then
- multiplier=15
- fi
-
- local CHECKREQS_DISK_BUILD="7G"
- local CHECKREQS_DISK_USR="150M"
- if ! has "distcc" ${FEATURES} ; then
- # bug #830661
- # Not super realistic to come up with good estimates for distcc right now
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-src_unpack() {
- case ${QT5_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # upstreamed, but not spinning new patchset just yet
- rm "${WORKDIR}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.patch || die
-
- if [[ ${PV} == ${QT5_PV}_p* ]]; then
- # This is made from git, and for some reason will fail w/o .git directories.
- mkdir -p .git src/3rdparty/chromium/.git || die
- fi
- # We need to make sure this integrates well into Qt 5.15.3 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
- sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
-
- # QTBUG-88657 - jumbo-build could still make trouble
- if ! use jumbo-build; then
- sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
- src/buildtools/config/common.pri || die
- fi
-
- # bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | \
- xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
- if use system-icu; then
- # Sanity check to ensure that bundled copy of ICU is not used.
- # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
- # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
- local file
- while read file; do
- echo "#error This file should not be used!" > "${file}" || die
- done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
- fi
-
- # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
- if tc-is-clang ; then
- if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- fi
- fi
-
- qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
- qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-
- # we need to generate ppc64 stuff because upstream does not ship it yet
- if use ppc64; then
- einfo "Patching for ppc64le and generating build files"
- eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
- pushd src/3rdparty/chromium > /dev/null || die
- eapply -p0 "${WORKDIR}/${PN}-ppc64le"
- popd > /dev/null || die
- pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
- mkdir -vp source/config/linux/ppc64 || die
- mkdir -p source/libvpx/test || die
- touch source/libvpx/test/test.mk || die
- # clang-format is used to re-format sources
- # but we'd rather make it a no-op than introduce a clang dependency
- # https://bugs.gentoo.org/849458
- clang-format() { : ; }
- export -f clang-format || die
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -no-build-qtpdf
- -printing-and-pdf
- -system-opus
- -system-webp
- $(qt_use alsa)
- $(qt_use !bindist proprietary-codecs)
- $(qt_use geolocation webengine-geolocation)
- $(qt_use kerberos webengine-kerberos)
- $(qt_use pulseaudio)
- $(usex screencast -webengine-webrtc-pipewire '')
- -qt-ffmpeg # bug 831487
- $(qt_use system-icu webengine-icu)
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 601472
- if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
- fi
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
- elog "with additional security fixes from newer versions. Extensive as it is, the"
- elog "list of backports is impossible to evaluate, but always bound to be behind"
- elog "Chromium's release schedule."
- elog "In addition, various online services may deny service based on an outdated"
- elog "user agent version (and/or other checks). Google is already known to do so."
- elog
- elog "tldr: Your web browsing experience will be compromised."
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild
deleted file mode 100644
index f5cbe139..00000000
--- a/dev-qt/qtwebengine/qtwebengine-6.5.1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="108.0.5359.181"
-CHROMIUM_PATCHES_VER="112.0.5615.138"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-build/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/re2:=
- =dev-qt/qtdeclarative-${PV}*
- =dev-qt/qtwebchannel-${PV}*
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=media-libs/libvpx-1.5:=[svc(+)]
- media-libs/libwebp:=
- media-libs/openjpeg:2=
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib[minizip]
- virtual/libudev
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence:=
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtpositioning-${PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*[widgets]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.5.1-normalise-clipboard-permissions.patch"
-
- # Patches for musl support
- "${FILESDIR}/${PN}-6.5.1-musl-disable-glibc-check.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-temp-retry-failure.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-mallinfo.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-crashpad.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-no-execinfo.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-resolve.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-stat.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-close.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-canonicalize-file-name.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-wtf-stacksize.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-missing-includes.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-default-pthread-stacksize.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-fix-narrowing-cast.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-systypes.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-lfs64.patch"
- "${FILESDIR}/${PN}-6.5.1-musl-remove-decls-usage.patch"
- ## runtime
- "${FILESDIR}/${PN}-6.5.1-musl-sandbox.patch"
-)
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- # bug #307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- fi
- eshopts_pop
-
- [[ ${MERGE_TYPE} == binary ]] && return
-
- # (check-reqs added for bug #570534)
- #
- # Estimate the amount of RAM required
- # Multiplier is *10 because Bash doesn't do floating point maths.
- # Let's crudely assume ~2GB per compiler job for GCC.
- local multiplier=20
-
- # And call it ~1.5GB for Clang.
- if tc-is-clang ; then
- multiplier=15
- fi
-
- local CHECKREQS_DISK_BUILD="7G"
- local CHECKREQS_DISK_USR="150M"
- if ! has "distcc" ${FEATURES} ; then
- # bug #830661
- # Not super realistic to come up with good estimates for distcc right now
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
- elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
- elog "list of backports is impossible to evaluate, but always bound to be behind"
- elog "Chromium's release schedule."
- elog "In addition, various online services may deny service based on an outdated"
- elog "user agent version (and/or other checks). Google is already known to do so."
- elog
- elog "tldr: Your web browsing experience will be compromised."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- ewarn
- fi
- eshopts_pop
-
- case ${QT6_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
- if tc-is-clang ; then
- if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
- eapply "${FILESDIR}/${PN}-6.5.1-clang-libc++.patch"
- fi
- fi
-
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
-
- if use system-icu; then
- # Sanity check to ensure that bundled copy of ICU is not used.
- # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
- # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
- local file
- while read file; do
- echo "#error This file should not be used!" > "${file}" || die
- done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
- fi
-
- qt6-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH="${BROOT}"/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libopenjpeg2=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2025-08-28 7:36 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-14 21:19 [gentoo-commits] proj/musl:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2025-08-28 7:36 Petr Vaněk
2023-07-08 5:29 Sam James
2022-07-22 20:20 Anthony G. Basile
2022-07-22 20:20 Anthony G. Basile
2022-07-22 20:20 Anthony G. Basile
2017-11-02 0:56 Anthony G. Basile
2017-02-06 15:23 Aric Belsito
2016-12-06 8:01 Aric Belsito
2016-11-09 19:49 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox