aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-02-14 13:48:05 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-02-20 14:45:09 +0100
commite434995a73a83a6604f231d9055b06a261d9f098 (patch)
tree7bcf2006f27e70d0bda92a2cc83b0d56ed3de336 /recipes-qt/qt5/qtwebkit
parente91dea65659b0975146ad4f23d46e561ba8d9a08 (diff)
qt5: upgrade to latest revisions in 5.6 branch (5.6 RC)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit')
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch4
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch4
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch4
3 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
index 33e7dd28..e8b0e432 100644
--- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
@@ -1,4 +1,4 @@
-From a5aae8adf808bb07b0326edbf2dc66bfb4917963 Mon Sep 17 00:00:00 2001
+From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001
From: Trevor Woerner <trevor.woerner@linaro.org>
Date: Fri, 7 Feb 2014 04:07:17 +0100
Subject: [PATCH 1/3] qtwebkit: fix QA issue (bad RPATH)
@@ -26,5 +26,5 @@ index fd66af6..ef754c3 100644
CONFIG(debug, debug|release)|force_debug_info {
# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
--
-2.6.1
+2.7.0
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
index 3c3b4893..b3a86159 100644
--- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
+++ b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
@@ -1,4 +1,4 @@
-From 08e983e065acce369aa95e3fcb5b7fe6ca563e04 Mon Sep 17 00:00:00 2001
+From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001
From: Magnus Granberg <zorry@gentoo.org>
Date: Fri, 27 Feb 2015 11:55:09 +0100
Subject: [PATCH 2/3] Remove TEXTREL tag in x86
@@ -75,5 +75,5 @@ index 0a2fe78..2dc40ef 100644
#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
#endif
--
-2.6.1
+2.7.0
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 44650931..43798666 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,4 +1,4 @@
-From d4ea11922ebaf865f0b0c57e6746d6b985bf840f Mon Sep 17 00:00:00 2001
+From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 5 Jun 2015 19:55:05 -0700
Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries
@@ -34,5 +34,5 @@ index 1b2091f..ba03a28 100644
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined
--
-2.6.1
+2.7.0