Hello community,
here is the log from the commit of package libNetworkManagerQt for
openSUSE:Factory checked in at 2014-07-16 16:16:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libNetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libNetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libNetworkManagerQt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libNetworkManagerQt/libNetworkManagerQt.changes
2014-02-28 18:54:16.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libNetworkManagerQt.new/libNetworkManagerQt.changes
2014-07-16 16:16:28.000000000 +0200
@@ -1,0 +2,14 @@
+Sun Jul 6 00:36:28 UTC 2014 - [email protected]
+
+- Update to 0.9.8.2
+ * Avoid crashes when NetworkManager is restarted.
+ * Respect external CMAKE_CXX_FLAGS values.
+ * Add a workaround to always get updated IPv[46]Config. kde#331771
+ * Properly update and notify about changed reference accesspoint.
+ * Bump required version of NetworkManager to 0.9.8.4.
+ * Emit signal after available connection is removed instead
+ of before.
+ * Bump soversion to indicate different binary application
+ interface (ABI) than the previous releases.
+
+-------------------------------------------------------------------
Old:
----
libnm-qt-0.9.8.1.tar.xz
New:
----
libnm-qt-0.9.8.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libNetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.8vxmuu/_old 2014-07-16 16:16:29.000000000 +0200
+++ /var/tmp/diff_new_pack.8vxmuu/_new 2014-07-16 16:16:29.000000000 +0200
@@ -17,16 +17,16 @@
Url: http://www.kde.org
-%define soversion 0
+%define soversion 1
Name: libNetworkManagerQt
-Version: 0.9.8.1
+Version: 0.9.8.2
Release: 0
Summary: A qt wrapper around the NetworkManager libraries
License: LGPL-2.1 or LGPL-3.0
Group: System/GUI/KDE
Source0:
http://download.kde.org/unstable/networkmanager-qt/%{version}/src/libnm-qt-%{version}.tar.xz
-BuildRequires: NetworkManager-devel >= 0.9.8.0
+BuildRequires: NetworkManager-devel >= 0.9.8.4
BuildRequires: cmake
BuildRequires: kde4-filesystem
BuildRequires: libModemManagerQt-devel
++++++ libnm-qt-0.9.8.1.tar.xz -> libnm-qt-0.9.8.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-0.9.8.1/CMakeLists.txt
new/libnm-qt-0.9.8.2/CMakeLists.txt
--- old/libnm-qt-0.9.8.1/CMakeLists.txt 2014-02-14 21:01:05.000000000 +0100
+++ new/libnm-qt-0.9.8.2/CMakeLists.txt 2014-07-05 21:47:35.000000000 +0200
@@ -2,20 +2,17 @@
project(NetworkManagerQt)
-set(VERSION 0.9.8.1)
+include(GNUInstallDirs)
+
+set(VERSION 0.9.8.2)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name
(32/64)" )
-set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING
- "Library directory name")
-set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/" CACHE STRING
- "Base directory for pkgconfig files")
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()
find_package(Qt4 REQUIRED)
-find_package(NetworkManager 0.9.8.0 REQUIRED)
+find_package(NetworkManager 0.9.8.4 REQUIRED)
if (DISABLE_MODEMMANAGERQT)
message(STATUS "Disabling ModemManagerQt support")
@@ -36,7 +33,7 @@
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-Werror=return-type" HAVE_GCC_ERROR_RETURN_TYPE)
if (HAVE_GCC_ERROR_RETURN_TYPE)
- set(CMAKE_CXX_FLAGS "-Werror=return-type")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
endif()
include_directories(
@@ -243,17 +240,17 @@
target_link_libraries(NetworkManagerQt ${QT_QTCORE_LIBRARY}
${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY})
endif()
-install(TARGETS NetworkManagerQt DESTINATION ${LIB_DESTINATION})
-install(FILES ${NetworkManagerQt_HEADERS} DESTINATION include/NetworkManagerQt
COMPONENT Devel)
-install(FILES ${CONNECTIONS_SETTINGS_HEADERS} DESTINATION
include/NetworkManagerQt/settings COMPONENT Devel)
+install(TARGETS NetworkManagerQt DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES ${NetworkManagerQt_HEADERS} DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}/NetworkManagerQt COMPONENT Devel)
+install(FILES ${CONNECTIONS_SETTINGS_HEADERS} DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}/NetworkManagerQt/settings COMPONENT Devel)
set_property(TARGET NetworkManagerQt PROPERTY COMPILE_DEFINITIONS
MAKE_NETWORKMANAGERQT_LIB)
set_property(TARGET NetworkManagerQt PROPERTY VERSION ${VERSION})
-set_property(TARGET NetworkManagerQt PROPERTY SOVERSION 0)
+set_property(TARGET NetworkManagerQt PROPERTY SOVERSION 1)
message(STATUS "Writing pkg-config file...")
configure_file(${CMAKE_SOURCE_DIR}/NetworkManagerQt.pc.cmake
${CMAKE_BINARY_DIR}/NetworkManagerQt.pc @ONLY)
-install(FILES ${CMAKE_BINARY_DIR}/NetworkManagerQt.pc DESTINATION
"${PKGCONFIG_INSTALL_PREFIX}")
+install(FILES ${CMAKE_BINARY_DIR}/NetworkManagerQt.pc DESTINATION
${CMAKE_INSTALL_LIBDIR}/pkgconfig)
add_subdirectory(include)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-0.9.8.1/NetworkManagerQt.pc.cmake
new/libnm-qt-0.9.8.2/NetworkManagerQt.pc.cmake
--- old/libnm-qt-0.9.8.1/NetworkManagerQt.pc.cmake 2014-02-14
21:01:05.000000000 +0100
+++ new/libnm-qt-0.9.8.2/NetworkManagerQt.pc.cmake 2014-07-05
21:47:35.000000000 +0200
@@ -1,4 +1,4 @@
-# Copyright 2011‐2013 Lamarque Souza <[email protected]>
+# Copyright 2011‐2014 Lamarque Souza <[email protected]>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -18,12 +18,13 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=@LIB_DESTINATION@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=${prefix}/include
Name: NetworkManagerQt
Description: Convenience Qt library for clients of NetworkManager
Version: @VERSION@
+Requires: QtCore QtDBus QtXml
Cflags: -DWITH_MODEMMANAGERQT=@WITH_MODEMMANAGERQT@ -I${includedir}
@CMAKE_INCLUDE_PATH@
Libs: -L${libdir} -lNetworkManagerQt @CMAKE_LIBRARY_PATH@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-0.9.8.1/device.cpp
new/libnm-qt-0.9.8.2/device.cpp
--- old/libnm-qt-0.9.8.1/device.cpp 2014-02-14 21:01:05.000000000 +0100
+++ new/libnm-qt-0.9.8.2/device.cpp 2014-07-05 21:47:35.000000000 +0200
@@ -212,8 +212,8 @@
}
foreach (const QString &availableConnection, d->availableConnections) {
if (!newAvailableConnections.contains(availableConnection)) {
- emit availableConnectionDisappeared(availableConnection);
d->availableConnections.removeOne(availableConnection);
+ emit availableConnectionDisappeared(availableConnection);
}
}
emit availableConnectionChanged();
@@ -495,11 +495,21 @@
void NetworkManager::Device::propertiesChanged(const QVariantMap &properties)
{
+ Q_D(Device);
+
QVariantMap::const_iterator it = properties.constBegin();
while (it != properties.constEnd()) {
propertyChanged(it.key(), it.value());
++it;
}
+
+ // FIXME workaround, we need to get a path to updated IPv[46]Config,
+ // because NM doesn't emit the updated value when the device is activated
+ // BUG: https://bugzilla.gnome.org/show_bug.cgi?id=725657
+ if (properties.contains(QLatin1String("State")) && d->connectionState ==
NetworkManager::Device::Activated) {
+ propertyChanged(QLatin1String("Ip4Config"),
QVariant::fromValue<QDBusObjectPath>(d->deviceIface.ip4Config()));
+ propertyChanged(QLatin1String("Ip6Config"),
QVariant::fromValue<QDBusObjectPath>(d->deviceIface.ip6Config()));
+ }
}
NetworkManager::Device::Type NetworkManager::Device::type() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-0.9.8.1/include/CMakeLists.txt
new/libnm-qt-0.9.8.2/include/CMakeLists.txt
--- old/libnm-qt-0.9.8.1/include/CMakeLists.txt 2014-02-14 21:01:05.000000000
+0100
+++ new/libnm-qt-0.9.8.2/include/CMakeLists.txt 2014-07-05 21:47:35.000000000
+0200
@@ -33,6 +33,6 @@
install(FILES
${NetworkManagerQt_CAMEL_HEADERS}
DESTINATION
- include/NetworkManagerQt COMPONENT Devel)
+ ${CMAKE_INSTALL_INCLUDEDIR}/NetworkManagerQt COMPONENT Devel)
add_subdirectory(settings)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-0.9.8.1/include/settings/CMakeLists.txt
new/libnm-qt-0.9.8.2/include/settings/CMakeLists.txt
--- old/libnm-qt-0.9.8.1/include/settings/CMakeLists.txt 2014-02-14
21:01:05.000000000 +0100
+++ new/libnm-qt-0.9.8.2/include/settings/CMakeLists.txt 2014-07-05
21:47:35.000000000 +0200
@@ -27,4 +27,4 @@
install(FILES
${NetworkManagerQt_settings_CAMEL_HEADERS}
DESTINATION
- include/NetworkManagerQt COMPONENT Devel)
+ ${CMAKE_INSTALL_INCLUDEDIR}/NetworkManagerQt COMPONENT Devel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-0.9.8.1/settings.cpp
new/libnm-qt-0.9.8.2/settings.cpp
--- old/libnm-qt-0.9.8.1/settings.cpp 2014-02-14 21:01:05.000000000 +0100
+++ new/libnm-qt-0.9.8.2/settings.cpp 2014-07-05 21:47:35.000000000 +0200
@@ -34,7 +34,8 @@
NM_GLOBAL_STATIC(NetworkManager::SettingsPrivate, globalSettings)
NetworkManager::SettingsPrivate::SettingsPrivate()
- : iface(NetworkManagerPrivate::DBUS_SERVICE,
NetworkManagerPrivate::DBUS_SETTINGS_PATH, QDBusConnection::systemBus())
+ : iface(NetworkManagerPrivate::DBUS_SERVICE,
NetworkManagerPrivate::DBUS_SETTINGS_PATH, QDBusConnection::systemBus()),
+ m_canModify(true)
{
init();
// This class is a friend of NetworkManagerPrivate thus initted there too
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-0.9.8.1/wirelessnetwork.cpp
new/libnm-qt-0.9.8.2/wirelessnetwork.cpp
--- old/libnm-qt-0.9.8.1/wirelessnetwork.cpp 2014-02-14 21:01:05.000000000
+0100
+++ new/libnm-qt-0.9.8.2/wirelessnetwork.cpp 2014-07-05 21:47:35.000000000
+0200
@@ -73,14 +73,24 @@
void NetworkManager::WirelessNetworkPrivate::updateStrength()
{
Q_Q(WirelessNetwork);
+
int maximumStrength = -1;
+ NetworkManager::AccessPoint::Ptr strongestAp;
foreach (const NetworkManager::AccessPoint::Ptr &iface, aps) {
- maximumStrength = qMax(maximumStrength, iface->signalStrength());
+ if (maximumStrength <= iface->signalStrength()) {
+ maximumStrength = iface->signalStrength();
+ strongestAp = iface;
+ }
}
if (maximumStrength != strength) {
strength = maximumStrength;
emit q->signalStrengthChanged(strength);
}
+
+ if (strongestAp && referenceAp != strongestAp) {
+ referenceAp = strongestAp;
+ emit q->referenceAccessPointChanged(referenceAp->uni());
+ }
//TODO: update the networks delayed
//kDebug() << "update strength" << ssid << strength;
}
@@ -116,16 +126,7 @@
NetworkManager::AccessPoint::Ptr
NetworkManager::WirelessNetwork::referenceAccessPoint() const
{
Q_D(const WirelessNetwork);
- int maximumStrength = -1;
- NetworkManager::AccessPoint::Ptr strongest;
- foreach (const NetworkManager::AccessPoint::Ptr &iface, d->aps) {
- int oldMax = maximumStrength;
- maximumStrength = qMax(maximumStrength, iface->signalStrength());
- if (oldMax <= maximumStrength) {
- strongest = iface;
- }
- }
- return strongest;
+ return d->referenceAp;
}
NetworkManager::AccessPoint::List
NetworkManager::WirelessNetwork::accessPoints() const
@@ -138,7 +139,11 @@
{
Q_D(const WirelessNetwork);
- return d->wirelessNetworkInterface->uni();
+ if (d->wirelessNetworkInterface) {
+ return d->wirelessNetworkInterface->uni();
+ } else {
+ return QString();
+ }
}
// vim: sw=4 sts=4 et tw=100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnm-qt-0.9.8.1/wirelessnetwork_p.h
new/libnm-qt-0.9.8.2/wirelessnetwork_p.h
--- old/libnm-qt-0.9.8.1/wirelessnetwork_p.h 2014-02-14 21:01:05.000000000
+0100
+++ new/libnm-qt-0.9.8.2/wirelessnetwork_p.h 2014-07-05 21:47:35.000000000
+0200
@@ -43,6 +43,7 @@
int strength;
QPointer<WirelessDevice> wirelessNetworkInterface;
QHash<QString, AccessPoint::Ptr> aps;
+ AccessPoint::Ptr referenceAp;
private Q_SLOTS:
void accessPointAppeared(const QString &uni);
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
