diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-04 11:11:01 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-04 11:24:46 +0200 |
commit | 3815b72ba156c35b962e15d65a52bb4ded404a58 (patch) | |
tree | 3e1595be115eb37e60a1fc57c242e43e7d26f9f3 /testing/qt5-qtwebengine/qt-musl-execinfo.patch | |
parent | de17d5212836b5874586e9f7cfee4381ee2a8401 (diff) | |
download | aports-3815b72ba156c35b962e15d65a52bb4ded404a58.tar.bz2 aports-3815b72ba156c35b962e15d65a52bb4ded404a58.tar.xz |
community/qt5-qtwebengine: move from testing
Diffstat (limited to 'testing/qt5-qtwebengine/qt-musl-execinfo.patch')
-rw-r--r-- | testing/qt5-qtwebengine/qt-musl-execinfo.patch | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/testing/qt5-qtwebengine/qt-musl-execinfo.patch b/testing/qt5-qtwebengine/qt-musl-execinfo.patch deleted file mode 100644 index 615177ba16..0000000000 --- a/testing/qt5-qtwebengine/qt-musl-execinfo.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2018-01-27 21:50:04.693231905 +0100 -@@ -26,7 +26,7 @@ - #if !defined(USE_SYMBOLIZE) - #include <cxxabi.h> - #endif --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - #include <execinfo.h> - #endif - -@@ -82,7 +82,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. -@@ -117,7 +117,7 @@ - search_from = mangled_start + 2; - } - } --#endif // !defined(__UCLIBC__) && !defined(_AIX) -+#endif // !defined(__GLIBC__) && !defined(_AIX) - } - #endif // !defined(USE_SYMBOLIZE) - -@@ -129,7 +129,7 @@ - virtual ~BacktraceOutputHandler() {} - }; - --#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. -@@ -206,7 +206,7 @@ - } - #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 -@@ -749,7 +749,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__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - count = std::min(arraysize(trace_), count); - - // Though the backtrace API man page does not list any possible negative -@@ -764,13 +764,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_, &handler); - #endif - } - --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - void StackTrace::OutputToStream(std::ostream* os) const { - StreamBacktraceOutputHandler handler(os); - ProcessBacktrace(trace_, count_, &handler); ---- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.cc 2018-01-27 22:31:08.296359000 +0100 -@@ -214,7 +214,7 @@ - - std::string StackTrace::ToString() const { - std::stringstream stream; --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - OutputToStream(&stream); - #endif - return stream.str(); ---- qtwebengine/src/3rdparty/chromium/base/logging.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/base/logging.cc 2018-01-27 22:46:34.970406807 +0100 -@@ -546,7 +546,7 @@ - - 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. ---- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/Assertions.cpp 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/Assertions.cpp 2018-01-29 20:23:26.498185623 +0100 -@@ -59,7 +59,6 @@ - #if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__)) - #include <cxxabi.h> - #include <dlfcn.h> --#include <execinfo.h> - #endif - - #if defined(OS_ANDROID) ---- qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.cc 2017-11-28 14:06:53.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.cc 2018-01-29 20:32:41.070163511 +0100 -@@ -16,7 +16,7 @@ - #include <cstdio> - #include <cstdlib> - --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(__GLIBCXX__) && defined(__GLIBC__) - #include <cxxabi.h> - #include <execinfo.h> - #endif -@@ -60,7 +60,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(__GLIBCXX__) && defined(__GLIBC__) - void* trace[100]; - int size = backtrace(trace, sizeof(trace) / sizeof(*trace)); - char** symbols = backtrace_symbols(trace, size); |