t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-06-21 08:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5: Update to Qt 5.14.0

Browse Source 
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Samuli Piippo
2020-01-08 14:10:13 +02:00
committed by Martin Jansa
parent ede15adc71
commit ca649e3f6f
56 changed files with 1156 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1674
licenses/The-Qt-Company-Commercial
View File

File diff suppressed because it is too large Load Diff

4
recipes-qt/qt5/nativesdk-qtbase_git.bb
View File

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \
"
QT_MODULE = "qtbase"
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
do_generate_qt_environment_file[umask] = "022"
addtask generate_qt_environment_file after do_install before do_package
SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb"
SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"

2
recipes-qt/qt5/qt3d_git.bb
View File

@@ -36,6 +36,6 @@ do_configure_prepend() {
${S}/src/quick3d/imports/input/importsinput.pro
}
SRCREV = "93361f1a59c1edd2e4eb6d2aa7e2da5b73760a18"
SRCREV = "96b1b9e3e198e751bb96eeb279106862ca38e7d7"
BBCLASSEXTEND += "native nativesdk"

4
recipes-qt/qt5/qt5-git.inc
View File

@@ -2,7 +2,7 @@
# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com>
QT_MODULE ?= "${BPN}"
QT_MODULE_BRANCH ?= "5.13"
QT_MODULE_BRANCH ?= "5.14"
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
# each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
S = "${WORKDIR}/git"
PV = "5.13.2+git${SRCPV}"
PV = "5.14.0+git${SRCPV}"

6
recipes-qt/qt5/qtbase-native_git.bb
View File

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \
"
require qt5-native.inc
@@ -137,11 +137,9 @@ do_install() {
done
fi
install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
# since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++")
# override this until somebody finds a better way
echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
}
SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb"
SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"

2
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
View File

@@ -18,7 +18,7 @@ diff --git a/configure.pri b/configure.pri
index 3778ece180..94bdfd2649 100644
--- a/configure.pri
+++ b/configure.pri
@@ -851,10 +851,10 @@ defineTest(qtConfOutput_preparePaths) {
@@ -844,10 +844,10 @@ defineTest(qtConfOutput_preparePaths) {
$${currentConfig}.output.qconfigSource = \
"/* Installation Info */" \

10
recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
View File

@@ -7,13 +7,13 @@ musl does not have feenableexcept function
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 +-
tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index be2e2a2e08..68aa8369a5 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
index 676c66d..ba05aad 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -46,7 +46,7 @@
#include <private/qlocale_tools_p.h>
#include <qnumeric.h>

8
recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
View File

@@ -25,15 +25,15 @@ diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
index df210fe42d..79a3ddf2f8 100644
--- a/mkspecs/common/clang.conf
+++ b/mkspecs/common/clang.conf
@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX
CONFIG += clang_pch_style
QMAKE_PCH_OUTPUT_EXT = .pch
@@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch
QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
-QMAKE_CFLAGS_ISYSTEM = -isystem
+QMAKE_CFLAGS_ISYSTEM =
QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
QMAKE_CFLAGS_LTCG = -flto
QMAKE_CFLAGS_LTCG = -flto=thin
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 44b4267207..9756a02014 100644
--- a/mkspecs/common/gcc-base.conf

8
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
View File

@@ -22,7 +22,7 @@ index a94f6d0eeb..ccab725843 100644
static:no-static-ltcg {
# Static library but no-static-ltcg enabled: skip LTCG
-} else: CONFIG(release, debug|release) {
+} else: CONFIG(release, debug|release)!host_build {
# We need fat object files when creating static libraries on some platforms
# so the linker will know to load a particular object from the library
# in the first place. On others, we have special ar and nm to create the symbol
+} else: CONFIG(release, debug|release):!host_build {
separate_debug_info {
# Evaluate single-$ variable references that have no valid value at mkspec loading time
QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO ~= s/\\$\\{/\$\$\{/

8
recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
View File

@@ -29,8 +29,8 @@ index 3555763..e7dc57c 100644
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
@@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(in
qCDebug(qLcEvdevKey) << "switchLed" << led << state;
@@ -150,7 +155,10 @@
qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
struct ::input_event led_ie;
- ::gettimeofday(&led_ie.time, 0);
@@ -45,7 +45,7 @@ diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/p
index 78728ef..1d65f9b 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
@@ -55,6 +55,11 @@
@@ -58,6 +58,11 @@
#include <linux/input.h>
#endif
@@ -57,7 +57,7 @@ index 78728ef..1d65f9b 100644
#include <math.h>
#if QT_CONFIG(mtdev)
@@ -568,7 +573,7 @@ void QEvdevTouchScreenData::processInput
@@ -573,7 +578,7 @@
// update timestamps
m_lastTimeStamp = m_timeStamp;

13
recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
View File

@@ -27,7 +27,7 @@ diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qcon
index 10458e41d7..8cfa40e461 100644
--- a/src/corelib/global/qconfig-bootstrapped.h
+++ b/src/corelib/global/qconfig-bootstrapped.h
@@ -100,14 +100,14 @@
@@ -104,7 +104,7 @@
#define QT_FEATURE_process -1
#define QT_FEATURE_regularexpression -1
#ifdef __GLIBC_PREREQ
@@ -36,7 +36,8 @@ index 10458e41d7..8cfa40e461 100644
#else
# define QT_FEATURE_renameat2 -1
#endif
#define QT_FEATURE_sharedmemory -1
@@ -112,7 +112,7 @@
#define QT_FEATURE_signaling_nan -1
#define QT_FEATURE_slog2 -1
#ifdef __GLIBC_PREREQ
-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
@@ -45,12 +46,12 @@ index 10458e41d7..8cfa40e461 100644
# define QT_FEATURE_statx -1
#endif
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index b78e037865..9574d1a044 100644
index c3abec8..6229c61 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -1232,16 +1232,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty()))
return emptyFileEntryWarning(), false;
@@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
Q_CHECK_FILE_NAME(srcPath, false);
Q_CHECK_FILE_NAME(tgtPath, false);
-#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2)
- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0)

4
recipes-qt/qt5/qtbase_git.bb
View File

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \
"
# common for qtbase-native, qtbase-nativesdk and qtbase
@@ -296,4 +296,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb"
SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"

2
recipes-qt/qt5/qtcharts_git.bb
View File

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia"
SRCREV = "f047b1a9bb73d4b6df24729435e4156dfb84e90e"
SRCREV = "8ea7ee70c994bcb3e1b20a9e839d26420be082cb"
# The same issue as in qtbase:
# http://errors.yoctoproject.org/Errors/Details/152641/

2
recipes-qt/qt5/qtcoap_git.bb
View File

@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
DEPENDS += "qtbase"
SRCREV = "bc4dca032f385658898db017af110f4d8e29816d"
SRCREV = "1d2ba407d26c6c7005e38fe9cec6d0a0ce405309"

2
recipes-qt/qt5/qtconnectivity_git.bb
View File

@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "13b15ab1b1ee2ad56d0d37b07d694fbfc22e97a3"
SRCREV = "1c92d490766f2ac93bf51771f913fdfe708da188"

2
recipes-qt/qt5/qtdatavis3d_git.bb
View File

@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
SRCREV = "af4466c7af7345a2a92f2523b29e79ce22205003"
SRCREV = "882075ef10d585c0e5779443a5bde8836b25762d"

2
recipes-qt/qt5/qtdeclarative_git.bb
View File

@@ -28,6 +28,6 @@ do_install_append_class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
SRCREV = "4080025fed9d43a78b578bcab67397712459d28c"
SRCREV = "290251541e615358dcc7a289ff2adb30f309c132"
BBCLASSEXTEND =+ "native nativesdk"

2
recipes-qt/qt5/qtgamepad_git.bb
View File

@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "2d5c3c24925bf96f48789fbc0e1b78371ba1170e"
SRCREV = "8bef70f170bf9803f77971f553ebdc9aac5a3aa6"

2
recipes-qt/qt5/qtgraphicaleffects_git.bb
View File

@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
# http://errors.yoctoproject.org/Errors/Build/44912/
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
SRCREV = "b38eddb4a5aff6dc408b99124ef3c43d80ee88cb"
SRCREV = "84c446d72349fc99ccad7b738b1a79c4ec36335d"

2
recipes-qt/qt5/qtimageformats_git.bb
View File

@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "9fe1f2e918d39031852805f1add23125c061d3c3"
SRCREV = "bcced9cb1baefe3507338a602fe95be915798661"

2
recipes-qt/qt5/qtknx_git.bb
View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "6cdc937d5cbfc4ca6b0520c27d0747a66ccb1879"
SRCREV = "9350fc875a0722e7d05d44f0d53e6aa92122b79c"

4
recipes-qt/qt5/qtlocation_git.bb
View File

@@ -36,7 +36,7 @@ SRC_URI += " \
${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
"
SRCREV_qtlocation = "b8cc5f3ae51cec793f1a962db88e3c251c983298"
SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
SRCREV_qtlocation = "dec8f4c7680b47c1386b69829fc1ae7c38e4186f"
SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb"
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"

2
recipes-qt/qt5/qtlottie_git.bb
View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "2c681d20c0afd203876bfd733b559eb021aa7cdf"
SRCREV = "6e1be78c12be9857c6c35bdd6e89331e41708b22"

2
recipes-qt/qt5/qtmqtt_git.bb
View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "4b3201059dfc2fc5038910c51eb8ca9d75e98765"
SRCREV = "37ead173bfabc8b930a2a0571ad03a15e86cf7bb"

2
recipes-qt/qt5/qtmultimedia_git.bb
View File

@@ -37,4 +37,4 @@ SRC_URI += "\
# http://errors.yoctoproject.org/Errors/Build/44914/
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
SRCREV = "dce51b45e8d50ad37fea3debb51a84d62e944b5d"
SRCREV = "d9f2a814eb5d8c2c0e985f60b345fefd956e2bb0"

2
recipes-qt/qt5/qtnetworkauth_git.bb
View File

@@ -9,4 +9,4 @@ require qt5-git.inc
DEPENDS += "qtbase"
SRCREV = "ee0ce46332d364e76e9ec2b0adf7e5cbda504863"
SRCREV = "abda4bd8ba187aac78052e30b286215b1746783a"

2
recipes-qt/qt5/qtopcua_git.bb
View File

@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "b4588093a5a32d12700afa9e0f0ff54df57ffd66"
SRCREV = "5b3ad68a3a0a6cc9670dc86c3d906ec72181253b"

2
recipes-qt/qt5/qtpurchasing_git.bb
View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "cc094b80bffd972a1dc071e745888b213dde44f5"
SRCREV = "ecb890f14ea3b81a97aaca05b6af2508bd6f68a4"

2
recipes-qt/qt5/qtquickcontrols2_git.bb
View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtdeclarative-native"
SRCREV = "c0fb745acdbed0828e3b66f6a6705203a2754591"
SRCREV = "0d2fc12b65028b4f04bdace3991448813130ab48"

2
recipes-qt/qt5/qtquickcontrols_git.bb
View File

@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
"
SRCREV = "9a5e84b8f9ca0eeda8170eb93c093f3ab25de988"
SRCREV = "d88b285166d7963faca84ce8484984a74904f58a"

2
recipes-qt/qt5/qtremoteobjects_git.bb
View File

@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "44d51ea7b45b2dce1b6772217269a4d1dff88a80"
SRCREV = "2f00e14a46292afbf036e196aa72dc2f1639bf50"
BBCLASSEXTEND += "native nativesdk"

2
recipes-qt/qt5/qtscript_git.bb
View File

@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
# http://errors.yoctoproject.org/Errors/Build/44915/
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
SRCREV = "18bade63bdcd1d8fcba013f788e114774efa0e4f"
SRCREV = "286286f9750a6417b00877c84cf73fc61002c139"

2
recipes-qt/qt5/qtscxml_git.bb
View File

@@ -10,7 +10,7 @@ require qt5-git.inc
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
SRCREV = "575d92175aec3d6bd84872a9ad00adf924b6993d"
SRCREV = "5e4882514dc9c5da9b8f268580078d57d50cbce9"
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13
# 5.13.meta-qt5.1

2
recipes-qt/qt5/qtsensors_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "e032fe21b6d8d2c92e93ab0ba7a367be23db82b8"
SRCREV = "615ae0abc1f2b9baf54f196bb5197c25a90304a3"

2
recipes-qt/qt5/qtserialbus_git.bb
View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtserialport"
SRCREV = "9c498a990646f6d51b461a246b7cce477423721a"
SRCREV = "08f5114d3943d2b4974384a3e1419690fb3882ab"

2
recipes-qt/qt5/qtserialport_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "2216279ffd43fb84042da2faa5bc432770351ec3"
SRCREV = "a7e3c9b9538bb87755f2765d2ab4926b2c854066"

2
recipes-qt/qt5/qtsvg_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "582bbf973f608e8a3b9d5e3b8318eb995930e4a0"
SRCREV = "90e901077aabaab30b585a3e5d6e6e9c93fa6352"

4
recipes-qt/qt5/qttools/run-ptest
View File

@@ -1,4 +0,0 @@
#!/bin/sh
./tst_qtdiag
./tst_qtattributionsscanner

3
recipes-qt/qt5/qttools_git.bb
View File

@@ -1,6 +1,5 @@
require qt5.inc
require qt5-git.inc
require qt5-ptest.inc
HOMEPAGE = "http://www.qt.io"
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
@@ -50,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
"
SRCREV = "78f52a4027da110bf14468b575c7262b4d28d65e"
SRCREV = "1682033b1bdadefeb9b953f7d9d096d884f797e2"
BBCLASSEXTEND = "native nativesdk"

2
recipes-qt/qt5/qttranslations_git.bb
View File

@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
"
SRCREV = "36022c8e9263c1940710cd214965979e9bd8a036"
SRCREV = "fbdeaab046d623f3238fbf0da9c8bdb0009c01a9"

2
recipes-qt/qt5/qtvirtualkeyboard_git.bb
View File

@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
SRCREV = "8fc2c34c670fb9bc9ed2393b2d2e1592a74dbfb0"
SRCREV = "459ec87b0abdd476d415946ed07c8490c10b97f0"

2
recipes-qt/qt5/qtwayland_git.bb
View File

@@ -39,7 +39,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "615aa208d131ab99e967725504fcb16fdda4ea83"
SRCREV = "4e015b3383a218b31cae4437cd30076fb031f3ad"
BBCLASSEXTEND =+ "native nativesdk"

2
recipes-qt/qt5/qtwebchannel_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtwebsockets"
SRCREV = "3be3e5756f867b34f29f18cbda9b0c2807017a71"
SRCREV = "e93a22de5465d76d139954c3dd059ed3041ea6b9"

32
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
View File

@@ -13,13 +13,26 @@ for the qmakes's host architecture.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
---
src/buildtools/config/linux.pri | 2 +-
src/buildtools/configure_host.pro | 14 +++++++-------
src/buildtools/gn.pro | 4 ++--
src/core/config/linux.pri | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
index 998aedc..b04db36 100644
--- a/src/buildtools/config/linux.pri
+++ b/src/buildtools/config/linux.pri
@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
host_build {
gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
- GN_HOST_CPU = $$gnArch($$QT_ARCH)
+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
gn_args += host_cpu=\"$$GN_HOST_CPU\"
# Don't bother trying to use system libraries in this case
gn_args += use_glib=false
diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
index dd0d3e32..6312c867 100644
index dd0d3e3..6312c86 100644
--- a/src/buildtools/configure_host.pro
+++ b/src/buildtools/configure_host.pro
@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -58,7 +71,7 @@ index dd0d3e32..6312c867 100644
" nm = \"$$which(nm)\" " \
" toolchain_args = { " \
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
index b6bf9cfc..ae419b1a 100644
index 033202e..a8ca656 100644
--- a/src/buildtools/gn.pro
+++ b/src/buildtools/gn.pro
@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
@@ -72,16 +85,3 @@ index b6bf9cfc..ae419b1a 100644
msvc:!clang_cl: gn_gen_args += --use-lto
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index f45c418f..df8ac00b 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -123,7 +123,7 @@ contains(QT_ARCH, "mips") {
host_build {
gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
- GN_HOST_CPU = $$gnArch($$QT_ARCH)
+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
gn_args += host_cpu=\"$$GN_HOST_CPU\"
# Don't bother trying to use system libraries in this case
gn_args += use_glib=false

24
recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
View File

@@ -13,22 +13,13 @@ of flagging this silent ignoring via [1]
Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
chromium/third_party/lss/linux_syscall_support.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
chromium/third_party/lss/linux_syscall_support.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
index 5d9c2e8582f..e19e51dd304 100644
index 9276f56..622cc1f 100644
--- a/chromium/third_party/lss/linux_syscall_support.h
+++ b/chromium/third_party/lss/linux_syscall_support.h
@@ -1964,7 +1964,7 @@ struct kernel_statfs {
__asm__ volatile(LSS_ENTRYPOINT \
: "=a" (__res) \
: "0" (__NR_##name) \
- : "esp", "memory"); \
+ : "memory"); \
LSS_RETURN(type,__res); \
}
#undef _syscall1
@@ -2012,7 +2012,7 @@ struct kernel_statfs {
: "i" (__NR_##name), "ri" ((long)(arg1)), \
"c" ((long)(arg2)), "d" ((long)(arg3)), \
@@ -56,12 +47,3 @@ index 5d9c2e8582f..e19e51dd304 100644
LSS_RETURN(int, __res);
}
@@ -2405,7 +2405,7 @@ struct kernel_statfs {
"d"(LSS_SYSCALL_ARG(parent_tidptr)),
"r"(LSS_SYSCALL_ARG(newtls)),
"r"(LSS_SYSCALL_ARG(child_tidptr))
- : "rsp", "memory", "r8", "r10", "r11", "rcx");
+ : "memory", "r8", "r10", "r11", "rcx");
}
LSS_RETURN(int, __res);
}

40
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
View File

@@ -13,21 +13,7 @@ diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/com
index 17f486447fe..06c93e5b3cf 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -570,13 +570,6 @@ config("compiler") {
}
}
- # Tells the compiler not to use absolute paths when passing the default
- # paths to the tools it invokes. We don't want this because we don't
- # really need it and it can mess up the goma cache entries.
- if (is_clang && !is_nacl) {
- cflags += [ "-no-canonical-prefixes" ]
- }
-
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
@@ -815,8 +808,6 @@ config("compiler_cpu_abi") {
@@ -773,8 +773,6 @@ config("compiler_cpu_abi") {
}
} else if (current_cpu == "arm") {
if (is_clang && !is_android && !is_nacl) {
@@ -36,7 +22,7 @@ index 17f486447fe..06c93e5b3cf 100644
}
if (!is_nacl) {
cflags += [
@@ -829,8 +820,6 @@ config("compiler_cpu_abi") {
@@ -787,8 +785,6 @@ config("compiler_cpu_abi") {
}
} else if (current_cpu == "arm64") {
if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -45,7 +31,7 @@ index 17f486447fe..06c93e5b3cf 100644
}
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
@@ -839,9 +828,6 @@ config("compiler_cpu_abi") {
@@ -797,9 +793,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mipsel-linux-android" ]
ldflags += [ "--target=mipsel-linux-android" ]
@@ -55,7 +41,7 @@ index 17f486447fe..06c93e5b3cf 100644
}
} else {
cflags += [ "-EL" ]
@@ -920,10 +906,7 @@ config("compiler_cpu_abi") {
@@ -878,10 +871,7 @@ config("compiler_cpu_abi") {
} else if (current_cpu == "mips" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -67,7 +53,7 @@ index 17f486447fe..06c93e5b3cf 100644
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
}
@@ -970,9 +953,6 @@ config("compiler_cpu_abi") {
@@ -928,9 +918,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mips64el-linux-android" ]
ldflags += [ "--target=mips64el-linux-android" ]
@@ -77,7 +63,7 @@ index 17f486447fe..06c93e5b3cf 100644
}
} else {
cflags += [
@@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") {
@@ -987,10 +974,7 @@ config("compiler_cpu_abi") {
} else if (current_cpu == "mips64") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -89,3 +75,17 @@ index 17f486447fe..06c93e5b3cf 100644
cflags += [
"-EB",
"-mabi=64",
@@ -1169,13 +1153,6 @@ config("compiler_deterministic") {
}
}
}
-
- # Tells the compiler not to use absolute paths when passing the default
- # paths to the tools it invokes. We don't want this because we don't
- # really need it and it can mess up the goma cache entries.
- if (is_clang && !is_nacl) {
- cflags += [ "-no-canonical-prefixes" ]
- }
}
config("clang_revision") {

12
recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
View File

@@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
index 458f428b7ce..18b4f23f769 100644
index 29dda54..6870dbb 100644
--- a/chromium/third_party/zlib/BUILD.gn
+++ b/chromium/third_party/zlib/BUILD.gn
@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) {
# implement the CRC32* instructions. These are optional in ARMv8.0."
# - Fuchsia just added a syscall for feature detection.
# TODO(cavalcantii): crbug.com/810125.
@@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) {
# Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
# "All implementations of the ARMv8.1 architecture are required to
# implement the CRC32* instructions. These are optional in ARMv8.0."
+ defines = []
if (is_clang && (!is_ios && !is_fuchsia)) {
if (!is_ios) {
- defines = [ "CRC32_ARMV8_CRC32" ]
+ if (current_cpu == "arm64") {
+ defines += [ "CRC32_ARMV8_CRC32" ]

2
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
View File

@@ -20,7 +20,7 @@ diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/com
index 06c93e5b3cf..8ba0f8a3109 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -809,15 +809,6 @@ config("compiler_cpu_abi") {
@@ -774,15 +774,6 @@ config("compiler_cpu_abi") {
} else if (current_cpu == "arm") {
if (is_clang && !is_android && !is_nacl) {
}

16
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
View File

@@ -24,18 +24,19 @@ moment.
Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
---
.../skia/src/opts/SkRasterPipeline_opts.h | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
.../third_party/skia/src/opts/SkRasterPipeline_opts.h | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
index de14e65b94e..b8be7852086 100644
index b59506d..b8f22c9 100644
--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -729,12 +729,7 @@ SI F approx_powf(F x, F y) {
@@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) {
}
SI F from_half(U16 h) {
-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
- __fp16 fp16;
- memcpy(&fp16, &h, sizeof(U16));
- return float(fp16);
@@ -45,11 +46,12 @@ index de14e65b94e..b8be7852086 100644
return _mm256_cvtph_ps(h);
#else
@@ -751,13 +746,7 @@ SI F from_half(U16 h) {
@@ -995,14 +989,7 @@ SI F from_half(U16 h) {
}
SI U16 to_half(F f) {
-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
- __fp16 fp16 = __fp16(f);
- U16 u16;
- memcpy(&u16, &fp16, sizeof(U16));

10
recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
View File

@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
index 277a7e9338d..2a6e060fa32 100644
index 095c49b8dc0..d1479b54d48 100644
--- a/chromium/base/threading/platform_thread_linux.cc
+++ b/chromium/base/threading/platform_thread_linux.cc
@@ -186,7 +186,8 @@ void TerminateOnThread() {}
@@ -24,10 +24,10 @@ index 277a7e9338d..2a6e060fa32 100644
// ThreadSanitizer bloats the stack heavily. Evidence has been that the
// default stack size isn't enough for some browser tests.
diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
index 248f93968a6..4bc5ac692af 100644
index b2421649ff3..a31b96e90e6 100644
--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
@@ -30,7 +30,7 @@ size_t GetUnderestimatedStackSize() {
@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
// FIXME: On Mac OSX and Linux, this method cannot estimate stack size
// correctly for the main thread.
@@ -35,8 +35,8 @@ index 248f93968a6..4bc5ac692af 100644
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
defined(OS_FUCHSIA)
// pthread_getattr_np() can fail if the thread is not invoked by
// pthread_create() (e.g., the main thread of webkit_unit_tests).
@@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() {
// pthread_create() (e.g., the main thread of blink_unittests).
@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
}
void* GetStackStart() {

6
recipes-qt/qt5/qtwebengine_git.bb
View File

@@ -135,7 +135,7 @@ RDEPENDS_${PN}-examples += " \
qtdeclarative-qmlplugins \
"
QT_MODULE_BRANCH_CHROMIUM = "73-based"
QT_MODULE_BRANCH_CHROMIUM = "77-based"
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13
# 5.13.meta-qt5.2
@@ -180,8 +180,8 @@ SRC_URI_append_libc-musl = "\
file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
"
SRCREV_qtwebengine = "556576b55f6b4404c71c74a5ef8e21f87ed09854"
SRCREV_chromium = "843d70ac87de7482c1c1195aa73899bc05efc8f3"
SRCREV_qtwebengine = "d366f1d5d37ce6f1833ac67c7ebda540b16690f2"
SRCREV_chromium = "939daf833fff3a9901afb6fd65d02e0f057a494a"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"

2
recipes-qt/qt5/qtwebglplugin_git.bb
View File

@@ -18,4 +18,4 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
SRCREV = "11b83427d9770f50b5d8ec420ec810e393f3af8c"
SRCREV = "2f47e9505bfc3e8a8adc16e6cc3e381e98cf3c9a"

2
recipes-qt/qt5/qtwebsockets_git.bb
View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "a8bbc056335719830a6b2746b7a85cfa2fd89164"
SRCREV = "9ef6658541c2e816b8119df98c1b66add5b7bcdd"

2
recipes-qt/qt5/qtwebview_git.bb
View File

@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
COMPATIBLE_MACHINE_armv7ve = "(.*)"
COMPATIBLE_MACHINE_aarch64 = "(.*)"
SRCREV = "2746b310f89e99144fff2a07e945a02e8c51d3da"
SRCREV = "a02484660ded03bc4a4ea98b1f4c5fb21afdaa4a"

2
recipes-qt/qt5/qtx11extras_git.bb
View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "0f6f4d20f76eaf55eebfddfe49d9a6335f443d65"
SRCREV = "111908d734b49b31b334cd5af45064aa888ec69a"

2
recipes-qt/qt5/qtxmlpatterns_git.bb
View File

@@ -25,7 +25,7 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
SRCREV = "74c5be960cbd4709cd8e4dee897cf53c00838128"
SRCREV = "f96db4b6dbcdf9734b8f09dad479daaa923a4065"
BBCLASSEXTEND =+ "native nativesdk"