nemo-qml-plugin-systemsettings: Bump SRCREV and adapt patches and QML import...

nemo-qml-plugin-systemsettings: Bump SRCREV and adapt patches and QML import path to the new Nemo.Abc norm

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings/0001-Disable-SSU-dependency.patch

+From e131c0ee861e4de36558951dc6c258cc6b9295cf Mon Sep 17 00:00:00 2001
+From: Florent Revest <revestflo@gmail.com>
+Date: Tue, 20 Feb 2018 14:46:26 +0100
+Subject: [PATCH] Disable SSU dependency
+
+---
+ src/deviceinfo.cpp | 21 ---------------------
+ src/src.pro        |  1 -
+ 2 files changed, 22 deletions(-)
+
+diff --git a/src/deviceinfo.cpp b/src/deviceinfo.cpp
+index db7941e..2f75861 100644
+--- a/src/deviceinfo.cpp
++++ b/src/deviceinfo.cpp
+@@ -33,8 +33,6 @@
+ 
+ #include <QSet>
+ 
+-#include <ssusysinfo.h>
+-
+ class DeviceInfoPrivate
+ {
+ public:
+@@ -47,25 +45,6 @@ public:
+ 
+ DeviceInfoPrivate::DeviceInfoPrivate()
+ {
+-    ssusysinfo_t *si = ssusysinfo_create();
+-
+-    hw_feature_t *features = ssusysinfo_get_hw_features(si);
+-    if (features) {
+-        for (size_t i = 0; features[i]; ++i) {
+-            m_features.insert(static_cast<DeviceInfo::Feature>(features[i]));
+-        }
+-        free(features);
+-    }
+-
+-    hw_key_t *keys = ssusysinfo_get_hw_keys(si);
+-    if (keys) {
+-        for (size_t i = 0; keys[i]; ++i) {
+-            m_keys.insert(static_cast<Qt::Key>(keys[i]));
+-        }
+-        free(keys);
+-    }
+-
+-    ssusysinfo_delete(si);
+ }
+ 
+ DeviceInfoPrivate::~DeviceInfoPrivate()
+diff --git a/src/src.pro b/src/src.pro
+index d86d61b..6f46264 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -7,7 +7,6 @@ QT -= gui
+ 
+ CONFIG += c++11 hide_symbols link_pkgconfig
+ PKGCONFIG += profile mlite5 mce timed-qt5 libshadowutils blkid libcrypto nemomodels-qt5 libsailfishkeyprovider connman-qt5
+-PKGCONFIG += ssu-sysinfo
+ 
+ system(qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)
+ system(qdbusxml2cpp -c ConnmanVpnProxy -p connmanvpnproxy ../dbus/net.connman.vpn.xml -i qdbusxml2cpp_dbus_types.h)
+-- 
+2.14.3
+

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings/0001-Update-QStorageInfo-API-usage.patch

-From 8cd5abea3b6c34c2e5e21c00a1b759c963ebf069 Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Mon, 26 Oct 2015 21:18:35 +0100
-Subject: [PATCH] Update QStorageInfo API usage
-
----
- src/aboutsettings.cpp | 10 ++++------
- src/aboutsettings.h   |  2 --
- 2 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/src/aboutsettings.cpp b/src/aboutsettings.cpp
-index ef10c82..d1a2f89 100644
---- a/src/aboutsettings.cpp
-+++ b/src/aboutsettings.cpp
-@@ -118,11 +118,9 @@ static QMap<QString, QString> parseReleaseFile(const QString &filename)
- 
- AboutSettings::AboutSettings(QObject *parent)
-     : QObject(parent),
--      m_sysinfo(new QStorageInfo(this)),
-       m_netinfo(new QNetworkInfo(this)),
-       m_devinfo(new QDeviceInfo(this))
- {
--    qDebug() << "Drives:" << m_sysinfo->allLogicalDrives();
- }
- 
- AboutSettings::~AboutSettings()
-@@ -131,12 +129,12 @@ AboutSettings::~AboutSettings()
- 
- qlonglong AboutSettings::totalDiskSpace() const
- {
--    return m_sysinfo->totalDiskSpace("/");
-+    return QStorageInfo("/").bytesTotal();
- }
- 
- qlonglong AboutSettings::availableDiskSpace() const
- {
--    return m_sysinfo->availableDiskSpace("/");
-+    return QStorageInfo("/").bytesFree();
- }
- 
- QVariant AboutSettings::diskUsageModel() const
-@@ -172,8 +170,8 @@ QVariant AboutSettings::diskUsageModel() const
-         QVariantMap row;
-         row["storageType"] = (paths.count() == 1) ? QString("mass") : (path == "/") ? QString("system") : QString("user");
-         row["path"] = QString(path);
--        row["available"] = m_sysinfo->availableDiskSpace(path);
--        row["total"] = m_sysinfo->totalDiskSpace(path);
-+        row["available"] = QStorageInfo(path).bytesFree();
-+        row["total"] = QStorageInfo(path).bytesTotal();
-         result << QVariant(row);
-     }
- 
-diff --git a/src/aboutsettings.h b/src/aboutsettings.h
-index dd3335a..bd3897f 100644
---- a/src/aboutsettings.h
-+++ b/src/aboutsettings.h
-@@ -35,7 +35,6 @@
- #include <QObject>
- #include <QVariant>
- 
--class QStorageInfo;
- class QNetworkInfo;
- class QDeviceInfo;
- class AboutSettings: public QObject
-@@ -75,7 +74,6 @@ public:
-     QString adaptationVersion() const;
- 
- private:
--    QStorageInfo *m_sysinfo;
-     QNetworkInfo *m_netinfo;
-     QDeviceInfo *m_devinfo;
- };
--- 
-2.6.1
-

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings/0003-languagemodel-don-t-require-region-names.patch

-From ec2014d39983c0a879a4190faf792169743a60c3 Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Mon, 16 Jan 2017 13:01:39 +0100
-Subject: [PATCH 2/2] languagemodel: don't require region names
-
----
- src/languagemodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/languagemodel.cpp b/src/languagemodel.cpp
-index 2ea0d72..4b493f4 100644
---- a/src/languagemodel.cpp
-+++ b/src/languagemodel.cpp
-@@ -222,7 +222,7 @@ QList<Language> LanguageModel::supportedLanguages()
-         QString region = settings.value("Region").toString();
-         //% "Region: %1"
-         QString regionLabel = settings.value("RegionLabel", qtTrId("settings_system-la-region")).toString();
--        if (name.isEmpty() || localeCode.isEmpty() || region.isEmpty()) {
-+        if (name.isEmpty() || localeCode.isEmpty()) {
-             continue;
-         }
-         Language newLanguage(name, localeCode, region, regionLabel);
--- 
-2.11.0
-

recipes-nemomobile/nemo-qml-plugins/nemo-qml-plugin-systemsettings_git.bb

@@ -4,18 +4,17 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://src/displaysettings.cpp;beginline=1;endline=31;md5=99ff23884718e3e2c85992a9294d18df"
 
 SRC_URI = "git://git.merproject.org/mer-core/nemo-qml-plugin-systemsettings.git;protocol=https \
-    file://0001-Update-QStorageInfo-API-usage.patch \
+    file://0001-Disable-SSU-dependency.patch \
     file://0002-languagemodel-install-languages-in-usr-share-support.patch \
-    file://0003-languagemodel-don-t-require-region-names.patch \
     file://0004-LanguageModel-Notify-asteroid-launcher-of-locale-cha.patch"
-SRCREV = "8e98f8c8069592d3dd21011743fdfb4d2efcc50a"
+SRCREV = "0c3034612fabce0cca18366f6ac04020296428cf"
 PR = "r1"
 PV = "+git${SRCPV}"
 S = "${WORKDIR}/git"
 inherit qmake5
 
-DEPENDS += "qtdeclarative profiled usb-moded-qt5 mlite mce timed qtsystems"
+DEPENDS += "qtdeclarative profiled usb-moded-qt5 mlite mce timed qtsystems libshadowutils nemo-qml-plugin-models libsailfishkeyprovider libconnman-qt5"
 RDEPENDS_${PN} += "profiled"
 
 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/"
+FILES_${PN} += "/usr/lib/qml/org/nemomobile/systemsettings/ /usr/lib/systemd"