Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2023-11-13 22:17:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Mon Nov 13 22:17:34 2023 rev:120 rq:1125361 version:5.112.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2023-10-19 22:48:46.825611365 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.17445/libKF5NetworkManagerQt.changes
2023-11-13 22:20:08.841904440 +0100
@@ -1,0 +2,12 @@
+Mon Nov 6 09:14:12 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 5.112.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.112.0
+- Changes since 5.111.0:
+ * Fix incorrect signal signature
+ * Remove incorrect comment
+ * Listen for both DBus service registration events and interface added
events (kde#471870)
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.111.0.tar.xz
networkmanager-qt-5.111.0.tar.xz.sig
New:
----
networkmanager-qt-5.112.0.tar.xz
networkmanager-qt-5.112.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.OPsULj/_old 2023-11-13 22:20:09.549930508 +0100
+++ /var/tmp/diff_new_pack.OPsULj/_new 2023-11-13 22:20:09.549930508 +0100
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without released
Name: libKF5NetworkManagerQt
-Version: 5.111.0
+Version: 5.112.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
++++++ networkmanager-qt-5.111.0.tar.xz -> networkmanager-qt-5.112.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.111.0/CMakeLists.txt
new/networkmanager-qt-5.112.0/CMakeLists.txt
--- old/networkmanager-qt-5.111.0/CMakeLists.txt 2023-10-07
12:23:46.000000000 +0200
+++ new/networkmanager-qt-5.112.0/CMakeLists.txt 2023-11-04
11:05:59.000000000 +0100
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "5.111.0") # handled by release scripts
+set(KF_VERSION "5.112.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 5.111.0 NO_MODULE)
+find_package(ECM 5.112.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.111.0/src/manager.cpp
new/networkmanager-qt-5.112.0/src/manager.cpp
--- old/networkmanager-qt-5.111.0/src/manager.cpp 2023-10-07
12:23:46.000000000 +0200
+++ new/networkmanager-qt-5.112.0/src/manager.cpp 2023-11-04
11:05:59.000000000 +0100
@@ -67,10 +67,10 @@
NetworkManager::NetworkManagerPrivate::NetworkManagerPrivate()
#ifdef NMQT_STATIC
- : watcher(DBUS_SERVICE, QDBusConnection::sessionBus(),
QDBusServiceWatcher::WatchForUnregistration, this)
+ : watcher(DBUS_SERVICE, QDBusConnection::sessionBus(),
QDBusServiceWatcher::WatchForOwnerChange, this)
, iface(NetworkManager::NetworkManagerPrivate::DBUS_SERVICE,
NetworkManager::NetworkManagerPrivate::DBUS_DAEMON_PATH,
QDBusConnection::sessionBus())
#else
- : watcher(DBUS_SERVICE, QDBusConnection::systemBus(),
QDBusServiceWatcher::WatchForUnregistration, this)
+ : watcher(DBUS_SERVICE, QDBusConnection::systemBus(),
QDBusServiceWatcher::WatchForOwnerChange, this)
, iface(NetworkManager::NetworkManagerPrivate::DBUS_SERVICE,
NetworkManager::NetworkManagerPrivate::DBUS_DAEMON_PATH,
QDBusConnection::systemBus())
#endif
, nmState(NetworkManager::Unknown)
@@ -99,6 +99,11 @@
connect(&iface, &OrgFreedesktopNetworkManagerInterface::PropertiesChanged,
this, &NetworkManagerPrivate::propertiesChanged);
#endif
+ // We register two listeners here:
+ // - a ServiceRegistered listener for newer NM versions that connect to
the bus when the interfaces
+ // we care about are already initialized
+ // - and an InterfaceAdded listener for older NM versions that connect to
the bus early,
+ // and then add interfaces dynamically
iface.connection().connect(NetworkManagerPrivate::DBUS_SERVICE,
"/org/freedesktop",
NetworkManagerPrivate::FDO_DBUS_OBJECT_MANAGER,
@@ -106,6 +111,7 @@
this,
SLOT(dbusInterfacesAdded(QDBusObjectPath,
QVariantMap)));
+ connect(&watcher, &QDBusServiceWatcher::serviceRegistered, this,
&NetworkManagerPrivate::daemonRegistered);
connect(&watcher, &QDBusServiceWatcher::serviceUnregistered, this,
&NetworkManagerPrivate::daemonUnregistered);
init();
@@ -175,14 +181,12 @@
qobject_cast<SettingsPrivate *>(settingsNotifier())->init();
});
- if (iface.isValid()) {
- const QList<QDBusObjectPath> devices = iface.devices();
- qCDebug(NMQT) << "Device list";
- for (const QDBusObjectPath &op : devices) {
- networkInterfaceMap.insert(op.path(), Device::Ptr());
- Q_EMIT deviceAdded(op.path());
- qCDebug(NMQT) << " " << op.path();
- }
+ const QList<QDBusObjectPath> devices = iface.devices();
+ qCDebug(NMQT) << "Device list";
+ for (const QDBusObjectPath &op : devices) {
+ networkInterfaceMap.insert(op.path(), Device::Ptr());
+ Q_EMIT deviceAdded(op.path());
+ qCDebug(NMQT) << " " << op.path();
}
}
@@ -899,6 +903,17 @@
return;
}
+ daemonRegistered();
+}
+
+void NetworkManager::NetworkManagerPrivate::daemonRegistered()
+{
+ if (iface.version().isEmpty()) {
+ // If this call fails, we've probably been called from
ServiceRegistered on an old NM,
+ // and the interface isn't ready yet. Just exit and hope we get called
again on InterfacesAdded.
+ return;
+ }
+
init();
Q_EMIT serviceAppeared();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.111.0/src/manager_p.h
new/networkmanager-qt-5.112.0/src/manager_p.h
--- old/networkmanager-qt-5.111.0/src/manager_p.h 2023-10-07
12:23:46.000000000 +0200
+++ new/networkmanager-qt-5.112.0/src/manager_p.h 2023-11-04
11:05:59.000000000 +0100
@@ -120,6 +120,7 @@
void dbusPropertiesChanged(const QString &interfaceName, const QVariantMap
&properties, const QStringList &invalidatedProperties);
void propertiesChanged(const QVariantMap &changedProperties);
void dbusInterfacesAdded(const QDBusObjectPath &path, const QVariantMap
&addedInterfaces);
+ void daemonRegistered();
void daemonUnregistered();
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.111.0/src/secretagent.cpp
new/networkmanager-qt-5.112.0/src/secretagent.cpp
--- old/networkmanager-qt-5.111.0/src/secretagent.cpp 2023-10-07
12:23:46.000000000 +0200
+++ new/networkmanager-qt-5.112.0/src/secretagent.cpp 2023-11-04
11:05:59.000000000 +0100
@@ -28,8 +28,10 @@
, agent(parent)
#ifdef NMQT_STATIC
, agentManager(NetworkManagerPrivate::DBUS_SERVICE,
QLatin1String(NM_DBUS_PATH_AGENT_MANAGER), QDBusConnection::sessionBus(),
parent)
+ , watcher(NetworkManagerPrivate::DBUS_SERVICE,
QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForOwnerChange, parent)
#else
, agentManager(NetworkManagerPrivate::DBUS_SERVICE,
QLatin1String(NM_DBUS_PATH_AGENT_MANAGER), QDBusConnection::systemBus(), parent)
+ , watcher(NetworkManagerPrivate::DBUS_SERVICE,
QDBusConnection::systemBus(), QDBusServiceWatcher::WatchForOwnerChange, parent)
#endif
, agentId(id)
, capabilities(capabilities)
@@ -39,6 +41,8 @@
qRegisterMetaType<NMVariantMapMap>("NMVariantMapMap");
qDBusRegisterMetaType<NMVariantMapMap>();
+ // Similarly to NetworkManagerPrivate(), we register two listeners here:
+ // one for ServiceRegistered and one for InterfacesAdded.
agentManager.connection().connect(NetworkManagerPrivate::DBUS_SERVICE,
"/org/freedesktop",
NetworkManagerPrivate::FDO_DBUS_OBJECT_MANAGER,
@@ -46,6 +50,8 @@
q,
SLOT(dbusInterfacesAdded(QDBusObjectPath, QVariantMap)));
+ QObject::connect(&watcher, &QDBusServiceWatcher::serviceRegistered,
parent, [this] { this->daemonRegistered(); });
+
agentManager.connection().registerObject(QLatin1String(NM_DBUS_PATH_SECRET_AGENT),
&agent, QDBusConnection::ExportAllSlots);
registerAgent(capabilities);
@@ -66,9 +72,14 @@
registerAgent(capabilities);
}
+void NetworkManager::SecretAgentPrivate::daemonRegistered()
+{
+ registerAgent(capabilities);
+}
+
void NetworkManager::SecretAgentPrivate::registerAgent()
{
- agentManager.RegisterWithCapabilities(agentId,
NetworkManager::SecretAgent::Capability::NoCapability);
+ registerAgent(NetworkManager::SecretAgent::Capability::NoCapability);
}
void
NetworkManager::SecretAgentPrivate::registerAgent(NetworkManager::SecretAgent::Capabilities
capabilities)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.111.0/src/secretagent_p.h
new/networkmanager-qt-5.112.0/src/secretagent_p.h
--- old/networkmanager-qt-5.111.0/src/secretagent_p.h 2023-10-07
12:23:46.000000000 +0200
+++ new/networkmanager-qt-5.112.0/src/secretagent_p.h 2023-11-04
11:05:59.000000000 +0100
@@ -7,6 +7,8 @@
#ifndef NETWORKMANAGERQT_SECRETAGENT_P_H
#define NETWORKMANAGERQT_SECRETAGENT_P_H
+#include <QDBusServiceWatcher>
+
#include "agentmanagerinterface.h"
#include "secretagentadaptor.h"
@@ -22,6 +24,7 @@
virtual ~SecretAgentPrivate();
private Q_SLOTS:
void dbusInterfacesAdded(const QDBusObjectPath &path, const QVariantMap
&interfaces);
+ void daemonRegistered();
void registerAgent();
void registerAgent(const NetworkManager::SecretAgent::Capabilities
capabilities);
@@ -29,6 +32,7 @@
SecretAgent *q_ptr;
SecretAgentAdaptor agent;
OrgFreedesktopNetworkManagerAgentManagerInterface agentManager;
+ QDBusServiceWatcher watcher;
QString agentId;
NetworkManager::SecretAgent::Capabilities capabilities;
};
