diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-19 14:50:16 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-23 13:08:53 +0200 |
commit | 89038bffd224a0d43aa8627472374503b3023f61 (patch) | |
tree | f618d1b35f469cb667619274989748b0d5e2c0c1 /recipes-qt/qt5/qtwebengine | |
parent | 37693b5357e790665bce4957cb7a8d5d2423390d (diff) | |
download | meta-qt5-jansa/jethro.tar.gz |
qt5: upgrade to latest revision in 5.5 branch (5.5.1+)upstream/jansa/jethrojansa/jethro
* this is probably last upgrade for jethro branch, master will switch
to 5.6 soon
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
6 files changed, 17 insertions, 17 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 f8808c10..062d9ed1 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,4 +1,4 @@ | |||
1 | From 8752cdaf7961ad0be8482cd6ebf76c91972f5088 Mon Sep 17 00:00:00 2001 | 1 | From 2a264c2ea7080b026ea1ec85f6317de13c5a6f4f Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 | 3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 |
4 | Subject: [PATCH 1/2] <chromium> base.gypi: include | 4 | Subject: [PATCH 1/2] <chromium> base.gypi: include |
@@ -23,5 +23,5 @@ index a5a285a..f1cad86 100644 | |||
23 | ['include', 'atomicops_internals_x86_gcc.cc'], | 23 | ['include', 'atomicops_internals_x86_gcc.cc'], |
24 | ], | 24 | ], |
25 | -- | 25 | -- |
26 | 2.5.3 | 26 | 2.6.1 |
27 | 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 cceba8d4..02381e04 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,4 +1,4 @@ | |||
1 | From f66dceb807d27e4c0a3d1dd4d5b4f448b08317c9 Mon Sep 17 00:00:00 2001 | 1 | From cf7f63dfcf71b7baee30112ef73fed67504033f7 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 | 3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 |
4 | Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | 4 | Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H |
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
13 | index 69d3fd3..5689ce0 100644 | 13 | index 64064bd..8287c8f 100644 |
14 | --- a/tools/qmake/mkspecs/features/functions.prf | 14 | --- a/tools/qmake/mkspecs/features/functions.prf |
15 | +++ b/tools/qmake/mkspecs/features/functions.prf | 15 | +++ b/tools/qmake/mkspecs/features/functions.prf |
16 | @@ -98,9 +98,9 @@ defineReplace(mocOutput) { | 16 | @@ -105,9 +105,9 @@ defineReplace(mocOutput) { |
17 | out = $$1 | 17 | out = $$1 |
18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | 18 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one |
19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ | 19 | for(ext, $$list($${QMAKE_EXT_CPP})): \ |
@@ -26,5 +26,5 @@ index 69d3fd3..5689ce0 100644 | |||
26 | } | 26 | } |
27 | 27 | ||
28 | -- | 28 | -- |
29 | 2.5.3 | 29 | 2.6.1 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch index 87d21dbe..ae91cd2f 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1efcdf981e6f4cc4e2b5e5dfe407030dc1e43e65 Mon Sep 17 00:00:00 2001 | 1 | From b534874479a150d1fef4e0a4fb79a176d0a342eb Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 27 Jun 2015 13:29:52 -0700 | 3 | Date: Sat, 27 Jun 2015 13:29:52 -0700 |
4 | Subject: [PATCH 2/2] chromium/third_party/boringssl: Demand for newer POSIX | 4 | Subject: [PATCH 2/2] chromium/third_party/boringssl: Demand for newer POSIX |
@@ -34,5 +34,5 @@ index ba65a1a..66c3976 100644 | |||
34 | #include <openssl/bio.h> | 34 | #include <openssl/bio.h> |
35 | #include <openssl/err.h> | 35 | #include <openssl/err.h> |
36 | -- | 36 | -- |
37 | 2.5.3 | 37 | 2.6.1 |
38 | 38 | ||
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 14481976..2ba8fec4 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,4 +1,4 @@ | |||
1 | From 3cdf1ffa138026a601df8e8ddff5ac0723edb0b7 Mon Sep 17 00:00:00 2001 | 1 | From 7f81bad8fcd00afcf2214285856d46f50f91b55c Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | 3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 |
4 | Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to |
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 2 insertions(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
14 | index 5689ce0..e71e6e4 100644 | 14 | index 8287c8f..04bdba5 100644 |
15 | --- a/tools/qmake/mkspecs/features/functions.prf | 15 | --- a/tools/qmake/mkspecs/features/functions.prf |
16 | +++ b/tools/qmake/mkspecs/features/functions.prf | 16 | +++ b/tools/qmake/mkspecs/features/functions.prf |
17 | @@ -95,7 +95,8 @@ defineReplace(findIncludedMocFiles) { | 17 | @@ -102,7 +102,8 @@ defineReplace(findIncludedMocFiles) { |
18 | } | 18 | } |
19 | 19 | ||
20 | defineReplace(mocOutput) { | 20 | defineReplace(mocOutput) { |
@@ -25,5 +25,5 @@ index 5689ce0..e71e6e4 100644 | |||
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 | -- | 27 | -- |
28 | 2.5.3 | 28 | 2.6.1 |
29 | 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 bfde82e1..23be4890 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,4 +1,4 @@ | |||
1 | From b7b5fa151e1ff1749ab5b04763f0f64a156e6e48 Mon Sep 17 00:00:00 2001 | 1 | From a7bb8e37abb3a11e6257d6e154d33c7af5856dcc Mon Sep 17 00:00:00 2001 |
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | 2 | From: Frieder Schrempf <frieder.schrempf@online.de> |
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | 3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 |
4 | Subject: [PATCH 3/4] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH 3/4] functions.prf: allow build for linux-oe-g++ platform |
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 14 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
15 | index e71e6e4..2161505 100644 | 15 | index 04bdba5..4206661 100644 |
16 | --- a/tools/qmake/mkspecs/features/functions.prf | 16 | --- a/tools/qmake/mkspecs/features/functions.prf |
17 | +++ b/tools/qmake/mkspecs/features/functions.prf | 17 | +++ b/tools/qmake/mkspecs/features/functions.prf |
18 | @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { | 18 | @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { |
@@ -25,5 +25,5 @@ index e71e6e4..2161505 100644 | |||
25 | 25 | ||
26 | skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") | 26 | skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") |
27 | -- | 27 | -- |
28 | 2.5.3 | 28 | 2.6.1 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch b/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch index 55dc557a..037b0e4e 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 55c5a15f0a11c76a930020ac725e57303da2ef48 Mon Sep 17 00:00:00 2001 | 1 | From 324eab1b148df1e8330b2dbbd114ab696c163e46 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> |
3 | Date: Mon, 11 May 2015 13:47:06 +0300 | 3 | Date: Mon, 11 May 2015 13:47:06 +0300 |
4 | Subject: [PATCH 4/4] Generate usable qmake_extras.gypi | 4 | Subject: [PATCH 4/4] Generate usable qmake_extras.gypi |
@@ -67,5 +67,5 @@ index 2a59966..317d24a 100644 | |||
67 | " 'target_defaults': {" \ | 67 | " 'target_defaults': {" \ |
68 | " 'target_conditions': [" \ | 68 | " 'target_conditions': [" \ |
69 | -- | 69 | -- |
70 | 2.5.3 | 70 | 2.6.1 |
71 | 71 | ||