From 178a817e6f4604e0f4b24a416d5e83b428cbabe7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 19 Oct 2015 15:26:34 +0200 Subject: qt5: upgrade to latest revision in 5.6 branch (5.6.0-alpha1+) Signed-off-by: Martin Jansa --- ...se.gypi-include-atomicops_internals_x86_g.patch | 10 +-- ...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 10 +-- ...ird_party-boringssl-Demand-for-newer-POSI.patch | 38 ------------ ...rf-Make-sure-we-only-use-the-file-name-to.patch | 10 +-- ...s.prf-allow-build-for-linux-oe-g-platform.patch | 29 --------- .../0004-Generate-usable-qmake_extras.gypi.patch | 71 ---------------------- 6 files changed, 15 insertions(+), 153 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch (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 062d9ed1..b6500ea0 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 2a264c2ea7080b026ea1ec85f6317de13c5a6f4f Mon Sep 17 00:00:00 2001 +From 53e16d6f07005c1176455a4488cd8f93218e3cde Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH 1/2] base.gypi: include - atomicops_internals_x86_gcc.cc when building for x64 arch +Subject: [PATCH] base.gypi: include atomicops_internals_x86_gcc.cc + when building for x64 arch Signed-off-by: Martin Jansa --- @@ -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 a5a285a..f1cad86 100644 +index b860735..0ed5de3 100644 --- a/src/3rdparty/chromium/base/base.gypi +++ b/src/3rdparty/chromium/base/base.gypi -@@ -759,7 +759,7 @@ +@@ -785,7 +785,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 02381e04..3249f834 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 cf7f63dfcf71b7baee30112ef73fed67504033f7 Mon Sep 17 00:00:00 2001 +From 38efc016f223a1277bd3a92e4c78ac816adbcdaa 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/2] 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,10 +10,10 @@ 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 64064bd..8287c8f 100644 +index d5265ab..2825457 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -105,9 +105,9 @@ defineReplace(mocOutput) { +@@ -113,9 +113,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 for(ext, $$list($${QMAKE_EXT_CPP})): \ @@ -26,5 +26,5 @@ index 64064bd..8287c8f 100644 } -- -2.6.1 +2.6.2 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 deleted file mode 100644 index ae91cd2f..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b534874479a150d1fef4e0a4fb79a176d0a342eb Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 27 Jun 2015 13:29:52 -0700 -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 -getaddrinfo if __USE_POSIX, i.e. POSIX.1:1990 or later. -However, these interfaces were new in the 2001 edition of POSIX -therefore ask for Extension from POSIX.1:2001 since we use addrinfo -structure here. - -Change-Id: Icb1c92745d1a0ca958108ae80c270c630628729e -Signed-off-by: Khem Raj -Reviewed-on: https://boringssl-review.googlesource.com/5253 -Reviewed-by: Adam Langley -Signed-off-by: Martin Jansa ---- - src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c b/src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c -index ba65a1a..66c3976 100644 ---- a/src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c -+++ b/src/3rdparty/chromium/third_party/boringssl/src/crypto/bio/socket_helper.c -@@ -12,7 +12,7 @@ - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - --#define _POSIX_SOURCE -+#define _POSIX_C_SOURCE 200112L - - #include - #include --- -2.6.1 - 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 2ba8fec4..4224d322 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 7f81bad8fcd00afcf2214285856d46f50f91b55c Mon Sep 17 00:00:00 2001 +From ebfec8ca32379bffd18cbab1f4335a458fcc7e41 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/2] 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 8287c8f..04bdba5 100644 +index 2825457..f761b64 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -102,7 +102,8 @@ defineReplace(findIncludedMocFiles) { +@@ -110,7 +110,8 @@ defineReplace(findIncludedMocFiles) { } defineReplace(mocOutput) { @@ -25,5 +25,5 @@ index 8287c8f..04bdba5 100644 for(ext, $$list($${QMAKE_EXT_CPP})): \ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) -- -2.6.1 +2.6.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 deleted file mode 100644 index 23be4890..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a7bb8e37abb3a11e6257d6e154d33c7af5856dcc 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 - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Frieder Schrempf -Signed-off-by: Martin Jansa ---- - tools/qmake/mkspecs/features/functions.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 04bdba5..4206661 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) - 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.6.1 - 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 deleted file mode 100644 index 037b0e4e..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 324eab1b148df1e8330b2dbbd114ab696c163e46 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Mon, 11 May 2015 13:47:06 +0300 -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 -is used for the ninja files. Do no try to write compiler tools as -it will break the build. - -Task-number: QTBUG-45706 -Upstream-Status: Pending ---- - src/core/core.pro | 7 ++++--- - src/core/gyp_configure_host.pro | 3 --- - src/core/gyp_configure_target.pro | 3 --- - 3 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/src/core/core.pro b/src/core/core.pro -index cf00f39..747b711 100644 ---- a/src/core/core.pro -+++ b/src/core/core.pro -@@ -12,9 +12,7 @@ gyp_run.depends = core_gyp_generator - core_module.file = core_module.pro - core_module.depends = gyp_run - --SUBDIRS += core_gyp_generator \ -- gyp_run \ -- core_module -+SUBDIRS += core_gyp_generator - - !win32 { - # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that -@@ -28,3 +26,6 @@ SUBDIRS += core_gyp_generator \ - gyp_run.depends += gyp_configure_host gyp_configure_target - SUBDIRS += gyp_configure_host gyp_configure_target - } -+ -+SUBDIRS += gyp_run \ -+ core_module -diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro -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) - - GYPI_CONTENTS = "{" \ - " 'make_global_settings': [" \ -- " ['CC.host', '$$which($$QMAKE_CC)']," \ -- " ['CXX.host', '$$which($$QMAKE_CXX)']," \ -- " ['LD.host', '$$which($$QMAKE_LINK)']," - - 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 2a59966..317d24a 100644 ---- a/src/core/gyp_configure_target.pro -+++ b/src/core/gyp_configure_target.pro -@@ -3,9 +3,6 @@ TEMPLATE = aux - - TOOLCHAIN_INCLUDES = $${QMAKE_INCDIR_EGL} $${INCLUDEPATH} $${QMAKE_INCDIR} - --GYPI_CONTENTS += " ['CC', '$$which($$QMAKE_CC)']," \ -- " ['CXX', '$$which($$QMAKE_CXX)']," \ -- " ['LD', '$$which($$QMAKE_LINK)']," - GYPI_CONTENTS += " ]," \ - " 'target_defaults': {" \ - " 'target_conditions': [" \ --- -2.6.1 - -- cgit v1.2.3