qt5: upgrade to latest revision in 5.5 branches

* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

6 files changed, 28 insertions, 27 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 32e8f873..f8808c10 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 @@
-From d1dfff21428643488790926bde3d699d64746f19 Mon Sep 17 00:00:00 2001
+From 8752cdaf7961ad0be8482cd6ebf76c91972f5088 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Fri, 3 Oct 2014 03:52:11 +0200
-Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
- when building for x64 arch
+Subject: [PATCH 1/2] <chromium> base.gypi: include
+ atomicops_internals_x86_gcc.cc when building for x64 arch
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
@@ -23,5 +23,5 @@ index a5a285a..f1cad86 100644
                  ['include', 'atomicops_internals_x86_gcc.cc'],
                ],
 -- 
-2.4.2
+2.5.3
 
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 e8a2babf..cceba8d4 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 42b7e38e8d6fd36976a984edb40f947923d78d2c Mon Sep 17 00:00:00 2001
+From f66dceb807d27e4c0a3d1dd4d5b4f448b08317c9 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 30 Jun 2014 20:08:17 +0200
-Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
+Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
  anywhere in path, but at the end
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@@ -10,7 +10,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index ef0320d..98cff24 100644
+index 69d3fd3..5689ce0 100644
 --- a/tools/qmake/mkspecs/features/functions.prf
 +++ b/tools/qmake/mkspecs/features/functions.prf
 @@ -98,9 +98,9 @@ defineReplace(mocOutput) {
@@ -26,5 +26,5 @@ index ef0320d..98cff24 100644
  }
  
 -- 
-2.4.2
+2.5.3
 
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 4e09f6ea..87d21dbe 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,7 +1,8 @@
-From 75e9a963561a73ef2a449d7915cd8b41285ac862 Mon Sep 17 00:00:00 2001
+From 1efcdf981e6f4cc4e2b5e5dfe407030dc1e43e65 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 27 Jun 2015 13:29:52 -0700
-Subject: [PATCH] chromium/third_party/boringssl: Demand for newer POSIX macro
+Subject: [PATCH 2/2] chromium/third_party/boringssl: Demand for newer POSIX
+ macro
 
 Reason for change: Define _POSIX_C_SOURCE such that it demands correct
 posix interfaces, netdb.h declares interfaces such as
@@ -33,5 +34,5 @@ index ba65a1a..66c3976 100644
  #include <openssl/bio.h>
  #include <openssl/err.h>
 -- 
-2.5.0
+2.5.3
 
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 9df1c046..14481976 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 4b5d3c736714b2712d7f3a77ea5a8a76fea0fc1f Mon Sep 17 00:00:00 2001
+From 3cdf1ffa138026a601df8e8ddff5ac0723edb0b7 Mon Sep 17 00:00:00 2001
 From: Simon Busch <morphis@gravedo.de>
 Date: Tue, 18 Nov 2014 10:38:18 +0100
-Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to
+Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to
  generate it's moc'ed abbreviation
 
 Signed-off-by: Simon Busch <morphis@gravedo.de>
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 98cff24..aec54ea 100644
+index 5689ce0..e71e6e4 100644
 --- a/tools/qmake/mkspecs/features/functions.prf
 +++ b/tools/qmake/mkspecs/features/functions.prf
 @@ -95,7 +95,8 @@ defineReplace(findIncludedMocFiles) {
@@ -25,5 +25,5 @@ index 98cff24..aec54ea 100644
    for(ext, $$list($${QMAKE_EXT_CPP})): \
        out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
 -- 
-2.4.2
+2.5.3
 
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 a533eea8..bfde82e1 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 399990aa9b68437be7f3d6fa16556bf091645c34 Mon Sep 17 00:00:00 2001
+From b7b5fa151e1ff1749ab5b04763f0f64a156e6e48 Mon Sep 17 00:00:00 2001
 From: Frieder Schrempf <frieder.schrempf@online.de>
 Date: Mon, 1 Dec 2014 14:34:40 +0000
-Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform
+Subject: [PATCH 3/4] functions.prf: allow build for linux-oe-g++ platform
 
 Upstream-Status: Inappropriate [OE specific]
 
@@ -12,18 +12,18 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index aec54ea..6a4b01f 100644
+index e71e6e4..2161505 100644
 --- a/tools/qmake/mkspecs/features/functions.prf
 +++ b/tools/qmake/mkspecs/features/functions.prf
 @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) {
  
    linux-g++*:!isGCCVersionSupported(): return(false)
    !isPythonVersionSupported(): return(false)
--  linux-g++*|win32-msvc2013|macx-clang: return(true)
-+  linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true)
+-  linux-g++*|win32-msvc2013|macx-clang*: return(true)
++  linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang*: return(true)
    boot2qt: return(true)
  
    skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
 -- 
-2.4.2
+2.5.3
 
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 89f56e05..55dc557a 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,7 +1,7 @@
-From 9d2fafdd9a15adf51d8383bdd545d73e76ad0428 Mon Sep 17 00:00:00 2001
+From 55c5a15f0a11c76a930020ac725e57303da2ef48 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Mon, 11 May 2015 13:47:06 +0300
-Subject: [PATCH] Generate usable qmake_extras.gypi
+Subject: [PATCH 4/4] Generate usable qmake_extras.gypi
 
 Running qmake recursively does not take .depends into account, so
 the SUBDIRS need to be in correct order so that qmake_extras.gypi
@@ -39,7 +39,7 @@ index cf00f39..747b711 100644
 +SUBDIRS += gyp_run \
 +           core_module
 diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro
-index 3eb6738..d6820c4 100644
+index eb94cb8..859bcbf 100644
 --- a/src/core/gyp_configure_host.pro
 +++ b/src/core/gyp_configure_host.pro
 @@ -6,9 +6,6 @@ option(host_build)
@@ -50,10 +50,10 @@ index 3eb6738..d6820c4 100644
 -                "    ['CXX.host', '$$which($$QMAKE_CXX)']," \
 -                "    ['LD.host', '$$which($$QMAKE_LINK)'],"
  
- GYPI_FILE = $$absolute_path('qmake_extras.gypi')
+ GYPI_FILE = $$OUT_PWD/qmake_extras.gypi
  !build_pass {
 diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro
-index 4d52044..f02bfa0 100644
+index 2a59966..317d24a 100644
 --- a/src/core/gyp_configure_target.pro
 +++ b/src/core/gyp_configure_target.pro
 @@ -3,9 +3,6 @@ TEMPLATE = aux
@@ -67,5 +67,5 @@ index 4d52044..f02bfa0 100644
                   "  'target_defaults': {" \
                   "    'target_conditions': [" \
 -- 
-1.9.1
+2.5.3