summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-12-14 16:39:54 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-12-16 15:51:12 +0000
commit5ae76bbcf5b59b12a03d0f017aab9139609f16f6 (patch)
tree8fdd5068969a476fa482fe7d6f280e1d753918eb
parent06d1c47396508ea50112a00e1c70c40da559aa1a (diff)
downloadmeta-qt5-5ae76bbcf5b59b12a03d0f017aab9139609f16f6.tar.gz
Upgrade to Qt 5.10.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch1
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb8
-rw-r--r--recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch27
-rw-r--r--recipes-qt/qt5/qtbase/0009-Always-build-uic.patch10
-rw-r--r--recipes-qt/qt5/qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb4
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb4
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb6
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb4
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch25
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb4
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch63
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch30
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch25
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch14
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch34
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch37
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch37
-rw-r--r--recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch24
-rw-r--r--recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch34
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb72
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
51 files changed, 270 insertions, 275 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 87bd5019..710d3a18 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -165,6 +165,10 @@ do_install() {
165 # Install CMake's toolchain configuration 165 # Install CMake's toolchain configuration
166 mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ 166 mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/
167 install -m 644 ${WORKDIR}/OEQt5Toolchain.cmake ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ 167 install -m 644 ${WORKDIR}/OEQt5Toolchain.cmake ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/
168
169 # Fix up absolute paths in scripts
170 grep -lr /usr/bin/python ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \
171 xargs -r sed -i -e '1s,#!.*python,#! ${USRBINPATH}/env python,'
168} 172}
169 173
170fakeroot do_generate_qt_environment_file() { 174fakeroot do_generate_qt_environment_file() {
@@ -197,4 +201,4 @@ fakeroot do_generate_qt_environment_file() {
197 201
198addtask generate_qt_environment_file after do_install before do_package 202addtask generate_qt_environment_file after do_install before do_package
199 203
200SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" 204SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce"
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 5aba2bfc..3b0a9adb 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -3,6 +3,7 @@ From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
5 5
6Change-Id: I4de6b96ec51fe297a0eeb757cef56d8fb40bd6f0
6--- 7---
7 qt3d.pro | 7 ++++++- 8 qt3d.pro | 7 ++++++-
8 src/3rdparty/assimp/assimp_dependency.pri | 2 +- 9 src/3rdparty/assimp/assimp_dependency.pri | 2 +-
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 6f8ab717..34e2423e 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -37,6 +37,6 @@ do_configure_prepend() {
37 ${S}/src/quick3d/imports/input/importsinput.pro 37 ${S}/src/quick3d/imports/input/importsinput.pro
38} 38}
39 39
40SRCREV = "143b721249af92fc27f48fb01914195516f7a087" 40SRCREV = "7bd57d2218794fdd7bcaa4f2c8107ef60740ff75"
41 41
42BBCLASSEXTEND += "native nativesdk" 42BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index ffa70e53..a613d1e1 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2017 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2017 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.9" 5QT_MODULE_BRANCH ?= "5.10"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.9.2+git${SRCPV}" 17PV = "5.10.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index b0f59701..4c6b7015 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -43,6 +43,11 @@ SRC_URI += " \
43 file://0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 43 file://0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
44" 44"
45 45
46# only for qtbase-native
47SRC_URI += " \
48 file://0001-Bootstrap-without-linkat-feature.patch \
49"
50
46CLEANBROKEN = "1" 51CLEANBROKEN = "1"
47 52
48XPLATFORM_toolchain-clang = "linux-oe-clang" 53XPLATFORM_toolchain-clang = "linux-oe-clang"
@@ -86,6 +91,7 @@ PACKAGECONFIG_CONFARGS = " \
86 -nomake examples \ 91 -nomake examples \
87 -nomake tests \ 92 -nomake tests \
88 -no-rpath \ 93 -no-rpath \
94 -no-feature-linkat \
89 -platform ${XPLATFORM} \ 95 -platform ${XPLATFORM} \
90" 96"
91 97
@@ -125,4 +131,4 @@ do_install() {
125 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 131 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
126} 132}
127 133
128SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" 134SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce"
diff --git a/recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch
new file mode 100644
index 00000000..32d8a4c7
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-Bootstrap-without-linkat-feature.patch
@@ -0,0 +1,27 @@
1From b15a9aa4f3229d01d3b12e0c4498bdcd55480a24 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 24 Nov 2017 15:16:31 +0200
4Subject: [PATCH] Bootstrap without linkat feature
5
6qmake does not work together with pseudo when unnamed temporary files
7are used with linkat.
8
9Upstream-Status: Inappropriate [OE specific]
10[YOCTO #11996]
11---
12 src/corelib/global/qconfig-bootstrapped.h | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
16index dabb715..5b4ff86 100644
17--- a/src/corelib/global/qconfig-bootstrapped.h
18+++ b/src/corelib/global/qconfig-bootstrapped.h
19@@ -88,7 +88,7 @@
20 #define QT_FEATURE_futimes -1
21 #define QT_FEATURE_library -1
22 #ifdef __linux__
23-# define QT_FEATURE_linkat 1
24+# define QT_FEATURE_linkat -1
25 #else
26 # define QT_FEATURE_linkat -1
27 #endif
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
index 2a1d534b..8ca2c8c4 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
@@ -1,7 +1,7 @@
1From bf173918731c626b6c8b84eb826c921e5c6d44f5 Mon Sep 17 00:00:00 2001 1From b63b2819b88ef252a078e7ef595f7f370ec0c050 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100 3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH] Always build uic 4Subject: [PATCH] Always build uic and qvkgen
5 5
6Even if we are not building gui or widgets. This tool is needed later 6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target. 7as a native tool when compiling the target.
@@ -14,15 +14,15 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/src.pro b/src/src.pro 16diff --git a/src/src.pro b/src/src.pro
17index 43fc06f2e5..1e9d4dcc0d 100644 17index a2064b1..9fae335 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -203,7 +203,7 @@ qtConfig(gui) { 20@@ -211,7 +211,7 @@ qtConfig(gui) {
21 } 21 }
22 } 22 }
23 } 23 }
24-SUBDIRS += src_plugins 24-SUBDIRS += src_plugins
25+SUBDIRS += src_plugins src_tools_uic 25+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen
26 26
27 nacl: SUBDIRS -= src_network src_testlib 27 nacl: SUBDIRS -= src_network src_testlib
28 28
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 3ac6b214..69245e81 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -217,10 +217,6 @@ do_install_append() {
217 sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \ 217 sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \
218 -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ 218 -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
219 ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri 219 ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
220
221 # Fix up absolute paths in scripts
222 grep -lr /usr/bin/perl ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \
223 xargs -r sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,'
224} 220}
225 221
226# mkspecs have mac specific scripts that depend on perl and bash 222# mkspecs have mac specific scripts that depend on perl and bash
@@ -228,4 +224,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
228 224
229RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 225RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
230 226
231SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" 227SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 17479e2f..2c891aaa 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "a1aee8ecbefb74cd5eae380ced56bb43ff3cc40b" 13SRCREV = "8137223f6c489c2d1bb2317474c99c77245bd7ec"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index d4944816..a416cef1 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "e3af14e9169207e0e73f7e50191106895c29ddc4" 11SRCREV = "6a9606270e6611c818bdab382a29051d4cd3b459"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
15LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" \ No newline at end of file 15LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index ca9866f1..3bf16a67 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "6b3bdb84406b42b50bdf5a39ee9ca2fabd3e6d2f" 22SRCREV = "bb9b8af08b1602c7c867969b236393b3ff3f7f18"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 7c8eda76..1bd34112 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "8329a8fb287094012989b965604ff9c9426f022a" 11SRCREV = "d2abb20082322167311cfe0c84afa822754b74ef"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 4ae870a1..facb4485 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() {
30 30
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
32 32
33SRCREV = "32218c3243fb4f0da83293c5bd6a663d8e3660ee" 33SRCREV = "dac71f3d6f6bc4f159f6107c792bc70cfe7c308e"
34 34
35BBCLASSEXTEND =+ "native nativesdk" 35BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 7e6cb1b2..a59ccf72 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "167566d228792c0f763b84a39ff5dc52fda046dd" 17SRCREV = "b505116ee456d7084d8f570e062b3031b77d79df"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 8f70bc0b..8312851e 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "1f6658cbaa5ffecbf9ba845ea81683dd2215cd34" 21SRCREV = "5ca1c00b33b0e125ab60413aa0fb3c7b0f89d8f2"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 52dd34a8..4552d683 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
26 26
27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
28 28
29SRCREV = "dc6dc3b088d1828ee6d31f92528e0c87272ad4ed" 29SRCREV = "caa90acd43684dc382f1e4f01c8787e18653ef43"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index baa25d8a..69277068 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -30,7 +30,7 @@ SRC_URI += " \
30 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 30 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
31" 31"
32 32
33SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718" 33SRCREV_qtlocation = "919bbf503d69fd6be87f22ea58c15872d08f8580"
34SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" 34SRCREV_qtlocation-mapboxgl = "572822c8ca15be190b43afbf7f91d132e988bf21"
35 35
36SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 36SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index f42bdc27..7a7e14b0 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35# http://errors.yoctoproject.org/Errors/Build/44914/ 35# http://errors.yoctoproject.org/Errors/Build/44914/
36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
37 37
38SRCREV = "1e2702e86dbd2b3de69c58438bcfcf6276124547" 38SRCREV = "3598915a360c596da48c9e7b00ba8469cba5249a"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index e5ca4dfd..4c383225 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "47b80ecae6fe0b9a2c74f0b0feb243145695995e" 12SRCREV = "febebfb6f09f23b16ac96a5a09d2ceb5b67046e7"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index c1bbc8aa..85b84629 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -25,7 +25,5 @@ do_configure_prepend() {
25} 25}
26 26
27QT_MODULE_BRANCH = "dev" 27QT_MODULE_BRANCH = "dev"
28# one commit behind: 28
29# 8a7b80eb Use QRandomGenerator instead of q?rand 29SRCREV = "b2476dcd53f0dea1e9eb38df5add3a771d64c4a1"
30# because QRandomGenerator is only since Qt 5.10
31SRCREV = "9bf0edd9bd46ecb900bcdc3349d14869b87ab7de"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 64cfbdf7..2cc63a7d 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "871d8e8e2faca0be870930d83f755a2ad484d30b" 13SRCREV = "1265fef3b290665272d3aacd0ba5213c43bad89d"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index aa0e6e3f..fff66cb2 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -15,8 +15,6 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtdeclarative" 16DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = ""
19
20FILES_${PN}-qmlplugins += " \ 18FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ 19 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \
22 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 20 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
@@ -28,4 +26,4 @@ SRC_URI += " \
28 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 26 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
29" 27"
30 28
31SRCREV = "8476f8fff7dc5b6f140074d280828cc0f9590088" 29SRCREV = "a749525164b771452599e67e277d2ea6b3866479"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 1e90323b..9d3135b2 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
24 24
25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
26 26
27SRCREV = "6e0341bc878ff82d3c1039dcce09f92269546189" 27SRCREV = "e6eb6ab12daf76f3e716c0d51ceecdab61e39e48"
28 28
29BBCLASSEXTEND += "native nativesdk" 29BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index b4f5a714..5d323155 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -30,4 +30,4 @@ DEPENDS += "qtbase"
30# http://errors.yoctoproject.org/Errors/Build/44915/ 30# http://errors.yoctoproject.org/Errors/Build/44915/
31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
32 32
33SRCREV = "08b74f4f30c304b80249a593a572808bc1892f66" 33SRCREV = "0bb3f3017f72cbf8d6866b8baa1820ab3dd89316"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index fc60d601..53bfcc39 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "3caae998c8c1770cd96cadba24d89a60005c5fe7" 13SRCREV = "bbf3be4679571edef60425c3fd12df9d3035001c"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
16# 5.9.meta-qt5.2 16# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 014b68f7..caa9a042 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "c273f2e5c82a3ef8e55e360988b8cf31362e2ba9" 15SRCREV = "7ae7dc325648a007a72e74f2bd7784a90b4714af"
diff --git a/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch b/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch
new file mode 100644
index 00000000..070c8e57
--- /dev/null
+++ b/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch
@@ -0,0 +1,25 @@
1From 896e90350f94654901e88f3365dd54986a6ba1fd Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 11 Dec 2017 14:39:34 +0200
4Subject: [PATCH] Add missing include for struct timeval
5
6Fix build failure with musl libc:
7socketcanbackend.h:88:38: error: 'timeval' was not declared in this scope
8
9Change-Id: I4089f5a906095c21b2790d35ad131d9a0713ff3b
10---
11 src/plugins/canbus/socketcan/socketcanbackend.h | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h
15index 50976b1..b49d267 100644
16--- a/src/plugins/canbus/socketcan/socketcanbackend.h
17+++ b/src/plugins/canbus/socketcan/socketcanbackend.h
18@@ -50,6 +50,7 @@
19 #include <sys/socket.h>
20 #include <sys/uio.h>
21 #include <linux/can.h>
22+#include <sys/time.h>
23
24 QT_BEGIN_NAMESPACE
25
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 8df89137..9ee34e43 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,6 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "ce5a3ced5eeefe05675736d3279d4d45bbb6df90" 14SRC_URI += "file://0001-Add-missing-include-for-struct-timeval.patch"
15
16SRCREV = "f25ddea7b12beff8d4de863fec18ce698d726ffa"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 0425e434..e48d095b 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "cb9ade8beabd3cdcd469a45fa82a27fcc960532f" 18SRCREV = "c7d99464c65a5bde663a8ec4daf3d343d8e9b14b"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index f9e04c85..3d0a372c 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "bdcd7a97449502f92069d36196cc81064b1c02a0" 16SRCREV = "984ba6977201f8fbd94d44a2b67519e1faf458cc"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 0c6ce7e0..bc3e289f 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -30,4 +30,4 @@ do_install_append() {
30 30
31QT_MODULE_BRANCH = "dev" 31QT_MODULE_BRANCH = "dev"
32 32
33SRCREV = "9c204e05ae7fefe9525b30238b469b1bb65d2537" 33SRCREV = "ca54870ffdf262f072c082adf80d63c421dbd68f"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 69305196..e47cde53 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -31,7 +31,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31 31
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
33 33
34SRCREV = "90a701032ec5c8898e33b4fb4df0480634caaf8d" 34SRCREV = "3ce89dc37d3c73033c18dcec9e4710afd747ce01"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
37 37
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 0238ce91..040dd717 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -111,4 +111,4 @@ FILES_${PN}-qt = " \
111 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 111 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
112" 112"
113 113
114SRCREV = "325a90e07e9dce4e5c915549e6c31a86423dfdd3" 114SRCREV = "f4b0f1684a8e668ede23fafbff02c3910d775043"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 5b544555..2930bd5a 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
53 53
54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
55 55
56SRCREV = "87218c4e68c4ebde8f5765f0dfe9a70a359ae05f" 56SRCREV = "8546475dd5d6076a98b0700f1d70211c1395fc63"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 979969ba..e7ded388 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "d483ed2927cb8d4685d5d3c7ea1c71246381910b" 40SRCREV = "1a457a9dc9c61a6c995dbe06d72267cb0412b3bc"
41 41
42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
43# 5.9.meta-qt5.2 43# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 1e0796ab..4469761e 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "61a638663c9061d7211849d3a9316661733a5ad9" 15SRCREV = "acb01cb27b6c4aead84435ec7115fecd2a8db336"
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
deleted file mode 100644
index 0e9ea724..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 12:46:58 -0200
4Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
5 qtwebengine compile
6
7Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------
11 1 file changed, 6 insertions(+), 6 deletions(-)
12
13diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc
14index 6d926378be..738d3fdedf 100644
15--- a/chromium/ui/gfx/codec/jpeg_codec.cc
16+++ b/chromium/ui/gfx/codec/jpeg_codec.cc
17@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
18 // tell libjpeg where to write the next data
19 cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
20 cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
21- return 1;
22+ return TRUE;
23 }
24
25 // Cleans up the JpegEncoderState to prepare for returning in the final form.
26@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
27 cinfo.data_precision = 8;
28
29 jpeg_set_defaults(&cinfo);
30- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100
31+ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100
32
33 // set up the destination manager
34 jpeg_destination_mgr destmgr;
35@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
36 JpegEncoderState state(output);
37 cinfo.client_data = &state;
38
39- jpeg_start_compress(&cinfo, 1);
40+ jpeg_start_compress(&cinfo, TRUE);
41
42 // feed it the rows, doing necessary conversions for the color format
43 #ifdef JCS_EXTENSIONS
44@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
45 // set to a positive value if TRUE is returned. A FALSE return should only
46 // be used when I/O suspension is desired."
47 boolean FillInputBuffer(j_decompress_ptr cinfo) {
48- return false;
49+ return FALSE;
50 }
51
52 // Skip data in the buffer. Since we have all the data at once, this operation
53@@ -488,8 +488,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
54 cinfo.client_data = &state;
55
56 // fill the file metadata into our buffer
57- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
58- return false;
59+ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
60+ return FALSE;
61
62 // we want to always get RGB data out
63 switch (cinfo.jpeg_color_space) {
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
deleted file mode 100644
index 275ef9e8..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
5
6Upstream-Status: Inappropriate [OE specific]
7
8Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 mkspecs/features/functions.prf | 6 ++++++
12 1 file changed, 6 insertions(+)
13
14diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
15index 56894e58..ef418a4c 100644
16--- a/mkspecs/features/functions.prf
17+++ b/mkspecs/features/functions.prf
18@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
19 return(false)
20 }
21 gcc:!clang:!isGCCVersionSupported(): return(false)
22+ } else:linux-oe-g++* {
23+ !gcc:!clang {
24+ skipBuild("Qt WebEngine on Linux requires clang or GCC.")
25+ return(false)
26+ }
27+ gcc:!clang:!isGCCVersionSupported(): return(false)
28 } else:win32 {
29 winrt {
30 skipBuild("WinRT is not supported.")
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
index 4a1a975f..3b24e064 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001 1From 5616656eb6d7423aaea107513209dac88c79d916 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] chromium: Force host toolchain configuration 4Subject: [PATCH] chromium: Force host toolchain configuration
@@ -10,16 +10,16 @@ Upstream-Status: Inappropriate [OE specific]
10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12--- 12---
13 chromium/tools/gn/bootstrap/bootstrap.py | 12 ++++++------ 13 chromium/tools/gn/bootstrap/bootstrap.py | 6 +++---
14 1 file changed, 6 insertions(+), 6 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py 16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py
17index 43d252b43e..e58347848e 100755 17index b1ff7e7..bccabbb 100755
18--- a/chromium/tools/gn/bootstrap/bootstrap.py 18--- a/chromium/tools/gn/bootstrap/bootstrap.py
19+++ b/chromium/tools/gn/bootstrap/bootstrap.py 19+++ b/chromium/tools/gn/bootstrap/bootstrap.py
20@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options): 20@@ -318,10 +318,10 @@ def write_gn_ninja(path, root_gen_dir, options):
21 ld = os.environ.get('LD', 'link.exe') 21 ld = os.environ.get('LD', cxx)
22 ar = os.environ.get('AR', 'lib.exe') 22 ar = os.environ.get('AR', 'ar -X64')
23 else: 23 else:
24- cc = os.environ.get('CC', 'cc') 24- cc = os.environ.get('CC', 'cc')
25- cxx = os.environ.get('CXX', 'c++') 25- cxx = os.environ.get('CXX', 'c++')
@@ -29,12 +29,5 @@ index 43d252b43e..e58347848e 100755
29- ar = os.environ.get('AR', 'ar') 29- ar = os.environ.get('AR', 'ar')
30+ ar = os.environ.get('AR_host', 'ar') 30+ ar = os.environ.get('AR_host', 'ar')
31 31
32- cflags = os.environ.get('CFLAGS', '').split() 32 # QTBUG-64759
33- cflags_cc = os.environ.get('CXXFLAGS', '').split() 33 # cflags = os.environ.get('CFLAGS', '').split()
34- ldflags = os.environ.get('LDFLAGS', '').split()
35+ cflags = os.environ.get('CFLAGS_host', '').split()
36+ cflags_cc = os.environ.get('CXXFLAGS_host', '').split()
37+ ldflags = os.environ.get('LDFLAGS_host', '').split()
38 include_dirs = [root_gen_dir, SRC_ROOT]
39 libs = []
40
diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
index bda0ba1a..464c7648 100644
--- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From 9bdd03ad0bbb221ad7bffe0e570605c21c28b1b5 Mon Sep 17 00:00:00 2001 1From 2a3c39550955ed44cfc8410ab2da124c58ca66c0 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
18 2 files changed, 8 insertions(+), 8 deletions(-) 18 2 files changed, 8 insertions(+), 8 deletions(-)
19 19
20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
21index f1b3d47b..12123729 100644 21index dd0d3e3..70161c8 100644
22--- a/src/buildtools/configure_host.pro 22--- a/src/buildtools/configure_host.pro
23+++ b/src/buildtools/configure_host.pro 23+++ b/src/buildtools/configure_host.pro
24@@ -4,7 +4,7 @@ TEMPLATE = aux 24@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -30,7 +30,7 @@ index f1b3d47b..12123729 100644
30 !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH) 30 !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
31 else: GN_TARGET_CPU = $$GN_HOST_CPU 31 else: GN_TARGET_CPU = $$GN_HOST_CPU
32 GN_OS = $$gnOS() 32 GN_OS = $$gnOS()
33@@ -29,9 +29,9 @@ GN_CONTENTS = \ 33@@ -31,9 +31,9 @@ GN_CONTENTS = \
34 "import(\"//build/config/sysroot.gni\")" \ 34 "import(\"//build/config/sysroot.gni\")" \
35 "import(\"//build/toolchain/gcc_toolchain.gni\")" \ 35 "import(\"//build/toolchain/gcc_toolchain.gni\")" \
36 "gcc_toolchain(\"host\") {" \ 36 "gcc_toolchain(\"host\") {" \
@@ -42,8 +42,8 @@ index f1b3d47b..12123729 100644
42+" ld = \"$$which(g++)\" " \ 42+" ld = \"$$which(g++)\" " \
43 " ar = \"$$which(ar)\" " \ 43 " ar = \"$$which(ar)\" " \
44 " nm = \"$$which(nm)\" " \ 44 " nm = \"$$which(nm)\" " \
45 " toolchain_args = { " \ 45 " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \
46@@ -42,9 +42,9 @@ GN_CONTENTS = \ 46@@ -45,9 +45,9 @@ GN_CONTENTS = \
47 " } " \ 47 " } " \
48 "}" \ 48 "}" \
49 "gcc_toolchain(\"v8_snapshot\") {" \ 49 "gcc_toolchain(\"v8_snapshot\") {" \
@@ -57,10 +57,10 @@ index f1b3d47b..12123729 100644
57 " nm = \"$$which(nm)\" " \ 57 " nm = \"$$which(nm)\" " \
58 " toolchain_args = { " \ 58 " toolchain_args = { " \
59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri 59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
60index 714c864d..f66ca551 100644 60index 6f7b27f..1b9434b 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@@ -98,7 +98,7 @@ contains(QT_ARCH, "mips"):!host_build { 63@@ -91,7 +91,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\"
diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index bf1f1891..1e187956 100644
--- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,19 +1,41 @@
1From e695f37fc52defd1b96664b003444692e9b6cb65 Mon Sep 17 00:00:00 2001 1From f6c6a5522f006b14c4d9c4daa23f96c4e8e65a32 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700 3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux 4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/base/process/process_metrics_posix.cc | 4 ++--
8 chromium/base/trace_event/malloc_dump_provider.cc | 3 ++- 9 chromium/base/trace_event/malloc_dump_provider.cc | 3 ++-
9 chromium/content/child/content_child_helpers.cc | 2 +- 10 chromium/content/child/content_child_helpers.cc | 2 +-
10 2 files changed, 3 insertions(+), 2 deletions(-) 11 3 files changed, 5 insertions(+), 4 deletions(-)
11 12
13diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
14index 0eb5c1f..8af7799 100644
15--- a/chromium/base/process/process_metrics_posix.cc
16+++ b/chromium/base/process/process_metrics_posix.cc
17@@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() {
18 malloc_statistics_t stats = {0};
19 malloc_zone_statistics(nullptr, &stats);
20 return stats.size_in_use;
21-#elif defined(OS_LINUX) || defined(OS_ANDROID)
22+#elif defined(__GLIBC__) || defined(OS_ANDROID)
23 struct mallinfo minfo = mallinfo();
24 #if defined(USE_TCMALLOC)
25 return minfo.uordblks;
26 #else
27 return minfo.hblkhd + minfo.arena;
28 #endif
29-#elif defined(OS_FUCHSIA)
30+#else
31 // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
32 return 0;
33 #endif
12diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc 34diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
13index 7d0cb57931..10be59ebad 100644 35index 14ba0a2..e5d9581 100644
14--- a/chromium/base/trace_event/malloc_dump_provider.cc 36--- a/chromium/base/trace_event/malloc_dump_provider.cc
15+++ b/chromium/base/trace_event/malloc_dump_provider.cc 37+++ b/chromium/base/trace_event/malloc_dump_provider.cc
16@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {} 38@@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() {}
17 // the current process. 39 // the current process.
18 bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, 40 bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
19 ProcessMemoryDump* pmd) { 41 ProcessMemoryDump* pmd) {
@@ -21,7 +43,7 @@ index 7d0cb57931..10be59ebad 100644
21 size_t total_virtual_size = 0; 43 size_t total_virtual_size = 0;
22 size_t resident_size = 0; 44 size_t resident_size = 0;
23 size_t allocated_objects_size = 0; 45 size_t allocated_objects_size = 0;
24@@ -321,7 +322,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, 46@@ -317,7 +318,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
25 pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); 47 pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc");
26 } 48 }
27 tid_dumping_heap_ = kInvalidThreadId; 49 tid_dumping_heap_ = kInvalidThreadId;
@@ -31,7 +53,7 @@ index 7d0cb57931..10be59ebad 100644
31 } 53 }
32 54
33diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc 55diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc
34index 7ddeb4d16a..b8c73b09c5 100644 56index 7ddeb4d..b8c73b0 100644
35--- a/chromium/content/child/content_child_helpers.cc 57--- a/chromium/content/child/content_child_helpers.cc
36+++ b/chromium/content/child/content_child_helpers.cc 58+++ b/chromium/content/child/content_child_helpers.cc
37@@ -25,7 +25,7 @@ namespace content { 59@@ -25,7 +25,7 @@ namespace content {
diff --git a/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
new file mode 100644
index 00000000..38fa8729
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
@@ -0,0 +1,37 @@
1From 0fd704beb18948577e793b73c569dc933c478f2e Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 12 Dec 2017 16:06:14 +0200
4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
5
6Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403
7Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
8---
9 src/core/api/qtbug-61521.cpp | 8 --------
10 1 file changed, 8 deletions(-)
11
12diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
13index 002a1af..8fd2da3 100644
14--- a/src/core/api/qtbug-61521.cpp
15+++ b/src/core/api/qtbug-61521.cpp
16@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc);
17 void* __valloc(size_t size)
18 SHIM_ALIAS_SYMBOL(ShimValloc);
19
20-SHIM_SYMBOL_VERSION(pvalloc);
21-void* __pvalloc(size_t size)
22- SHIM_ALIAS_SYMBOL(ShimPvalloc);
23-
24 SHIM_SYMBOL_VERSION(posix_memalign);
25 int __posix_memalign(void** r, size_t a, size_t s)
26 SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
27@@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) {
28 return valloc(size);
29 }
30
31-SHIM_HIDDEN void* ShimPvalloc(size_t size) {
32- return pvalloc(size);
33-}
34-
35 SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
36 return posix_memalign(r,a,s);
37 }
diff --git a/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch b/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch
deleted file mode 100644
index 8b82010c..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 006f08373cbaa8485311f491ab8e67433c0e9ad6 Mon Sep 17 00:00:00 2001
2From: Daniel Mack <daniel@zonque.org>
3Date: Tue, 24 Oct 2017 15:46:19 +0200
4Subject: [PATCH] tests: make accessibility tests conditional
5
6Only test the accessibility functions if accessibility was enabled in the Qt
7config.
8---
9 tests/auto/widgets/widgets.pro | 5 ++++-
10 1 file changed, 4 insertions(+), 1 deletion(-)
11
12diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
13index 441eea0f..7bab18f0 100644
14--- a/tests/auto/widgets/widgets.pro
15+++ b/tests/auto/widgets/widgets.pro
16@@ -1,7 +1,6 @@
17 TEMPLATE = subdirs
18
19 SUBDIRS += \
20- qwebengineaccessibility \
21 qwebenginedefaultsurfaceformat \
22 qwebenginedownloads \
23 qwebenginefaviconmanager \
24@@ -14,6 +13,10 @@ SUBDIRS += \
25 qwebenginesettings \
26 qwebengineview
27
28+qtConfig(accessibility) {
29+ SUBDIRS += qwebengineaccessibility
30+}
31+
32 contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile {
33 !contains(WEBENGINE_CONFIG, use_native_spellchecker) {
34 SUBDIRS += qwebenginespellcheck
35--
362.13.6
37
diff --git a/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
new file mode 100644
index 00000000..cabc598e
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
@@ -0,0 +1,24 @@
1From 59fd9db95db829e51840df09962f7c6baf484246 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 14 Dec 2017 11:28:10 +0200
4Subject: [PATCH] musl: link against libexecinfo
5
6Change-Id: Ifada60f9c72691973612850121f6fb152d70839a
7Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
8---
9 src/core/core_module.pro | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/src/core/core_module.pro b/src/core/core_module.pro
13index 2409ccb..e41e5a9 100644
14--- a/src/core/core_module.pro
15+++ b/src/core/core_module.pro
16@@ -45,7 +45,7 @@ else: QMAKE_LFLAGS += $$NINJA_LFLAGS
17 POST_TARGETDEPS += $$NINJA_TARGETDEPS
18
19
20-LIBS_PRIVATE += -L$$api_library_path
21+LIBS_PRIVATE += -L$$api_library_path -lexecinfo
22 CONFIG *= no_smart_library_merge
23 osx {
24 LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a
diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch
index 7a778c22..d6de1c00 100644
--- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
1From d0621f9278ddd04c05b6ab3ef638be65f96f1bd6 Mon Sep 17 00:00:00 2001 1From 2ed7538fb95ce3bb8a5917c648e2361f85b9c67b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:54:38 -0700 3Date: Fri, 7 Jul 2017 14:54:38 -0700
4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction 4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
@@ -9,12 +9,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc 11diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc
12index 5a0564d2f3..8c2dc6491d 100644 12index 9cd5d22..1e70095 100644
13--- a/chromium/base/allocator/allocator_check.cc 13--- a/chromium/base/allocator/allocator_check.cc
14+++ b/chromium/base/allocator/allocator_check.cc 14+++ b/chromium/base/allocator/allocator_check.cc
15@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { 15@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {
16 #if defined(OS_WIN) && defined(ALLOCATOR_SHIM) 16 // Set by allocator_shim_override_ucrt_symbols_win.h when the
17 // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called. 17 // shimmed _set_new_mode() is called.
18 return g_is_win_shim_layer_initialized; 18 return g_is_win_shim_layer_initialized;
19-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \ 19-#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \
20+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \ 20+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \
diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
index f1cc205b..652b89ec 100644
--- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,16 +1,16 @@
1From 72a77c994434ecb708b2790ba9efaf1decc02503 Mon Sep 17 00:00:00 2001 1From d42b48975e92cfc4510030315ad8093bece4b7c5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 16:41:23 -0700 3Date: Fri, 7 Jul 2017 16:41:23 -0700
4Subject: [PATCH] chromium: musl: Adjust default pthread stack size 4Subject: [PATCH] chromium: musl: Adjust default pthread stack size
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/base/threading/platform_thread_linux.cc | 3 ++- 8 chromium/base/threading/platform_thread_linux.cc | 3 ++-
9 chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- 9 chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | 4 ++--
10 2 files changed, 4 insertions(+), 3 deletions(-) 10 2 files changed, 4 insertions(+), 3 deletions(-)
11 11
12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc 12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
13index 92fbda5ee1..c41579d4ed 100644 13index 8d411ed..4b56cf3 100644
14--- a/chromium/base/threading/platform_thread_linux.cc 14--- a/chromium/base/threading/platform_thread_linux.cc
15+++ b/chromium/base/threading/platform_thread_linux.cc 15+++ b/chromium/base/threading/platform_thread_linux.cc
16@@ -175,7 +175,8 @@ void TerminateOnThread() {} 16@@ -175,7 +175,8 @@ void TerminateOnThread() {}
@@ -23,25 +23,25 @@ index 92fbda5ee1..c41579d4ed 100644
23 #else 23 #else
24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the 24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the
25 // default stack size isn't enough for some browser tests. 25 // default stack size isn't enough for some browser tests.
26diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 26diff --git a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp
27index 1d164f510a..3358deb256 100644 27index 13c3f90..07308e0 100644
28--- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 28--- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp
29+++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 29+++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp
30@@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { 30@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() {
31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size 31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
32 // correctly for the main thread. 32 // correctly for the main thread.
33 33
34-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) 34-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
35+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) 35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
36 defined(OS_FUCHSIA)
36 // pthread_getattr_np() can fail if the thread is not invoked by 37 // pthread_getattr_np() can fail if the thread is not invoked by
37 // pthread_create() (e.g., the main thread of webkit_unit_tests). 38 // pthread_create() (e.g., the main thread of webkit_unit_tests).
38 // If so, a conservative size estimate is returned. 39@@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() {
39@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() {
40 } 40 }
41 41
42 void* StackFrameDepth::getStackStart() { 42 void* GetStackStart() {
43-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) 43-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
44+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) 44+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
45 defined(OS_FUCHSIA)
45 pthread_attr_t attr; 46 pthread_attr_t attr;
46 int error; 47 int error;
47 #if OS(FREEBSD)
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 50a98b66..f88e5e7d 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -13,26 +13,23 @@ LIC_FILES_CHKSUM = " \
13" 13"
14 14
15DEPENDS += " \ 15DEPENDS += " \
16 libpng-native \
17 nss-native \
18 nspr-native \
16 ninja-native \ 19 ninja-native \
17 yasm-native \ 20 yasm-native \
18 qtwebchannel \ 21 qtwebchannel \
19 qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \ 22 qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \
20 qtlocation \ 23 qtlocation \
21 libdrm fontconfig pixman openssl pango cairo icu pciutils \ 24 libdrm fontconfig pixman openssl pango cairo icu pciutils nss \
22 libcap \ 25 libcap \
23 gperf-native \ 26 gperf-native \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
25" 28"
26 29
27DEPENDS += "yasm-native"
28DEPENDS_append_libc-musl = " libexecinfo" 30DEPENDS_append_libc-musl = " libexecinfo"
29 31
30EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \ 32EXTRA_QMAKEVARS_CONFIGURE += "-feature-webengine-system-ninja -no-feature-webengine-system-gn"
31 GYP_CONFIG+=generate_character_data=0 \
32 GYP_CONFIG+=use_allocator=none \
33 GYP_CONFIG+=use_experimental_allocator_shim=false \
34"
35EXTRA_QMAKEVARS_CONFIGURE += "-feature-system-ninja -no-feature-system-gn"
36 33
37# chromium/third_party/openh264/openh264.gyp adds 34# chromium/third_party/openh264/openh264.gyp adds
38# -Wno-format to openh264_cflags_add 35# -Wno-format to openh264_cflags_add
@@ -42,22 +39,26 @@ EXTRA_QMAKEVARS_CONFIGURE += "-feature-system-ninja -no-feature-system-gn"
42# http://errors.yoctoproject.org/Errors/Details/150333/ 39# http://errors.yoctoproject.org/Errors/Details/150333/
43SECURITY_STRINGFORMAT = "" 40SECURITY_STRINGFORMAT = ""
44 41
45# To use system ffmpeg you need to enable also libwebp, opus, vpx 42# To use system ffmpeg you need to enable also libwebp, opus, vpx
46# Only depenedencies available in oe-core are enabled by default 43# Only depenedencies available in oe-core are enabled by default
47PACKAGECONFIG ??= "libwebp flac libevent libxslt speex nss" 44PACKAGECONFIG ??= "libwebp libevent libpng"
48PACKAGECONFIG[opus] = "WEBENGINE_CONFIG+=use_system_opus,,libopus" 45PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu"
49PACKAGECONFIG[icu] = "WEBENGINE_CONFIG+=use_system_icu,,icu" 46PACKAGECONFIG[ffmpeg] = "-feature-webengine-system-ffmpeg,-no-feature-webengine-system-ffmpeg,libav"
50PACKAGECONFIG[ffmpeg] = "WEBENGINE_CONFIG+=use_system_ffmpeg,,libav" 47PACKAGECONFIG[webrtc] = "-feature-webengine-webrtc,-no-feature-webengine-webrtc,libvpx"
51PACKAGECONFIG[libwebp] = "WEBENGINE_CONFIG+=use_system_libwebp,,libwebp" 48PACKAGECONFIG[libwebp] = "-feature-webengine-system-libwebp,-no-feature-webengine-system-libwebp,libwebp"
52PACKAGECONFIG[flac] = "WEBENGINE_CONFIG+=use_system_flac,,flac" 49PACKAGECONFIG[opus] = "-feature-webengine-system-opus,-no-feature-webengine-system-opus,libopus"
53PACKAGECONFIG[libevent] = "WEBENGINE_CONFIG+=use_system_libevent,,libevent" 50PACKAGECONFIG[libvpx] = "-feature-webengine-system-libvpx,-no-feature-webengine-system-libvpx,libvpx"
54PACKAGECONFIG[libxslt] = "WEBENGINE_CONFIG+=use_system_libxslt,,libxslt" 51PACKAGECONFIG[libevent] = "-feature-webengine-system-libevent,-no-feature-webengine-system-libevent,libevent"
55PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" 52PACKAGECONFIG[libpng] = "-feature-webengine-system-png,-no-feature-webengine-system-png,libpng"
56PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" 53PACKAGECONFIG[harfbuzz] = "-feature-webengine-system-harfbuzz,-no-feature-webengine-system-harfbuzz,harfbuzz"
57PACKAGECONFIG[webrtc] = "WEBENGINE_CONFIG+=use_webrtc,,libvpx" 54PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib"
58PACKAGECONFIG[nss] = "WEBENGINE_CONFIG+=use_nss,,nss" 55PACKAGECONFIG[zlib] = "-feature-webengine-system-zlib,-no-feature-webengine-system-zlib,zlib"
59 56PACKAGECONFIG[protobuf] = "-feature-webengine-system-protobuf,-no-feature-webengine-system-protobuf,protobuf"
60EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 57PACKAGECONFIG[jasoncpp] = "-feature-webengine-system-jsoncpp,-no-feature-webengine-system-jsoncpp,jasoncpp"
58PACKAGECONFIG[libxml2] = "-feature-webengine-system-libxml2,-no-feature-webengine-system-libxml2,libxml2"
59PACKAGECONFIG[minizip] = "-feature-webengine-system-minizip,-no-feature-webengine-system-minizip,minizip"
60
61EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
61 62
62COMPATIBLE_MACHINE = "(-)" 63COMPATIBLE_MACHINE = "(-)"
63COMPATIBLE_MACHINE_x86 = "(.*)" 64COMPATIBLE_MACHINE_x86 = "(.*)"
@@ -79,18 +80,10 @@ def gettext_oeconf(d):
79require qt5.inc 80require qt5.inc
80require qt5-git.inc 81require qt5-git.inc
81 82
83export GN_PKG_CONFIG_HOST = "${STAGING_BINDIR_NATIVE}/pkg-config-native"
84export GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS = "-I${STAGING_DIR_NATIVE}/usr/include"
85
82do_configure() { 86do_configure() {
83 # Disable autodetection from sysroot:
84 sed -e 's/packagesExist([^)]*vpx[^)]*):/false:/g'\
85 -e 's/config_libvpx:/false:/g' \
86 -e 's/config_srtp:/false:/g' \
87 -e 's/config_snappy:/false:/g' \
88 -e 's/packagesExist(nss):/false:/g' \
89 -e 's/packagesExist(minizip, zlib):/false:/g' \
90 -e 's/packagesExist(libwebp,libwebpdemux):/false:/g' \
91 -e 's/packagesExist(libxml-2.0,libxslt):/false:/g'\
92 -e 's/^ *packagesExist($$package):/false:/g' \
93 -i ${S}/mkspecs/features/configure.prf
94 87
95 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as 88 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as
96 # arguments here 89 # arguments here
@@ -127,28 +120,27 @@ RDEPENDS_${PN}-examples += " \
127 qtdeclarative-qmlplugins \ 120 qtdeclarative-qmlplugins \
128" 121"
129 122
130QT_MODULE_BRANCH_CHROMIUM = "56-based" 123QT_MODULE_BRANCH_CHROMIUM = "61-based"
131 124
132# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 125# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
133# 5.9.meta-qt5.3 126# 5.9.meta-qt5.3
134SRC_URI += " \ 127SRC_URI += " \
135 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 128 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
136 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
137 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ 129 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
138 file://0003-Include-dependency-to-QCoreApplication-translate.patch \ 130 file://0003-Include-dependency-to-QCoreApplication-translate.patch \
139 file://0004-Force-host-toolchain-configuration.patch \ 131 file://0004-Force-host-toolchain-configuration.patch \
140 file://0005-tests-make-accessibility-tests-conditional.patch \
141" 132"
142 133
143# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 134# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based
144# 56-based.meta-qt5.2 135# 56-based.meta-qt5.2
145SRC_URI += " \ 136SRC_URI += " \
146 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
147 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ 137 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
148 file://0003-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ 138 file://0003-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
149" 139"
150 140
151SRC_URI_append_libc-musl = "\ 141SRC_URI_append_libc-musl = "\
142 file://0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
143 file://0006-musl-link-against-libexecinfo.patch \
152 file://0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ 144 file://0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
153 file://0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ 145 file://0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
154 file://0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ 146 file://0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
@@ -164,8 +156,8 @@ SRC_URI_append_libc-musl = "\
164 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 156 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
165" 157"
166 158
167SRCREV_qtwebengine = "c11c2c8981e647c1eb2c6753ce77d436b92fff87" 159SRCREV_qtwebengine = "efa6d3f0d3a01753dd40823ce119e7d4f9765c8e"
168SRCREV_chromium = "cfe8c60903b327ac94406661350f4ac05aa8c21b" 160SRCREV_chromium = "e36dcec23b79a52fd7794ed2fad49bbf65a8146b"
169SRCREV = "${SRCREV_qtwebengine}" 161SRCREV = "${SRCREV_qtwebengine}"
170 162
171SRCREV_FORMAT = "qtwebengine_chromium" 163SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index eb3ab51b..220f2597 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -1,7 +1,7 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0)" 4LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0) | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 6 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 7 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "492981b93295f575ad77b6767dc5b8851287aa2e" 14SRCREV = "0e4b43383dd826b5927f6276033f52ede1fa7936"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 79089aec..9c849499 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "ec640efd1d82cdc88157159cbaa048815696ee25" 22SRCREV = "54ea23243ca84ec5f086abf6c2278a025758b6ce"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index d15fc2d9..0646ef02 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "160435b0eb076c31a021004eeede143fc265bce4" 16SRCREV = "33e3fcc1fb1eb614f8b452296f2d4c4353c413c6"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 8b706ddb..e44823a8 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = " \
18 18
19DEPENDS += "qtbase" 19DEPENDS += "qtbase"
20 20
21SRCREV = "8d7e1e0ec06724a4d332c050e9260530c708e773" 21SRCREV = "8b831bdb513b4f6b7567c171d09875b14214c5c4"
22 22
23BBCLASSEXTEND =+ "native nativesdk" 23BBCLASSEXTEND =+ "native nativesdk"
24 24
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-02 03:14:10 +0000