From 20e3c35f9ce30dcd25fac773d2b63f43ac8668a1 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 10 Aug 2016 13:59:44 +0200
Subject: libconnman-qt5: move to recipes-connectivity and don't use MeeGo as
 prefix

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...eeGo-as-prefix-in-order-to-make-this-a-co.patch | 50 ++++++++++++++++++++++
 .../libconnman-qt/libconnman-qt5_git.bb            | 25 +++++++++++
 recipes-qt/libconnman-qt/libconnman-qt5_git.bb     | 23 ----------
 3 files changed, 75 insertions(+), 23 deletions(-)
 create mode 100644 recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
 create mode 100644 recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb
 delete mode 100644 recipes-qt/libconnman-qt/libconnman-qt5_git.bb

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 @@
+From 46b6456bc8995b8d6249fb008a538222d30716cd Mon Sep 17 00:00:00 2001
+From: Christophe Chapuis <chris.chapuis@gmail.com>
+Date: Tue, 26 Jan 2016 18:56:42 +0100
+Subject: [PATCH] Don't use MeeGo as prefix in order to make this a common
+ component
+
+Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
+---
+ plugin/components.h | 2 +-
+ plugin/plugin.pro   | 2 +-
+ plugin/qmldir       | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugin/components.h b/plugin/components.h
+index d4f2bcd..49b7ac2 100644
+--- a/plugin/components.h
++++ b/plugin/components.h
+@@ -17,7 +17,7 @@
+ class Components : public QQmlExtensionPlugin
+ {
+     Q_OBJECT
+-    Q_PLUGIN_METADATA(IID "MeeGo.Connman")
++    Q_PLUGIN_METADATA(IID "Connman")
+ 
+ public:
+     void registerTypes(const char *uri);
+diff --git a/plugin/plugin.pro b/plugin/plugin.pro
+index 31d9076..da47ad9 100644
+--- a/plugin/plugin.pro
++++ b/plugin/plugin.pro
+@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX)
+ QT += qml
+ OTHER_FILES += plugin.json qmldirs
+ 
+-MODULENAME = MeeGo/Connman
++MODULENAME = Connman
+ TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME
+ 
+ target.path = $$TARGETPATH
+diff --git a/plugin/qmldir b/plugin/qmldir
+index 5db82b7..de56688 100644
+--- a/plugin/qmldir
++++ b/plugin/qmldir
+@@ -1,2 +1,2 @@
+-module MeeGo.Connman
++module Connman
+ plugin ConnmanQtDeclarative
+-- 
+1.8.1.2
+
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 @@
+require recipes-qt/qt5/qt5.inc
+
+SUMMARY = "Qt Library for ConnMan"
+HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
+DEPENDS += "qtbase qtdeclarative"
+PV = "1.0.98+git${SRCPV}"
+
+SRCREV = "8d4580a55ca02b84fc3db374c6530e39c94e0d92"
+SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \
+    file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \
+"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+RDEPENDS_${PN} += "connman"
+
+do_install_append() {
+    if ls ${D}${libdir}/pkgconfig/connman-qt5.pc >/dev/null 2>/dev/null; then
+        sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/connman-qt5.pc
+    fi
+}
diff --git a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
deleted file mode 100644
index fe86eb56..00000000
--- a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require recipes-qt/qt5/qt5.inc
-
-SUMMARY = "Qt Library for ConnMan"
-HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
-DEPENDS += "qtbase qtdeclarative"
-PV = "1.0.98+git${SRCPV}"
-
-SRCREV = "8d4580a55ca02b84fc3db374c6530e39c94e0d92"
-SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https"
-
-S = "${WORKDIR}/git"
-
-inherit pkgconfig
-
-RDEPENDS_${PN} += "connman"
-
-do_install_append() {
-    if ls ${D}${libdir}/pkgconfig/connman-qt5.pc >/dev/null 2>/dev/null; then
-        sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/connman-qt5.pc
-    fi
-}
-- 
cgit v1.2.3