diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-10 13:59:44 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-05 13:43:11 +0200 |
| commit | 20e3c35f9ce30dcd25fac773d2b63f43ac8668a1 (patch) | |
| tree | 4733153be71046c38a9a990c3231a5edbc0a8222 /recipes-connectivity | |
| parent | 37a165badb89c4908cfbb535c784586481949a26 (diff) | |
| download | meta-qt5-20e3c35f9ce30dcd25fac773d2b63f43ac8668a1.tar.gz | |
libconnman-qt5: move to recipes-connectivity and don't use MeeGo as prefix
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-connectivity')
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch | 50 | ||||
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb | 25 |
2 files changed, 75 insertions, 0 deletions
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch new file mode 100644 index 00000000..75943db0 --- /dev/null +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | From 46b6456bc8995b8d6249fb008a538222d30716cd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Christophe Chapuis <chris.chapuis@gmail.com> | ||
| 3 | Date: Tue, 26 Jan 2016 18:56:42 +0100 | ||
| 4 | Subject: [PATCH] Don't use MeeGo as prefix in order to make this a common | ||
| 5 | component | ||
| 6 | |||
| 7 | Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com> | ||
| 8 | --- | ||
| 9 | plugin/components.h | 2 +- | ||
| 10 | plugin/plugin.pro | 2 +- | ||
| 11 | plugin/qmldir | 2 +- | ||
| 12 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/plugin/components.h b/plugin/components.h | ||
| 15 | index d4f2bcd..49b7ac2 100644 | ||
| 16 | --- a/plugin/components.h | ||
| 17 | +++ b/plugin/components.h | ||
| 18 | @@ -17,7 +17,7 @@ | ||
| 19 | class Components : public QQmlExtensionPlugin | ||
| 20 | { | ||
| 21 | Q_OBJECT | ||
| 22 | - Q_PLUGIN_METADATA(IID "MeeGo.Connman") | ||
| 23 | + Q_PLUGIN_METADATA(IID "Connman") | ||
| 24 | |||
| 25 | public: | ||
| 26 | void registerTypes(const char *uri); | ||
| 27 | diff --git a/plugin/plugin.pro b/plugin/plugin.pro | ||
| 28 | index 31d9076..da47ad9 100644 | ||
| 29 | --- a/plugin/plugin.pro | ||
| 30 | +++ b/plugin/plugin.pro | ||
| 31 | @@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX) | ||
| 32 | QT += qml | ||
| 33 | OTHER_FILES += plugin.json qmldirs | ||
| 34 | |||
| 35 | -MODULENAME = MeeGo/Connman | ||
| 36 | +MODULENAME = Connman | ||
| 37 | TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME | ||
| 38 | |||
| 39 | target.path = $$TARGETPATH | ||
| 40 | diff --git a/plugin/qmldir b/plugin/qmldir | ||
| 41 | index 5db82b7..de56688 100644 | ||
| 42 | --- a/plugin/qmldir | ||
| 43 | +++ b/plugin/qmldir | ||
| 44 | @@ -1,2 +1,2 @@ | ||
| 45 | -module MeeGo.Connman | ||
| 46 | +module Connman | ||
| 47 | plugin ConnmanQtDeclarative | ||
| 48 | -- | ||
| 49 | 1.8.1.2 | ||
| 50 | |||
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb new file mode 100644 index 00000000..3ceb3558 --- /dev/null +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | require recipes-qt/qt5/qt5.inc | ||
| 2 | |||
| 3 | SUMMARY = "Qt Library for ConnMan" | ||
| 4 | HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt" | ||
| 5 | LICENSE = "Apache-2.0" | ||
| 6 | LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" | ||
| 7 | DEPENDS += "qtbase qtdeclarative" | ||
| 8 | PV = "1.0.98+git${SRCPV}" | ||
| 9 | |||
| 10 | SRCREV = "8d4580a55ca02b84fc3db374c6530e39c94e0d92" | ||
| 11 | SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ | ||
| 12 | file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ | ||
| 13 | " | ||
| 14 | |||
| 15 | S = "${WORKDIR}/git" | ||
| 16 | |||
| 17 | inherit pkgconfig | ||
| 18 | |||
| 19 | RDEPENDS_${PN} += "connman" | ||
| 20 | |||
| 21 | do_install_append() { | ||
| 22 | if ls ${D}${libdir}/pkgconfig/connman-qt5.pc >/dev/null 2>/dev/null; then | ||
| 23 | sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/connman-qt5.pc | ||
| 24 | fi | ||
| 25 | } | ||
