mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-11 00:25:19 +02:00
qt5: upgrade to 5.14.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -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;md5=994e4301576163cfe0bc3f4f5462bf09 \
|
||||
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
|
||||
"
|
||||
|
||||
QT_MODULE = "qtbase"
|
||||
@@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
|
||||
|
||||
# common for qtbase-native, qtbase-nativesdk and qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared
|
||||
# 5.14.meta-qt5-shared.1
|
||||
# 5.14.meta-qt5-shared.2
|
||||
SRC_URI += "\
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
|
||||
@@ -47,7 +47,7 @@ SRC_URI += "\
|
||||
|
||||
# common for qtbase-native and nativesdk-qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native
|
||||
# 5.14.meta-qt5-native.1
|
||||
# 5.14.meta-qt5-native.2
|
||||
SRC_URI += " \
|
||||
file://0019-Always-build-uic-and-qvkgen.patch \
|
||||
file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \
|
||||
@@ -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 = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"
|
||||
SRCREV = "0ab53fbdda2fd7f24f45dcd52fbd195e282554da"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From e77e54151e4ebee6996c13675ca0a68c880f9960 Mon Sep 17 00:00:00 2001
|
||||
From 01c62d4e4bf1034302834fef48a894c6b0ebe147 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Fri, 17 Aug 2018 13:23:58 +0300
|
||||
Subject: [PATCH] Allow a tools-only build
|
||||
|
||||
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \
|
||||
DEPENDS += "qtbase"
|
||||
DEPENDS_class-target += "qtdeclarative qt3d-native"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qt3d/commits/b5.13
|
||||
# 5.13.meta-qt5.1
|
||||
# Patches from https://github.com/meta-qt5/qt3d/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
SRC_URI += " \
|
||||
file://0001-Allow-a-tools-only-build.patch \
|
||||
"
|
||||
@@ -36,6 +36,6 @@ do_configure_prepend() {
|
||||
${S}/src/quick3d/imports/input/importsinput.pro
|
||||
}
|
||||
|
||||
SRCREV = "96b1b9e3e198e751bb96eeb279106862ca38e7d7"
|
||||
SRCREV = "5aedae5aa9251e1216d7bc1652cb1f451dd047c1"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
|
||||
# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com>
|
||||
# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
|
||||
|
||||
QT_MODULE ?= "${BPN}"
|
||||
QT_MODULE_BRANCH ?= "5.14"
|
||||
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PV = "5.14.0+git${SRCPV}"
|
||||
PV = "5.14.1+git${SRCPV}"
|
||||
|
||||
@@ -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;md5=994e4301576163cfe0bc3f4f5462bf09 \
|
||||
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
|
||||
"
|
||||
|
||||
require qt5-native.inc
|
||||
@@ -18,7 +18,7 @@ require qt5-git.inc
|
||||
|
||||
# common for qtbase-native, qtbase-nativesdk and qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared
|
||||
# 5.14.meta-qt5-shared.1
|
||||
# 5.14.meta-qt5-shared.2
|
||||
SRC_URI += "\
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
|
||||
@@ -42,7 +42,7 @@ SRC_URI += "\
|
||||
|
||||
# common for qtbase-native and nativesdk-qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native
|
||||
# 5.14.meta-qt5-native.1
|
||||
# 5.14.meta-qt5-native.2
|
||||
SRC_URI += " \
|
||||
file://0019-Always-build-uic-and-qvkgen.patch \
|
||||
file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \
|
||||
@@ -143,4 +143,4 @@ do_install() {
|
||||
echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
|
||||
}
|
||||
|
||||
SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"
|
||||
SRCREV = "0ab53fbdda2fd7f24f45dcd52fbd195e282554da"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 5668523aa073c1ef430b1662c735ead8fd64c83b Mon Sep 17 00:00:00 2001
|
||||
From 0d13aba5a2ab1794bfea5a3bbf2096da17f0cae1 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Mon, 15 Apr 2013 04:29:32 +0200
|
||||
Subject: [PATCH] Add linux-oe-g++ platform
|
||||
@@ -89,10 +89,10 @@ index 3a71376029..dd6020f1fe 100644
|
||||
# run qmlimportscanner
|
||||
qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
|
||||
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
|
||||
index 661b7dd961..3bc73ab0c6 100644
|
||||
index 7777e615bd..8d792fa70a 100644
|
||||
--- a/mkspecs/features/qt_functions.prf
|
||||
+++ b/mkspecs/features/qt_functions.prf
|
||||
@@ -76,7 +76,7 @@ defineTest(qtHaveModule) {
|
||||
@@ -87,7 +87,7 @@ defineTest(qtHaveModule) {
|
||||
defineTest(qtPrepareTool) {
|
||||
cmd = $$eval(QT_TOOL.$${2}.binary)
|
||||
isEmpty(cmd) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b0e51c74e3f550c2d72ee4e02d1f9c3f5d2e83b5 Mon Sep 17 00:00:00 2001
|
||||
From 8409ffc14e5176595c7d591ebd07f5b49af8d245 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sat, 6 Apr 2013 13:15:07 +0200
|
||||
Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From db95ec35c5e2a1604f82803fc5c09dc82b594175 Mon Sep 17 00:00:00 2001
|
||||
From 73c6762cc7d4c3449fc152f706c8d0efa2f7e65e Mon Sep 17 00:00:00 2001
|
||||
From: Holger Freyther <zecke@selfish.org>
|
||||
Date: Wed, 26 Sep 2012 17:22:30 +0200
|
||||
Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3fa9db42f3b34f97929662a461c9a07982505178 Mon Sep 17 00:00:00 2001
|
||||
From fad25d26b6ec478d0b22bc4fbfec65a6665608c0 Mon Sep 17 00:00:00 2001
|
||||
From: Denys Dmytriyenko <denys@ti.com>
|
||||
Date: Tue, 25 Aug 2015 10:05:15 -0400
|
||||
Subject: [PATCH] configure: bump path length from 256 to 512 characters
|
||||
@@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.pri b/configure.pri
|
||||
index 47882afeb6..a50aa0e176 100644
|
||||
index 81c84b28ef..bf40b68835 100644
|
||||
--- a/configure.pri
|
||||
+++ b/configure.pri
|
||||
@@ -870,10 +870,10 @@ defineTest(qtConfOutput_preparePaths) {
|
||||
@@ -872,10 +872,10 @@ defineTest(qtConfOutput_preparePaths) {
|
||||
|
||||
$${currentConfig}.output.qconfigSource = \
|
||||
"/* Installation Info */" \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1ca3511433c55755c63dfa0fb78d712c6605b37a Mon Sep 17 00:00:00 2001
|
||||
From 24c469b3c9599aa106c44d1df48fb04db5b8c904 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Mon, 24 Oct 2016 09:45:18 +0300
|
||||
Subject: [PATCH] Disable all unknown features instead of erroring out
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 37f7cae8d723341b12fe76bca12c4c76d98fb874 Mon Sep 17 00:00:00 2001
|
||||
From 8143b5913e50d26ef39fbbed5f1e28ff74a57d20 Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Bach <pascal.bach@siemens.com>
|
||||
Date: Wed, 11 May 2016 15:20:41 +0200
|
||||
Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
|
||||
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
|
||||
2 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index 364c23e750..670b5c71f2 100644
|
||||
index 50364765fb..e101a2e841 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2b0adcafba19d87ef452dad156c8fda8ec8396b0 Mon Sep 17 00:00:00 2001
|
||||
From 41d43606a50fbeae73d585ed727ec13e36f785c0 Mon Sep 17 00:00:00 2001
|
||||
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
Date: Wed, 7 Jun 2017 21:00:49 +0900
|
||||
Subject: [PATCH] Delete qlonglong and qulonglong
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 98fbf9fcbe29886dbc84a7e95a9f58a588a8e8ea Mon Sep 17 00:00:00 2001
|
||||
From 4d8c0a0524ceea0590f15d87a4aa604a488bedc5 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 27 Jul 2017 08:02:51 -0700
|
||||
Subject: [PATCH] Replace pthread_yield with sched_yield
|
||||
@@ -36,7 +36,7 @@ index 12c29a6e13..7d31799da6 100644
|
||||
QMetaType info(tp);
|
||||
if (!info.isValid()) {
|
||||
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
|
||||
index 75b9b23259..77b5bf1525 100644
|
||||
index 0546c6ba7d..f602b035d6 100644
|
||||
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
|
||||
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
|
||||
@@ -78,6 +78,7 @@
|
||||
@@ -47,7 +47,7 @@ index 75b9b23259..77b5bf1525 100644
|
||||
#endif
|
||||
|
||||
#include "private/qhostinfo_p.h"
|
||||
@@ -2177,8 +2178,8 @@ public slots:
|
||||
@@ -2178,8 +2179,8 @@ public slots:
|
||||
|
||||
#if defined(Q_OS_MAC)
|
||||
pthread_yield_np();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 46b07eaf67735ad21b56c67a61737491c1150760 Mon Sep 17 00:00:00 2001
|
||||
From ba7dda9ef0e33103e26fee2e41f25d8c0e3bfb78 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 3 Sep 2017 09:11:44 -0700
|
||||
Subject: [PATCH] Add OE specific specs for clang compiler
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From df0f6f03af2494d7dc73035273e0a7e65780f3d7 Mon Sep 17 00:00:00 2001
|
||||
From 03e57f526db46b93b2bcbd01974446b9819e73e7 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 3 Sep 2017 09:44:48 -0700
|
||||
Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From fab74db07a1f4f7502d37c4f4c2a04f540dbe6a5 Mon Sep 17 00:00:00 2001
|
||||
From f3befb762f2e69fa1f8a444ca9b392b4cb48ba5f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 3 Sep 2017 10:11:50 -0700
|
||||
Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
|
||||
index 20ed7500b5..90181fd078 100644
|
||||
index 8f434acb29..53dc0d9121 100644
|
||||
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
|
||||
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 716d70f9ac91725155f7e6c14727ab86fbdf44f4 Mon Sep 17 00:00:00 2001
|
||||
From 382e44787d366428892161881fdc3c2481cefc04 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 14 Feb 2018 17:08:43 -0800
|
||||
Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 63cf72b8519dd58a5fb6eeeef67b19842806cddc Mon Sep 17 00:00:00 2001
|
||||
From 8a2c2006676b0cb1a579efabb0ab24a277024b54 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Tue, 23 Oct 2018 09:54:57 +0300
|
||||
Subject: [PATCH] Disable ltcg for host_build
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 5630158766df351317ead6059ca7039cd125ab27 Mon Sep 17 00:00:00 2001
|
||||
From 73b4276844b4fadc42375f713b51031b5c7c15b1 Mon Sep 17 00:00:00 2001
|
||||
From: Max Krummenacher <max.krummenacher@toradex.com>
|
||||
Date: Sat, 27 Oct 2018 12:29:31 +0000
|
||||
Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a1508aff41a526b900f958831a1196f2655c57e9 Mon Sep 17 00:00:00 2001
|
||||
From 3a147b314b96a3f2bd7ded41a9c5fe685985fa29 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 6 Dec 2018 11:47:52 -0800
|
||||
Subject: [PATCH] corelib: Include sys/types.h for uint32_t
|
||||
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h
|
||||
index 86e7997680..73bcd370c2 100644
|
||||
index 7418579fe0..aba29de499 100644
|
||||
--- a/src/corelib/global/qnumeric_p.h
|
||||
+++ b/src/corelib/global/qnumeric_p.h
|
||||
@@ -55,6 +55,7 @@
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From e983e9e5451d6961a11206360aeae599f090f971 Mon Sep 17 00:00:00 2001
|
||||
From 90f1d71d609495ba305d052017df4d3fb801401c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 6 Dec 2018 15:06:20 -0800
|
||||
Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a0f5ac48354dd86aaa53c07e08e30098c62f5097 Mon Sep 17 00:00:00 2001
|
||||
From e9b0666990eb91c18f42f4f15e863273462f544a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 5 Oct 2019 16:21:08 -0700
|
||||
Subject: [PATCH] qfloat16: check for __ARM_FP & 2
|
||||
@@ -20,7 +20,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp
|
||||
index 6c21b7de5a..98d34a96a5 100644
|
||||
index c868e879b7..0c9bb80cb2 100644
|
||||
--- a/src/corelib/global/qfloat16.cpp
|
||||
+++ b/src/corelib/global/qfloat16.cpp
|
||||
@@ -205,7 +205,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b83804eb1f9087800295cf40916577f932673dc8 Mon Sep 17 00:00:00 2001
|
||||
From 54328b4942eb8cc884bdf41d58f2408a60ea7605 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 25 Nov 2019 08:27:39 -0800
|
||||
Subject: [PATCH] input: Make use of timeval portable for 64bit time_t
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From eff8ae2d5748626dfd173fa6cb5860bb72ffeafa Mon Sep 17 00:00:00 2001
|
||||
From 71089d2dbc2becf51e419741afb5f9e2028963e7 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sat, 16 Nov 2013 00:32:30 +0100
|
||||
Subject: [PATCH] Always build uic and qvkgen
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 37ea0b0c40f541cf9741c064e97ec9e9327ba7a1 Mon Sep 17 00:00:00 2001
|
||||
From cbf26740eca4972824e74acbb8ca5ccb3cdde9b7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 14 Apr 2019 13:27:58 +0200
|
||||
Subject: [PATCH] Avoid renameeat2 for native(sdk) builds
|
||||
@@ -24,7 +24,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
2 files changed, 2 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
|
||||
index e6ad80525a..283ce1ce26 100644
|
||||
index c6f071bc3f..575c993e68 100644
|
||||
--- a/src/corelib/global/qconfig-bootstrapped.h
|
||||
+++ b/src/corelib/global/qconfig-bootstrapped.h
|
||||
@@ -104,7 +104,7 @@
|
||||
@@ -46,7 +46,7 @@ index e6ad80525a..283ce1ce26 100644
|
||||
# define QT_FEATURE_statx -1
|
||||
#endif
|
||||
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
index c3abec8989..6229c611b8 100644
|
||||
index 38cb6a423d..b6d5e16464 100644
|
||||
--- a/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
@@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7596905dbe3ff36a129b5793966da30579d877f4 Mon Sep 17 00:00:00 2001
|
||||
From 61a5dc7d949bc0f8ff3c4a1060c91c61187e5fb2 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Fri, 24 Nov 2017 15:16:31 +0200
|
||||
Subject: [PATCH] Bootstrap without linkat feature
|
||||
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific]
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
|
||||
index 283ce1ce26..dfcbb15a6b 100644
|
||||
index 575c993e68..d0c9fdfce3 100644
|
||||
--- a/src/corelib/global/qconfig-bootstrapped.h
|
||||
+++ b/src/corelib/global/qconfig-bootstrapped.h
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
|
||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
|
||||
file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \
|
||||
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
|
||||
"
|
||||
|
||||
# common for qtbase-native, qtbase-nativesdk and qtbase
|
||||
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared
|
||||
# 5.14.meta-qt5-shared.1
|
||||
# 5.14.meta-qt5-shared.2
|
||||
SRC_URI += "\
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
|
||||
@@ -296,4 +296,4 @@ sed -i \
|
||||
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
|
||||
}
|
||||
|
||||
SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"
|
||||
SRCREV = "0ab53fbdda2fd7f24f45dcd52fbd195e282554da"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia"
|
||||
|
||||
SRCREV = "8ea7ee70c994bcb3e1b20a9e839d26420be082cb"
|
||||
SRCREV = "97e9be186913cf1a2857fd34f994fbb74a508c3b"
|
||||
|
||||
# The same issue as in qtbase:
|
||||
# http://errors.yoctoproject.org/Errors/Details/152641/
|
||||
|
||||
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "1d2ba407d26c6c7005e38fe9cec6d0a0ce405309"
|
||||
SRCREV = "7dc2630196197363f1861e23bb8eef6f53074eff"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 872f3db59b77c09b052733210e49c7770381d93a Mon Sep 17 00:00:00 2001
|
||||
From 000075567007d0ef76ef3c782fc4060f8ff8e647 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 29 Jan 2019 20:29:19 -0800
|
||||
Subject: [PATCH] Add missing header for errno
|
||||
|
||||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "1c92d490766f2ac93bf51771f913fdfe708da188"
|
||||
SRCREV = "a9b5b10ce113db1c1bb3d42d058caa7b8e1a964a"
|
||||
|
||||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
|
||||
|
||||
SRCREV = "882075ef10d585c0e5779443a5bde8836b25762d"
|
||||
SRCREV = "6b15c2bee08a0477e718a407fdf81917a064c1ca"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2ca54b2296463f626f8438825907610cb22169fc Mon Sep 17 00:00:00 2001
|
||||
From d39e76b9662ea9cf236ac59749855e7da7ad29a8 Mon Sep 17 00:00:00 2001
|
||||
From: Piotr Tworek <tworaz@tworaz.net>
|
||||
Date: Wed, 3 Jul 2019 01:13:40 +0200
|
||||
Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to locate qmlcachegen
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From dc94032e6132b41bd6927357e4a57c31436294eb Mon Sep 17 00:00:00 2001
|
||||
From 838fb4676f78d169dc88f87544cf1a4003302aea Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 26 Nov 2019 21:10:03 -0800
|
||||
Subject: [PATCH] Use python3 explicitly
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/qtdeclarative.pro b/qtdeclarative.pro
|
||||
index 5b94da9b6..0e3496ce8 100644
|
||||
index 5b94da9b69..0e3496ce80 100644
|
||||
--- a/qtdeclarative.pro
|
||||
+++ b/qtdeclarative.pro
|
||||
@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
|
||||
@@ -24,7 +24,7 @@ index 5b94da9b6..0e3496ce8 100644
|
||||
tmp = python_available
|
||||
CONFIG += $$tmp
|
||||
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
|
||||
index 0e63ac2ce..7a30ab64e 100644
|
||||
index 1df4585aae..00038104ec 100644
|
||||
--- a/src/3rdparty/masm/masm.pri
|
||||
+++ b/src/3rdparty/masm/masm.pri
|
||||
@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
|
||||
@@ -36,7 +36,7 @@ index 0e63ac2ce..7a30ab64e 100644
|
||||
QMAKE_EXTRA_COMPILERS += udis86
|
||||
|
||||
udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
|
||||
@@ -113,7 +113,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
|
||||
@@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
|
||||
retgen.script = $$PWD/yarr/create_regex_tables
|
||||
retgen.input = retgen.script
|
||||
retgen.CONFIG += no_link
|
||||
@@ -46,7 +46,7 @@ index 0e63ac2ce..7a30ab64e 100644
|
||||
|
||||
# Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
|
||||
diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
|
||||
index 19551e3ba..bf3f79a45 100755
|
||||
index 19551e3ba2..bf3f79a45f 100755
|
||||
--- a/tests/auto/qml/ecmascripttests/test262.py
|
||||
+++ b/tests/auto/qml/ecmascripttests/test262.py
|
||||
@@ -1,4 +1,4 @@
|
||||
@@ -55,6 +55,3 @@ index 19551e3ba..bf3f79a45 100755
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -12,9 +12,12 @@ LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
|
||||
"
|
||||
|
||||
SRC_URI += "file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
|
||||
file://0001-Use-python3-explicitly.patch \
|
||||
"
|
||||
# Patches from https://github.com/meta-qt5/qtdeclarative/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
SRC_URI += " \
|
||||
file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
|
||||
file://0002-Use-python3-explicitly.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
@@ -28,6 +31,6 @@ do_install_append_class-nativesdk() {
|
||||
rm -rf ${D}${OE_QMAKE_PATH_QML}
|
||||
}
|
||||
|
||||
SRCREV = "290251541e615358dcc7a289ff2adb30f309c132"
|
||||
SRCREV = "51a158929b55dffbdfb757da8bd6a2cd181906c6"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "8bef70f170bf9803f77971f553ebdc9aac5a3aa6"
|
||||
SRCREV = "89e9949e720dba11e6f6f05b50c3523a2eca37d7"
|
||||
|
||||
@@ -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 = "84c446d72349fc99ccad7b738b1a79c4ec36335d"
|
||||
SRCREV = "4d271e84875a8dc9dd582139e7235497816f9f82"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "9350fc875a0722e7d05d44f0d53e6aa92122b79c"
|
||||
SRCREV = "bddcb323228191945c9e3a8644cc4307158d4551"
|
||||
|
||||
@@ -35,7 +35,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 = "dec8f4c7680b47c1386b69829fc1ae7c38e4186f"
|
||||
SRCREV_qtlocation = "bdd1967a3901432eaa6c152eee547e3d322b4a98"
|
||||
SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb"
|
||||
|
||||
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "6e1be78c12be9857c6c35bdd6e89331e41708b22"
|
||||
SRCREV = "42ec006a0b82ba24eaa13b45e959d85cd9bb0d02"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "37ead173bfabc8b930a2a0571ad03a15e86cf7bb"
|
||||
SRCREV = "c27f0d93b6034748d311c233020465554bdab79c"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From c39c68f73c86378897dbc6f59b48c2ced1eaa72f Mon Sep 17 00:00:00 2001
|
||||
From ac8c96da1849106b34592bab10459c854140a574 Mon Sep 17 00:00:00 2001
|
||||
From: Wenlin Kang <wenlin.kang@windriver.com>
|
||||
Date: Thu, 8 Sep 2016 12:18:13 +0800
|
||||
Subject: [PATCH] qtmultimedia: fix a conflicting declaration
|
||||
|
||||
@@ -27,8 +27,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream
|
||||
|
||||
CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.13
|
||||
# 5.13.meta-qt5.1
|
||||
# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
SRC_URI += "\
|
||||
file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
|
||||
"
|
||||
@@ -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 = "d9f2a814eb5d8c2c0e985f60b345fefd956e2bb0"
|
||||
SRCREV = "2091eac697ff6f7be03203d3180633a417c8c58c"
|
||||
|
||||
@@ -9,4 +9,4 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "abda4bd8ba187aac78052e30b286215b1746783a"
|
||||
SRCREV = "ada2b06b4523ab7c88e4a5e93f7987f1f0677d4e"
|
||||
|
||||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "5b3ad68a3a0a6cc9670dc86c3d906ec72181253b"
|
||||
SRCREV = "4a9653f36d528e30989ea4e00a15a6d06a19001f"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "ecb890f14ea3b81a97aaca05b6af2508bd6f68a4"
|
||||
SRCREV = "ad9f777a6e40ee95a9d220dcfadfcd4e513fbf2e"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtdeclarative-native"
|
||||
|
||||
SRCREV = "0d2fc12b65028b4f04bdace3991448813130ab48"
|
||||
SRCREV = "7be5d463e25218a2987d6c1735fd81bc226b29b6"
|
||||
|
||||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
|
||||
"
|
||||
|
||||
SRCREV = "d88b285166d7963faca84ce8484984a74904f58a"
|
||||
SRCREV = "c8a2a74b2839d9d6c5f8f6f9034470dafc8bcc40"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From c4b36e140b1938c19e06e20c55d0861e67763912 Mon Sep 17 00:00:00 2001
|
||||
From 5f151a2148be90ca8c4470bea7b4358659c9fff1 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Wed, 7 Jun 2017 15:17:12 +0300
|
||||
Subject: [PATCH] Allow a tools-only build
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 11390088fdb719ee6ccb07c5ca98bb8e44cdef23 Mon Sep 17 00:00:00 2001
|
||||
From 75050b24ee94d078a3e987535aef6cbaac561c69 Mon Sep 17 00:00:00 2001
|
||||
From: ibinderwolf <daniel@bluepattern.net>
|
||||
Date: Wed, 26 Jun 2019 09:46:48 +0200
|
||||
Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
|
||||
|
||||
@@ -11,8 +11,8 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.13
|
||||
# 5.13.meta-qt5.1
|
||||
# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
SRC_URI += " \
|
||||
file://0001-Allow-a-tools-only-build.patch \
|
||||
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
|
||||
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "2f00e14a46292afbf036e196aa72dc2f1639bf50"
|
||||
SRCREV = "0cb1384479a2ebcbc72a3941462fb3e67aaa884d"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From c04b2d1f2b465e88d23b12cc70e27b6325f65b03 Mon Sep 17 00:00:00 2001
|
||||
From 0608bd81fd1f2075c2f98fb314af0111c8659afb Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 23 Aug 2018 02:58:14 +0000
|
||||
Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems
|
||||
|
||||
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscript/commits/b5.13
|
||||
# 5.13.meta-qt5.1
|
||||
# Patches from https://github.com/meta-qt5/qtscript/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
SRC_URI += " \
|
||||
file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \
|
||||
"
|
||||
@@ -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 = "286286f9750a6417b00877c84cf73fc61002c139"
|
||||
SRCREV = "77b77e351f0faa3376da330d14236087cc7e6b46"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 5f311180f7f74fdb3be8efc45a99411f98a1140b Mon Sep 17 00:00:00 2001
|
||||
From 9e2ef02c25fedb6faad0d26ba2273297918f6399 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Tue, 10 Jan 2017 15:28:26 +0200
|
||||
Subject: [PATCH] Use external host bin path for cmake file
|
||||
|
||||
@@ -10,10 +10,10 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
|
||||
|
||||
SRCREV = "5e4882514dc9c5da9b8f268580078d57d50cbce9"
|
||||
SRCREV = "acc2d33514d741cde8f67521b4d60e398171f6a8"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13
|
||||
# 5.13.meta-qt5.1
|
||||
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
|
||||
|
||||
do_install_append_class-nativesdk() {
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "615ae0abc1f2b9baf54f196bb5197c25a90304a3"
|
||||
SRCREV = "6beffc03d6a55adc06177a2e5d53811c5ab26bc8"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtserialport"
|
||||
|
||||
SRCREV = "08f5114d3943d2b4974384a3e1419690fb3882ab"
|
||||
SRCREV = "948edd56ece2f2b5fdcd9fc050efd72e27adcc13"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "a7e3c9b9538bb87755f2765d2ab4926b2c854066"
|
||||
SRCREV = "85389370bf5f6c8b560e906c8027713b1858929e"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "90e901077aabaab30b585a3e5d6e6e9c93fa6352"
|
||||
SRCREV = "3e2823a147b2dca492fece187facfe39f4d33bed"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a42f74d9572f785489daf2fa3de5f36269e9bfef Mon Sep 17 00:00:00 2001
|
||||
From 0835a82c0002bfadb1e3007ae75ad1159aef0906 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 4 Jun 2014 11:28:16 +0200
|
||||
Subject: [PATCH] add noqtwebkit configuration
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 17e39873d9655339fa32e3b1b29ef2254c52bc2e Mon Sep 17 00:00:00 2001
|
||||
From 2d76f5a7770076eccd55dec4a3f1f63b931a566c Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Mon, 18 Feb 2019 10:45:03 +0200
|
||||
Subject: [PATCH] linguist-tools cmake: allow overriding the location for
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 623675e07231f62cdc7600dca5897a9fc70e0467 Mon Sep 17 00:00:00 2001
|
||||
From ffbd58e5a6c709592fb97a6d033820556b76ab53 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 14 Dec 2019 18:36:49 -0800
|
||||
Subject: [PATCH] src.pro: Add option noqdoc to disable qdoc builds
|
||||
@@ -23,6 +23,3 @@ index 5c256ea3..196c34c7 100644
|
||||
|
||||
!android|android_app: SUBDIRS += qtpaths
|
||||
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = " \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
|
||||
# Patches from https://github.com/meta-qt5/qttools/commits/b5.13
|
||||
# 5.13.meta-qt5.1
|
||||
# Patches from https://github.com/meta-qt5/qttools/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
SRC_URI += " \
|
||||
file://0001-add-noqtwebkit-configuration.patch \
|
||||
file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
|
||||
@@ -49,6 +49,6 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
|
||||
"
|
||||
|
||||
SRCREV = "1682033b1bdadefeb9b953f7d9d096d884f797e2"
|
||||
SRCREV = "3300714730761ac23f5c9753071a46685eb87d0e"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
|
||||
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
|
||||
"
|
||||
|
||||
SRCREV = "fbdeaab046d623f3238fbf0da9c8bdb0009c01a9"
|
||||
SRCREV = "8b7c8801f2317bef8e21e9080ce242cbb7818a98"
|
||||
|
||||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
|
||||
|
||||
SRCREV = "459ec87b0abdd476d415946ed07c8490c10b97f0"
|
||||
SRCREV = "e73bd4875d5a07d5357bbcb46d581dd32b3821de"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4df2574a86c2ce86c97da0795dec29438b0c0024 Mon Sep 17 00:00:00 2001
|
||||
From e1c8cf94727583c666efe3e6852fa60fba9a652b Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 6 Oct 2019 21:44:38 -0700
|
||||
Subject: [PATCH] tst_seatv4: Include <array>
|
||||
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp
|
||||
index 1d6fb6b9..4c5732da 100644
|
||||
index 2e17bef8..df78ba69 100644
|
||||
--- a/tests/auto/client/seatv4/tst_seatv4.cpp
|
||||
+++ b/tests/auto/client/seatv4/tst_seatv4.cpp
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
|
||||
"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
SRC_URI += "file://0001-tst_seatv4-Include-array.patch"
|
||||
|
||||
PACKAGECONFIG ?= " \
|
||||
@@ -39,7 +41,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "4e015b3383a218b31cae4437cd30076fb031f3ad"
|
||||
SRCREV = "c2f216ef211ae8fbe0073c296742f584f5493e9f"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtwebsockets"
|
||||
|
||||
SRCREV = "e93a22de5465d76d139954c3dd059ed3041ea6b9"
|
||||
SRCREV = "edaf98129a60fda1d017db805b2e5d63902598ea"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From cdadaf40267c81ff730e90798cf486b35bb20758 Mon Sep 17 00:00:00 2001
|
||||
From fe603fbecb5731febc392b51bbbee1090be243d6 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Wed, 15 Mar 2017 13:53:28 +0200
|
||||
Subject: [PATCH] Force host toolchain configuration
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 312f6955af1dc6ea61bbd48bece794c1257822fa Mon Sep 17 00:00:00 2001
|
||||
From 9f996977ebbb894aa321240cb5590bdae27f14a5 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Tue, 12 Dec 2017 16:06:14 +0200
|
||||
Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8c66e08c65963cd2eeabe84e89445dbe557c23ae Mon Sep 17 00:00:00 2001
|
||||
From 7ed387e99975dc25ced3496c7dd98411f11d28e2 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Thu, 14 Dec 2017 11:28:10 +0200
|
||||
Subject: [PATCH] musl: link against libexecinfo
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 71d55292cdd72dcf1ed5eb4ba7299433a35a4bb0 Mon Sep 17 00:00:00 2001
|
||||
From cde19c7f959ff4ea0d2aa202b9c7a048d3c7200e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 12 Nov 2019 19:53:59 -0800
|
||||
Subject: [PATCH] mkspecs: Allow builds with libc != glibc
|
||||
|
||||
@@ -145,7 +145,7 @@ RDEPENDS_${PN}-examples += " \
|
||||
QT_MODULE_BRANCH_CHROMIUM = "77-based"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
# 5.14.meta-qt5.2
|
||||
SRC_URI += " \
|
||||
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
|
||||
file://0001-Force-host-toolchain-configuration.patch \
|
||||
@@ -157,7 +157,7 @@ SRC_URI_append_libc-musl = "\
|
||||
"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/77-based
|
||||
# 77-based.meta-qt5.1
|
||||
# 77-based.meta-qt5.2
|
||||
SRC_URI += " \
|
||||
file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
|
||||
@@ -188,8 +188,8 @@ SRC_URI_append_libc-musl = "\
|
||||
file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
SRCREV_qtwebengine = "d366f1d5d37ce6f1833ac67c7ebda540b16690f2"
|
||||
SRCREV_chromium = "939daf833fff3a9901afb6fd65d02e0f057a494a"
|
||||
SRCREV_qtwebengine = "73d457481caff493066d9cce50087b56ee506f6a"
|
||||
SRCREV_chromium = "a9a20127e8adeb3f3cd7921b0bec32083103cc5c"
|
||||
SRCREV = "${SRCREV_qtwebengine}"
|
||||
|
||||
SRCREV_FORMAT = "qtwebengine_chromium"
|
||||
|
||||
@@ -18,4 +18,4 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "2f47e9505bfc3e8a8adc16e6cc3e381e98cf3c9a"
|
||||
SRCREV = "11324948c1a68233d08726c13571d394b85f4d13"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "9ef6658541c2e816b8119df98c1b66add5b7bcdd"
|
||||
SRCREV = "ba3acb9d9c7b5234071143d7980576e7eceb6102"
|
||||
|
||||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
|
||||
COMPATIBLE_MACHINE_armv7ve = "(.*)"
|
||||
COMPATIBLE_MACHINE_aarch64 = "(.*)"
|
||||
|
||||
SRCREV = "a02484660ded03bc4a4ea98b1f4c5fb21afdaa4a"
|
||||
SRCREV = "94c697c37945dedb37a55c1a9669d868f8c97f41"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "111908d734b49b31b334cd5af45064aa888ec69a"
|
||||
SRCREV = "ea1ce1167fca96a1663ced0d7d6c2da9c20240b9"
|
||||
|
||||
@@ -25,7 +25,6 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "f96db4b6dbcdf9734b8f09dad479daaa923a4065"
|
||||
SRCREV = "0fa22b3674db3d48bbd0b091b7710158ae152daa"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user