The new Arm toolchain fails to build qtwebkit for now. https://bugs.linaro.org/show_bug.cgi?id=4284
Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../recipes-core/packagegroups/packagegroup-arago-qte.bb | 12 ++++++------ .../packagegroups/packagegroup-arago-tisdk-matrix.bb | 8 ++++---- .../packagegroups/packagegroup-arago-tisdk-qte.bb | 12 ++++++------ .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 6 +++--- .../packagegroup-arago-qte-toolchain-target.bb | 16 ++++++++-------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb index c038a16..992b0b7 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb @@ -46,12 +46,12 @@ QT5_ESSENTIALS = "\ qtconnectivity-qmlplugins \ " -QT5_ESSENTIALS_append_k3 = "\ - qtwebkit-qmlplugins \ -" -QT5_ESSENTIALS_remove_k3 = "\ - qtwebengine-qmlplugins \ -" +#QT5_ESSENTIALS_append_k3 = "\ +# qtwebkit-qmlplugins \ +#" +#QT5_ESSENTIALS_remove_k3 = "\ +# qtwebengine-qmlplugins \ +#" RDEPENDS_${PN} = "\ ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb index 101fb0b..3db7c3f 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb @@ -45,10 +45,10 @@ MATRIX_TOUCH_APPS = " \ MATRIX_QT_APPS_keystone = "" MATRIX_QT_APPS_omapl138 = "" -MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser" -MATRIX_QT_APPS_append_k3 = " \ - matrix-qt5-demo-webkit-browser \ -" +#MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser" +#MATRIX_QT_APPS_append_k3 = " \ +# matrix-qt5-demo-webkit-browser \ +#" MATRIX_SGX_DEMOS = " \ matrix-3d-demo-chameleon \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb index 43a0d02..36cfca9 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb @@ -28,13 +28,13 @@ QT5_DEMOS = "\ qtserialport-examples \ " -QT5_DEMOS_append_k3 = " qtwebkit-examples-examples" +#QT5_DEMOS_append_k3 = " qtwebkit-examples-examples" -QT5_DEMOS_remove_k3 = "\ - qtwebbrowser \ - qtwebbrowser-examples \ - qtwebengine-examples \ -" +#QT5_DEMOS_remove_k3 = "\ +# qtwebbrowser \ +# qtwebbrowser-examples \ +# qtwebengine-examples \ +#" QT_DEMOS = "\ qt-tstat \ diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb index 9ceaa56..9635429 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb @@ -10,14 +10,14 @@ inherit qt-provider RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}" DEPENDS += "${QT_DEPENDS_WEBENGINE}" -DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}" -DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}" +#DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}" +#DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}" PR = "r16" QT4_SRCREV = "83019b46fb3dec1a12667d251d35ba8682953a79" QT5_SRCREV = "d3ecf8d0dff3e4f901d588ea0dfe485733dfc9dc" -QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5" +#QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5" SRCREV = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_SRCREV}", "${QT4_SRCREV}", d)}" diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb index 2afc974..5add6f9 100644 --- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb +++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb @@ -67,15 +67,15 @@ QT5_DEV = " \ qtserialport-dev \ " -QT5_DEV_append_k3 = " \ - qtwebkit-mkspecs \ - qtwebkit-dev \ -" +#QT5_DEV_append_k3 = " \ +# qtwebkit-mkspecs \ +# qtwebkit-dev \ +#" -QT5_DEV_remove_k3 = " \ - qtwebengine-mkspecs \ - qtwebengine-dev \ -" +#QT5_DEV_remove_k3 = " \ +# qtwebengine-mkspecs \ +# qtwebengine-dev \ +#" RDEPENDS_${PN} += " \ ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}", "${QT4_DEV}", d)} \ -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
