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 <[email protected]>
-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 <[email protected]>
-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 <[email protected]>
----
- .../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 <[email protected]>
-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 <[email protected]>
-(cherry picked from commit 79e4a37668a9176373e81fe4fc8dfe29f6c8c37b)
-Reviewed-by: Qt Cherry-pick Bot <[email protected]>
----
- 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>[email protected]</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
- <maintainer type="person">
- <description>ppc64 patchset maintainer</description>
- <email>[email protected]</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
-}
