diff options
Diffstat (limited to 'community/qt5-qtwebengine/qt-musl-execinfo.patch')
| -rw-r--r-- | community/qt5-qtwebengine/qt-musl-execinfo.patch | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/community/qt5-qtwebengine/qt-musl-execinfo.patch b/community/qt5-qtwebengine/qt-musl-execinfo.patch index 615177ba16..c5e085005c 100644 --- a/community/qt5-qtwebengine/qt-musl-execinfo.patch +++ b/community/qt5-qtwebengine/qt-musl-execinfo.patch @@ -92,9 +92,11 @@ !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 @@ +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc +index c7ecc7f..96ba0e4 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/assertions.cc +@@ -51,7 +51,6 @@ #if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__)) #include <cxxabi.h> #include <dlfcn.h> @@ -102,23 +104,3 @@ #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); |