From c4a0a450b4275cc3869cf389c92e86b62f09fcea Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 1 Dec 2016 16:46:14 +0200 Subject: qt5: update submodules New configuration system is now used for more modules, so add new EXTRA_QMAKEVARS_CONFIGURE variable that can be used for configure modules with -[no-]feature flags. SHA1s are now from the release 5.8.0 branches, so need to add "nobranch=1" option so that there is no build break when release branches are removed. Add recipe for QtGamepad module, it's already used by Qt3D. Change-Id: I152b3b66b68c802d07445f4a7f1e81802308418e Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 26 +++- recipes-qt/qt5/qt3d_git.bb | 21 ++- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qt5.inc | 2 + recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 9 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 11 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- .../0001-qmltestexample-fix-link.patch | 72 ---------- ...omparison-fix-QCoreApplication-has-not-be.patch | 25 ---- recipes-qt/qt5/qtdeclarative_git.bb | 12 +- recipes-qt/qt5/qtenginio_git.bb | 8 +- recipes-qt/qt5/qtgamepad_git.bb | 17 +++ recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- ...ats.pro-Make-the-dependencies-determinist.patch | 28 ---- recipes-qt/qt5/qtimageformats_git.bb | 18 +-- recipes-qt/qt5/qtlocation_git.bb | 19 +-- ...1-Initial-porting-effort-to-GStreamer-1.0.patch | 56 -------- recipes-qt/qt5/qtmultimedia_git.bb | 22 ++- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_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 +- ...w-to-build-only-lrelease-lupdate-lconvert.patch | 160 --------------------- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 117 --------------- recipes-qt/qt5/qtwayland_git.bb | 32 ++--- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 20 +-- recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +- ...move-unused-check-for-the-private_headers.patch | 12 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 43 files changed, 128 insertions(+), 605 deletions(-) delete mode 100644 recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch delete mode 100644 recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch create mode 100644 recipes-qt/qt5/qtgamepad_git.bb delete mode 100644 recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch delete mode 100644 recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch delete mode 100644 recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch delete mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 526a9c17..bd5ef490 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -188,4 +188,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de" +SRCREV = "947cace7993807d173656300f4440ae5166624fe" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 2e8d887e..b19f963e 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,23 +1,24 @@ -From 19e8db58f5c344cc15aba5c0525ceddaa307d39d Mon Sep 17 00:00:00 2001 +From 64f46f5399627430f9ce1a888fb9212b33977231 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build --- - qt3d.pro | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + qt3d.pro | 7 ++++++- + src/3rdparty/assimp/assimp_dependency.pri | 2 +- + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 83e0ffc..9bb7690 100644 +index 2cc347a..81cdeef 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,4 +1,4 @@ -requires(qtConfig(opengl)) +!tools-only:requires(qtConfig(opengl)) - load(configure) - qtCompileTest(assimp) -@@ -17,3 +17,8 @@ load(qt_parts) + CONFIG += examples_need_tools + load(qt_parts) +@@ -14,3 +14,8 @@ load(qt_parts) OTHER_FILES += \ sync.profile @@ -26,3 +27,14 @@ index 83e0ffc..9bb7690 100644 + sub_tools.depends -= sub_src + SUBDIRS = sub_tools +} +diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri +index 8ba2d9a..e973d93 100644 +--- a/src/3rdparty/assimp/assimp_dependency.pri ++++ b/src/3rdparty/assimp/assimp_dependency.pri +@@ -1,5 +1,5 @@ + QT_FOR_CONFIG += 3dcore-private +-qtConfig(system-assimp):!if(cross_compile:host_build) { ++!tools-only:qtConfig(system-assimp):!if(cross_compile:host_build) { + QMAKE_USE_PRIVATE += assimp + } else { + include(assimp.pri) diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 2922173d..eb26a44b 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -18,15 +18,22 @@ SRC_URI += " \ PACKAGECONFIG ??= "" PACKAGECONFIG_class-native ??= "tools-only" PACKAGECONFIG_class-nativesdk ??= "tools-only" -PACKAGECONFIG[tools-only] = "CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib" +PACKAGECONFIG[tools-only] = "" +PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp" +PACKAGECONFIG[qtgamepad] = ",,qtgamepad" -EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" +EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -FILES_${PN}-qmlplugins += " \ - ${OE_QMAKE_PATH_QML}/*/*/*.bez \ - ${OE_QMAKE_PATH_QML}/*/*/*.obj \ -" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}" + +do_configure_prepend() { + # disable qtgamepad test if it isn't enabled by PACKAGECONFIG + sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \ + ${S}/src/input/frontend/frontend.pri \ + ${S}/src/quick3d/imports/input/importsinput.pro +} -SRCREV = "6e8e228852f0930638b0e0272509809a0fb9ab42" +SRCREV = "a2c6c81f5c67390629a313ff7ba985d0967ca1fa" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index a1dd16a9..f8649533 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -3,7 +3,7 @@ QT_MODULE ?= "${BPN}" QT_MODULE_BRANCH ?= "5.8" -QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" +QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" # each module needs to define valid SRCREV SRC_URI = " \ diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index a01c490c..90d7896f 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -6,7 +6,9 @@ inherit qmake5 PACKAGECONFIG_OPENSSL ?= "openssl" PACKAGECONFIG[examples] = "" +PACKAGECONFIG[tests] = "" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', '', d)}" # we don't want conflicts with qt4 OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index b8dc6f3b..22ca3d5c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -105,4 +105,4 @@ do_install() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de" +SRCREV = "947cace7993807d173656300f4440ae5166624fe" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 242aaf01..4297ec76 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -40,10 +40,9 @@ RDEPENDS_${PN}-tools += "perl" PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" -PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb', '', d)}" +PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb xkbcommon-evdev', '', d)}" PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" -PACKAGECONFIG_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG_DISTRO ?= "" # Either release or debug, can be overridden in bbappends PACKAGECONFIG_RELEASE ?= "release" @@ -60,7 +59,6 @@ PACKAGECONFIG ?= " \ ${PACKAGECONFIG_X11} \ ${PACKAGECONFIG_FONTS} \ ${PACKAGECONFIG_SYSTEM} \ - ${PACKAGECONFIG_MULTIMEDIA} \ ${PACKAGECONFIG_DISTRO} \ " @@ -91,6 +89,7 @@ PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" PACKAGECONFIG[eglfs] = "-eglfs,-no-eglfs,drm" PACKAGECONFIG[gl] = "-opengl desktop,,virtual/libgl" PACKAGECONFIG[gles2] = "-opengl es2,,virtual/libgles2 virtual/egl" +PACKAGECONFIG[no-opengl] = "-no-opengl" PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" PACKAGECONFIG[cups] = "-cups,-no-cups,cups" PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" @@ -122,8 +121,6 @@ PACKAGECONFIG[gbm] = "-gbm,-no-gbm,gbm" PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" -PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" -PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" PACKAGECONFIG[widgets] = "-widgets,-no-widgets" PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" @@ -182,4 +179,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de" +SRCREV = "947cace7993807d173656300f4440ae5166624fe" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index d45c9d4f..2ad8b187 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 = "6c5121eab75e61f807c2df0f14988317f220b945" +SRCREV = "c8cf923ee5076db1b37fdd012994adf72ce6445e" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index a1477b1a..1b969f33 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "15447eed96be05b2607fa23c6455c37ab1990282" +SRCREV = "38386fda213cd50e3a3284b69ae15d5f33a7e049" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 5fad9844..219f78a7 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,13 +19,8 @@ DEPENDS += "qtbase qtdeclarative" inherit bluetooth PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" +PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" -EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" +EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -do_configure_prepend() { - # disable bluez test if it isn't enabled by PACKAGECONFIG - sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro -} - -SRCREV = "515ff5b0f9a2245a13cec6f2d37edd1715cdae8c" +SRCREV = "78c593fcdd9cdfa5804404f2120768544c01c7f5" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 8eb56ae0..7d6a51fc 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 = "96086b01a3e732cfb58cfd6e15a8dfc53550eb13" +SRCREV = "a78f8d6bef57dd4283094a52551705ee02909970" diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch deleted file mode 100644 index b71e3a4b..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0d742f34ef91fb4e35c68b1274f68daef594f0c3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Sun, 26 May 2013 14:26:19 +0200 -Subject: [PATCH] qmltestexample: fix link -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -else we get : -ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found - -Upstream-Status: Inappropriate - -Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450 -Signed-off-by: Eric Bénard -Signed-off-by: Martin Jansa ---- - examples/qmltest/qmltest/qmltest.pro | 2 +- - tests/auto/qml/qjsengine/qjsengine.pro | 2 +- - tests/auto/qmltest/qmltest.pro | 1 + - tools/qmltestrunner/qmltestrunner.pro | 2 +- - 4 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro -index b5893c5..1b00e6c 100644 ---- a/examples/qmltest/qmltest/qmltest.pro -+++ b/examples/qmltest/qmltest/qmltest.pro -@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml - # This code exists solely for the purpose of building this example - # inside the examples/ hierarchy. - --QT += qml qmltest -+QT += qml qmltest quick - - macx: CONFIG -= app_bundle - -diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro -index c9d78e2..5861613 100644 ---- a/tests/auto/qml/qjsengine/qjsengine.pro -+++ b/tests/auto/qml/qjsengine/qjsengine.pro -@@ -1,6 +1,6 @@ - CONFIG += testcase - TARGET = tst_qjsengine --QT += qml qml-private widgets testlib gui-private -+QT += qml qml-private widgets testlib gui-private quick - macx:CONFIG -= app_bundle - SOURCES += tst_qjsengine.cpp - RESOURCES += qjsengine.qrc -diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro -index 52fd6bf..843cae6 100644 ---- a/tests/auto/qmltest/qmltest.pro -+++ b/tests/auto/qmltest/qmltest.pro -@@ -4,6 +4,7 @@ CONFIG += qmltestcase - CONFIG += console - SOURCES += tst_qmltest.cpp - -+QT += quick - - importFiles.files = borderimage buttonclick createbenchmark events qqmlbinding selftests - -diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro -index 1bb913e..56f2dd5 100644 ---- a/tools/qmltestrunner/qmltestrunner.pro -+++ b/tools/qmltestrunner/qmltestrunner.pro -@@ -1,6 +1,6 @@ - SOURCES += main.cpp - --QT += qml qmltest -+QT += qml qmltest quick - CONFIG += no_import_scan - - load(qt_tool) diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch deleted file mode 100644 index d0d0f8e0..00000000 --- a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6b1cef42f828cd2374739aa7e3b3800d579315d6 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Thu, 31 Mar 2016 19:38:58 -0400 -Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been - declared error - -Upstream-Status: Pending - -Signed-off-by: Denys Dmytriyenko ---- - examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h -index 5b86c93..e77514e 100644 ---- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h -+++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - QT_FORWARD_DECLARE_CLASS(QRadioButton) - QT_FORWARD_DECLARE_CLASS(QCheckBox) diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 6912ea87..bf25d078 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -16,13 +16,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRC_URI += " \ - file://0001-qmltestexample-fix-link.patch \ - file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ -" - -EXTRA_OEMAKE += "QMAKE_SYNCQT=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt" - PACKAGECONFIG ??= "qtxmlpatterns" PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" @@ -30,9 +23,6 @@ do_configure_prepend() { # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro - - #set the path for syncqt properly - echo "QT_TOOL.syncqt.binary = \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt\"" > ${B}/.qmake.cache } do_install_append_class-nativesdk() { @@ -42,6 +32,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "9d085bf0024c442b14b7d22bc629574058176deb" +SRCREV = "fc5c77e371867cf6be8e270e452e21e5ac338283" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index c2455bf1..2f32a884 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb @@ -3,9 +3,9 @@ require qt5-git.inc 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=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ - file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ + file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ + file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ " @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" QT_MODULE_BRANCH = "dev" -SRCREV = "b0ad5907f480307853f7ac951bacfaa61dcbd94e" +SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" do_install_append() { if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb new file mode 100644 index 00000000..2ecbd5af --- /dev/null +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -0,0 +1,17 @@ +require qt5.inc +require qt5-git.inc + +LICENSE = "GPL-3.0 | LGPL-3.0 | The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ +" + +DEPENDS += "qtbase qtxmlpatterns qtdeclarative" + +PACKAGECONFIG ??= "sdl2" +PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" + +EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" + +SRCREV = "dc599eca071d545aab3f6a5c854911cac9585a57" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index d0a31caa..a5660c51 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -19,4 +19,4 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "8b5cb6185a014eb65150bef11aebdecb6a723aef" +SRCREV = "863682782bd7ba3edc33d3e13938437af0637320" diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch deleted file mode 100644 index 03432c9e..00000000 --- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7eb3fddc70871048f170211a88194c8cdeeca4dd Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 4 Aug 2014 19:19:05 +0200 -Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic - -Signed-off-by: Martin Jansa ---- - qtimageformats.pro | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/qtimageformats.pro b/qtimageformats.pro -index 8382e5c..63d13ce 100644 ---- a/qtimageformats.pro -+++ b/qtimageformats.pro -@@ -1,9 +1,9 @@ - requires(qtHaveModule(gui)) - - load(configure) --qtCompileTest(jasper) --qtCompileTest(libmng) --qtCompileTest(libtiff) --qtCompileTest(libwebp) -+OE_JASPER_ENABLED:qtCompileTest(jasper) -+OE_LIBMNG_ENABLED:qtCompileTest(libmng) -+OE_LIBTIFF_ENABLED:qtCompileTest(libtiff) -+OE_LIBWEBP_ENABLED:qtCompileTest(libwebp) - - load(qt_parts) diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 88ca6840..d073730c 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -16,20 +16,14 @@ LIC_FILES_CHKSUM = " \ " DEPENDS += "qtbase" -ALLOW_EMPTY_${PN} = "1" - -SRC_URI += "file://0001-qtimageformats.pro-Make-the-dependencies-determinist.patch" PACKAGECONFIG ?= "libtiff" # Currently we don't have recipe for libmng, but lock it anyway so qtimageformats stay deterministic even when libmng is introduced -PACKAGECONFIG[jasper] = ",,jasper" -PACKAGECONFIG[libmng] = ",,libmng" -PACKAGECONFIG[libtiff] = ",,tiff" -PACKAGECONFIG[libwebp] = ",,libwebp" +PACKAGECONFIG[jasper] = ",CONFIG+=done_config_jasper,jasper" +PACKAGECONFIG[libmng] = ",CONFIG+=done_config_libmng,libmng" +PACKAGECONFIG[libtiff] = ",CONFIG+=done_config_libtiff,tiff" +PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libmng', 'CONFIG+=OE_LIBMNG_ENABLED', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_JASPER_ENABLED', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "99d9e0c527ad91f186628ece1c8b3a5ec07f7add" +SRCREV = "65db62e4398c5ddfba1ea7825987b3f4ab04369e" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 49579dd6..40003094 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -14,19 +14,10 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" PACKAGECONFIG ??= "" -# older geoclue 0.x is needed -PACKAGECONFIG[geoclue] = "OE_GEOCLUE_ENABLED,,gconf geoclue" -PACKAGECONFIG[gypsy] = "OE_GYPSY_ENABLED,,gconf gypsy" +# older geoclue 0.12.99 is needed +PACKAGECONFIG[geoclue] = ",,geoclue" +PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" -do_configure_prepend() { - # disable geoclue tests if it isn't enabled by PACKAGECONFIG - sed -i -e 's/^\(qtCompileTest(geoclue)\)/OE_GEOCLUE_ENABLED:\1/' ${S}/qtlocation.pro - sed -i -e 's/^\(qtCompileTest(geoclue-satellite)\)/OE_GEOCLUE_ENABLED:\1/' ${S}/qtlocation.pro - # disable gypsy test if it isn't enabled by PACKAGECONFIG - sed -i -e 's/^\(qtCompileTest(gypsy)\)/OE_GYPSY_ENABLED:\1/' ${S}/qtlocation.pro -} +EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" - -SRCREV = "8aabdb0975c3532324d299dfa62aa333a56d2d3b" +SRCREV = "ba9b7b9ef674d93680070f6c4bb1053d0d2325dd" diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch deleted file mode 100644 index fa6b5852..00000000 --- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 26fd6cf787a7a413d54205b8b42d16a63ed5d36a Mon Sep 17 00:00:00 2001 -From: Yoann Lopes -Date: Thu, 31 Oct 2013 15:06:30 +0100 -Subject: [PATCH] Initial porting effort to GStreamer 1.0. - -* It's already included in 5.5 with this commit: - commit 108dda7a90bd0f0337358b0db47ae55acd16dea6 - Author: Yoann Lopes - Date: Thu Nov 20 17:54:18 2014 +0100 - GStreamer: port to 1.0. -* here we restore only the done_config_gstreamer variable - to explicitly disable it from OE build - -Signed-off-by: Martin Jansa ---- - qtmultimedia.pro | 26 ++++++++++++++------------ - 1 file changed, 14 insertions(+), 12 deletions(-) - -diff --git a/qtmultimedia.pro b/qtmultimedia.pro -index 98bb315..287887f 100644 ---- a/qtmultimedia.pro -+++ b/qtmultimedia.pro -@@ -17,19 +17,21 @@ win32 { - contains(QT_CONFIG, alsa):qtCompileTest(alsa) - contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio) - -- isEmpty(GST_VERSION) { -- contains(QT_CONFIG, gstreamer-0.10) { -- GST_VERSION = 0.10 -- } else: contains(QT_CONFIG, gstreamer-1.0) { -- GST_VERSION = 1.0 -+ !done_config_gstreamer { -+ isEmpty(GST_VERSION) { -+ contains(QT_CONFIG, gstreamer-0.10) { -+ GST_VERSION = 0.10 -+ } else: contains(QT_CONFIG, gstreamer-1.0) { -+ GST_VERSION = 1.0 -+ } -+ } -+ cache(GST_VERSION, set) -+ !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { -+ qtCompileTest(gstreamer_photography) -+ qtCompileTest(gstreamer_encodingprofiles) -+ qtCompileTest(gstreamer_appsrc) -+ qtCompileTest(linux_v4l) - } -- } -- cache(GST_VERSION, set) -- !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { -- qtCompileTest(gstreamer_photography) -- qtCompileTest(gstreamer_encodingprofiles) -- qtCompileTest(gstreamer_appsrc) -- qtCompileTest(linux_v4l) - } - - qtCompileTest(resourcepolicy) diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 4fe2d8e6..9f8701d1 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -18,25 +18,19 @@ DEPENDS += "qtdeclarative" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" -PACKAGECONFIG[alsa] = ",,alsa-lib" -PACKAGECONFIG[pulseaudio] = ",,pulseaudio" -PACKAGECONFIG[openal] = ",,openal-soft" -PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad" +PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" +PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" +PACKAGECONFIG[openal] = "-feature-openal,-no-feature-openal,openal-soft" +PACKAGECONFIG[gstreamer] = "-gstreamer 1.0,,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" +PACKAGECONFIG[gstreamer010] = "-gstreamer 0.10,,gstreamer gst-plugins-base gst-plugins-bad" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}" +EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -# Handles GStreamer support -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer', 'GST_VERSION=1.0', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', '', d)}" # Disable GStreamer if completely disabled -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}" +EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" SRC_URI += "\ - file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " -SRCREV = "0cb4dc5c1fded81b4f47945b51b8de0b0151bf67" +SRCREV = "77567bad82081ffb166578bdeac52fb1f2dce464" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index b93cd6c7..7b659341 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 = "e09a8591990e5281929ca2a7bb180bb3a35556ba" +SRCREV = "661bba4f11666d5d9018a6a1d16a71c324bdf123" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 54aaad4f..dbba0f27 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -21,4 +21,4 @@ SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "3bc99dd69fb9099a13dd94ebd081dba5c68d6def" +SRCREV = "84b48cadc8f68d57d1a750e6aec690f46582e0c5" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 2058e229..1ee6e0b1 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS += "qtbase" -SRCREV = "89e980b8e0007a3615d01286d1f590fb95757233" +SRCREV = "dcc9a3fdbf14e14a40bed106a0af93e7134690d4" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index d1ea63f6..c8a8b120 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "8065e461421ea17a942ea09d67aaa053a136a54e" +SRCREV = "07bf3002fecd493a47bfb97420d3c3fbe6ee1458" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 5b903950..2d650bc0 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 = "8e4bd5bcfd6093c980866a6b258311e7d8ae5bbf" +SRCREV = "fb63280f12042be341df9de55aa94ca23e991fe9" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index e2917b46..10c2e243 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 = "e2a658a2472d9fa710c251a065f488bae981c0ae" +SRCREV = "4e667fa7f88144e198692d9794baacc86bb4eb98" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 9e0c4fb3..76729b64 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "5a00abdefd1c050aae8760dfc01ae5e3631077aa" +SRCREV = "51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765" diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch deleted file mode 100644 index 46ab795d..00000000 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 68ecc4f25789321fc29ec9e4981fcfa27e706f1c Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 11 Sep 2013 18:30:08 +0200 -Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert - -This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native -is built without GUI support (no-png is set) and we still want to build -native lrelease + lupdate + lconvert tools. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - examples/examples.pro | 3 ++- - src/designer/src/src.pro | 18 ++++++++++-------- - src/linguist/linguist.pro | 2 +- - src/src.pro | 16 +++++++++------- - tests/auto/auto.pro | 24 +++++++++++++----------- - 5 files changed, 35 insertions(+), 28 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index 69365d1..da7b38b 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -1,4 +1,5 @@ - TEMPLATE = subdirs --qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant -+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant -+qtHaveModule(widgets): SUBDIRS += linguist uitools - - winrt: SUBDIRS -= assistant designer -diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro -index 6915e34..3ff2eca 100644 ---- a/src/designer/src/src.pro -+++ b/src/designer/src/src.pro -@@ -1,13 +1,15 @@ - TEMPLATE = subdirs - --SUBDIRS = \ -- uiplugin \ -- uitools \ -- lib \ -- components \ -- designer -+!linguistonly { -+ SUBDIRS = \ -+ uiplugin \ -+ lib \ -+ components \ -+ designer -+} -+SUBDIRS += uitools - --contains(QT_CONFIG, shared): SUBDIRS += plugins -+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins - - uitools.depends = uiplugin - lib.depends = uiplugin -@@ -15,7 +17,7 @@ components.depends = lib - designer.depends = components - plugins.depends = lib - --qtNomakeTools( \ -+!linguistonly:qtNomakeTools( \ - lib \ - components \ - designer \ -diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro -index 3a70580..a977878 100644 ---- a/src/linguist/linguist.pro -+++ b/src/linguist/linguist.pro -@@ -3,7 +3,7 @@ SUBDIRS = \ - lrelease \ - lupdate \ - lconvert --!no-png:qtHaveModule(widgets): SUBDIRS += linguist -+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist - - qtNomakeTools( \ - linguist \ -diff --git a/src/src.pro b/src/src.pro -index 387d54f..56b7d0c 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -4,19 +4,21 @@ qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") - } else { -- SUBDIRS = assistant \ -+ !linguistonly { -+ SUBDIRS = assistant \ - pixeltool \ -- qtestlib \ -- designer -+ qtestlib -+ } -+ SUBDIRS += designer - - linguist.depends = designer - } - } - - SUBDIRS += linguist \ -- qdoc \ - qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths -+!linguistonly: SUBDIRS += qdoc -+if(!android|android_app):!ios:!linguistonly: SUBDIRS += qtpaths - - mac { - SUBDIRS += macdeployqt -@@ -26,11 +28,11 @@ android { - SUBDIRS += androiddeployqt - } - --qtHaveModule(dbus): SUBDIRS += qdbus -+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus - --win32|winrt:SUBDIRS += windeployqt --winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag -+!linguistonly:win32|winrt:SUBDIRS += windeployqt -+!linguistonly:winrt:SUBDIRS += winrtrunner -+!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - - qtNomakeTools( \ - pixeltool \ -diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro -index 20b5fec..8a42d1f 100644 ---- a/tests/auto/auto.pro -+++ b/tests/auto/auto.pro -@@ -1,15 +1,17 @@ - TEMPLATE=subdirs --SUBDIRS=\ -- linguist \ -- qhelpcontentmodel \ -- qhelpenginecore \ -- qhelpgenerator \ -- qhelpindexmodel \ -- qhelpprojectdata \ -- cmake \ -- installed_cmake \ -- qtdiag \ -- windeployqt -+!linguistonly { -+ SUBDIRS=\ -+ linguist \ -+ qhelpcontentmodel \ -+ qhelpenginecore \ -+ qhelpgenerator \ -+ qhelpindexmodel \ -+ qhelpprojectdata \ -+ cmake \ -+ installed_cmake \ -+ qtdiag \ -+ windeployqt -+} - - installed_cmake.depends = cmake - diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 3d77ec70..c3f653d6 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -30,6 +30,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "b8113e90e2a1d9ea38a478990a93615f432ac35b" +SRCREV = "c3b5247161eff3b521381a9ada14b180e330a037" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index c2592448..f502d2a1 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -114,4 +114,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "64f3b105fb67d813512b287be6fdaec409d6d943" +SRCREV = "3ddc17398e5634e43d3ed5fa88bcf8c8b158ae06" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index c93a9bd5..e538a224 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -48,4 +48,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "947a55149aec2724158934efde1be496b3c5e04e" +SRCREV = "cfa4ab4cbf13971d4b71ee920353822755a3bf31" diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch deleted file mode 100644 index 982c60c5..00000000 --- a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 4fd9d8ce8289e0b7d5ecf01c7cce89d20d93b0d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= -Date: Sun, 18 Sep 2016 11:51:59 +0300 -Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are - disabled. - -QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, -QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and -QT_NO_SESSIONMANAGER, these has to be taken into account when compiling -QtWayland. ---- - src/client/qwaylandintegration.cpp | 17 ++++++++++++++++- - src/client/qwaylandintegration_p.h | 8 ++++++++ - 2 files changed, 24 insertions(+), 1 deletion(-) - -diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp -index 48517fc..9ea8647 100644 ---- a/src/client/qwaylandintegration.cpp -+++ b/src/client/qwaylandintegration.cpp -@@ -45,7 +45,9 @@ - #include "qwaylandinputcontext_p.h" - #include "qwaylandshmbackingstore_p.h" - #include "qwaylandnativeinterface_p.h" -+#ifndef QT_NO_CLIPBOARD - #include "qwaylandclipboard_p.h" -+#endif - #include "qwaylanddnd_p.h" - #include "qwaylandwindowmanagerintegration_p.h" - #include "qwaylandscreen_p.h" -@@ -63,7 +65,9 @@ - #include - - #include -+#ifndef QT_NO_ACCESSIBILITY - #include -+#endif - #include - - #include "qwaylandhardwareintegration_p.h" -@@ -132,9 +136,12 @@ QWaylandIntegration::QWaylandIntegration() - { - initializeInputDeviceIntegration(); - mDisplay = new QWaylandDisplay(this); -+#ifndef QT_NO_CLIPBOARD - mClipboard = new QWaylandClipboard(mDisplay); -+#endif -+#ifndef QT_NO_DRAGANDDROP - mDrag = new QWaylandDrag(mDisplay); -- -+#endif - QString icStr = QPlatformInputContextFactory::requested(); - if (!icStr.isNull()) { - mInputContext.reset(QPlatformInputContextFactory::create(icStr)); -@@ -153,8 +160,12 @@ QWaylandIntegration::QWaylandIntegration() - - QWaylandIntegration::~QWaylandIntegration() - { -+#ifndef QT_NO_DRAGANDDROP - delete mDrag; -+#endif -+#ifndef QT_NO_CLIPBOARD - delete mClipboard; -+#endif - #ifndef QT_NO_ACCESSIBILITY - delete mAccessibility; - #endif -@@ -230,15 +241,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const - return mFontDb; - } - -+#ifndef QT_NO_CLIPBOARD - QPlatformClipboard *QWaylandIntegration::clipboard() const - { - return mClipboard; - } -+#endif - -+#ifndef QT_NO_DRAGANDDROP - QPlatformDrag *QWaylandIntegration::drag() const - { - return mDrag; - } -+#endif - - QPlatformInputContext *QWaylandIntegration::inputContext() const - { -diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h -index 9a49902..082e0c8 100644 ---- a/src/client/qwaylandintegration_p.h -+++ b/src/client/qwaylandintegration_p.h -@@ -86,9 +86,13 @@ public: - - QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; - -+#ifndef QT_NO_CLIPBOARD - QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; -+#endif - -+#ifndef QT_NO_DRAGANDDROP - QPlatformDrag *drag() const Q_DECL_OVERRIDE; -+#endif - - QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; - -@@ -126,8 +130,12 @@ private: - QWaylandShellIntegration *createShellIntegration(const QString& interfaceName); - - QPlatformFontDatabase *mFontDb; -+#ifndef QT_NO_CLIPBOARD - QPlatformClipboard *mClipboard; -+#endif -+#ifndef QT_NO_DRAGANDDROP - QPlatformDrag *mDrag; -+#endif - QWaylandDisplay *mDisplay; - QPlatformNativeInterface *mNativeInterface; - QScopedPointer mInputContext; diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index c64a92f1..c38d5f0c 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -16,13 +16,11 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -#FIXME: xkb should be optional; we add it here to fix the build error without it -# (https://bugreports.qt.io/browse/QTBUG-54851) PACKAGECONFIG ?= " \ - compositor-api \ + wayland-client \ + wayland-server \ wayland-egl \ - xkb \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcompositor xkb glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \ " PACKAGECONFIG_class-native ?= "" PACKAGECONFIG_class-nativesdk ?= "" @@ -31,21 +29,17 @@ QMAKE_PROFILES_class-nativesdk = "${S}/src/qtwaylandscanner" B_class-native = "${SEPB}/src/qtwaylandscanner" B_class-nativesdk = "${SEPB}/src/qtwaylandscanner" -PACKAGECONFIG[compositor-api] = "CONFIG+=wayland-compositor" -PACKAGECONFIG[xcompositor] = "CONFIG+=config_xcomposite CONFIG+=done_config_xcomposite,CONFIG+=done_config_xcomposite,libxcomposite" -PACKAGECONFIG[glx] = "CONFIG+=config_glx CONFIG+=done_config_glx,CONFIG+=done_config_glx,virtual/mesa" -PACKAGECONFIG[xkb] = "CONFIG+=config_xkbcommon CONFIG+=done_config_xkbcommon,CONFIG+=done_config_xkbcommon,libxkbcommon xproto" -PACKAGECONFIG[wayland-egl] = "CONFIG+=config_wayland_egl CONFIG+=done_config_wayland_egl,CONFIG+=done_config_wayland_egl,virtual/egl" -PACKAGECONFIG[brcm-egl] = "CONFIG+=config_brcm_egl CONFIG+=done_config_brcm_egl,CONFIG+=done_config_brcm_egl,virtual/egl" -PACKAGECONFIG[drm-egl] = "CONFIG+=config_drm_egl_server CONFIG+=done_config_drm_egl_server,CONFIG+=done_config_drm_egl_server,libdrm virtual/egl" -PACKAGECONFIG[libhybris-egl] = "CONFIG+=config_libhybris_egl_server CONFIG+=done_config_libhybris_egl_server,CONFIG+=done_config_libhybris_egl_server,libhybris" +PACKAGECONFIG[wayland-client] = "-feature-wayland-client,-no-feature-wayland-client" +PACKAGECONFIG[wayland-server] = "-feature-wayland-server,-no-feature-wayland-server" +PACKAGECONFIG[xcomposite-egl] = "-feature-xcomposite-egl,-no-feature-xcomposite-egl,libxcomposite" +PACKAGECONFIG[xcomposite-glx] = "-feature-xcomposite-glx,-no-feature-xcomposite-glx,virtual/mesa" +PACKAGECONFIG[wayland-egl] = "-feature-wayland-egl,no-feature-wayland-egl,virtual/egl" +PACKAGECONFIG[wayland-brcm] = "-feature-wayland-brcm,-no-feature-wayland-brcm,virtual/egl" +PACKAGECONFIG[drm-egl-server] = "-feature-drm-egl-server,-no-feature-drm-egl-server,libdrm virtual/egl" +PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature-libhybris-egl-server,libhybris" -EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" +EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRC_URI += " \ - file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ -" - -SRCREV = "3443483c9efdcfbfe049f96c83f83a5bf1d81e61" +SRCREV = "545ef2e21d74128733f3b9b117d7c6024826cbb5" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index a108a221..2625b3f5 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "bf66a8531e0ada3ade7e873bc3fae824237acd3e" +SRCREV = "8cc9153f413c36d505794adfaca4f4724692fa81" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 4152ef0a..7dc37a92 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -20,14 +20,9 @@ DEPENDS += " \ libdrm fontconfig pixman openssl pango cairo icu pciutils \ libcap \ gperf-native \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ " -# when qtbase is built with xcb enabled (default with x11 in DISTRO_FEATURES), -# qtwebengine will have additional dependencies: -# contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst -# xscreensaver isn't covered in qtbase DEPENDS -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}" - DEPENDS += "yasm-native" EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm" @@ -52,6 +47,7 @@ COMPATIBLE_MACHINE_x86-64 = "(.*)" COMPATIBLE_MACHINE_armv6 = "(.*)" COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" +COMPATIBLE_MACHINE_aarch64 = "(.*)" inherit qmake5 inherit gettext @@ -65,10 +61,6 @@ def gettext_oeconf(d): require qt5.inc require qt5-git.inc -# To avoid trouble start with not separated build directory -SEPB = "${S}" -B = "${SEPB}" - export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja" do_configure() { @@ -86,7 +78,7 @@ do_configure() { # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as # arguments here - ${OE_QMAKE_QMAKE} ${OE_QMAKE_QTCONF} -r ${EXTRA_QMAKEVARS_PRE} QTWEBENGINE_ROOT="${S}" \ + ${OE_QMAKE_QMAKE} ${OE_QMAKE_QTCONF} -r ${EXTRA_QMAKEVARS_PRE} ${S} \ QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ QMAKE_LINK="${OE_QMAKE_LINK}" \ QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ @@ -123,13 +115,11 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "ac3d8780a0293793dbc3cd47b96aab4613dec5d9" -SRCREV_chromium = "f3ce802c71aeaeb7dd218180a3bc5c6ac63b445d" +SRCREV_qtwebengine = "a79fd91391c489ea1cd7baf717778b75e4847b92" +SRCREV_chromium = "93b3786290ac16c95f15c95e2c2f3d8254171ab6" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" -S = "${WORKDIR}/git" - # WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel] INSANE_SKIP_${PN} += "textrel" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 95446fb0..84b4d0ba 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" -SRCREV = "1a839b50564782feac2e5dd439686c2a0ed7d985" +SRCREV = "f0898f83abdcacc8bd3bca3479884376b0963398" diff --git a/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch b/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch index bd8d6485..b6eabfda 100644 --- a/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch +++ b/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch @@ -1,19 +1,17 @@ From 6f4746e59c3768a56336f202054ec5498a7d376f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Wed, 14 Sep 2016 23:51:14 +0200 -Subject: [PATCH] Remove unused check for the private_headers +Subject: [PATCH] Remove unused check for private_tests -TL;DR: it is useless and it breaks the build -> remove - -The configuration system in qtbase got changed during the 5.8 -development, and as a result, this won't build anymore. It seems that -the new syntax is `contains(QT_CONFIG, private_tests)`, but it turns out -that qt_developer_build is never used anyway. +It turns out that qt_developer_build is never used anyway. I did some git archeology and it looks like it was nuked when doing the 5.2 merge from upstream. The original purpose was apparently to control -Werror, which is nowadays controlled by CONFIG -= production_build. +This actually fixes the build, as the QT_FOR_CONFIG += core-private which +would have been required for qtConfig(private_tests) is missing. + Task-number: QTBUG-55950 Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3 --- diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 6944603d..5497ff1c 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -84,4 +84,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" -SRCREV = "431520f1508e92272171c214b087183e71d08ec5" +SRCREV = "67fef93059ba23812d7390ec7bb8d70f8e7b0492" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 4897d257..47981c93 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 = "ccb138548314a767a897496c74c04a261a391027" +SRCREV = "5e66a1c5d25caef259e6e8b41023004c2b8de355" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 16db1139..d6d3b15e 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 = "0f91218091da69a81eb3e3336d1bdbe572a21908" +SRCREV = "177a8090fbe346ab34040acc60655dcb768ebf4f" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 73f5dbfd..08e0aa4c 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "977d0fb3f0bf776e2aad3c8ff795115ce62909ff" +SRCREV = "594ad16ae17072a44219228783f2ae051f88eba0" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf