Hello community,
here is the log from the commit of package libKF5ModemManagerQt for
openSUSE:Factory checked in at 2015-05-11 19:38:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5ModemManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5ModemManagerQt"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5ModemManagerQt/libKF5ModemManagerQt.changes
2015-04-13 20:28:59.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new/libKF5ModemManagerQt.changes
2015-05-11 19:48:39.000000000 +0200
@@ -1,0 +2,7 @@
+Sun May 3 19:54:14 UTC 2015 - [email protected]
+
+- Update to 5.10.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.10.0.php
+
+-------------------------------------------------------------------
Old:
----
modemmanager-qt-5.9.0.tar.xz
New:
----
modemmanager-qt-5.10.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5ModemManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.ySbMnE/_old 2015-05-11 19:48:40.000000000 +0200
+++ /var/tmp/diff_new_pack.ySbMnE/_new 2015-05-11 19:48:40.000000000 +0200
@@ -17,9 +17,9 @@
%define soversion 6
-%define _tar_path 5.9
+%define _tar_path 5.10
Name: libKF5ModemManagerQt
-Version: 5.9.0
+Version: 5.10.0
Release: 0
Summary: Qt wrapper for ModemManager DBus API
License: LGPL-2.1 or LGPL-3.0
++++++ modemmanager-qt-5.9.0.tar.xz -> modemmanager-qt-5.10.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.9.0/CMakeLists.txt
new/modemmanager-qt-5.10.0/CMakeLists.txt
--- old/modemmanager-qt-5.9.0/CMakeLists.txt 2015-04-07 13:08:16.000000000
+0200
+++ new/modemmanager-qt-5.10.0/CMakeLists.txt 2015-05-02 14:40:26.000000000
+0200
@@ -2,7 +2,7 @@
project(ModemManagerQt)
-find_package(ECM 5.9.0 REQUIRED NO_MODULE)
+find_package(ECM 5.10.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake
${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -12,7 +12,7 @@
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
-set(REQUIRED_QT_VERSION 5.2.0)
+set(REQUIRED_QT_VERSION 5.4.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Xml)
add_definitions(${QT_DEFINITIONS})
@@ -28,7 +28,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "5.9.0") # handled by release scripts
+set(KF5_VERSION "5.10.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX MODEMMANAGERQT
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/modemmanagerqt_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.9.0/cmake/FindModemManager.cmake
new/modemmanager-qt-5.10.0/cmake/FindModemManager.cmake
--- old/modemmanager-qt-5.9.0/cmake/FindModemManager.cmake 2015-04-07
13:08:16.000000000 +0200
+++ new/modemmanager-qt-5.10.0/cmake/FindModemManager.cmake 2015-05-02
14:40:26.000000000 +0200
@@ -10,9 +10,28 @@
# Copyright (c) 2006, Alexander Neundorf, <[email protected]>
# Copyright (c) 2007, Will Stephenson, <[email protected]>
#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
IF (MODEMMANAGER_INCLUDE_DIRS)
# in cache already
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.9.0/metainfo.yaml
new/modemmanager-qt-5.10.0/metainfo.yaml
--- old/modemmanager-qt-5.9.0/metainfo.yaml 2015-04-07 13:08:16.000000000
+0200
+++ new/modemmanager-qt-5.10.0/metainfo.yaml 2015-05-02 14:40:26.000000000
+0200
@@ -8,4 +8,7 @@
portingAid: false
deprecated: false
release: true
+libraries:
+ - qmake: ModemManagerQt
+ cmake: "KF5ModemManagerQt"
cmakename: KF5ModemManagerQt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.9.0/src/modem.cpp
new/modemmanager-qt-5.10.0/src/modem.cpp
--- old/modemmanager-qt-5.9.0/src/modem.cpp 2015-04-07 13:08:16.000000000
+0200
+++ new/modemmanager-qt-5.10.0/src/modem.cpp 2015-05-02 14:40:26.000000000
+0200
@@ -172,27 +172,6 @@
, q_ptr(q)
{
if (modemIface.isValid()) {
-#if MM_CHECK_VERSION(1, 2, 0)
- QList<QDBusObjectPath> bearersList = modemIface.bearers();
- Q_FOREACH (const QDBusObjectPath & bearer, bearersList) {
- if (!bearers.contains(bearer.path())) {
- bearers.insert(bearer.path(), Bearer::Ptr());
- Q_EMIT q->bearerAdded(bearer.path());
- }
- }
-#else
- QDBusPendingReply<QList<QDBusObjectPath> > reply =
modemIface.ListBearers();
- reply.waitForFinished();
- if (reply.isValid()) {
- Q_FOREACH (const QDBusObjectPath & bearer, reply.value()) {
- if (!bearers.contains(bearer.path())) {
- bearers.insert(bearer.path(), Bearer::Ptr());
- Q_EMIT q->bearerAdded(bearer.path());
- }
- }
- }
-#endif
-
simPath = modemIface.sim().path();
Q_FOREACH (uint cap, modemIface.supportedCapabilities()) {
supportedCapabilities.append((MMModemCapability)cap);
@@ -227,9 +206,37 @@
currentBands.append((MMModemBand)band);
}
supportedIpFamilies =
(ModemManager::Modem::IpBearerFamilies)modemIface.supportedIpFamilies();
+
+ QTimer::singleShot(0, this,
&ModemManager::ModemPrivate::initializeBearers);
}
}
+void ModemManager::ModemPrivate::initializeBearers()
+{
+ Q_Q(Modem);
+
+#if MM_CHECK_VERSION(1, 2, 0)
+ QList<QDBusObjectPath> bearersList = modemIface.bearers();
+ Q_FOREACH (const QDBusObjectPath & bearer, bearersList) {
+ if (!bearers.contains(bearer.path())) {
+ bearers.insert(bearer.path(), Bearer::Ptr());
+ Q_EMIT q->bearerAdded(bearer.path());
+ }
+ }
+#else
+ QDBusPendingReply<QList<QDBusObjectPath> > reply =
modemIface.ListBearers();
+ reply.waitForFinished();
+ if (reply.isValid()) {
+ Q_FOREACH (const QDBusObjectPath & bearer, reply.value()) {
+ if (!bearers.contains(bearer.path())) {
+ bearers.insert(bearer.path(), Bearer::Ptr());
+ Q_EMIT q->bearerAdded(bearer.path());
+ }
+ }
+ }
+#endif
+}
+
ModemManager::Modem::Modem(const QString &path, QObject *parent)
: Interface(*new ModemPrivate(path, this), parent)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/modemmanager-qt-5.9.0/src/modem_p.h
new/modemmanager-qt-5.10.0/src/modem_p.h
--- old/modemmanager-qt-5.9.0/src/modem_p.h 2015-04-07 13:08:16.000000000
+0200
+++ new/modemmanager-qt-5.10.0/src/modem_p.h 2015-05-02 14:40:26.000000000
+0200
@@ -74,6 +74,7 @@
Q_DECLARE_PUBLIC(Modem)
Modem *q_ptr;
private Q_SLOTS:
+ void initializeBearers();
virtual void onPropertiesChanged(const QString &interface, const
QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE;
void onStateChanged(int oldState, int newState, uint reason);
};
