summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-04-20 11:38:06 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-04-21 21:36:18 +0200
commit754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch)
treea417716816e08846114d65394239c309bc129dbd /recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
parentf636eb7444a3454f2a25275a07e414d7409734d7 (diff)
downloadmeta-qt5-754aaadc7f0a1c98a4895899617afbaef0f1cdfa.tar.gz
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch and qtwebkit/0004-Fix-linking-with-libpthread.patch were resolved upstream * all patches were refreshed with: git format-patch --no-numbered --no-signature -NUMBER to remove numbering from Subject (it's good enough in filename) and to remove git version from signature (so it doesn't look differently when generated on different hosts with different git version). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch7
1 files changed, 2 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
index 43798666..5edc9392 100644
--- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
+++ b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
@@ -1,7 +1,7 @@
1From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 1From 5e5545f49d91e1c40d85d2497e16495ee9e53c11 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jun 2015 19:55:05 -0700 3Date: Fri, 5 Jun 2015 19:55:05 -0700
4Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries 4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
5 5
6It was excluding musl with current checks, so lets make it such that it 6It was excluding musl with current checks, so lets make it such that it
7considers only glibc when using backtrace API 7considers only glibc when using backtrace API
@@ -33,6 +33,3 @@ index 1b2091f..ba03a28 100644
33 *size = backtrace(stack, *size); 33 *size = backtrace(stack, *size);
34 #elif OS(WINDOWS) && !OS(WINCE) 34 #elif OS(WINDOWS) && !OS(WINCE)
35 // The CaptureStackBackTrace function is available in XP, but it is not defined 35 // The CaptureStackBackTrace function is available in XP, but it is not defined
36--
372.7.0
38