summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-08-19 15:44:17 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-20 19:30:06 +0200
commit2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (patch)
treebdf9c293b998f776a26d6ad2ec273f282333f929 /recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
parenta0b2220b5e08a7914d55afec0ff6e2316cb47404 (diff)
downloadmeta-qt5-2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed.tar.gz
qt: refresh remaining patches and add links to meta-qt5 repos
* remove qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch which is already applied and fuzzy patch just apply the same section twice * restore qttools/0001-add-noqtwebkit-configuration.patch which was removed from SRC_URI in 5.9 upgrade * add comment with link to meta-qt5 repository where the meta-qt5 .patch files are maintained, include branch and tag name so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
new file mode 100644
index 00000000..147a7baa
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
@@ -0,0 +1,35 @@
1From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jun 2015 19:55:05 -0700
4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
5
6It was excluding musl with current checks, so lets make it such that it
7considers only glibc when using backtrace API
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 Source/WTF/wtf/Assertions.cpp | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
15index 1b2091f53..ba03a28ec 100644
16--- a/Source/WTF/wtf/Assertions.cpp
17+++ b/Source/WTF/wtf/Assertions.cpp
18@@ -61,7 +61,7 @@
19 #include <windows.h>
20 #endif
21
22-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
23+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
24 #include <cxxabi.h>
25 #include <dlfcn.h>
26 #include <execinfo.h>
27@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
28
29 void WTFGetBacktrace(void** stack, int* size)
30 {
31-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
32+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
33 *size = backtrace(stack, *size);
34 #elif OS(WINDOWS) && !OS(WINCE)
35 // The CaptureStackBackTrace function is available in XP, but it is not defined