qt5: upgrade to latest revision in 5.12

* WIP * zlib temporarily disabled in qtbase-native, the configure fails too find it even when it is in RSS: docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\* /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939 /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed. * fixes #136 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
author: Martin Jansa <Martin.Jansa@gmail.com> 2018-12-20 01:05:55 +0000
committer: Martin Jansa <Martin.Jansa@gmail.com> 2018-12-21 21:01:40 +0000
commit: c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (patch)
tree: 821445c6e1fe46948cd9fba26480ed359288b545 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
parent: c6be23d3b01b046d2142bb6fc017078f6154ddb5 (diff)
download: meta-qt5-c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0.tar.gz
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 86f37e1a..b51c4c72 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
-From 7c9b995ee8bc8798e41a14cb8007c06073006e64 Mon Sep 17 00:00:00 2001
+From a321d1b96ce0563a08d0bb44c39d24f86608f6ae Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] Force host toolchain configuration
@@ -57,10 +57,10 @@ index dd0d3e32..70161c82 100644
 "  nm = \"$$which(nm)\" " \
 "  toolchain_args = { " \
 diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 4ade2827..cad3d7bf 100644
+index 85b948db..c529c641 100644
 --- a/src/core/config/linux.pri
 +++ b/src/core/config/linux.pri
-@@ -92,7 +92,7 @@ contains(QT_ARCH, "mips") {
+@@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") {
 
 host_build {
     gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
author	Martin Jansa <Martin.Jansa@gmail.com>	2018-12-20 01:05:55 +0000
committer	Martin Jansa <Martin.Jansa@gmail.com>	2018-12-21 21:01:40 +0000
commit	c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (patch)
tree	821445c6e1fe46948cd9fba26480ed359288b545 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
parent	c6be23d3b01b046d2142bb6fc017078f6154ddb5 (diff)
download	meta-qt5-c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0.tar.gz

diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 86f37e1a..b51c4c72 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1	From 7c9b995ee8bc8798e41a14cb8007c06073006e64 Mon Sep 17 00:00:00 2001	1	From a321d1b96ce0563a08d0bb44c39d24f86608f6ae Mon Sep 17 00:00:00 2001
2	From: Samuli Piippo <samuli.piippo@qt.io>	2	From: Samuli Piippo <samuli.piippo@qt.io>
3	Date: Wed, 15 Mar 2017 13:53:28 +0200	3	Date: Wed, 15 Mar 2017 13:53:28 +0200
4	Subject: [PATCH] Force host toolchain configuration	4	Subject: [PATCH] Force host toolchain configuration
@@ -57,10 +57,10 @@ index dd0d3e32..70161c82 100644
57	" nm = \"$$which(nm)\" " \	57	" nm = \"$$which(nm)\" " \
58	" toolchain_args = { " \	58	" toolchain_args = { " \
59	diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri	59	diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
60	index 4ade2827..cad3d7bf 100644	60	index 85b948db..c529c641 100644
61	--- a/src/core/config/linux.pri	61	--- a/src/core/config/linux.pri
62	+++ b/src/core/config/linux.pri	62	+++ b/src/core/config/linux.pri
63	@@ -92,7 +92,7 @@ contains(QT_ARCH, "mips") {	63	@@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") {
64		64
65	host_build {	65	host_build {
66	gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"	66	gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"