From 90d4a41621886ae5e738ec8a0b693e88b25d8267 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 11:10:34 -0700 Subject: qtbase: Add OE clang specific mkspecs We can not piggy back clang anymore on existing OE mkspecs since starting 5.9 the configure is asking compiler for include paths and it needs to know if platform is clang-linux or g++-linux Fixes: ERROR: failed to parse default search paths from compiler output Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 6 +- ...-Add-OE-specific-specs-for-clang-compiler.patch | 72 ++++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 6 +- 3 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 54a0b785..72b977d3 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -38,10 +38,14 @@ SRC_URI += "\ # 5.9.meta-qt5-native.2 SRC_URI += " \ file://0009-Always-build-uic.patch \ + file://0010-Add-OE-specific-specs-for-clang-compiler.patch \ " CLEANBROKEN = "1" +XPLATFORM_toolchain-clang = "linux-oe-clang" +XPLATFORM ?= "linux-oe-g++" + PACKAGECONFIG_CONFARGS = " \ -sysroot ${STAGING_DIR_NATIVE} \ -no-gcc-sysroot \ @@ -79,7 +83,7 @@ PACKAGECONFIG_CONFARGS = " \ -nomake examples \ -nomake tests \ -no-rpath \ - -platform linux-oe-g++ \ + -platform ${XPLATFORM} \ " # for qtbase configuration we need default settings diff --git a/recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch new file mode 100644 index 00000000..b019f67c --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch @@ -0,0 +1,72 @@ +From 3a46fb7b47d19c5261e1590f8d70fe41443def64 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 3 Sep 2017 09:11:44 -0700 +Subject: [PATCH] Add OE specific specs for clang compiler + +Signed-off-by: Khem Raj +--- + mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++++++++++ + mkspecs/linux-oe-clang/qplatformdefs.h | 1 + + 2 files changed, 44 insertions(+) + create mode 100644 mkspecs/linux-oe-clang/qmake.conf + create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h + +diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf +new file mode 100644 +index 0000000000..ffc9f051db +--- /dev/null ++++ b/mkspecs/linux-oe-clang/qmake.conf +@@ -0,0 +1,43 @@ ++# ++# qmake configuration for linux-g++ with modifications for building with OpenEmbedded ++# ++ ++MAKEFILE_GENERATOR = UNIX ++CONFIG += incremental ++QMAKE_INCREMENTAL_STYLE = sublib ++ ++include(../common/linux.conf) ++ ++# QMAKE_ (moc, uic, rcc) are gone, overwrite only ar and strip ++QMAKE_AR = $$(OE_QMAKE_AR) cqs ++QMAKE_STRIP = $$(OE_QMAKE_STRIP) ++QMAKE_WAYLAND_SCANNER = $$(OE_QMAKE_WAYLAND_SCANNER) ++ ++include(../common/gcc-base-unix.conf) ++ ++# *FLAGS from gcc-base.conf ++QMAKE_CFLAGS += $$(OE_QMAKE_CFLAGS) ++QMAKE_CXXFLAGS += $$(OE_QMAKE_CXXFLAGS) ++QMAKE_LFLAGS += $$(OE_QMAKE_LDFLAGS) ++ ++include(../common/clang.conf) ++ ++# tc settings from g++-base.conf ++QMAKE_COMPILER = $$(OE_QMAKE_COMPILER) clang ++QMAKE_CC = $$(OE_QMAKE_CC) ++QMAKE_CXX = $$(OE_QMAKE_CXX) ++ ++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(OE_QMAKE_CFLAGS) ++ ++QMAKE_LINK = $$(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK) ++QMAKE_LINK_C = $$(OE_QMAKE_LINK) ++QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) ++ ++# for the SDK ++isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) ++ ++include(../oe-device-extra.pri) ++ ++load(device_config) ++load(qt_config) +diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h +new file mode 100644 +index 0000000000..880c927b21 +--- /dev/null ++++ b/mkspecs/linux-oe-clang/qplatformdefs.h +@@ -0,0 +1 @@ ++#include "../linux-clang/qplatformdefs.h" +-- +2.14.1 + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index aaa59f33..25d99e83 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -26,6 +26,7 @@ SRC_URI += "\ file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0007-Delete-qlonglong-and-qulonglong.patch \ file://0008-Replace-pthread_yield-with-sched_yield.patch \ + file://0010-Add-OE-specific-specs-for-clang-compiler.patch \ file://run-ptest \ " @@ -160,6 +161,9 @@ QT_CONFIG_FLAGS += " \ # since we cannot set empty set filename to a not existent file deltask generate_qt_config_file +XPLATFORM_toolchain-clang = "linux-oe-clang" +XPLATFORM ?= "linux-oe-g++" + do_configure() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration touch ${S}/mkspecs/oe-device-extra.pri @@ -188,7 +192,7 @@ do_configure() { -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ -platform ${OE_QMAKE_PLATFORM_NATIVE} \ - -xplatform linux-oe-g++ \ + -xplatform ${XPLATFORM} \ ${QT_CONFIG_FLAGS} } -- cgit v1.2.3 From ec80b092470a8bc775c2d9dd6fa19827019190c1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 11:10:35 -0700 Subject: qtbase: Fix build with musl/clang Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 2 ++ ...-Invert-conditional-for-defining-QT_SOCKL.patch | 35 ++++++++++++++++++++++ ..._qlocale-Enable-QT_USE_FENV-only-on-glibc.patch | 28 +++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 2 ++ 4 files changed, 67 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch create mode 100644 recipes-qt/qt5/qtbase/0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 72b977d3..5137deef 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -39,6 +39,8 @@ SRC_URI += "\ SRC_URI += " \ file://0009-Always-build-uic.patch \ file://0010-Add-OE-specific-specs-for-clang-compiler.patch \ + file://0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ + file://0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch new file mode 100644 index 00000000..0c7fb874 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch @@ -0,0 +1,35 @@ +From 8394ad48f454aa292e4da57b3b75a3701dadcf96 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 3 Sep 2017 09:44:48 -0700 +Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T + +This helps to make sure that QT_SOCKLEN_T is defined to be 'int' +only when its glibc < 2 and not for other libcswhich may define +it as per standards but are not glibc, e.g. musl + +Signed-off-by: Khem Raj +--- + mkspecs/linux-clang/qplatformdefs.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h +index d29225f12f..a0cdb57343 100644 +--- a/mkspecs/linux-clang/qplatformdefs.h ++++ b/mkspecs/linux-clang/qplatformdefs.h +@@ -84,10 +84,10 @@ + + #undef QT_SOCKLEN_T + +-#if defined(__GLIBC__) && (__GLIBC__ >= 2) +-#define QT_SOCKLEN_T socklen_t +-#else ++#if defined(__GLIBC__) && (__GLIBC__ < 2) + #define QT_SOCKLEN_T int ++#else ++#define QT_SOCKLEN_T socklen_t + #endif + + #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +-- +2.14.1 + diff --git a/recipes-qt/qt5/qtbase/0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch new file mode 100644 index 00000000..a1776258 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -0,0 +1,28 @@ +From 30076434a9f651614db8c3e5db32d4acae54c600 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 3 Sep 2017 10:11:50 -0700 +Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc + +musl does not have feenableexcept function + +Signed-off-by: Khem Raj +--- + tests/auto/corelib/tools/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 10d78b1f2f..a59f358f80 100644 +--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp ++++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +@@ -46,7 +46,7 @@ + #include + #include + +-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + # define QT_USE_FENV + #endif + +-- +2.14.1 + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 25d99e83..dce2d778 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -27,6 +27,8 @@ SRC_URI += "\ file://0007-Delete-qlonglong-and-qulonglong.patch \ file://0008-Replace-pthread_yield-with-sched_yield.patch \ file://0010-Add-OE-specific-specs-for-clang-compiler.patch \ + file://0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ + file://0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://run-ptest \ " -- cgit v1.2.3 From be3c2d3e8c06528c20fa4511a75d649488a8c802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 5 Sep 2017 09:29:19 +0200 Subject: qtbase-native: set path to mkspec for cmake properly again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since update to 5.9.2 native recipes in meta-qt5-extra fail due to strange path to mkspecs. This patch fixes this the hard way. Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 5137deef..7e916dfd 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -118,6 +118,10 @@ do_install() { 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 = "73573fce295caef35da706a8c8c796ec18e6baf1" -- cgit v1.2.3 From 743b3b93e17f5382fd1f9f4e0d2932501c8a3c78 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Fri, 8 Sep 2017 14:48:02 +0100 Subject: qtbase-native: Force use of built-in pcre If we specify neither -system-pcre nor -qt-pcre then qtbase will first see if it can find the pcre library in the system and fall back to compiling its own if that's not possible. Unfortunately, this means that if qtbase-native happens to be built on a machine with system pcre available then the resulting binaries such as bin/qt5/uic in sstate files won't work correctly on machines that don't have pcre available. Even ignoring that, it doesn't help for packages to build differently depending on how the build system is configured. We could depend on pcre-native and pass -system-pcre, but this doesn't work by default because qtbase actually requires pcre16 which is an optional (via PACKAGECONFIG) feature of pcre so the default there would need to be changed too. So, let's make qtbase-native match the default of qtbase by passing -qt-pcre in order to ensure that qtbase-native is always built with its own pcre implementation. Signed-off-by: Mike Crowe Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 7e916dfd..3a0699c4 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -52,6 +52,7 @@ PACKAGECONFIG_CONFARGS = " \ -sysroot ${STAGING_DIR_NATIVE} \ -no-gcc-sysroot \ -system-zlib \ + -qt-pcre \ -no-libjpeg \ -no-libpng \ -no-gif \ -- cgit v1.2.3 From d4b0f7e7d2895ce6dd260a9f6cb62b0da4d1590a Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Mon, 18 Sep 2017 13:54:41 +0800 Subject: qtdeclarative: Add HOMEPAGE info into recipe file. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 12e5f4eb..2cc969a6 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -2,6 +2,7 @@ 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 )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ -- cgit v1.2.3 From 2d9d82ad6a4d8d75c46ed2acfeb9615f5d9045ce Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Mon, 18 Sep 2017 13:54:42 +0800 Subject: qtquick1: Add HOMEPAGE info into recipe file. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtquick1_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index eaa36611..c1bbc8aa 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -2,6 +2,7 @@ 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 )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ -- cgit v1.2.3 From be83a60d6b6966c80b01402c15b7d5e98b51da48 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Mon, 18 Sep 2017 13:54:43 +0800 Subject: qtscript: Add HOMEPAGE info into recipe file. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtscript_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 9061c3c7..9fe23589 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,6 +1,7 @@ require qt5.inc require qt5-git.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 )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ -- cgit v1.2.3 From ba258899bb75196ad87be3545d6cc65e0e6b6d63 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Mon, 18 Sep 2017 13:54:44 +0800 Subject: qtsvg: Add HOMEPAGE info into recipe file. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtsvg_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 40854e0b..e3bd8407 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -1,6 +1,7 @@ require qt5.inc require qt5-git.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 )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ -- cgit v1.2.3 From 681891067c87379907a001cb9232fed165a5d878 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Mon, 18 Sep 2017 13:54:45 +0800 Subject: qttools: Add HOMEPAGE info into recipe file. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qttools_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 32d65d6a..151b4dfb 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -1,6 +1,7 @@ require qt5.inc require qt5-git.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 )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ -- cgit v1.2.3 From f00f79b6846e24b22f1071a8c002943b9d58b79b Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Mon, 18 Sep 2017 13:54:46 +0800 Subject: qtxmlpatterns: Add HOMEPAGE info into recipe file. Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtxmlpatterns_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 7c18079a..f4f46f11 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -2,6 +2,7 @@ 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 )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ -- cgit v1.2.3 From 2c3ef00f53683fbdce5b390950b49b67da85d3a1 Mon Sep 17 00:00:00 2001 From: Kwangsub Kim Date: Thu, 21 Sep 2017 13:14:07 +0900 Subject: qt5: add missing commercial license Signed-off-by: Kwangsub Kim Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index c354db4b..0cb75a63 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-2.0" +LICENSE = "LGPL-3.0 | GPL-2.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 25cd72ba..f46cbc2c 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-3.0" +LICENSE = "LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d3447efc..26881f0e 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 471cfee5..3737e107 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 19f895e9..0aebbd34 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e123f0d2..4b2924b0 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" +LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \ diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index d3a83a72..0b30043c 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+)" +LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 056e2377..23f03cea 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -3,7 +3,7 @@ require qt5-git.inc # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what # other qt* components use :/ -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ -- cgit v1.2.3 From bbb304456978fa9713932e9ff529d18a5ef2a947 Mon Sep 17 00:00:00 2001 From: Herman van Hazendonk Date: Thu, 12 Oct 2017 14:13:05 +0200 Subject: meta-qt5: Update to 5.9.2 release Signed-off-by: Herman van Hazendonk --- recipes-qt/examples/qt5everywheredemo_1.0.bb | 8 +++--- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb | 4 +-- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 6 ++++- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtenginio_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- .../0001-Make-mapbox-gl-build-configurable.patch | 27 ------------------- recipes-qt/qt5/qtlocation_git.bb | 8 ++---- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- ...qtbug-61521.cpp-use-free-instead-of-cfree.patch | 25 ----------------- recipes-qt/qt5/qtwebengine_git.bb | 5 ++-- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- recipes-qt/qtchooser/qtchooser_git.bb | 6 ++--- ...kspecs-and-CMake-module-install-directori.patch | 29 +++++++------------- recipes-qt/tufao/tufao_1.2.1.bb | 31 ---------------------- recipes-qt/tufao/tufao_1.3.10.bb | 31 ++++++++++++++++++++++ 41 files changed, 88 insertions(+), 152 deletions(-) delete mode 100644 recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch delete mode 100644 recipes-qt/tufao/tufao_1.2.1.bb create mode 100644 recipes-qt/tufao/tufao_1.3.10.bb (limited to 'recipes-qt') diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb index 7735d902..ee947991 100644 --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb @@ -1,12 +1,12 @@ SUMMARY = "Qt5 everywhere demo" DESCRIPTION = "Quick tour of Qt 5.0, primarily focusing on its graphical capabilities." +LICENSE = "BSD" HOMEPAGE = "https://qt.gitorious.org/qt-labs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://main.cpp;md5=1187cb795a0f96bce64e63dd1a67dc2b" +LIC_FILES_CHKSUM = "file://qml/QtDemo/main.qml;endline=39;md5=7d80863906a4bc8ffca77fd869e335a9" -DEPENDS = "qtdeclarative qtgraphicaleffects" +DEPENDS = "qtdeclarative qtgraphicaleffects qtsvg qtmultimedia" -SRCREV = "c17fe9e0ec0882ac4c4dc1168095f569acab5d09" +SRCREV = "35d72a2eba7456a2efc5eb8b77afbc00f69ba0ac" SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo" S = "${WORKDIR}/git/QtDemo" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 0cb75a63..6f8ab717 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -37,6 +37,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "9d8c9ada161ad97634992c444196add0abb4f9d1" +SRCREV = "143b721249af92fc27f48fb01914195516f7a087" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb index 2676bdd7..383145be 100644 --- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://evdevmousehandler.cpp;beginline=1;endline=40;md5=9081062f6e7f74b6e62ad7ecee4a71be \ " -PV = "1.1.3+gitr${SRCPV}" +PV = "1.1.4+gitr${SRCPV}" DEPENDS = "qtbase" @@ -17,7 +17,7 @@ DEPENDS = "qtbase" CXXFLAGS += "-Wno-narrowing" SRC_URI = "git://github.com/nemomobile/qt5-plugin-generic-vboxtouch.git" -SRCREV = "d613ad1cc64d7a6a9b38df4d49146170be6876aa" +SRCREV = "3f2bdb5a1d346f02d5ab185522271ba2288a42bb" S = "${WORKDIR}/git/vboxtouch" inherit qmake5 diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3a0699c4..b0f59701 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -125,4 +125,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 = "73573fce295caef35da706a8c8c796ec18e6baf1" +SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index dce2d778..3ac6b214 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -228,4 +228,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" +SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index f46cbc2c..17479e2f 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "25447e889dc43c0831100bee1625a6f667d364cf" +SRCREV = "a1aee8ecbefb74cd5eae380ced56bb43ff3cc40b" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 26881f0e..d4944816 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,4 +8,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "1f47b1a7ae58702dccc57a9ccbaa905441f4fecb" +SRCREV = "e3af14e9169207e0e73f7e50191106895c29ddc4" + +# The same issue as in qtbase: +# http://errors.yoctoproject.org/Errors/Details/152641/ +LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" \ No newline at end of file diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 9e91a1d4..ca9866f1 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}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4" +SRCREV = "6b3bdb84406b42b50bdf5a39ee9ca2fabd3e6d2f" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 3737e107..7c8eda76 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f" +SRCREV = "8329a8fb287094012989b965604ff9c9426f022a" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 2cc969a6..4ae870a1 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "7c45b035b97ce705d536932965673dca7cfa489e" +SRCREV = "32218c3243fb4f0da83293c5bd6a663d8e3660ee" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 1fa8e826..30d5eeae 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" QT_MODULE_BRANCH = "dev" -SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" +SRCREV = "23603a3b088178d8ec92fddb240e5a5c55d77d5a" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index a771d9da..7e6cb1b2 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" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1fc40deed6993265c436783cc367285bf9a2266a" +SRCREV = "167566d228792c0f763b84a39ff5dc52fda046dd" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 6c6f3aef..8f70bc0b 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -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 = "b6ff12df5496f3d296bb438ae343d5f771e93fec" +SRCREV = "1f6658cbaa5ffecbf9ba845ea81683dd2215cd34" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 1e022f4a..52dd34a8 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" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "144a3535db9f95e60972d3c3b6eaceb65a604577" +SRCREV = "dc6dc3b088d1828ee6d31f92528e0c87272ad4ed" diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch deleted file mode 100644 index 7db1676d..00000000 --- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dbc899b088817cf6529d7e5cb8be7a6a95556127 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 7 Jun 2017 13:29:29 +0300 -Subject: [PATCH] Make mapbox-gl build configurable - -mapbox-gl-native won't compile for ARMv5 or older, so disable the -build by default. - -Task-number: QTBUG-61289 -Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b ---- - src/plugins/geoservices/geoservices.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro -index 459897a8..d97e05d0 100644 ---- a/src/plugins/geoservices/geoservices.pro -+++ b/src/plugins/geoservices/geoservices.pro -@@ -6,7 +6,7 @@ qtConfig(concurrent) { - SUBDIRS += osm - } - --qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { -+mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { - !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { - warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") - } else { diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 0aebbd34..baa25d8a 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -13,10 +13,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" -# Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9 -# 5.9.meta-qt5.2 -SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch" - PACKAGECONFIG ??= "" # older geoclue 0.12.99 is needed PACKAGECONFIG[geoclue] = ",,geoclue" @@ -34,7 +30,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "c832af789766fcebd8cfb15e53ce14f36278ca6d" -SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" +SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718" +SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 729b3ffd..f42bdc27 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -35,4 +35,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 = "343e281f0e7cc7fd9e1558e4d92f5019fa565181" +SRCREV = "1e2702e86dbd2b3de69c58438bcfcf6276124547" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 0655b425..e5ca4dfd 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "3d93f6436596e349e43c3798b675af66db71df8a" +SRCREV = "47b80ecae6fe0b9a2c74f0b0feb243145695995e" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 4b2924b0..64cfbdf7 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "63f2f55462f2f040cfe175ada8aa1e01168597fc" +SRCREV = "871d8e8e2faca0be870930d83f755a2ad484d30b" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 50d6ba6c..aa0e6e3f 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -28,4 +28,4 @@ SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "a77494140324c3ede1f7c16086593c070d81e2b3" +SRCREV = "8476f8fff7dc5b6f140074d280828cc0f9590088" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 9fe23589..b4f5a714 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -30,4 +30,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 = "86ee61734e0331459f9cfeb1ad56f773b7e994be" +SRCREV = "08b74f4f30c304b80249a593a572808bc1892f66" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 36ca665d..fc60d601 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f" +SRCREV = "3caae998c8c1770cd96cadba24d89a60005c5fe7" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 # 5.9.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 6b2c28e3..014b68f7 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "1673dbed00ba68209b6de95981f1e3b4a2a24682" +SRCREV = "c273f2e5c82a3ef8e55e360988b8cf31362e2ba9" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 0b30043c..8df89137 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "1d37c357c843a2622d2af7e1684576e19a8c7c30" +SRCREV = "ce5a3ced5eeefe05675736d3279d4d45bbb6df90" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 23f03cea..0425e434 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8" +SRCREV = "cb9ade8beabd3cdcd469a45fa82a27fcc960532f" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index e3bd8407..f9e04c85 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "0fcd0160662941a9ba800b36671e88d82790bd95" +SRCREV = "bdcd7a97449502f92069d36196cc81064b1c02a0" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 911a7098..0c6ce7e0 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -30,4 +30,4 @@ do_install_append() { QT_MODULE_BRANCH = "dev" -SRCREV = "f364358a817ba57fa5aa9c67e731241249e704f8" +SRCREV = "9c204e05ae7fefe9525b30238b469b1bb65d2537" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 151b4dfb..69305196 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -31,7 +31,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "fdc5749b5603653c5d0c59db267f44fd1609457e" +SRCREV = "90a701032ec5c8898e33b4fb4df0480634caaf8d" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 122d0681..5b544555 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" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58" +SRCREV = "87218c4e68c4ebde8f5765f0dfe9a70a359ae05f" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 9847f393..979969ba 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 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "7f70da6a644bc5b690066f0ab4814e1358f57e81" +SRCREV = "d483ed2927cb8d4685d5d3c7ea1c71246381910b" # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 # 5.9.meta-qt5.2 diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 7e12a337..1e0796ab 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "b5229df6a08a902b11a2fc9529af6385f4d985d5" +SRCREV = "61a638663c9061d7211849d3a9316661733a5ad9" diff --git a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch deleted file mode 100644 index d8d89b8e..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 331de4be615b8552e498ac2f3deff4b49b4b0fc0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 20 Aug 2017 20:37:38 +0200 -Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree - -* as cfree man says: - This function should never be used. Use free(3) instead. - Starting with version 2.26, it has been removed from glibc. ---- - src/core/api/qtbug-61521.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp -index 86d5998e..1dcc4cfa 100644 ---- a/src/core/api/qtbug-61521.cpp -+++ b/src/core/api/qtbug-61521.cpp -@@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) { - } - - SHIM_HIDDEN void ShimCFree(void* ptr) { -- cfree(ptr); -+ free(ptr); - } - - SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 7a9c6148..4ced7925 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -137,7 +137,6 @@ SRC_URI += " \ file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ file://0003-Include-dependency-to-QCoreApplication-translate.patch \ file://0004-Force-host-toolchain-configuration.patch \ - file://0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based @@ -164,8 +163,8 @@ SRC_URI_append_libc-musl = "\ file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "99f84ffd2c0c78014a24534a863aa1c755abd51c" -SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9" +SRCREV_qtwebengine = "c11c2c8981e647c1eb2c6753ce77d436b92fff87" +SRCREV_chromium = "cfe8c60903b327ac94406661350f4ac05aa8c21b" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 448ce5c4..eb3ab51b 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "fb71c823a7ae823345518ca33ccfe273fcf76494" +SRCREV = "492981b93295f575ad77b6767dc5b8851287aa2e" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 0bbb09ea..79089aec 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d" +SRCREV = "ec640efd1d82cdc88157159cbaa048815696ee25" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index ed1440c1..d15fc2d9 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8" +SRCREV = "160435b0eb076c31a021004eeede143fc265bce4" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index f4f46f11..8b706ddb 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe" +SRCREV = "8d7e1e0ec06724a4d332c050e9260530c708e773" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qtchooser/qtchooser_git.bb b/recipes-qt/qtchooser/qtchooser_git.bb index f7656450..e745e8ad 100644 --- a/recipes-qt/qtchooser/qtchooser_git.bb +++ b/recipes-qt/qtchooser/qtchooser_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Wrapper to select between Qt development binary versions" HOMEPAGE = "http://macieira.org/qtchooser" LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0" -SRC_URI = "git://code.qt.io/qt/qtchooser.git;branch=master \ +SRC_URI = "git://code.qt.io/cgit/qtsdk/qtchooser.git;branch=master \ file://0001-Makefile-install-the-man-dir.patch" LIC_FILES_CHKSUM = " \ @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ " S = "${WORKDIR}/git" -SRCREV = "4717841185d34bbe450e3b24445f2d35e3325a6a" -PV = "39+git${SRCREV}" +SRCREV = "a1b6736e4f2daf86cd1626004d40ef57db85fbb5" +#PV = "39+git${SRCREV}" inherit pkgconfig diff --git a/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch b/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch index a6da1ae4..d405c168 100644 --- a/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch +++ b/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch @@ -1,42 +1,31 @@ -From 878c5a2a47d620f36dd281d4b0eb6677a8a1fbd4 Mon Sep 17 00:00:00 2001 +From d8c16e032a6b639b410761a07f2158e0aeda0b08 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 7 Jun 2014 18:13:14 -0300 Subject: [PATCH] build: Fix mkspecs and CMake module install directories + Organization: O.S. Systems Software LTDA. Upstream-Status: Inapropriate [configuration] Signed-off-by: Otavio Salvador +Signed-off-by: Herman van Hazendonk --- - CMakeLists.txt | 2 +- - pkg/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d78fedf..1f4db6b 100644 +index 0695a76..f2266c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -27,7 +27,7 @@ endfunction(QUERY_QMAKE) +@@ -34,7 +34,7 @@ endfunction(QUERY_QMAKE) query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR) query_qmake(QT_HOST_DATA QT_DATA_DIR) -set(QT_MKSPECS_DIR ${QT_DATA_DIR}/mkspecs) +set(QT_MKSPECS_DIR ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs) - # Configure options - option(GENERATE_DOC -diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt -index 25891a5..a87fedd 100644 ---- a/pkg/CMakeLists.txt -+++ b/pkg/CMakeLists.txt -@@ -19,6 +19,6 @@ if(PKG_CONFIG_FOUND) - ) - endif(PKG_CONFIG_FOUND) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FindTufao${TUFAO_VERSION_MAJOR}.cmake" -- DESTINATION "${CMAKE_ROOT}/Modules" -+ DESTINATION "${libdir}/cmake" - COMPONENT development - ) + # Debug version of library should have 'd' postfix on Windows + # and '_debug' on Mac OS X -- 2.0.0.rc4 diff --git a/recipes-qt/tufao/tufao_1.2.1.bb b/recipes-qt/tufao/tufao_1.2.1.bb deleted file mode 100644 index 34b28b78..00000000 --- a/recipes-qt/tufao/tufao_1.2.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "An asynchronous web framework for C++ built on top of Qt" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "qtbase" - -SRCREV = "a4832b4c941b5ff3f5fab23adcff39e6ad6cb4e5" -SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http \ - file://build-Fix-mkspecs-and-CMake-module-install-directori.patch" - -# This includes bugfixes from 1.x branch -PV_append = "+${SRCPV}" - -S = "${WORKDIR}/git" - -inherit cmake_qt5 - -PACKAGES += "${PN}-mkspecs" - -FILES_${PN}-mkspecs = "\ - ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ -" - -FILES_${PN}-dev += " \ - ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ - ${OE_QMAKE_PATH_LIBS}/pkgconfig \ - ${OE_QMAKE_PATH_LIBS}/cmake/* \ - ${OE_QMAKE_PATH_LIBS}/*.prl \ - ${OE_QMAKE_PATH_LIBS}/*.la \ - ${OE_QMAKE_PATH_DATA}/* \ - ${OE_QMAKE_PATH_HEADERS}/* \ -" diff --git a/recipes-qt/tufao/tufao_1.3.10.bb b/recipes-qt/tufao/tufao_1.3.10.bb new file mode 100644 index 00000000..d4b62e2b --- /dev/null +++ b/recipes-qt/tufao/tufao_1.3.10.bb @@ -0,0 +1,31 @@ +SUMMARY = "An asynchronous web framework for C++ built on top of Qt" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" +DEPENDS = "qtbase" + +SRCREV = "ad505c32d0ba14c3c616de8ba4c7eb79396c20a6" +SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http;branch=1.x \ + file://build-Fix-mkspecs-and-CMake-module-install-directori.patch" + +# This includes bugfixes from 1.x branch +PV_append = "+${SRCPV}" + +S = "${WORKDIR}/git" + +inherit cmake_qt5 + +PACKAGES += "${PN}-mkspecs" + +FILES_${PN}-mkspecs = "\ + ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ +" + +FILES_${PN}-dev += " \ + ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ + ${OE_QMAKE_PATH_LIBS}/pkgconfig \ + ${OE_QMAKE_PATH_LIBS}/cmake/* \ + ${OE_QMAKE_PATH_LIBS}/*.prl \ + ${OE_QMAKE_PATH_LIBS}/*.la \ + ${OE_QMAKE_PATH_DATA}/* \ + ${OE_QMAKE_PATH_HEADERS}/* \ +" -- cgit v1.2.3 From d87335a50a9dd35d890786edbd79b8953fdaa11a Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 18 Oct 2017 14:42:44 -0400 Subject: qt5-ptest.inc: fix qtxmlpatterns:do_install_ptest out-of-order call ptest.bbclass provides a set of standard do_*_ptest_base tasks. Each of them calls a corresponding regular do_*_ptest task, that components are supposed to override for own implementation. When PTEST_ENABLED is not set, an anonymous python function removes all do_*_ptest_base tasks from the queue. qt5-ptest.inc adds a special case for do_populate_sysroot and re-arranges the order or ptest tasks due to that. But, unfortunately, do_install_ptest was added directly, not do_install_ptest_base, hence when "ptest" is disabled and all other do_*_ptest_base tasks are removed, this one do_install_ptest task is left w/o dependencies and gets scheduled for execution very early on, even before pseudo-native gets built and stages "fakeroot" functionality. The fix is to add do_install_ptest_base task, which calls do_install_ptest only when "ptest" is enabled. Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-ptest.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc index 4844878a..97bce88e 100644 --- a/recipes-qt/qt5/qt5-ptest.inc +++ b/recipes-qt/qt5/qt5-ptest.inc @@ -4,8 +4,9 @@ inherit ptest addtask do_populate_sysroot after do_install before do_compile_ptest_base deltask do_compile_ptest_base -addtask do_compile_ptest_base after do_populate_sysroot before do_install_ptest -addtask do_install_ptest after do_compile_ptest_base before do_package +addtask do_compile_ptest_base after do_populate_sysroot before do_install_ptest_base +deltask do_install_ptest_base +addtask do_install_ptest_base after do_compile_ptest_base before do_package do_compile_ptest() { cd ${S}/tests -- cgit v1.2.3