jgrulich pushed to plasma-nm (master). "Rebuild (kf5-modemmanager-qt)"

[notifications at fedoraproject.org]

>From fd29b2caf0a87c235198742ea2eaa596debbf67e Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich at redhat.com>
Date: Thu, 9 Apr 2015 11:15:06 +0200
Subject: Rebuild (kf5-modemmanager-qt)


diff --git a/plasma-nm-adapt-to-modemmanager-qt-API-changes.patch b/plasma-nm-adapt-to-modemmanager-qt-API-changes.patch
new file mode 100644
index 0000000..124a10a
--- /dev/null
+++ b/plasma-nm-adapt-to-modemmanager-qt-API-changes.patch
@@ -0,0 +1,65 @@
+diff --git a/libs/models/networkmodel.cpp b/libs/models/networkmodel.cpp
+index b15181b..2258f1f 100644
+--- a/libs/models/networkmodel.cpp
++++ b/libs/models/networkmodel.cpp
+@@ -246,10 +246,10 @@ void NetworkModel::initializeSignals(const NetworkManager::Device::Ptr& device)
+             if (modem->hasInterface(ModemManager::ModemDevice::ModemInterface)) {
+                 ModemManager::Modem::Ptr modemNetwork = modem->interface(ModemManager::ModemDevice::ModemInterface).objectCast<ModemManager::Modem>();
+                 if (modemNetwork) {
+-                    connect(modemNetwork.data(), SIGNAL(signalQualityChanged(uint)),
+-                            SLOT(gsmNetworkSignalQualityChanged(uint)), Qt::UniqueConnection);
+-                    connect(modemNetwork.data(), SIGNAL(accessTechnologyChanged(ModemManager::Modem::AccessTechnologies)),
+-                            SLOT(gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies)), Qt::UniqueConnection);
++                    connect(modemNetwork.data(), SIGNAL(signalQualityChanged(ModemManager::SignalQualityPair)),
++                            SLOT(gsmNetworkSignalQualityChanged(ModemManager::SignalQualityPair)), Qt::UniqueConnection);
++                    connect(modemNetwork.data(), SIGNAL(accessTechnologiesChanged(QFlags<MMModemAccessTechnology>)),
++                            SLOT(gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology>)), Qt::UniqueConnection);
+                     connect(modemNetwork.data(), SIGNAL(currentModesChanged()),
+                             SLOT(gsmNetworkCurrentModesChanged()), Qt::UniqueConnection);
+                 }
+@@ -854,9 +854,9 @@ void NetworkModel::deviceStateChanged(NetworkManager::Device::State state, Netwo
+ }
+ 
+ #if WITH_MODEMMANAGER_SUPPORT
+-void NetworkModel::gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies technology)
++void NetworkModel::gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology> accessTechnologies)
+ {
+-    Q_UNUSED(technology);
++    Q_UNUSED(accessTechnologies);
+     ModemManager::Modem * gsmNetwork = qobject_cast<ModemManager::Modem*>(sender());
+     if (gsmNetwork) {
+         Q_FOREACH(const NetworkManager::Device::Ptr & dev, NetworkManager::networkInterfaces()) {
+@@ -900,7 +900,7 @@ void NetworkModel::gsmNetworkCurrentModesChanged()
+     }
+ }
+ 
+-void NetworkModel::gsmNetworkSignalQualityChanged(uint signal)
++void NetworkModel::gsmNetworkSignalQualityChanged(const ModemManager::SignalQualityPair &signalQuality)
+ {
+     ModemManager::Modem * gsmNetwork = qobject_cast<ModemManager::Modem*>(sender());
+     if (gsmNetwork) {
+@@ -912,7 +912,7 @@ void NetworkModel::gsmNetworkSignalQualityChanged(uint signal)
+                         ModemManager::Modem::Ptr modemNetwork = modem->interface(ModemManager::ModemDevice::ModemInterface).objectCast<ModemManager::Modem>();
+                         if (modemNetwork && modemNetwork->device() == gsmNetwork->device()) {
+                             Q_FOREACH(NetworkModelItem * item, m_list.returnItems(NetworkItemsList::Device, dev->uni())) {
+-                                item->setSignal(signal);
++                                item->setSignal(signalQuality.signal);
+                                 updateItem(item);
+                             }
+                         }
+diff --git a/libs/models/networkmodel.h b/libs/models/networkmodel.h
+index bb83a95..acb520d 100644
+--- a/libs/models/networkmodel.h
++++ b/libs/models/networkmodel.h
+@@ -95,9 +95,9 @@ private Q_SLOTS:
+     void deviceRemoved(const QString& device);
+     void deviceStateChanged(NetworkManager::Device::State state, NetworkManager::Device::State oldState, NetworkManager::Device::StateChangeReason reason);
+ #if WITH_MODEMMANAGER_SUPPORT
+-    void gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies technology);
++    void gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology> accessTechnologies);
+     void gsmNetworkCurrentModesChanged();
+-    void gsmNetworkSignalQualityChanged(uint signal);
++    void gsmNetworkSignalQualityChanged(const ModemManager::SignalQualityPair &signalQuality);
+ #endif
+     void ipConfigChanged();
+     void ipInterfaceChanged();
diff --git a/plasma-nm.spec b/plasma-nm.spec
index 6d7955b..4f0c7e6 100644
--- a/plasma-nm.spec
+++ b/plasma-nm.spec
@@ -1,6 +1,6 @@
 Name:           plasma-nm
 Version:        5.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plasma Next applet written in QML for managing network connections
 License:        LGPLv2+ and GPLv2+
 URL:            https://projects.kde.org/projects/kde/workspace/plasma-nm
@@ -14,7 +14,10 @@ URL:            https://projects.kde.org/projects/kde/workspace/plasma-nm
 Source0:        http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
 
 # Add plasma-nm to default systray if needed, for upgraders...
-Source10:        01-fedora-plasma-nm.js
+Source10:       01-fedora-plasma-nm.js
+
+# Upstream patches
+Patch0:         plasma-nm-adapt-to-modemmanager-qt-API-changes.patch
 
 BuildRequires:  gettext
 
@@ -154,6 +157,8 @@ Provides:       kde-plasma-nm-pptp = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0 -p1 -b .adapt-to-modemmanager-qt-API-changes
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -240,6 +245,9 @@ install -m644 -p -D %{SOURCE10} %{buildroot}%{_datadir}/plasma/updates/01-fedora
 %endif
 
 %changelog
+* Thu Apr 09 2015 Jan Grulich <jgrulich at redhat.com> - 5.2.2-2
+- Rebuild (kf5-modemmanager-qt)
+
 * Fri Mar 20 2015 Daniel Vrátil <dvratil at redhat.com> - 5.2.2-1
 - Plasma 5.2.2
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/plasma-nm.git/commit/?h=master&id=fd29b2caf0a87c235198742ea2eaa596debbf67e