summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit
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
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')
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch7
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch7
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch7
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch33
4 files changed, 6 insertions, 48 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 e8b0e432..1f3dd2a7 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,7 +1,7 @@
1From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001 1From 3e321803386278c52508d114f5096883e974a4bb Mon Sep 17 00:00:00 2001
2From: Trevor Woerner <trevor.woerner@linaro.org> 2From: Trevor Woerner <trevor.woerner@linaro.org>
3Date: Fri, 7 Feb 2014 04:07:17 +0100 3Date: Fri, 7 Feb 2014 04:07:17 +0100
4Subject: [PATCH 1/3] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
5 5
6Building qtwebkit causes a QA issue such that QtWebPluginProcess and 6Building qtwebkit causes a QA issue such that QtWebPluginProcess and
7QtWebProcess contain bad RPATHs which point into the build location. This fix 7QtWebProcess contain bad RPATHs which point into the build location. This fix
@@ -25,6 +25,3 @@ index fd66af6..ef754c3 100644
25 25
26 CONFIG(debug, debug|release)|force_debug_info { 26 CONFIG(debug, debug|release)|force_debug_info {
27 # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. 27 # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
28--
292.7.0
30
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 b3a86159..2114b42c 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,7 +1,7 @@
1From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001 1From f1eb41ada1a9bb5f4073c8a48010555cbefeec34 Mon Sep 17 00:00:00 2001
2From: Magnus Granberg <zorry@gentoo.org> 2From: Magnus Granberg <zorry@gentoo.org>
3Date: Fri, 27 Feb 2015 11:55:09 +0100 3Date: Fri, 27 Feb 2015 11:55:09 +0100
4Subject: [PATCH 2/3] Remove TEXTREL tag in x86 4Subject: [PATCH] Remove TEXTREL tag in x86
5 5
6Fix textrel QA warnings when building qtwebkit for x86: 6Fix textrel QA warnings when building qtwebkit for x86:
7 7
@@ -74,6 +74,3 @@ index 0a2fe78..2dc40ef 100644
74 #else 74 #else
75 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) 75 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
76 #endif 76 #endif
77--
782.7.0
79
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
diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch b/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch
deleted file mode 100644
index c5e6ac52..00000000
--- a/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 5dd4bb67cfce812fd7686e43616e2069f354a7df Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
3Date: Mon, 22 Feb 2016 10:57:32 +0100
4Subject: [PATCH] Fix linking with libpthread
5
6WebKit use libpthread directly but is depending on other qt modules
7causing it to be linked against, which might break unless -lpthread
8is last. Instead just add it explicitly after the static libraries.
9
10Upstream-Status: Backport from 5.7 branch
11
12Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
13Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
14Signed-off-by: Jonathan Liu <net147@gmail.com>
15---
16 Tools/qmake/mkspecs/features/default_post.prf | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
20index 67276b7..39bb3f7 100644
21--- a/Tools/qmake/mkspecs/features/default_post.prf
22+++ b/Tools/qmake/mkspecs/features/default_post.prf
23@@ -201,6 +201,7 @@ needToLink() {
24 linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
25 LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
26 }
27+ posix:!darwin: LIBS += -lpthread
28 }
29
30 creating_module {
31--
322.7.1
33