diff options
Diffstat (limited to 'dev-qt/qtwebengine/files')
14 files changed, 0 insertions, 601 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-execinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-execinfo.patch deleted file mode 100644 index 0ef84e45..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-execinfo.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/third_party/webrtc/base/checks.cc 2016-03-03 15:48:36.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/webrtc/base/checks.cc 2016-03-17 01:56:11.685588906 +0100 -@@ -16,7 +16,7 @@ - #include <cstdio> - #include <cstdlib> - --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(__GLIBC__) && defined(__GLIBCXX__) && !defined(__UCLIBC__) - #include <cxxabi.h> - #include <execinfo.h> - #endif -@@ -55,7 +55,7 @@ - // to get usable symbols on Linux. This is copied from V8. Chromium has a more - // advanced stace trace system; also more difficult to copy. - void DumpBacktrace() { --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(__GLIBC__) && defined(__GLIBCXX__) && !defined(__UCLIBC__) - void* trace[100]; - int size = backtrace(trace, sizeof(trace) / sizeof(*trace)); - char** symbols = backtrace_symbols(trace, size); ---- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2016-03-03 15:48:36.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2016-03-17 02:23:45.442708132 +0100 -@@ -22,7 +22,7 @@ - #if defined(__GLIBCXX__) - #include <cxxabi.h> - #endif --#if !defined(__UCLIBC__) -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - #include <execinfo.h> - #endif - -@@ -169,7 +169,7 @@ - - handler->HandleOutput("\n"); - } --#elif !defined(__UCLIBC__) -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) - bool printed = false; - - // Below part is async-signal unsafe (uses malloc), so execute it only -@@ -738,7 +738,7 @@ - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. - --#if !defined(__UCLIBC__) -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. - count_ = base::saturated_cast<size_t>(backtrace(trace_, arraysize(trace_))); ---- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/Assertions.cpp 2016-03-03 15:48:36.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/Assertions.cpp 2016-03-17 05:47:32.637589639 +0100 -@@ -61,7 +61,7 @@ - #define HAVE_ISDEBUGGERPRESENT 1 - #endif - --#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__) && defined(__GLIBC__)) - #include <cxxabi.h> - #include <dlfcn.h> - #include <execinfo.h> -@@ -222,7 +222,7 @@ - - void WTFGetBacktrace(void** stack, int* size) - { --#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__) && defined(__GLIBC__)) - *size = backtrace(stack, *size); - #elif OS(WIN) - // The CaptureStackBackTrace function is available in XP, but it is not defined -@@ -260,7 +260,7 @@ - : m_name(0) - , m_cxaDemangled(0) - { --#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__) && defined(__GLIBC__)) - Dl_info info; - if (!dladdr(addr, &info) || !info.dli_sname) - return; diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-off_t.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-off_t.patch deleted file mode 100644 index f5e87484..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-off_t.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h ---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h 2016-07-28 18:44:48.921463425 -0700 -+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h 2016-07-29 12:44:27.881928176 -0700 -@@ -22,6 +22,7 @@ - #else - #include <arpa/inet.h> -+#include <sys/types.h> - #include <stdint.h> - #endif - - #include <algorithm> diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-siginfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-siginfo.patch deleted file mode 100644 index fe760be1..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-siginfo.patch +++ /dev/null @@ -1,18 +0,0 @@ -There's a subtle difference in the internal name of siginfo_t fields -between glibc and musl. The structure itself is equivalent, so it -should suffice to add a macro to rename the field. - ---- qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-02-17 05:57:43.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-06-03 08:20:25.032716427 +0200 -@@ -22,6 +22,11 @@ - #include "sandbox/linux/services/android_ucontext.h" - #endif - -+// musl libc defines siginfo_t __si_fields instead of _sifields -+#if !defined(__GLIBC__) -+#define _sifields __si_fields -+#endif -+ - namespace { - - const int kCapacityIncrement = 20; diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-stack.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-stack.patch deleted file mode 100644 index 7c72417b..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-stack.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/base/threading/platform_thread_linux.cc 2016-03-03 15:48:36.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/threading/platform_thread_linux.cc 2016-03-17 06:31:13.832778611 +0100 -@@ -109,7 +109,7 @@ - - size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { - #if !defined(THREAD_SANITIZER) -- return 0; -+ return 1 << 21; - #else - // ThreadSanitizer bloats the stack heavily. Evidence has been that the - // default stack size isn't enough for some browser tests. ---- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 2016-03-03 15:48:36.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 2016-03-17 06:31:13.832778611 +0100 -@@ -67,7 +67,7 @@ - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. - --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). - // In this case, this method returns 0 and the caller must handle it. -@@ -114,7 +114,7 @@ - - void* StackFrameDepth::getStackStart() - { --#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - pthread_attr_t attr; - int error; - #if OS(FREEBSD) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sysctl.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sysctl.patch deleted file mode 100644 index 86470438..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-musl-sysctl.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c ---- qtwebengine-opensource-src-5.6.1.orig/src/3rdparty/chromium/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c 2016-07-28 18:44:47.582449126 -0700 -+++ qtwebengine-opensource-src-5.6.1/src/3rdparty/chromium/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c 2016-07-29 12:05:34.463048187 -0700 -@@ -38,7 +38,6 @@ - #include <sys/param.h> - #endif - #include <sys/types.h> --#include <sys/sysctl.h> - #endif - #if HAVE_UNISTD_H - #include <unistd.h> diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch deleted file mode 100644 index 71881e0f..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:01:20.929772871 -0800 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:02:18.879462854 -0800 -@@ -24,7 +24,9 @@ - // Disable deprecated features which result in spammy compile warnings. This - // list of defines must mirror those in the 'defines' section of BUILD.gn file & - // ffmpeg.gyp file or the headers below will generate different structures! -+#if !defined(USE_SYSTEM_FFMPEG) - #define FF_API_CONVERGENCE_DURATION 0 -+#endif - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch deleted file mode 100644 index ced5367c..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:07:38.680665385 -0800 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:12:17.564001354 -0800 -@@ -26,6 +26,9 @@ - #include "wtf/StdLibExtras.h" - #include "wtf/text/CharacterNames.h" - -+#include <unicode/uchar.h> -+#include <unicode/uvernum.h> -+ - namespace blink { - - unsigned numGraphemeClusters(const String& string) -@@ -122,13 +125,18 @@ - { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL - }; - -+#if U_ICU_VERSION_MAJOR_NUM >= 58 -+#define BA_LB_COUNT (U_LB_COUNT - 3) -+#else -+#define BA_LB_COUNT U_LB_COUNT -+#endif - // Line breaking table for CSS word-break: break-all. This table differs from - // asciiLineBreakTable in: - // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking - // Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties - // - 1 indicates additional break opportunities. 0 indicates to fallback to - // normal line break, not "prohibit break." --static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = { -+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = { - // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI - { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX - { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI -@@ -178,7 +186,7 @@ - #undef AL - - static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent"); --static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); -+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); - - static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) - { -@@ -209,7 +217,7 @@ - - static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak) - { -- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) { -+ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) { - const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak]; - return tableRow[lineBreak / 8] & (1 << (lineBreak % 8)); - } diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-mallinfo.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-mallinfo.patch deleted file mode 100644 index 43ddac53..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-mallinfo.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-10-06 22:02:53.540968618 -0700 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc 2016-10-06 22:07:22.631008903 -0700 -@@ -61,7 +61,7 @@ - // fixed quantum, so the excess region will not be resident. - // See crrev.com/1531463004 for detailed explanation. - resident_size = stats.max_size_in_use; --#else -+#elif defined(__GLIBC__) - struct mallinfo info = mallinfo(); - DCHECK_GE(info.arena + info.hblkhd, info.uordblks); - -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/content/child/content_child_helpers.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/content/child/content_child_helpers.cc ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/content/child/content_child_helpers.cc 2016-10-06 22:03:03.098035960 -0700 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/content/child/content_child_helpers.cc 2016-10-06 22:06:05.905348789 -0700 -@@ -18,7 +18,7 @@ - - namespace content { - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID) - size_t GetMemoryUsageKB() { - struct mallinfo minfo = mallinfo(); - uint64_t mem_usage = diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-pthread-setname.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-pthread-setname.patch deleted file mode 100644 index a984f97c..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-pthread-setname.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c 2016-10-07 08:13:22.385902742 -0700 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c 2016-10-07 08:14:48.045335758 -0700 -@@ -37,6 +37,9 @@ - #if defined(__Userspace_os_FreeBSD) - #include <pthread_np.h> - #endif -+#if defined(__Userspace_os_Linux) && !defined(__GLIBC__) -+#include <sys/prctl.h> -+#endif - - #if defined(__Userspace_os_Windows) - /* Adapter to translate Unix thread start routines to Windows thread start -@@ -72,7 +75,11 @@ - pthread_setname_np(name); - #endif - #if defined(__Userspace_os_Linux) -+#if defined(__GLIBC__) - pthread_setname_np(pthread_self(), name); -+#else -+ prctl(PR_SET_NAME, name); -+#endif - #endif - #if defined(__Userspace_os_FreeBSD) - pthread_set_name_np(pthread_self(), name); diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-resolver.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-resolver.patch deleted file mode 100644 index b6bdec57..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-resolver.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-10-06 21:21:24.505574899 -0700 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-10-06 21:26:35.597302630 -0700 -@@ -25,6 +25,10 @@ - #include "net/dns/notify_watcher_mac.h" - #include "net/dns/serial_worker.h" - -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#include "net/dns/resolv_compat.h" -+#endif -+ - #if defined(OS_MACOSX) && !defined(OS_IOS) - #include "net/dns/dns_config_watcher_mac.h" - #endif -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/dns_reloader.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/dns_reloader.cc ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-10-06 21:21:24.506574908 -0700 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-10-06 21:27:43.025896377 -0700 -@@ -8,6 +8,9 @@ - !defined(OS_ANDROID) - - #include <resolv.h> -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#include "net/dns/resolv_compat.h" -+#endif - - #include "base/lazy_instance.h" - #include "base/logging.h" -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/resolv_compat.h qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/resolv_compat.h ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/net/dns/resolv_compat.h 1969-12-31 16:00:00.000000000 -0800 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/net/dns/resolv_compat.h 2016-10-06 21:26:35.597302630 -0700 -@@ -0,0 +1,29 @@ -+#if !defined(__GLIBC__) -+/*************************************************************************** -+ * resolv_compat.h -+ * -+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc -+ * Note: res_init() is actually deprecated according to -+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html -+ **************************************************************************/ -+#include <string.h> -+ -+static inline int res_ninit(res_state statp) -+{ -+ int rc = res_init(); -+ if (statp != &_res) { -+ memcpy(statp, &_res, sizeof(*statp)); -+ } -+ return rc; -+} -+ -+static inline int res_nclose(res_state statp) -+{ -+ if (!statp) -+ return -1; -+ if (statp != &_res) { -+ memset(statp, 0, sizeof(*statp)); -+ } -+ return 0; -+} -+#endif diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-sandbox.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-sandbox.patch deleted file mode 100644 index e6c71d14..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-musl-sandbox.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2016-10-07 20:26:54.170418460 -0700 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2016-10-07 20:28:30.342515797 -0700 -@@ -116,21 +116,13 @@ - const Arg<unsigned long> flags(0); - - // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2. -- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES | -- CLONE_SIGHAND | CLONE_THREAD | -- CLONE_SYSVSEM; -- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED; -+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | -+ CLONE_THREAD | CLONE_SYSVSEM; -+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | -+ CLONE_DETACHED; -+ const BoolExpr thread_clone_ok = (flags & ~safe) == required; - -- const uint64_t kGlibcPthreadFlags = -- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | -- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID; -- const BoolExpr glibc_test = flags == kGlibcPthreadFlags; -- -- const BoolExpr android_test = -- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask, -- flags == kGlibcPthreadFlags); -- -- return If(IsAndroid() ? android_test : glibc_test, Allow()) -+ return If(thread_clone_ok, Allow()) - .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM)) - .Else(CrashSIGSYSClone()); - } -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2016-10-07 20:26:54.169418448 -0700 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2016-10-07 20:29:16.430041661 -0700 -@@ -414,6 +414,7 @@ - case __NR_epoll_create: - case __NR_epoll_wait: - #endif -+ case __NR_epoll_pwait: - case __NR_epoll_create1: - case __NR_epoll_ctl: - return true; -@@ -421,7 +422,6 @@ - #if defined(__x86_64__) - case __NR_epoll_ctl_old: - #endif -- case __NR_epoll_pwait: - #if defined(__x86_64__) - case __NR_epoll_wait_old: - #endif -@@ -494,6 +494,7 @@ - case __NR_mlock: - case __NR_munlock: - case __NR_munmap: -+ case __NR_mremap: - return true; - case __NR_madvise: - case __NR_mincore: -@@ -509,7 +510,6 @@ - case __NR_modify_ldt: - #endif - case __NR_mprotect: -- case __NR_mremap: - case __NR_msync: - case __NR_munlockall: - case __NR_readahead: diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch deleted file mode 100644 index 597554e6..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch +++ /dev/null @@ -1,23 +0,0 @@ -# dev-qt/qtwebengine: Fix detecting audio backends. - -# The upstream change doesn't really work for us, so we'll make -# it work with us. -# Gentoo-Bug: https://bugs.gentoo.org/603498 - ---- /src/core/config/linux.pri 2016-12-23 00:05:41.057955774 +0200 -+++ /src/core/config/linux.pri 2016-12-23 00:09:39.000573909 +0200 -@@ -35,12 +35,12 @@ - contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 - contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 - contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 --contains(QT_CONFIG, pulseaudio) { -+use?(pulseaudio) { - GYP_CONFIG += use_pulseaudio=1 - } else { - GYP_CONFIG += use_pulseaudio=0 - } --contains(QT_CONFIG, alsa) { -+use?(alsa) { - GYP_CONFIG += use_alsa=1 - } else { - GYP_CONFIG += use_alsa=0 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch deleted file mode 100644 index a5c3072a..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Wed, 29 Mar 2017 17:42:18 +0200 -Subject: [PATCH] Fix build with GCC 7.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but -earlier compilers did. - -Task-number:QTBUG-59776 -Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3 -Reviewed-by: Michael Brüning <michael.bruning@qt.io> ---- - .../mojo/public/cpp/bindings/interface_ptr_info.h | 2 +- - .../third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ - chromium/v8/src/objects-body-descriptors.h | 2 +- - chromium/v8/src/objects-inl.h | 19 +++++++++++++++++++ - chromium/v8/src/objects.h | 16 ++-------------- - 5 files changed, 25 insertions(+), 16 deletions(-) - -diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h -index 5bd29d5..c94a5ac 100644 ---- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h -+++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h -@@ -34,7 +34,7 @@ class InterfacePtrInfo { - - InterfacePtrInfo& operator=(InterfacePtrInfo&& other) { - if (this != &other) { -- handle_ = other.handle_.Pass(); -+ handle_ = std::move(other.handle_); - version_ = other.version_; - other.version_ = 0u; - } --- -2.7.4 -From 493441248c82d9f39d0947e3bbf4571736e1cf85 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Wed, 29 Mar 2017 15:53:00 +0200 -Subject: [PATCH 1/1] Fix build with GCC 7.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fixes a few problems with using undeclared functions and ambigious -code. - -Task-number: QTBUG-59776 -Change-Id: I59813919b4867d5dd3499a45baed004a1a1c1a3c -Reviewed-by: Michael Brüning <michael.bruning@qt.io> ---- - chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ - .../third_party/pdfium/fpdfsdk/javascript/global.cpp | 8 ++++---- - chromium/v8/src/objects-body-descriptors.h | 2 +- - chromium/v8/src/objects-inl.h | 18 ++++++++++++++++++ - chromium/v8/src/objects.h | 16 ++-------------- - 5 files changed, 27 insertions(+), 19 deletions(-) - -diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -index e85c72f..6f94cd6 100644 ---- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -@@ -542,6 +542,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(LinkedHas - return *this; - } - -+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); -+ - template<typename T, typename U, typename V, typename W> - inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other) - { -diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h -index 91cb888..a1c3634 100644 ---- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h -+++ b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h -@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { - - template <typename StaticVisitor> - static inline void IterateBody(HeapObject* obj, int object_size) { -- IterateBody(obj); -+ IterateBody<StaticVisitor>(obj); - } - }; - -diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h b/src/3rdparty/chromium/v8/src/objects-inl.h -index 58441d3..4c486ea 100644 ---- a/src/3rdparty/chromium/v8/src/objects-inl.h -+++ b/src/3rdparty/chromium/v8/src/objects-inl.h -@@ -7588,6 +7588,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) { - } - - -+template <typename Derived, typename Shape, typename Key> -+inline uint32_t HashTable<Derived,Shape,Key>::Hash(Key key) { -+ if (Shape::UsesSeed) { -+ return Shape::SeededHash(key, GetHeap()->HashSeed()); -+ } else { -+ return Shape::Hash(key); -+ } -+} -+ -+template <typename Derived, typename Shape, typename Key> -+inline uint32_t HashTable<Derived,Shape,Key>::HashForObject(Key key, Object* object) { -+ if (Shape::UsesSeed) { -+ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); -+ } else { -+ return Shape::HashForObject(key, object); -+ } -+} -+ - bool ObjectHashTableShape::IsMatch(Handle<Object> key, Object* other) { - return key->SameValue(other); - } -diff --git a/src/3rdparty/chromium/v8/src/objects.h b/src/3rdparty/chromium/v8/src/objects.h -index 7d774be..42da5fa 100644 ---- a/src/3rdparty/chromium/v8/src/objects.h -+++ b/src/3rdparty/chromium/v8/src/objects.h -@@ -3194,21 +3194,9 @@ class HashTable : public HashTableBase { - typedef Shape ShapeT; - - // Wrapper methods -- inline uint32_t Hash(Key key) { -- if (Shape::UsesSeed) { -- return Shape::SeededHash(key, GetHeap()->HashSeed()); -- } else { -- return Shape::Hash(key); -- } -- } -+ inline uint32_t Hash(Key key); - -- inline uint32_t HashForObject(Key key, Object* object) { -- if (Shape::UsesSeed) { -- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); -- } else { -- return Shape::HashForObject(key, object); -- } -- } -+ inline uint32_t HashForObject(Key key, Object* object); - - // Returns a new HashTable object. - MUST_USE_RESULT static Handle<Derived> New( --- -2.7.4 diff --git a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch deleted file mode 100644 index c71cedc2..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-03-04 01:48:36.000000000 +1100 -+++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-05-01 19:15:44.052770543 +1000 -@@ -33,6 +33,7 @@ - 'embed_script%': "", - 'v8_extra_library_files%': [], - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'remove_v8base_debug_symbols%': 0, - }, - 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'], -@@ -1913,7 +1914,7 @@ - ] - }, - { -- 'target_name': 'mksnapshot', -+ 'target_name': 'mksnapshot_u', - 'type': 'executable', - 'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'], - 'include_dirs+': [ -@@ -1936,5 +1937,26 @@ - }], - ], - }, -+ { -+ 'target_name': 'mksnapshot', -+ 'type': 'executable', -+ 'dependencies': ['mksnapshot_u'], -+ 'actions': [ -+ { -+ 'action_name': 'paxmark_m_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'action': [ -+ 'sh', -+ '-c', -+ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)', -+ ], -+ }, -+ ], -+ }, - ], - } |