Hello community, here is the log from the commit of package libKF5ModemManagerQt for openSUSE:Factory checked in at 2014-07-11 20:05:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libKF5ModemManagerQt (Old) and /work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5ModemManagerQt" Changes: -------- New Changes file: --- /dev/null 2014-06-12 08:28:52.960034756 +0200 +++ /work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new/libKF5ModemManagerQt.changes 2014-07-11 20:05:43.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Thu Jul 3 21:45:39 UTC 2014 - hrvoje.sen...@gmail.com + +- Activate libKF5ModemManagerQt package + New: ---- fix_build.diff libKF5ModemManagerQt.changes libKF5ModemManagerQt.spec libmm-qt-5.0.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libKF5ModemManagerQt.spec ++++++ # # spec file for package libKF5ModemManagerQt # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Url: http://www.kde.org %define soversion 5 Name: libKF5ModemManagerQt Version: 5.0.90 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 BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: pkgconfig(ModemManager) BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Qt5 wrapper for ModemManager DBus API. %package devel Summary: Development package for the libmm-qt library Group: Development/Libraries/KDE Requires: libKF5ModemManagerQt%{soversion} = %{version} Requires: pkgconfig(ModemManager) >= 0.8 Requires: pkgconfig(Qt5Core) >= 5.2.0 Requires: pkgconfig(Qt5DBus) >= 5.2.0 Requires: pkgconfig(Qt5Network) >= 5.2.0 Requires: pkgconfig(Qt5Xml) >= 5.2.0 %description devel Qt5 wrapper for ModemManager DBus API. Development files. %package -n libKF5ModemManagerQt%{soversion} Summary: Qt wrapper around the ModemManager libraries Group: Development/Libraries/KDE %description -n libKF5ModemManagerQt%{soversion} Qt5 wrapper for ModemManager DBus API. %prep %setup -q -n libmm-qt-%{version} %patch0 -p1 %build %cmake_kf5 -d build %make_jobs %install %kf5_makeinstall -C build %post -n libKF5ModemManagerQt%{soversion} -p /sbin/ldconfig %postun -n libKF5ModemManagerQt%{soversion} -p /sbin/ldconfig %files -n libKF5ModemManagerQt%{soversion} %defattr(-,root,root) %doc README COPYING.LIB %{_kf5_libdir}/libKF5ModemManagerQt.so.* %files devel %defattr(-,root,root) %{_kf5_libdir}/libKF5ModemManagerQt.so %{_kf5_includedir}/ModemManagerQt/ %{_kf5_includedir}/*.h %{_kf5_libdir}/cmake/KF5ModemManagerQt/ %{_kf5_mkspecsdir}/qt_ModemManagerQt.pri %changelog ++++++ fix_build.diff ++++++ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fccc638..beeaa53 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,9 +17,7 @@ set(ModemManagerQt_SRCS modemfirmware.cpp modemlocation.cpp modemmessaging.cpp - modemsignal.cpp modemtime.cpp - modemoma.cpp sim.cpp sms.cpp ) @@ -34,8 +32,6 @@ set(DBUS_INTERFACES_FILES 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 @@ set(DBUS_INTERFACES_FILES 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 --git a/src/generictypes.cpp b/src/generictypes.cpp index b298489..edf26f5 100644 --- a/src/generictypes.cpp +++ b/src/generictypes.cpp @@ -65,6 +65,7 @@ const QDBusArgument &operator >> (const QDBusArgument &arg, CurrentModesType &mo 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 @@ const QDBusArgument &operator >> (const QDBusArgument &arg, OmaSessionType &sess return arg; } +#endif // Marshall the SignalQualityPair data into a D-BUS argument QDBusArgument &operator << (QDBusArgument &arg, const SignalQualityPair &sqp) @@ -160,8 +162,10 @@ void registerModemManagerTypes() 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 --git a/src/generictypes.h b/src/generictypes.h index 9362d71..59961fe 100644 --- a/src/generictypes.h +++ b/src/generictypes.h @@ -28,7 +28,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. #include <QMetaType> #include <QtDBus/QtDBus> -#if !MM_CHECK_VERSION(1, 2, 0) +#if MM_CHECK_VERSION(1, 2, 0) typedef uint MMSmsCdmaTeleserviceId; typedef uint MMSmsCdmaServiceCategory; #endif @@ -55,12 +55,14 @@ public: } 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 +87,11 @@ MODEMMANAGERQT_EXPORT const QDBusArgument &operator >> (const QDBusArgument &arg 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 --git a/src/generictypes_p.h b/src/generictypes_p.h index 457a1f0..a2cbe73 100644 --- a/src/generictypes_p.h +++ b/src/generictypes_p.h @@ -37,8 +37,10 @@ Q_DECLARE_METATYPE(SignalQualityPair) 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 --git a/src/modem.cpp b/src/modem.cpp index 5c8a4dd..d4498b2 100644 --- a/src/modem.cpp +++ b/src/modem.cpp @@ -115,7 +115,7 @@ QStringList ModemManager::Modem::listBearers() 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 --git a/src/modemdevice.cpp b/src/modemdevice.cpp index 735a80f..067c679 100644 --- a/src/modemdevice.cpp +++ b/src/modemdevice.cpp @@ -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 @@ void ModemDevicePrivate::initInterfaces() 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 @@ ModemManager::Interface::Ptr ModemDevicePrivate::createInterface(ModemManager::M 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 @@ void ModemManager::ModemDevice::onInterfacesAdded(const QDBusObjectPath &object_ 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 @@ void ModemManager::ModemDevice::onInterfacesRemoved(const QDBusObjectPath &objec 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 --git a/src/modemdevice.h b/src/modemdevice.h index 0990af0..1adc4fc 100644 --- a/src/modemdevice.h +++ b/src/modemdevice.h @@ -61,8 +61,10 @@ public: LocationInterface, TimeInterface, FirmwareInterface, +#if MM_CHECK_VERSION(1, 2, 0) OmaInterface, SignalInterface +#endif }; explicit ModemDevice(const QString &path, QObject *parent = 0); diff --git a/src/sms.cpp b/src/sms.cpp index 64b1d99..00495f7 100644 --- a/src/sms.cpp +++ b/src/sms.cpp @@ -53,9 +53,10 @@ ModemManager::Sms::Sms(const QString &path, QObject *parent) 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,1,900) 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 @@ MMSmsStorage ModemManager::Sms::storage() const 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 @@ MMSmsCdmaTeleserviceId ModemManager::Sms::teleserviceId() const Q_D(const Sms); return d->teleserviceId; } +#endif diff --git a/src/sms.h b/src/sms.h index 5ee0cd9..65dff9d 100644 --- a/src/sms.h +++ b/src/sms.h @@ -138,7 +138,7 @@ public: * 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 @@ public: * @since 1.1.91 */ MMSmsCdmaTeleserviceId teleserviceId() const; - +#endif Q_SIGNALS: /** * This signal is emitted when the state of the SMS has changed diff --git a/src/sms_p.h b/src/sms_p.h index 6a6a929..589f36b 100644 --- a/src/sms_p.h +++ b/src/sms_p.h @@ -48,8 +48,11 @@ public: QDateTime dischargeTimestamp; MMSmsDeliveryState deliveryState; MMSmsStorage storage; +#if MM_CHECK_VERSION(1, 2, 0) MMSmsCdmaServiceCategory serviceCategory; MMSmsCdmaTeleserviceId teleserviceId; +#endif + }; #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
