summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch9
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch7
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch7
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch7
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch7
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch9
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch7
7 files changed, 16 insertions, 37 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
index a1ea375f..75350c17 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
@@ -1,8 +1,8 @@
1From 90d2f7aefa8922c3aa29e6907c1520c814d1797f Mon Sep 17 00:00:00 2001 1From 04be78d20ecc23e289e171e907bb5daf9393619d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 3 Oct 2014 03:52:11 +0200 3Date: Fri, 3 Oct 2014 03:52:11 +0200
4Subject: [PATCH 1/2] <chromium> base.gypi: include 4Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
5 atomicops_internals_x86_gcc.cc when building for x64 arch 5 when building for x64 arch
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8--- 8---
@@ -22,6 +22,3 @@ index b860735..0ed5de3 100644
22 'sources/': [ 22 'sources/': [
23 ['include', 'atomicops_internals_x86_gcc.cc'], 23 ['include', 'atomicops_internals_x86_gcc.cc'],
24 ], 24 ],
25--
262.7.0
27
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
index 88d4826e..c95fad09 100644
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
@@ -1,7 +1,7 @@
1From f052458fe39733602751f9f9a09d1c0d78bea421 Mon Sep 17 00:00:00 2001 1From dde0edc1681bb49580584028c2d7b5757e177cd1 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 30 Jun 2014 20:08:17 +0200 3Date: Mon, 30 Jun 2014 20:08:17 +0200
4Subject: [PATCH 1/5] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H 4Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
5 anywhere in path, but at the end 5 anywhere in path, but at the end
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@@ -25,6 +25,3 @@ index 2df689b..8d984c7 100644
25 return($$out) 25 return($$out)
26 } 26 }
27 27
28--
292.7.0
30
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
index 1227d0a0..00432bc0 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
@@ -1,7 +1,7 @@
1From a015bddaf2005cac376be7dda4603637afc5844c Mon Sep 17 00:00:00 2001 1From 3ae00f0217e4a0039f0855ea6cd945209b1734ee Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 12:46:58 -0200 3Date: Thu, 24 Dec 2015 12:46:58 -0200
4Subject: [PATCH 2/2] chromium: Change false to FALSE and 1 to TRUE, FIX 4Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
5 qtwebengine compile 5 qtwebengine compile
6 6
7Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 7Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
@@ -61,6 +61,3 @@ index 8a08fe0..32b2a05 100644
61 61
62 // we want to always get RGB data out 62 // we want to always get RGB data out
63 switch (cinfo.jpeg_color_space) { 63 switch (cinfo.jpeg_color_space) {
64--
652.7.0
66
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
index dbc1e24e..18f268ce 100644
--- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
@@ -1,7 +1,7 @@
1From 5f6389fe3493420c2afeec8f2786165f1d08901a Mon Sep 17 00:00:00 2001 1From 6576e3135b839b53c422befac0a233f6dd1966bf Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100 3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to 4Subject: [PATCH] functions.prf: Make sure we only use the file name to
5 generate it's moc'ed abbreviation 5 generate it's moc'ed abbreviation
6 6
7Signed-off-by: Simon Busch <morphis@gravedo.de> 7Signed-off-by: Simon Busch <morphis@gravedo.de>
@@ -24,6 +24,3 @@ index 8d984c7..055e960 100644
24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one 24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
25 for(ext, $$list($${QMAKE_EXT_CPP})): \ 25 for(ext, $$list($${QMAKE_EXT_CPP})): \
26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) 26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
27--
282.7.0
29
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
index 28960ed4..78cb3fc4 100644
--- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
1From 348a74cb924cf6ac4384069d84ee3995644b2ce1 Mon Sep 17 00:00:00 2001 1From f4c64fbabdcc30d46d9181401aa1c9d78fcb0b2f Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de> 2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000 3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform 4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
5 5
6Upstream-Status: Inappropriate [OE specific] 6Upstream-Status: Inappropriate [OE specific]
7 7
@@ -28,6 +28,3 @@ index 055e960..379c9b5 100644
28 } else:win32 { 28 } else:win32 {
29 winrt { 29 winrt {
30 skipBuild("WinRT is not supported.") 30 skipBuild("WinRT is not supported.")
31--
322.7.0
33
diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
index 4a3deb9b..901462cd 100644
--- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@@ -1,7 +1,7 @@
1From 80f5e26073ef58c1a2ff510c6ccdb7423bcb2fc3 Mon Sep 17 00:00:00 2001 1From a2670f5ad67822b399e9dd7b3b87589be1da9749 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200 3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor 4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
5 5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7--- 7---
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h 11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index dbbbf91..94268b6 100644 12index 65bf25e..0447d07 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h 13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h 14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -56,6 +56,8 @@ 15@@ -56,6 +56,8 @@
@@ -21,6 +21,3 @@ index dbbbf91..94268b6 100644
21 21
22 namespace QtWebEngineCore { 22 namespace QtWebEngineCore {
23 class WebContentsAdapter; 23 class WebContentsAdapter;
24--
252.7.0
26
diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
index 6fd9e499..fa3faf45 100644
--- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
@@ -1,7 +1,7 @@
1From b3f3154e4852a830fdc4e311d4f5105fc337e8f2 Mon Sep 17 00:00:00 2001 1From b523c4dd76f6205389d8f5771124f0451ec7183f Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200 3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate() 4Subject: [PATCH] Include dependency to QCoreApplication::translate()
5 5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7--- 7---
@@ -21,6 +21,3 @@ index 500fe76..eda2824 100644
21 #include "web_contents_adapter_client.h" 21 #include "web_contents_adapter_client.h"
22 22
23 #include "base/callback.h" 23 #include "base/callback.h"
24--
252.7.0
26