summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-02-14 18:37:41 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-05-02 15:16:18 +0200
commitbf2cafa909a27250f853a823e9d7101307337e7a (patch)
tree3b70ffa8f12510fb777a42ce7d6eedf4886819d3 /recipes-qt/qt5/qtwebkit
parentc1b0c9f546289b1592d7a895640de103723a0305 (diff)
downloadmeta-qt5-bf2cafa909a27250f853a823e9d7101307337e7a.tar.gz
qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available * it's highly recommended to read: http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ to find out how you're affected check which files/tools are included in your builds, e.g. for qtwebengine: OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c 11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$ 67 ** $QT_BEGIN_LICENSE:BSD$ 17 ** $QT_BEGIN_LICENSE:FDL$ 61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$ 261 ** $QT_BEGIN_LICENSE:LGPL$ * change in chromium's LICENSE is only copyright year update 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.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch2
3 files changed, 3 insertions, 3 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 1f3dd2a7..d96636e6 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 @@
1From 3e321803386278c52508d114f5096883e974a4bb Mon Sep 17 00:00:00 2001 1From 86bdd059606252b16c24432fbe4bba461406c1e4 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] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
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 2114b42c..d7627ec2 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 @@
1From f1eb41ada1a9bb5f4073c8a48010555cbefeec34 Mon Sep 17 00:00:00 2001 1From f6989fec34f0bafdeda549d71751f236ef1f3b96 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] Remove TEXTREL tag in x86 4Subject: [PATCH] Remove TEXTREL tag in x86
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 5edc9392..a16801b5 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 @@
1From 5e5545f49d91e1c40d85d2497e16495ee9e53c11 Mon Sep 17 00:00:00 2001 1From ed626df67e8287fadbfe2801c241c9717472dcf4 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] Exclude backtrace() API for non-glibc libraries 4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries