Updates various paths to follow the new Qt install dir

423da979 · Florent Revest · ca5e3914 · 423da979 · 423da979 · 423da979
Commit 423da979 authored Jan 01, 2016 by Florent Revest
20 changed files
--- a/recipes-asteroid/qml-asteroid/qml-asteroid_git.bb
+++ b/recipes-asteroid/qml-asteroid/qml-asteroid_git.bb
@@ -17,5 +17,5 @@ do_configure_prepend() {
    sed -i "s@examples@@" ${S}/qml-asteroid.pro
 }

-FILES_${PN} += "/usr/lib/qt5"
-FILES_${PN}-dbg += "/usr/lib/qt5/examples/.debug/ /usr/lib/qt5/qml/org/asteroid/controls/.debug/ /usr/lib/qt5/qml/QtQuick/Controls/Styles/Asteroid/.debug/"
+FILES_${PN} += "/usr/lib"
+FILES_${PN}-dbg += "/usr/lib/examples/.debug/ /usr/lib/qml/org/asteroid/controls/.debug/ /usr/lib/qml/QtQuick/Controls/Styles/Asteroid/.debug/"
--- a/recipes-nemomobile/libngf/libngf-qt_git.bb
+++ b/recipes-nemomobile/libngf/libngf-qt_git.bb
@@ -18,5 +18,5 @@ do_install_append() {
    rmdir ${D}/include/ ${D}/lib/
 }

-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/ngf"
-FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/ngf/.debug/"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/ngf"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/ngf/.debug/"
--- a/recipes-nemomobile/lipstick/lipstick_git.bb
+++ b/recipes-nemomobile/lipstick/lipstick_git.bb
@@ -18,9 +18,9 @@ RDEPENDS_${PN} += "qt5-qpa-hwcomposer-plugin"

 inherit qmake5

-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/lipstick/liblipstickplugin.so /usr/lib/qt5/qml/org/nemomobile/lipstick/qmldir"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/lipstick/liblipstickplugin.so /usr/lib/qml/org/nemomobile/lipstick/qmldir"
 FILES_${PN}-dev += "/usr/lib/liblipstick-qt5.prl"
-FILES_${PN}-dbg += "/usr/lib/qt5/qml/org/nemomobile/lipstick/.debug"
+FILES_${PN}-dbg += "/usr/lib/qml/org/nemomobile/lipstick/.debug"
 FILES_${PN}-locale += "/usr/share/translations"

 INSANE_SKIP_${PN} += "dev-deps"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-alarms_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-alarms_git.bb
@@ -12,5 +12,5 @@ inherit qmake5

 DEPENDS += "qtdeclarative timed"

-FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/alarms/.debug"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/alarms/"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/alarms/.debug"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/alarms/"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-configuration_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-configuration_git.bb
@@ -12,5 +12,5 @@ inherit qmake5

 DEPENDS += "qtdeclarative mlite"

-FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/configuration/.debug"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/configuration/"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/configuration/.debug"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/configuration/"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-connectivity_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-connectivity_git.bb
@@ -12,5 +12,5 @@ inherit qmake5

 DEPENDS += "qtdeclarative qtbase libconnman-qt"

-FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/connectivity/.debug"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/connectivity/"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/connectivity/.debug"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/connectivity/"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-contextkit_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-contextkit_git.bb
@@ -14,5 +14,9 @@ EXTRA_OECMAKE+="-DUSEQT=5"

 DEPENDS += "qtdeclarative statefs-qt"

-FILES_${PN}-dbg += "/usr/lib/qt5/qml/org/freedesktop/contextkit/.debug/"
-FILES_${PN} += "/usr/lib/qt5/qml/org/freedesktop/contextkit"
+do_configure_prepend() {
+    sed -i "s@DESTINATION lib/qt5/qml/@DESTINATION lib/qml/@" src/CMakeLists.txt
+}
+
+FILES_${PN}-dbg += "/usr/lib/qml/org/freedesktop/contextkit/.debug/"
+FILES_${PN} += "/usr/lib/qml/org/freedesktop/contextkit"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-dbus_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-dbus_git.bb
@@ -12,5 +12,5 @@ inherit qmake5

 DEPENDS += "dbus qtdeclarative qtbase"

-FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/dbus/.debug"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/dbus/"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/dbus/.debug"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/dbus/"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-notifications_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-notifications_git.bb
@@ -12,6 +12,6 @@ inherit qmake5

 DEPENDS += "qtdeclarative"

-FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/notifications/.debug"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/notifications/.debug"
 FILES_${PN}-dev += "/usr/lib/libnemonotifications-qt5.prl"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/notifications/"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/notifications/"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-policy_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-policy_git.bb
@@ -12,5 +12,5 @@ inherit qmake5

 DEPENDS += "qtdeclarative qtbase libresourceqt"

-FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/policy/.debug"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/policy/"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/policy/.debug"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/policy/"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-social_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-social_git.bb
@@ -12,5 +12,5 @@ inherit qmake5

 DEPENDS += "qtdeclarative qtbase"

-FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/social/.debug"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/social/"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/social/.debug"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/social/"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings_git.bb
@@ -14,5 +14,5 @@ inherit qmake5
 DEPENDS += "qtquickcontrols profiled usb-moded-qt5 mlite mce timed qtsystems"
 RDEPENDS_${PN} += "qtquickcontrols-qmlplugins profiled"

-FILES_${PN}-dbg += "/usr/lib/qt5/qml/org/nemomobile/systemsettings/.debug /opt/ /usr/share/nemo-qml-plugin-systemsettings-tests /usr/lib/nemo-qml-plugin-systemsettings-tests"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/systemsettings/"
+FILES_${PN}-dbg += "/usr/lib/qml/org/nemomobile/systemsettings/.debug /opt/ /usr/share/nemo-qml-plugin-systemsettings-tests /usr/lib/nemo-qml-plugin-systemsettings-tests"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/systemsettings/"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-thumbnailer_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-thumbnailer_git.bb
@@ -12,5 +12,5 @@ inherit qmake5

 DEPENDS += "qtdeclarative qtbase"

-FILES_${PN}-dbg += "/opt /usr/lib/qt5/qml/org/nemomobile/thumbnailer/.debug"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/thumbnailer/"
+FILES_${PN}-dbg += "/opt /usr/lib/qml/org/nemomobile/thumbnailer/.debug"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/thumbnailer/"
--- a/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-time_git.bb
+++ b/recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-time_git.bb
@@ -13,5 +13,5 @@ inherit qmake5
 DEPENDS += "qtquickcontrols timed"
 RDEPENDS_${PN} += "qtquickcontrols-qmlplugins"

-FILES_${PN}-dbg += "/usr/lib/qt5/qml/org/nemomobile/time/.debug /opt/"
-FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/time/ "
+FILES_${PN}-dbg += "/usr/lib/qml/org/nemomobile/time/.debug /opt/"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/time/ "
--- a/recipes-nemomobile/qtquickcontrols-nemo/qtquickcontrols-nemo_git.bb
+++ b/recipes-nemomobile/qtquickcontrols-nemo/qtquickcontrols-nemo_git.bb
@@ -14,9 +14,9 @@ DEPENDS += "qtquickcontrols"
 RDEPENDS_${PN} += "qtquickcontrols-qmlplugins"

 do_configure_prepend() {
-    sed -i "s@\$\$\[QT_INSTALL_QML\]/\$\$PLUGIN_IMPORT_PATH/themes@/usr/lib/qt5/qml/QtQuick/Controls/Styles/Nemo/themes@" ${S}/src/styles/styles.pro
+    sed -i "s@\$\$\[QT_INSTALL_QML\]/\$\$PLUGIN_IMPORT_PATH/themes@/usr/lib/qml/QtQuick/Controls/Styles/Nemo/themes@" ${S}/src/styles/styles.pro
    sed -i "s@src examples@src@" ${S}/qtquickcontrols-nemo.pro
 }

-FILES_${PN} += "/usr/lib/qt5"
-FILES_${PN}-dbg += "/usr/lib/qt5/examples/.debug/ /usr/lib/qt5/qml/QtQuick/Controls/Nemo/.debug/ /usr/lib/qt5/qml/QtQuick/Controls/Styles/Nemo/.debug/"
+FILES_${PN} += "/usr/lib"
+FILES_${PN}-dbg += "/usr/lib/examples/.debug/ /usr/lib/qml/QtQuick/Controls/Nemo/.debug/ /usr/lib/qml/QtQuick/Controls/Styles/Nemo/.debug/"
--- a/recipes-nemomobile/statefs/statefs-loader-qt_git.bb
+++ b/recipes-nemomobile/statefs/statefs-loader-qt_git.bb
@@ -13,7 +13,7 @@ DEPENDS += "qtbase cor statefs"
 inherit cmake_qt5

 B = "${WORKDIR}/git"
-EXTRA_OECMAKE=" -DUSEQT=5 -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_DIR_NATIVE}/usr/bin/qt5/"
+EXTRA_OECMAKE=" -DUSEQT=5 -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_DIR_NATIVE}/usr/bin/"

 FILES_${PN} += "/usr/lib/statefs/"
 FILES_${PN}-dbg += "/usr/lib/statefs/.debug/"
--- a/recipes-nemomobile/statefs/statefs-qt_git.bb
+++ b/recipes-nemomobile/statefs/statefs-qt_git.bb
@@ -21,11 +21,6 @@ do_configure_prepend() {
    sed -i "s@DESTINATION include/qt5@DESTINATION include@" CMakeLists.txt
 }

-# Workaround for "ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: statefs-qt path '/work/armv7a-vfp-neon-oe-linux-gnueabi/statefs-qt/+gitAUTOINC-r1/packages-split/statefs-qt/usr/lib/qt5/qml/Mer/State/libstatefs-declarative.so' [dev-so]"
-do_install_append() {
-    rm ${D}/usr/lib/qt5/qml/Mer/State/libstatefs-declarative.so
-}
-
-FILES_${PN} = "/usr/bin/contextkit-monitor /usr/lib/qt5/ /usr/lib/libstatefs-qt5.so /usr/lib/libcontextkit-statefs-qt5.so"
-FILES_${PN}-dev = "/usr/lib/pkgconfig /usr/include/"
+FILES_${PN} = "/usr/bin/contextkit-monitor /usr/lib/ /usr/lib/libstatefs-qt5.so /usr/lib/libcontextkit-statefs-qt5.so"
+FILES_${PN}-dev = "/usr/lib/pkgconfig /usr/include/ /usr/lib/qt5/qml/Mer/State/libstatefs-declarative.so"
 FILES_${PN}-dbg = "/usr/lib/qt5/qml/Mer/State/.debug/ /usr/src /usr/bin/.debug/ /usr/lib/.debug/"
--- a/recipes-qt/libconnman-qt/libconnman-qt.inc
+++ b/recipes-qt/libconnman-qt/libconnman-qt.inc
@@ -15,6 +15,6 @@ inherit pkgconfig
 DEPENDS += "qtbase qtdeclarative"
 RDEPENDS_${PN} = "connman"

-FILES_${PN}-dbg += "/usr/lib/qt5/qml/MeeGo/Connman/.debug"
+FILES_${PN}-dbg += "/usr/lib/qml/MeeGo/Connman/.debug"
 FILES_${PN}-dev += "/usr/lib/libconnman-qt5.prl"
-FILES_${PN} += "/usr/lib/qt5/qml/MeeGo/Connman"
+FILES_${PN} += "/usr/lib/qml/MeeGo/Connman"
--- a/recipes-qt/libqofono/libqofono_0.4.bb
+++ b/recipes-qt/libqofono/libqofono_0.4.bb
@@ -17,6 +17,6 @@ RDEPENDS_${PN} = "ofono"
 SRC_URI = "git://github.com/nemomobile/${BPN}.git"
 S = "${WORKDIR}/git"

-FILES_${PN}-dev += "/usr/share/qt5"
-FILES_${PN}-dbg += "/opt /usr/lib/libqofono-qt5/tests /usr/lib/qt5/qml/MeeGo/QOfono/.debug/"
-FILES_${PN} += "/usr/lib/qt5 /usr/lib/libqofono-qt5.prl"
+FILES_${PN}-dev += "/usr/share/"
+FILES_${PN}-dbg += "/opt /usr/lib/libqofono-qt5/tests /usr/lib/qml/MeeGo/QOfono/.debug/"
+FILES_${PN} += "/usr/lib/ /usr/lib/libqofono-qt5.prl"
--- a/recipes-qt/qt5/qt5-qpa-hwcomposer-plugin_git.bb
+++ b/recipes-qt/qt5/qt5-qpa-hwcomposer-plugin_git.bb
@@ -31,6 +31,6 @@ do_install_append() {
    rm -vf ${D}${libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
 }

-FILES_${PN} += "${libdir}/qt5/plugins/platforms/libhwcomposer.so"
-FILES_${PN}-dbg += "${libdir}/qt5/plugins/platforms/.debug/libhwcomposer.so"
+FILES_${PN} += "${libdir}/plugins/platforms/libhwcomposer.so"
+FILES_${PN}-dbg += "${libdir}/plugins/platforms/.debug/libhwcomposer.so"
 FILES_${PN}-dev += "${libdir}/cmake"