Commit fe3ed87e authored by Florent Revest's avatar Florent Revest

Make various previously implicit dependencies explicit for OE pyro

parent 1f644992
...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}" ...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit qmake5 inherit qmake5
DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents nemo-qml-plugin-alarms" DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents nemo-qml-plugin-alarms qttools-native"
RDEPENDS_${PN} += "nemo-qml-plugin-alarms" RDEPENDS_${PN} += "nemo-qml-plugin-alarms"
FILES_${PN} += "/usr/share/translations/ /usr/lib/systemd/user/alarmpresenter.service /usr/share/dbus-1/services/com.nokia.voland.service" FILES_${PN} += "/usr/share/translations/ /usr/lib/systemd/user/alarmpresenter.service /usr/share/dbus-1/services/com.nokia.voland.service"
......
...@@ -11,7 +11,7 @@ PV = "+git${SRCPV}" ...@@ -11,7 +11,7 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit qmake5 gsettings inherit qmake5 gsettings
DEPENDS += "qtbase glibmm qtmpris statefs-qt timed" DEPENDS += "qtbase glibmm qtmpris statefs-qt timed qttools-native"
RDEPENDS_${PN} += "glibmm qtmpris" RDEPENDS_${PN} += "glibmm qtmpris"
FILES_${PN} += "/usr/bin/ /usr/lib/systemd/user/ /usr/share/glib-2.0/schemas /usr/share/translations/ /home/ceres/.config/systemd/user/default.target.wants/" FILES_${PN} += "/usr/bin/ /usr/lib/systemd/user/ /usr/share/glib-2.0/schemas /usr/share/translations/ /home/ceres/.config/systemd/user/default.target.wants/"
......
...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}" ...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit qmake5 inherit qmake5
DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents nemo-qml-plugin-calendar" DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents nemo-qml-plugin-calendar qttools-native"
RDEPENDS_${PN} += "nemo-qml-plugin-calendar" RDEPENDS_${PN} += "nemo-qml-plugin-calendar"
FILES_${PN} += "/usr/share/translations/" FILES_${PN} += "/usr/share/translations/"
......
...@@ -13,7 +13,7 @@ PV = "+git${SRCPV}" ...@@ -13,7 +13,7 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit qmake5 inherit qmake5
DEPENDS += "lipstick" DEPENDS += "lipstick qttools-native"
RDEPENDS_${PN} += "qtdeclarative-qmlplugins qml-asteroid qtwayland-plugins nemo-qml-plugin-time nemo-qml-plugin-contextkit nemo-qml-plugin-configuration asteroid-wallpapers ttf-roboto ttf-raleway ttf-orbitron" RDEPENDS_${PN} += "qtdeclarative-qmlplugins qml-asteroid qtwayland-plugins nemo-qml-plugin-time nemo-qml-plugin-contextkit nemo-qml-plugin-configuration asteroid-wallpapers ttf-roboto ttf-raleway ttf-orbitron"
FILES_${PN} += "/usr/share/asteroid-launcher/ /usr/lib/systemd/user/ /usr/share/translations/ /home/ceres/.config/systemd/user/default.target.wants/" FILES_${PN} += "/usr/share/asteroid-launcher/ /usr/lib/systemd/user/ /usr/share/translations/ /home/ceres/.config/systemd/user/default.target.wants/"
......
...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}" ...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit qmake5 inherit qmake5
DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents qtmpris" DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents qtmpris qttools-native"
RDEPENDS_${PN} += "qtmpris" RDEPENDS_${PN} += "qtmpris"
FILES_${PN} += "/usr/share/translations/" FILES_${PN} += "/usr/share/translations/"
......
...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}" ...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit qmake5 inherit qmake5
DEPENDS += "qml-asteroid nemo-qml-plugin-systemsettings nemo-qml-plugin-dbus mapplauncherd-booster-qtcomponents" DEPENDS += "qml-asteroid nemo-qml-plugin-systemsettings nemo-qml-plugin-dbus mapplauncherd-booster-qtcomponents qttools-native"
RDEPENDS_${PN} += "nemo-qml-plugin-systemsettings nemo-qml-plugin-dbus" RDEPENDS_${PN} += "nemo-qml-plugin-systemsettings nemo-qml-plugin-dbus"
FILES_${PN} += "/usr/share/translations/" FILES_${PN} += "/usr/share/translations/"
......
...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}" ...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit qmake5 inherit qmake5
DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents nemo-qml-plugin-configuration" DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents nemo-qml-plugin-configuration qttools-native"
RDEPENDS_${PN} += "nemo-qml-plugin-configuration" RDEPENDS_${PN} += "nemo-qml-plugin-configuration"
FILES_${PN} += "/usr/share/translations/ /usr/share/fonts" FILES_${PN} += "/usr/share/translations/ /usr/share/fonts"
......
...@@ -3,7 +3,7 @@ HOMEPAGE = "https://git.merproject.org/mer-core/libdsme" ...@@ -3,7 +3,7 @@ HOMEPAGE = "https://git.merproject.org/mer-core/libdsme"
LICENSE = "LGPL-2.1+" LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS += " glib-2.0 libcheck" DEPENDS += " glib-2.0 libcheck pkgconfig-native"
SRC_URI = "git://git.merproject.org/mer-core/libdsme.git;protocol=https \ SRC_URI = "git://git.merproject.org/mer-core/libdsme.git;protocol=https \
file://001-Allows-custom-cflags.patch \ file://001-Allows-custom-cflags.patch \
......
...@@ -18,7 +18,7 @@ do_configure_prepend() { ...@@ -18,7 +18,7 @@ do_configure_prepend() {
sed -i "s/docs tools/tools/" Makefile.am sed -i "s/docs tools/tools/" Makefile.am
} }
DEPENDS += "glib-2.0" DEPENDS += "glib-2.0 glib-2.0-native"
inherit autotools pkgconfig inherit autotools pkgconfig
B = "${S}" B = "${S}"
......
...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}" ...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit qmake5 inherit qmake5
B = "${S}" B = "${S}"
DEPENDS += "qtbase" DEPENDS += "qtbase bison-native flex-native"
do_configure_prepend () { do_configure_prepend () {
export IODATA_VERSION=0.19.8 export IODATA_VERSION=0.19.8
......
...@@ -9,7 +9,7 @@ PR = "r1" ...@@ -9,7 +9,7 @@ PR = "r1"
PV = "+git${SRCPV}" PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEPENDS += "glib-2.0 dbus dbus-glib" DEPENDS += "glib-2.0 dbus dbus-glib libcheck"
RDEPENDS_${PN} += "ngfd" RDEPENDS_${PN} += "ngfd"
inherit autotools pkgconfig inherit autotools pkgconfig
...@@ -13,5 +13,5 @@ do_compile_prepend() { ...@@ -13,5 +13,5 @@ do_compile_prepend() {
sed -i "s@\$(top_builddir)/src/libresource.la@libresource.la@g" src/Makefile sed -i "s@\$(top_builddir)/src/libresource.la@libresource.la@g" src/Makefile
} }
DEPENDS += " glib-2.0 dbus-glib dbus" DEPENDS += " glib-2.0 dbus-glib dbus libcheck-native"
inherit autotools pkgconfig inherit autotools pkgconfig
...@@ -13,7 +13,7 @@ PR = "r1" ...@@ -13,7 +13,7 @@ PR = "r1"
PV = "+git${SRCPV}" PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEPENDS += "glib-2.0 libdsme libiphb systemd dbus-glib dbus libngf" DEPENDS += "glib-2.0 libdsme libiphb systemd dbus-glib dbus libngf pkgconfig-native"
do_install() { do_install() {
oe_runmake install DESTDIR=${D} oe_runmake install DESTDIR=${D}
......
...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}" ...@@ -10,7 +10,7 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit qmake5 inherit qmake5
DEPENDS += "qtdeclarative timed" DEPENDS += "qtdeclarative timed mce"
FILES_${PN}-dbg += "/usr/lib/qml/org/nemomobile/time/.debug /opt/" FILES_${PN}-dbg += "/usr/lib/qml/org/nemomobile/time/.debug /opt/"
FILES_${PN} += "/usr/lib/qml/org/nemomobile/time/ " FILES_${PN} += "/usr/lib/qml/org/nemomobile/time/ "
...@@ -10,7 +10,7 @@ PR = "r1" ...@@ -10,7 +10,7 @@ PR = "r1"
PV = "+git${SRCPV}" PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEPENDS += "glib-2.0 dbus dbus-glib" DEPENDS += "glib-2.0 dbus dbus-glib pkgconfig-native"
B = "${WORKDIR}/git" B = "${WORKDIR}/git"
do_compile_prepend() { do_compile_prepend() {
......
...@@ -9,7 +9,7 @@ PR = "r1" ...@@ -9,7 +9,7 @@ PR = "r1"
PV = "+git${SRCPV}" PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEPENDS += "statefs boost qtbase statefs-qt qtsensors" DEPENDS += "statefs boost qtbase statefs-qt qtsensors mce"
RDEPENDS_${PN} += "statefs-loader-qt" RDEPENDS_${PN} += "statefs-loader-qt"
inherit cmake_qt5 inherit cmake_qt5
......
...@@ -11,6 +11,8 @@ PV = "+git${SRCPV}" ...@@ -11,6 +11,8 @@ PV = "+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
B = "${S}" B = "${S}"
DEPENDS = "pcre-native"
do_configure_append() { do_configure_append() {
if [ ! -x /usr/sbin/zic ] && [ -x /usr/bin/zic ]; then if [ ! -x /usr/sbin/zic ] && [ -x /usr/bin/zic ]; then
sed -i "s,/usr/sbin/zic,/usr/bin/zic," "${S}/scripts/zone-generate.sh" "${S}/scripts/zone-list.sh" sed -i "s,/usr/sbin/zic,/usr/bin/zic," "${S}/scripts/zone-generate.sh" "${S}/scripts/zone-list.sh"
......
From 5b724dd32edb965bfc7c762d0a88e8c4f85eaff0 Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Wed, 24 May 2017 22:10:43 +0200
Subject: [PATCH] src.pro: Make sure com.meego.usb_moded.xml is correctly found
---
src/src.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/src.pro b/src/src.pro
index 3212eba..10f53c4 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -27,7 +27,7 @@ HEADERS += \
$$PUBLIC_HEADERS \
qusbmoded_debug.h
-USB_MODED_INCLUDE_PATH = $$system(for d in `pkg-config --cflags-only-I usb_moded` ; do echo $d ; done | grep usb.moded | sed s/^-I//g)
+USB_MODED_INCLUDE_PATH = "../../recipe-sysroot/usr/include/usb-moded/"
DBUS_INTERFACES += com_meego_usb_moded
com_meego_usb_moded.files = $$USB_MODED_INCLUDE_PATH/com.meego.usb_moded.xml
com_meego_usb_moded.header_flags = -N -c QUsbModedInterface
--
2.11.0
...@@ -4,6 +4,7 @@ LICENSE = "BSD" ...@@ -4,6 +4,7 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://src/qusbmoded.cpp;beginline=1;endline=32;md5=ad12d596c12a6a1ba1d75376dc1f199a" LIC_FILES_CHKSUM = "file://src/qusbmoded.cpp;beginline=1;endline=32;md5=ad12d596c12a6a1ba1d75376dc1f199a"
SRC_URI = "git://github.com/nemomobile/libusb-moded-qt;protocol=https \ SRC_URI = "git://github.com/nemomobile/libusb-moded-qt;protocol=https \
file://0001-src.pro-Make-sure-com.meego.usb_moded.xml-is-correct.patch \
file://usb-moded-qt5.pc" file://usb-moded-qt5.pc"
SRCREV = "0a4b8ffe0cd775cce7a2366c8363d29d617b8e60" SRCREV = "0a4b8ffe0cd775cce7a2366c8363d29d617b8e60"
PR = "r1" PR = "r1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment