Hello community,
here is the log from the commit of package libKF5ModemManagerQt for
openSUSE:Factory checked in at 2014-07-25 09:09:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-07-11 20:05:43.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new/libKF5ModemManagerQt.changes
2014-07-25 09:10:07.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jul 11 16:53:31 UTC 2014 - [email protected]
+
+- Update to 5.0.91
+ * Build fixes for MM 1.0 and 1.2
+- Drop fix_build.diff, merged upstream
+
+-------------------------------------------------------------------
Old:
----
fix_build.diff
libmm-qt-5.0.90.tar.xz
New:
----
libmm-qt-5.0.91.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5ModemManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.nPdxOG/_old 2014-07-25 09:10:08.000000000 +0200
+++ /var/tmp/diff_new_pack.nPdxOG/_new 2014-07-25 09:10:08.000000000 +0200
@@ -20,15 +20,14 @@
%define soversion 5
Name: libKF5ModemManagerQt
-Version: 5.0.90
+Version: 5.0.91
Release: 0
Summary: Qt wrapper for ModemManager DBus API
License: LGPL-2.1 or LGPL-3.0
Group: System/GUI/KDE
-Source:
http://download.kde.org/unstable/plasma/4.98.0/src/libmm-qt-%{version}.tar.xz
-Patch0: fix_build.diff
+Source: libmm-qt-%{version}.tar.xz
BuildRequires: cmake
-BuildRequires: extra-cmake-modules
+BuildRequires: extra-cmake-modules >= 1.0.0
BuildRequires: kf5-filesystem
BuildRequires: pkgconfig(ModemManager)
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
@@ -63,7 +62,6 @@
%prep
%setup -q -n libmm-qt-%{version}
-%patch0 -p1
%build
%cmake_kf5 -d build
++++++ libmm-qt-5.0.90.tar.xz -> libmm-qt-5.0.91.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/CMakeLists.txt
new/libmm-qt-5.0.91/CMakeLists.txt
--- old/libmm-qt-5.0.90/CMakeLists.txt 2014-07-03 17:24:32.000000000 +0200
+++ new/libmm-qt-5.0.91/CMakeLists.txt 2014-07-11 11:10:22.000000000 +0200
@@ -2,7 +2,7 @@
project(ModemManagerQt)
-find_package(ECM 0.0.13 REQUIRED NO_MODULE)
+find_package(ECM 1.0.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -34,7 +34,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "5.0.90")
+set(KF5_VERSION "5.0.91")
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/libmm-qt-5.0.90/modemmanagerqt.yaml
new/libmm-qt-5.0.91/modemmanagerqt.yaml
--- old/libmm-qt-5.0.90/modemmanagerqt.yaml 2014-07-03 17:24:32.000000000
+0200
+++ new/libmm-qt-5.0.91/modemmanagerqt.yaml 2014-07-11 11:10:22.000000000
+0200
@@ -1 +1,10 @@
+maintainer: Lamarque Souza, Jan Grulich, Lukáš Tinkl
+description: Qt wrapper for ModemManager API
tier: 1
+type: integration
+platforms:
+ - name: Linux
+ - note: Functional only with running ModemManager
+portingAid: false
+deprecated: false
+release: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/CMakeLists.txt
new/libmm-qt-5.0.91/src/CMakeLists.txt
--- old/libmm-qt-5.0.90/src/CMakeLists.txt 2014-07-03 17:24:32.000000000
+0200
+++ new/libmm-qt-5.0.91/src/CMakeLists.txt 2014-07-11 11:10:22.000000000
+0200
@@ -17,9 +17,7 @@
modemfirmware.cpp
modemlocation.cpp
modemmessaging.cpp
- modemsignal.cpp
modemtime.cpp
- modemoma.cpp
sim.cpp
sms.cpp
)
@@ -34,8 +32,6 @@
dbus/modemcdmainterface.cpp
dbus/modeminterface.cpp
dbus/modemmanager1interface.cpp
- dbus/omainterface.cpp
- dbus/signalinterface.cpp
dbus/siminterface.cpp
dbus/simpleinterface.cpp
dbus/smsinterface.cpp
@@ -43,6 +39,20 @@
dbus/ussdinterface.cpp
)
+if (${MODEMMANAGER_VERSION} VERSION_EQUAL 1.2.0 OR ${MODEMMANAGER_VERSION}
VERSION_GREATER 1.2.0)
+ set(ModemManagerQt_SRCS
+ ${ModemManagerQt_SRCS}
+ modemoma.cpp
+ modemsignal.cpp
+ )
+
+ set(DBUS_INTERFACES_FILES
+ ${DBUS_INTERFACES_FILES}
+ dbus/omainterface.cpp
+ dbus/signalinterface.cpp
+ )
+endif()
+
add_library(KF5ModemManagerQt SHARED ${ModemManagerQt_SRCS}
${DBUS_INTERFACES_FILES})
generate_export_header(KF5ModemManagerQt BASE_NAME ModemManagerQt)
add_library(KF5::ModemManagerQt ALIAS KF5ModemManagerQt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/generictypes.cpp
new/libmm-qt-5.0.91/src/generictypes.cpp
--- old/libmm-qt-5.0.90/src/generictypes.cpp 2014-07-03 17:24:32.000000000
+0200
+++ new/libmm-qt-5.0.91/src/generictypes.cpp 2014-07-11 11:10:22.000000000
+0200
@@ -65,6 +65,7 @@
return arg;
}
+#if MM_CHECK_VERSION(1, 2, 0)
// Marshall the OmaSessionType data into a D-BUS argument
QDBusArgument &operator << (QDBusArgument &arg, const OmaSessionType
&sessionType)
{
@@ -86,6 +87,7 @@
return arg;
}
+#endif
// Marshall the SignalQualityPair data into a D-BUS argument
QDBusArgument &operator << (QDBusArgument &arg, const SignalQualityPair &sqp)
@@ -160,8 +162,10 @@
qDBusRegisterMetaType<SupportedModesType>();
qDBusRegisterMetaType<UnlockRetriesMap>();
qDBusRegisterMetaType<QVariantMapList>();
+#if MM_CHECK_VERSION(1, 2, 0)
qDBusRegisterMetaType<OmaSessionType>();
qDBusRegisterMetaType<OmaSessionTypes>();
+#endif
//qDBusRegisterMetaType<LocationInformationMap>();
qDBusRegisterMetaType<ValidityPair>();
qDBusRegisterMetaType<PortList>();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/generictypes.h
new/libmm-qt-5.0.91/src/generictypes.h
--- old/libmm-qt-5.0.90/src/generictypes.h 2014-07-03 17:24:32.000000000
+0200
+++ new/libmm-qt-5.0.91/src/generictypes.h 2014-07-11 11:10:22.000000000
+0200
@@ -28,11 +28,6 @@
#include <QMetaType>
#include <QtDBus/QtDBus>
-#if !MM_CHECK_VERSION(1, 2, 0)
-typedef uint MMSmsCdmaTeleserviceId;
-typedef uint MMSmsCdmaServiceCategory;
-#endif
-
typedef QMap<QString, QVariantMap> NMVariantMapMap;
typedef QMap<QDBusObjectPath, NMVariantMapMap> DBUSManagerStruct;
typedef QList<uint> UIntList;
@@ -55,12 +50,14 @@
} CurrentModesType;
typedef QList<CurrentModesType> SupportedModesType;
+#if MM_CHECK_VERSION(1, 2, 0)
typedef struct {
public:
MMOmaSessionType type;
uint id;
} OmaSessionType;
typedef QList<OmaSessionType> OmaSessionTypes;
+#endif
typedef QMap</*MMModemLock*/uint, uint> UnlockRetriesMap;
typedef QList<QVariantMap> QVariantMapList;
typedef QMap<MMModemLocationSource, QVariant> LocationInformationMap;
@@ -85,9 +82,11 @@
MODEMMANAGERQT_EXPORT QDBusArgument &operator << (QDBusArgument &arg, const
ValidityPair &vp);
MODEMMANAGERQT_EXPORT const QDBusArgument &operator >> (const QDBusArgument
&arg, ValidityPair &vp);
+#if MM_CHECK_VERSION(1, 2, 0)
// OmaSessionType
MODEMMANAGERQT_EXPORT QDBusArgument &operator << (QDBusArgument &arg, const
OmaSessionType &sessionType);
MODEMMANAGERQT_EXPORT const QDBusArgument &operator >> (const QDBusArgument
&arg, OmaSessionType &sessionType);
+#endif
// QVariantMapList
MODEMMANAGERQT_EXPORT QDBusArgument &operator<<(QDBusArgument &argument, const
QVariantMapList &variantMapList);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/generictypes_p.h
new/libmm-qt-5.0.91/src/generictypes_p.h
--- old/libmm-qt-5.0.90/src/generictypes_p.h 2014-07-03 17:24:32.000000000
+0200
+++ new/libmm-qt-5.0.91/src/generictypes_p.h 2014-07-11 11:10:22.000000000
+0200
@@ -37,8 +37,10 @@
Q_DECLARE_METATYPE(MMModemMode)
Q_DECLARE_METATYPE(CurrentModesType)
Q_DECLARE_METATYPE(SupportedModesType)
+#if MM_CHECK_VERSION(1, 2, 0)
Q_DECLARE_METATYPE(OmaSessionType)
Q_DECLARE_METATYPE(OmaSessionTypes)
+#endif
//Q_DECLARE_METATYPE(MMModemLock)
Q_DECLARE_METATYPE(UnlockRetriesMap)
Q_DECLARE_METATYPE(QVariantMapList)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/modem.cpp
new/libmm-qt-5.0.91/src/modem.cpp
--- old/libmm-qt-5.0.90/src/modem.cpp 2014-07-03 17:24:32.000000000 +0200
+++ new/libmm-qt-5.0.91/src/modem.cpp 2014-07-11 11:10:22.000000000 +0200
@@ -115,7 +115,7 @@
Q_D(const Modem);
QStringList result;
-#if MM_CHECK_VERSION(1,1,900)
+#if MM_CHECK_VERSION(1, 2, 0)
QList<QDBusObjectPath> bearers = d->modemIface.bearers();
#else
QList<QDBusObjectPath> bearers = const_cast<ModemPrivate
*>(d)->modemIface.ListBearers();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/modemdevice.cpp
new/libmm-qt-5.0.91/src/modemdevice.cpp
--- old/libmm-qt-5.0.90/src/modemdevice.cpp 2014-07-03 17:24:32.000000000
+0200
+++ new/libmm-qt-5.0.91/src/modemdevice.cpp 2014-07-11 11:10:22.000000000
+0200
@@ -31,10 +31,12 @@
#include "modem3gpp.h"
#include "modem3gppussd.h"
#include "modemlocation.h"
+#if MM_CHECK_VERSION(1, 2, 0)
#include "modemoma.h"
+#include "modemsignal.h"
+#endif
#include "modemtime.h"
#include "modemfirmware.h"
-#include "modemsignal.h"
#include <QDomDocument>
@@ -108,13 +110,17 @@
interfaceList.insert(ModemManager::ModemDevice::LocationInterface,
ModemManager::ModemLocation::Ptr());
} else if (name == QLatin1String(MM_DBUS_INTERFACE_MODEM_TIME)) {
interfaceList.insert(ModemManager::ModemDevice::TimeInterface,
ModemManager::ModemTime::Ptr());
- } else if (name == QLatin1String(MM_DBUS_INTERFACE_MODEM_OMA)) {
+ }
+#if MM_CHECK_VERSION(1, 2, 0)
+ else if (name == QLatin1String(MM_DBUS_INTERFACE_MODEM_OMA)) {
interfaceList.insert(ModemManager::ModemDevice::OmaInterface,
ModemManager::ModemOma::Ptr());
- } else if (name ==
QLatin1String(MM_DBUS_INTERFACE_MODEM_FIRMWARE)) {
-
interfaceList.insert(ModemManager::ModemDevice::FirmwareInterface,
ModemManager::ModemFirmware::Ptr());
} else if (name == QLatin1String(MM_DBUS_INTERFACE_MODEM_SIGNAL)) {
interfaceList.insert(ModemManager::ModemDevice::SignalInterface,
ModemManager::ModemSignal::Ptr());
}
+#endif
+ else if (name == QLatin1String(MM_DBUS_INTERFACE_MODEM_FIRMWARE)) {
+
interfaceList.insert(ModemManager::ModemDevice::FirmwareInterface,
ModemManager::ModemFirmware::Ptr());
+ }
}
}
@@ -208,15 +214,17 @@
case ModemManager::ModemDevice::TimeInterface:
createdInterface = ModemManager::Interface::Ptr(new
ModemManager::ModemTime(uni), &QObject::deleteLater);
break;
+#if MM_CHECK_VERSION(1, 2, 0)
case ModemManager::ModemDevice::OmaInterface:
createdInterface = ModemManager::Interface::Ptr(new
ModemManager::ModemOma(uni), &QObject::deleteLater);
break;
- case ModemManager::ModemDevice::FirmwareInterface:
- createdInterface = ModemManager::Interface::Ptr(new
ModemManager::ModemFirmware(uni), &QObject::deleteLater);
- break;
case ModemManager::ModemDevice::SignalInterface:
createdInterface = ModemManager::Interface::Ptr(new
ModemManager::ModemSignal(uni), &QObject::deleteLater);
break;
+#endif
+ case ModemManager::ModemDevice::FirmwareInterface:
+ createdInterface = ModemManager::Interface::Ptr(new
ModemManager::ModemFirmware(uni), &QObject::deleteLater);
+ break;
}
return createdInterface;
}
@@ -350,13 +358,17 @@
d->interfaceList.insert(ModemManager::ModemDevice::LocationInterface,
ModemManager::ModemLocation::Ptr());
} else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_TIME)) {
d->interfaceList.insert(ModemManager::ModemDevice::TimeInterface,
ModemManager::ModemTime::Ptr());
- } else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_OMA)) {
+ }
+#if MM_CHECK_VERSION(1, 2, 0)
+ else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_OMA)) {
d->interfaceList.insert(ModemManager::ModemDevice::OmaInterface,
ModemManager::ModemOma::Ptr());
- } else if (iface ==
QLatin1String(MM_DBUS_INTERFACE_MODEM_FIRMWARE)) {
-
d->interfaceList.insert(ModemManager::ModemDevice::FirmwareInterface,
ModemManager::ModemFirmware::Ptr());
} else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_SIGNAL))
{
d->interfaceList.insert(ModemManager::ModemDevice::SignalInterface,
ModemManager::ModemSignal::Ptr());
}
+#endif
+ else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_FIRMWARE))
{
+
d->interfaceList.insert(ModemManager::ModemDevice::FirmwareInterface,
ModemManager::ModemFirmware::Ptr());
+ }
}
}
}
@@ -390,13 +402,17 @@
d->interfaceList.remove(ModemManager::ModemDevice::LocationInterface);
} else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_TIME)) {
d->interfaceList.remove(ModemManager::ModemDevice::TimeInterface);
- } else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_OMA)) {
+ }
+#if MM_CHECK_VERSION(1, 2, 0)
+ else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_OMA)) {
d->interfaceList.remove(ModemManager::ModemDevice::OmaInterface);
- } else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_FIRMWARE)) {
-
d->interfaceList.remove(ModemManager::ModemDevice::FirmwareInterface);
} else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_SIGNAL)) {
d->interfaceList.remove(ModemManager::ModemDevice::SignalInterface);
}
+#endif
+ else if (iface == QLatin1String(MM_DBUS_INTERFACE_MODEM_FIRMWARE)) {
+
d->interfaceList.remove(ModemManager::ModemDevice::FirmwareInterface);
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/modemdevice.h
new/libmm-qt-5.0.91/src/modemdevice.h
--- old/libmm-qt-5.0.90/src/modemdevice.h 2014-07-03 17:24:32.000000000
+0200
+++ new/libmm-qt-5.0.91/src/modemdevice.h 2014-07-11 11:10:22.000000000
+0200
@@ -61,8 +61,10 @@
LocationInterface,
TimeInterface,
FirmwareInterface,
+#if MM_CHECK_VERSION(1, 2, 0)
OmaInterface,
SignalInterface
+#endif
};
explicit ModemDevice(const QString &path, QObject *parent = 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/sms.cpp
new/libmm-qt-5.0.91/src/sms.cpp
--- old/libmm-qt-5.0.90/src/sms.cpp 2014-07-03 17:24:32.000000000 +0200
+++ new/libmm-qt-5.0.91/src/sms.cpp 2014-07-11 11:10:22.000000000 +0200
@@ -53,9 +53,10 @@
d->dischargeTimestamp =
QDateTime::fromString(d->smsIface.dischargeTimestamp(), Qt::ISODate);
d->deliveryState = (MMSmsDeliveryState) d->smsIface.deliveryState();
d->storage = (MMSmsStorage) d->smsIface.storage();
+#if MM_CHECK_VERSION(1, 2, 0)
d->serviceCategory = (MMSmsCdmaServiceCategory)
d->smsIface.serviceCategory();
d->teleserviceId = (MMSmsCdmaTeleserviceId) d->smsIface.teleserviceId();
-
+#endif
QDBusConnection::systemBus().connect(MM_DBUS_SERVICE, path,
DBUS_INTERFACE_PROPS, QStringLiteral("PropertiesChanged"), this,
SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
}
@@ -256,7 +257,7 @@
Q_D(const Sms);
return d->storage;
}
-
+#if MM_CHECK_VERSION(1, 2, 0)
MMSmsCdmaServiceCategory ModemManager::Sms::serviceCategory() const
{
Q_D(const Sms);
@@ -268,3 +269,4 @@
Q_D(const Sms);
return d->teleserviceId;
}
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/sms.h
new/libmm-qt-5.0.91/src/sms.h
--- old/libmm-qt-5.0.90/src/sms.h 2014-07-03 17:24:32.000000000 +0200
+++ new/libmm-qt-5.0.91/src/sms.h 2014-07-11 11:10:22.000000000 +0200
@@ -138,7 +138,7 @@
* This method returns the storage area/location of the SMS
*/
MMSmsStorage storage() const;
-
+#if MM_CHECK_VERSION(1, 2, 0)
/**
* @return service category for CDMA SMS, as defined in 3GPP2 C.R1001-D
(section 9.3).
* @since 1.1.91
@@ -151,7 +151,7 @@
* @since 1.1.91
*/
MMSmsCdmaTeleserviceId teleserviceId() const;
-
+#endif
Q_SIGNALS:
/**
* This signal is emitted when the state of the SMS has changed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libmm-qt-5.0.90/src/sms_p.h
new/libmm-qt-5.0.91/src/sms_p.h
--- old/libmm-qt-5.0.90/src/sms_p.h 2014-07-03 17:24:32.000000000 +0200
+++ new/libmm-qt-5.0.91/src/sms_p.h 2014-07-11 11:10:22.000000000 +0200
@@ -48,8 +48,11 @@
QDateTime dischargeTimestamp;
MMSmsDeliveryState deliveryState;
MMSmsStorage storage;
+#if MM_CHECK_VERSION(1, 2, 0)
MMSmsCdmaServiceCategory serviceCategory;
MMSmsCdmaTeleserviceId teleserviceId;
+#endif
+
};
#endif
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
