diff options
| author |   Alfred Persson Forsberg <cat@catcream.org> | 2022-07-25 21:03:40 +0200 |
|---|---|---|
| committer |   Anthony G. Basile <blueness@gentoo.org> | 2022-07-26 12:08:21 -0400 |
| commit | 95d844bb35515f1b928c6874031dd42505243781 (patch) | |
| tree | 11555fbc19802f3174fc15ce1c4dea07b3b49c1c | |
| parent | dev-qt/qtwebengine: remove cdefs includes (diff) | |
| download | musl-95d844bb35515f1b928c6874031dd42505243781.tar.gz musl-95d844bb35515f1b928c6874031dd42505243781.tar.bz2 musl-95d844bb35515f1b928c6874031dd42505243781.zip | |
dev-qt/qtwebengine: Merge two patches
This merges a patch that removes cdefs.h includes and another
one that replaces __*_DECLS usage. These patches must be used togheter.
Signed-off-by: Alfred Persson Forsberg <cat@catcream.org>
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
3 files changed, 541 insertions, 727 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-cdefs-includes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-cdefs-includes.patch deleted file mode 100644 index 219485f9..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-cdefs-includes.patch +++ /dev/null @@ -1,697 +0,0 @@ -From e7a7741bd2c1caaa98f72955aa3faacef23b1fb9 Mon Sep 17 00:00:00 2001 -From: Your Name <you@example.com> -Date: Fri, 22 Jul 2022 18:02:47 +0200 -Subject: [PATCH] remove cdefs.h - ---- - src/3rdparty/chromium/base/allocator/allocator_shim_internals.h | 2 +- - src/3rdparty/chromium/base/mac/close_nocancel.cc | 2 +- - src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h | 2 +- - .../breakpad/breakpad/src/common/android/include/stab.h | 2 +- - .../breakpad/breakpad/src/common/android/include/sys/procfs.h | 2 +- - .../third_party/crashpad/crashpad/compat/android/sys/mman.h | 2 +- - .../third_party/crashpad/crashpad/compat/linux/sys/ptrace.h | 2 +- - .../chromium/third_party/libsync/src/include/sync/sync.h | 2 +- - .../tcmalloc/chromium/src/libc_override_gcc_and_weak.h | 2 +- - .../tcmalloc/vendor/src/libc_override_gcc_and_weak.h | 2 +- - .../third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h | 2 +- - .../third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c | 2 +- - .../usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h | 2 +- - 49 files changed, 49 insertions(+), 49 deletions(-) - -diff --git a/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h b/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h -index da1e5a6f9..c9c36b3c3 100644 ---- a/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h -+++ b/src/3rdparty/chromium/base/allocator/allocator_shim_internals.h -@@ -9,7 +9,7 @@ - - #if defined(__GNUC__) - --#include <sys/cdefs.h> // for __THROW -+ // for __THROW - - #ifndef __THROW // Not a glibc system - #ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead -diff --git a/src/3rdparty/chromium/base/mac/close_nocancel.cc b/src/3rdparty/chromium/base/mac/close_nocancel.cc -index 8971e731c..d91482f1b 100644 ---- a/src/3rdparty/chromium/base/mac/close_nocancel.cc -+++ b/src/3rdparty/chromium/base/mac/close_nocancel.cc -@@ -34,7 +34,7 @@ - // is resolved from libsyscall. By linking with this version of close prior to - // the libsyscall version, close's implementation is overridden. - --#include <sys/cdefs.h> -+ - #include <unistd.h> - - // If the non-cancelable variants of all system calls have already been -diff --git a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h -index 4840f0ae9..50ed790c6 100644 ---- a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h -+++ b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h -@@ -28,7 +28,7 @@ - * These routines provide access to the systems DNS configuration - */ - --#include <sys/cdefs.h> -+ - #include <stdint.h> - #include <sys/types.h> - #include <sys/socket.h> -diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h -index cd9290215..e9ac64cf6 100644 ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/stab.h -@@ -30,7 +30,7 @@ - #ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H - #define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H - --#include <sys/cdefs.h> -+ - - #ifdef __BIONIC_HAVE_STAB_H - #include <stab.h> -diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h -index 185124364..3dff002f5 100644 ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/procfs.h -@@ -37,7 +37,7 @@ - #else - - #include <asm/ptrace.h> --#include <sys/cdefs.h> -+ - #if defined (__mips__) - #include <sys/types.h> - #endif -diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h -index 5e7cd69f1..3385f39a8 100644 ---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h -+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/android/sys/mman.h -@@ -18,7 +18,7 @@ - #include_next <sys/mman.h> - - #include <android/api-level.h> --#include <sys/cdefs.h> -+ - - // There’s no mmap() wrapper compatible with a 64-bit off_t for 32-bit code - // until API 21 (Android 5.0/“Lollipop”). A custom mmap() wrapper is provided -diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h -index f8be372cc..760b19fd5 100644 ---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h -+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h -@@ -17,7 +17,7 @@ - - #include_next <sys/ptrace.h> - --#include <sys/cdefs.h> -+ - - // https://sourceware.org/bugzilla/show_bug.cgi?id=22433 - #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \ -diff --git a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h -index 91dfd5d69..4960264cf 100644 ---- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h -+++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h -@@ -19,7 +19,7 @@ - #ifndef __SYS_CORE_SYNC_H - #define __SYS_CORE_SYNC_H - --#include <sys/cdefs.h> -+ - #include <stdint.h> - - #include <linux/types.h> -diff --git a/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h b/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h -index 687516467..5ddbe3a23 100644 ---- a/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h -+++ b/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h -@@ -40,7 +40,7 @@ - #define TCMALLOC_LIBC_OVERRIDE_GCC_AND_WEAK_INL_H_ - - #ifdef HAVE_SYS_CDEFS_H --#include <sys/cdefs.h> // for __THROW -+ // for __THROW - #endif - #include <gperftools/tcmalloc.h> - -diff --git a/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h b/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h -index 687516467..5ddbe3a23 100644 ---- a/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h -+++ b/src/3rdparty/chromium/third_party/tcmalloc/vendor/src/libc_override_gcc_and_weak.h -@@ -40,7 +40,7 @@ - #define TCMALLOC_LIBC_OVERRIDE_GCC_AND_WEAK_INL_H_ - - #ifdef HAVE_SYS_CDEFS_H --#include <sys/cdefs.h> // for __THROW -+ // for __THROW - #endif - #include <gperftools/tcmalloc.h> - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h -index 8d8bf31fe..52dec541e 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp.h 356357 2020-01-04 20:33:12Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c -index 81e2acfd5..5e98be8a3 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 363194 2020-07-14 20:32:50Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h -index e171a0b56..ee61355aa 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_asconf.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.h 362377 2020-06-19 12:35:29Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c -index 3a8fac073..b362f8062 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.c 362054 2020-06-11 13:34:09Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h -index 3dc5a59e2..fd5b3ac15 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.h 338749 2018-09-18 10:53:07Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c -index 40e308f8f..525b02b44 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_bsd_addr.c 358080 2020-02-18 19:41:55Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h -index 05d1b3fee..73da56192 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_bsd_addr.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_bsd_addr.h 353480 2019-10-13 18:17:08Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h -index 81fd8530d..dc1c9b1d8 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_callout.h -@@ -31,7 +31,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD$"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c -index dcf629857..53183db4c 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_cc_functions.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_cc_functions.c 359405 2020-03-28 20:25:45Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h -index b932d7f19..b10b2e3be 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_constants.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_constants.h 363440 2020-07-23 01:35:24Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c -index 0b5a06e06..a30adcc29 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_crc32.c 362498 2020-06-22 14:36:14Z tuexen $"); - - #include "opt_sctp.h" -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h -index 5e76ff21b..25048d1f0 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_crc32.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_crc32.h 362338 2020-06-18 19:32:34Z markj $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h -index 602921d0e..de23c1b01 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_header.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_header.h 309682 2016-12-07 19:30:59Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c -index 806f63092..e48c8bf3b 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 363440 2020-07-23 01:35:24Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h -index 829a014f2..feb20f9cd 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.h 361116 2020-05-16 19:26:39Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c -index 4a9460827..146ba0e13 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 368622 2020-12-13 23:51:51Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h -index 55a174bae..f70ef3f65 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_input.h 326672 2017-12-07 22:19:08Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h -index 0aed34770..7c882a7f9 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_lock_userspace.h -@@ -34,7 +34,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD$"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h -index e01b95777..17627aa0d 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_os.h 361872 2020-06-06 18:20:09Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c -index 21424b694..275fe05f9 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 364937 2020-08-28 20:05:18Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h -index 4849c2b49..2fb7ac0b4 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_output.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_output.h 362054 2020-06-11 13:34:09Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c -index f439c78eb..acfcc2467 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 366248 2020-09-29 09:36:06Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h -index 73b32549b..fe047c7f3 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.h 362106 2020-06-12 16:31:13Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c -index 8581f515f..3d21ff574 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.c 362054 2020-06-11 13:34:09Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h -index 7e1c5ecee..1f9312489 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_peeloff.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.h 309607 2016-12-06 10:21:25Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h -index d535ee463..f0868567c 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sha1.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD$"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c -index fad42467c..f7c2a07f5 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_ss_functions.c -@@ -29,7 +29,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_ss_functions.c 362173 2020-06-14 09:50:00Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h -index 1f5f153e9..737bd89b7 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_structs.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_structs.h 364268 2020-08-16 11:50:37Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c -index 91068118e..2b3dceea3 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_sysctl.c 361934 2020-06-08 20:23:20Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h -index eb888338c..67c047690 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_sysctl.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_sysctl.h 361895 2020-06-07 14:39:20Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c -index ad062b35e..9ed7718d8 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 362054 2020-06-11 13:34:09Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h -index ee1c49308..8bffcb2f4 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_timer.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.h 359195 2020-03-21 16:12:19Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h -index d688d9d75..1c92bc42b 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_uio.h 362473 2020-06-21 23:12:56Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c -index 78d795cc1..732dc95b9 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_usrreq.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_usrreq.c 364353 2020-08-18 19:25:03Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h -index d2433d607..82f4f2e29 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_var.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctp_var.h 363323 2020-07-19 12:34:19Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c -index f050610ab..0cda1629a 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 364268 2020-08-16 11:50:37Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h -index 764616950..131a8a522 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctputil.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet/sctputil.h 364268 2020-08-16 11:50:37Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c -index 1fc81daa8..9c8af07d5 100644 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_usrreq.c -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 361895 2020-06-07 14:39:20Z tuexen $"); - #endif - -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h -index 56a6c3af3..ade166031 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h -+++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet6/sctp6_var.h -@@ -33,7 +33,7 @@ - */ - - #if defined(__FreeBSD__) && !defined(__Userspace__) --#include <sys/cdefs.h> -+ - __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_var.h 317457 2017-04-26 19:26:40Z tuexen $"); - #endif - --- -2.35.1 - diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-decls-usage.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-remove-decls-usage.patch index 3dfa65d8..7318a0b0 100644 --- 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 @@ -2,19 +2,21 @@ https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I- "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. ---- - src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h | 8 ++++++-- - .../chromium/third_party/libsync/src/include/sync/sync.h | 8 ++++++-- - src/3rdparty/chromium/third_party/libsync/src/sw_sync.h | 8 ++++++-- - .../usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h | 8 ++++++-- - 4 files changed, 24 insertions(+), 8 deletions(-) - -diff --git a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h -index db2ad9027..4840f0ae9 100644 ---- a/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h +--- b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h +++ b/src/3rdparty/chromium/third_party/apple_apsl/dnsinfo.h -@@ -91,7 +91,9 @@ typedef struct { +@@ -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() @@ -25,8 +27,7 @@ index db2ad9027..4840f0ae9 100644 /* * DNS configuration access APIs -@@ -109,6 +111,8 @@ void - _dns_configuration_ack (dns_config_t *config, +@@ -110,5 +112,7 @@ const char *bundle_id); -__END_DECLS @@ -35,11 +36,15 @@ index db2ad9027..4840f0ae9 100644 +#endif #endif /* __DNSINFO_H__ */ -diff --git a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h -index 50ed0ac57..91dfd5d69 100644 ---- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h +--- b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h +++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h -@@ -24,7 +24,9 @@ +@@ -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> @@ -50,8 +55,7 @@ index 50ed0ac57..91dfd5d69 100644 struct sync_legacy_merge_data { int32_t fd2; -@@ -158,6 +160,8 @@ struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info, - struct sync_pt_info *itr); +@@ -159,5 +161,7 @@ void sync_fence_info_free(struct sync_fence_info_data *info); -__END_DECLS @@ -60,8 +64,6 @@ index 50ed0ac57..91dfd5d69 100644 +#endif #endif /* __SYS_CORE_SYNC_H */ -diff --git a/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h b/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h -index fda1c4c57..395c38072 100644 --- a/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h +++ b/src/3rdparty/chromium/third_party/libsync/src/sw_sync.h @@ -19,7 +19,9 @@ @@ -85,11 +87,18 @@ index fda1c4c57..395c38072 100644 +#endif #endif /* __SYS_CORE_SW_SYNC_H */ -diff --git a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h -index 6298f9334..d688d9d75 100755 ---- a/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h +--- b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h +++ b/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_uio.h -@@ -1317,7 +1317,9 @@ sctp_sorecvmsg(struct socket *so, +@@ -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__)) @@ -100,7 +109,7 @@ index 6298f9334..d688d9d75 100755 int sctp_peeloff(int, sctp_assoc_t); int sctp_bindx(int, struct sockaddr *, int, int); int sctp_connectx(int, const struct sockaddr *, int, sctp_assoc_t *); -@@ -1355,7 +1357,9 @@ ssize_t sctp_sendv(int, const struct iovec *, int, struct sockaddr *, +@@ -1355,7 +1357,9 @@ ssize_t sctp_recvv(int, const struct iovec *, int, struct sockaddr *, socklen_t *, void *, socklen_t *, unsigned int *, int *); @@ -111,6 +120,509 @@ index 6298f9334..d688d9d75 100755 #endif /* !_KERNEL */ #endif /* !__sctp_uio_h__ */ --- -2.35.1 - +--- 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/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild index 4b6137b1..ebdc15b3 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild @@ -128,7 +128,6 @@ PATCHES=( "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-hacks-ii.patch ## runtime "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-sandbox.patch - "${FILESDIR}"/${PN}-5.15.5_p20220618-remove-cdefs-includes.patch ) qtwebengine_check-reqs() { |