From 18741e483851e1a6aae79992b130aee34ad48879 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 16 Apr 2015 13:15:26 +0200 Subject: recipes-git: upgrade to 5.5 * based on my WIP patch + fixes from John Mullen * I was trying to get rhid of 0003-Add-external-hostbindir-option.patch and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using upstream configure parameter added in some previous version, but I've failed, so now good-old -external-hostbindir parameter is back Signed-off-by: Martin Jansa --- ...-base.gypi-include-atomicops_internals_x86_g.patch | 6 +++--- ...s.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 19 ++++++++++--------- ...s.prf-Make-sure-we-only-use-the-file-name-to.patch | 12 ++++++------ ...ions.prf-allow-build-for-linux-oe-g-platform.patch | 8 ++++---- 4 files changed, 23 insertions(+), 22 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine') 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 64670f0e..32e8f873 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 @@ -From 59e305219cdaeac6d143cb0466a2f518b4050688 Mon Sep 17 00:00:00 2001 +From d1dfff21428643488790926bde3d699d64746f19 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 3 Oct 2014 03:52:11 +0200 Subject: [PATCH] base.gypi: include atomicops_internals_x86_gcc.cc @@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi -index a5a990a..af30cfa 100644 +index a5a285a..f1cad86 100644 --- a/src/3rdparty/chromium/base/base.gypi +++ b/src/3rdparty/chromium/base/base.gypi -@@ -745,7 +745,7 @@ +@@ -759,7 +759,7 @@ ['include', '^nix/'], ], }], 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 447552e6..e8a2babf 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 @@ -From 6e468c814087bac6ff88a1d7d02549e6cf8a152c Mon Sep 17 00:00:00 2001 +From 42b7e38e8d6fd36976a984edb40f947923d78d2c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Jun 2014 20:08:17 +0200 -Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H +Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H anywhere in path, but at the end Signed-off-by: Martin Jansa @@ -10,17 +10,18 @@ Signed-off-by: Martin Jansa 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 4c2547d..64c08ad 100644 +index ef0320d..98cff24 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -87,8 +87,8 @@ defineReplace(findIncludedMocFiles) { - defineReplace(mocOutput) { +@@ -98,9 +98,9 @@ defineReplace(mocOutput) { out = $$1 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one -- out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|)), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) -- out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|)), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) -+ out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) -+ out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) + for(ext, $$list($${QMAKE_EXT_CPP})): \ +- out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) ++ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) + for(ext, $$list($${QMAKE_EXT_H})): \ +- out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) ++ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) return($$out) } 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 e7f4f7f0..9df1c046 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 @@ -From 7a4a82af04fb228526dfd72a1d42b53b402952d1 Mon Sep 17 00:00:00 2001 +From 4b5d3c736714b2712d7f3a77ea5a8a76fea0fc1f Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Tue, 18 Nov 2014 10:38:18 +0100 -Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to +Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to generate it's moc'ed abbreviation Signed-off-by: Simon Busch @@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 64c08ad..b46478b 100644 +index 98cff24..aec54ea 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -85,7 +85,8 @@ defineReplace(findIncludedMocFiles) { +@@ -95,7 +95,8 @@ defineReplace(findIncludedMocFiles) { } defineReplace(mocOutput) { @@ -22,8 +22,8 @@ index 64c08ad..b46478b 100644 + in = $$1 + out = $$basename(in) # The order is important, since the output of the second replace would end up accidentaly transformed by the first one - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) + for(ext, $$list($${QMAKE_EXT_CPP})): \ + out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) -- 2.4.2 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 a932aefc..a533eea8 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 @@ -From 87f1a22e6a1a6b40712eb131ba128d4f1e2da9b8 Mon Sep 17 00:00:00 2001 +From 399990aa9b68437be7f3d6fa16556bf091645c34 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Mon, 1 Dec 2014 14:34:40 +0000 -Subject: [PATCH 3/4] functions.prf: allow build for linux-oe-g++ platform +Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform Upstream-Status: Inappropriate [OE specific] @@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index b46478b..6205bf4 100644 +index aec54ea..6a4b01f 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -10,7 +10,7 @@ defineTest(isPlatformSupported) { +@@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { linux-g++*:!isGCCVersionSupported(): return(false) !isPythonVersionSupported(): return(false) -- cgit v1.2.3-54-g00ecf