From 61c02506f6f6689e81b3ff709ea2fa28a18bc964 Mon Sep 17 00:00:00 2001 From: Schrempf Frieder Date: Thu, 16 Feb 2017 16:05:58 +0100 Subject: qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec setting for SDK The patch 0008-configure-paths-for-target-qmake-properly.patch seems to be intended for the target, not for native/nativesdk, as it breaks the mkspec setting (sets linux-g++ instead of linux-oe-g++) by default. This issue is also described here: https://github.com/graugans/meta-udoo/issues/20#issuecomment-261241783 Signed-off-by: Frieder Schrempf Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 - recipes-qt/qt5/qtbase-native_git.bb | 1 - recipes-qt/qt5/qtbase_git.bb | 6 +++++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 7a4c1139..94ad6b9a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -31,7 +31,6 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0008-configure-paths-for-target-qmake-properly.patch \ file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ " diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 9cd3dfcc..fbaa5ee1 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -26,7 +26,6 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0008-configure-paths-for-target-qmake-properly.patch \ file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ " diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index ecdc7634..4e1ab72c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -21,11 +21,15 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0008-configure-paths-for-target-qmake-properly.patch \ file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ " +# only for target qtbase +SRC_URI += "\ + file://0008-configure-paths-for-target-qmake-properly.patch \ +" + DEPENDS += "qtbase-native" # LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp -- cgit v1.2.3-54-g00ecf From 595e9cf446f320647709f41cfa15a8758932b51d Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Thu, 23 Feb 2017 19:41:44 +0100 Subject: qtbase: remove absolute binary paths from mkspec files When running 'bitbake -c populate_sdk' on an image that has qt5webkit enabled, the uikit feature is enabled in qtbase, which then fails to install with error: qtbase-mkspecs-5.8.0+git0+49dc9aa409-r0 conflicts with /usr/bin/perl The culprit for this is /usr/lib/qt5/mkspecs/features/uikit/devices.pl, which has #!/usr/bin/perl hardcoded. Fix this in a similar way other recipes do it as well and strip out these bits at install time. Signed-off-by: Daniel Mack Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4e1ab72c..803c3f64 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -178,6 +178,10 @@ do_install_append() { sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \ -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri + + # Fix up absolute paths in scripts + grep -lr /usr/bin/perl ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \ + xargs -r sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' } # mkspecs have mac specific scripts that depend on perl and bash -- cgit v1.2.3-54-g00ecf From 9927aacfc3b341eb36764fbe7d5a929d4f05f327 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 1 Mar 2017 08:46:53 +0100 Subject: qtbase: PACKAGECONFIG[gtk] change gtk+ -> gtk+3 in dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit | WARNING: QA Issue: qtbase-plugins rdepends on gtk+3, but it isn't a build dependency, missing gtk+3 in DEPENDS or PACKAGECONFIG? [build-deps] Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 803c3f64..27d0de1a 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -112,7 +112,7 @@ PACKAGECONFIG[evdev] = "-evdev,-no-evdev" PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" # depends on glib PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig" -PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+" +PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+3" PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" -- cgit v1.2.3-54-g00ecf From 4f44a5799a96a6a1100bf9b19140315dc0905811 Mon Sep 17 00:00:00 2001 From: Yann PERON Date: Mon, 6 Mar 2017 12:36:42 +0100 Subject: packagegroup-qt5-toolchain-target: Add QtSerialBus to meta-toolchain-qt5. Dynamic library Qt5SerialBus.so was not created in toolchain file system when I built bitbake meta-toolchain-qt5 Signed-off-by: Yann PERON Signed-off-by: Martin Jansa --- recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 1521dbfa..2735135a 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -83,6 +83,8 @@ RDEPENDS_${PN} += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \ qtserialport-dev \ qtserialport-mkspecs \ + qtserialbus-dev \ + qtserialbus-mkspecs \ qtsvg-dev \ qtsvg-mkspecs \ qtsvg-plugins \ -- cgit v1.2.3-54-g00ecf From abc89e9d7f4c3239c38473d7df50516c6af01a59 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 7 Mar 2017 14:51:48 +0100 Subject: qtbase-native; do not build qdbuscpp2xml and qdbusxml2cpp bootstrapped MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes build of kde's baloo. That project converts a header file using QDBusMessage to xml which won't work. More details can be found at [1]. Problems with qdbus-helpers came up with update Qt5.7->Qt.5.8 where we use bootstrapped qtbase-native for the first time due to qtbase's new configuration and for reduced build time. [1] http://lists.qt-project.org/pipermail/development/2017-February/028756.html Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 1 + ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index fbaa5ee1..c013029d 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -33,6 +33,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ file://0011-Always-build-uic.patch \ + file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch new file mode 100644 index 00000000..e72601ca --- /dev/null +++ b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch @@ -0,0 +1,79 @@ +From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 6 Mar 2017 11:50:38 +0100 +Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped + dependenciies +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/src.pro | 9 ++------- + src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +-- + src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +---- + 3 files changed, 4 insertions(+), 13 deletions(-) + +diff --git a/src/src.pro b/src/src.pro +index 90d7e2b..0aaf604 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private + include($$OUT_PWD/corelib/qtcore-config.pri) + include($$OUT_PWD/gui/qtgui-config.pri) + +-force_bootstrap|!qtConfig(commandlineparser): \ +- CONFIG += force_dbus_bootstrap +- + src_qtzlib.file = $$PWD/corelib/qtzlib.pro + src_qtzlib.target = sub-zlib + +@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap + + src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp + src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp +-force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus +-else: src_tools_qdbusxml2cpp.depends = src_dbus ++src_tools_qdbusxml2cpp.depends = src_dbus + + src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml + src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml +-force_bootstrap: src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus +-else: src_tools_qdbuscpp2xml.depends = src_dbus ++src_tools_qdbuscpp2xml.depends = src_dbus + + src_winmain.subdir = $$PWD/winmain + src_winmain.target = sub-winmain +diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +index 5ac3159..74c507c 100644 +--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro ++++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +@@ -1,7 +1,6 @@ + option(host_build) + QT = core-private +-force_bootstrap: QT += bootstrap_dbus-private +-else: QT += dbus-private ++QT += dbus-private + DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH + QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS + +diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +index d9ee5de..e891103 100644 +--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro ++++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +@@ -1,9 +1,6 @@ + option(host_build) +-!force_bootstrap:!qtConfig(commandlineparser): \ +- CONFIG += force_bootstrap + QT = core-private +-force_bootstrap: QT += bootstrap_dbus-private +-else: QT += dbus-private ++QT += dbus-private + DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH + QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS + +-- +2.9.3 + -- cgit v1.2.3-54-g00ecf From 77a7558a6614bc1a1876723b34bff147aed7917f Mon Sep 17 00:00:00 2001 From: Gordan Markuš Date: Wed, 15 Mar 2017 09:43:49 +0100 Subject: qtwebengine: add commercial license MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gordan Markuš Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 8e60d724..a4ee0555 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -1,7 +1,7 @@ SUMMARY = "QtWebEngine combines the power of Chromium and Qt" # Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ -LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0" +LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \ file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ -- cgit v1.2.3-54-g00ecf From b72a117386c09b770a03d8cce8c452a6989bc71a Mon Sep 17 00:00:00 2001 From: Niels Kolthoff Date: Wed, 8 Mar 2017 03:59:34 -0800 Subject: packagegroup-qt5-toolchain-target: add qtquickcontrols2 package Signed-off-by: Niels Kolthoff Signed-off-by: Martin Jansa --- recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 2735135a..234cde8c 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -108,6 +108,9 @@ RDEPENDS_${PN} += " \ qtxmlpatterns-dev \ qtxmlpatterns-mkspecs \ qttranslations-qtxmlpatterns \ + qtquickcontrols2 \ + qtquickcontrols2-dev \ + qtquickcontrols2-mkspecs \ " RRECOMMENDS_${PN} += " \ -- cgit v1.2.3-54-g00ecf From c4e34aaab991dd445808a801e4e191041b769eb6 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 9 Mar 2017 00:28:16 +0100 Subject: qtwebengine: show progress for do_compile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was stolen from meta-oe / meson.bbclass - qtwebengine uses ninja for build too. Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index a4ee0555..deb336f8 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -87,6 +87,8 @@ do_configure() { -after ${EXTRA_QMAKEVARS_POST} } +do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" + do_install_append() { rmdir ${D}${OE_QMAKE_PATH_PLUGINS}/${BPN} ${D}${OE_QMAKE_PATH_PLUGINS} || true sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@-L${B}[^ ]* @ @g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc -- cgit v1.2.3-54-g00ecf From ff073f04109900fc07bf81e2f1df63c626caf342 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 15 Mar 2017 12:37:44 -0400 Subject: nativesdk-qtbase: pass -no-icu for deterministic builds Similar to qtbase-native. Otherwise it may fail with this error, if icu is not yet staged: | .../git/src/corelib/codecs/qicucodec.cpp:53:26: fatal error: unicode/ucnv.h: No such file or directory | #include "unicode/ucnv.h" | ^ | compilation terminated. Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 94ad6b9a..f2ff5f7e 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -115,6 +115,7 @@ do_configure() { -no-opengl \ -no-openssl \ -no-xcb \ + -no-icu \ -verbose \ -release \ -prefix ${OE_QMAKE_PATH_PREFIX} \ -- cgit v1.2.3-54-g00ecf