Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-network-utils for
openSUSE:Factory checked in at 2021-08-16 10:09:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-network-utils (Old)
and /work/SRC/openSUSE:Factory/.deepin-network-utils.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-network-utils"
Mon Aug 16 10:09:10 2021 rev:4 rq:910902 version:5.4.9
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-network-utils/deepin-network-utils.changes
2021-06-21 20:36:28.254683705 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-network-utils.new.1899/deepin-network-utils.changes
2021-08-16 10:14:11.274910209 +0200
@@ -1,0 +2,6 @@
+Mon Jul 26 13:06:13 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update version to 5.4.9
+ * Fix bugs
+
+-------------------------------------------------------------------
Old:
----
dde-network-utils-5.4.6.tar.gz
New:
----
dde-network-utils-5.4.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-network-utils.spec ++++++
--- /var/tmp/diff_new_pack.Q4yI46/_old 2021-08-16 10:14:11.670909704 +0200
+++ /var/tmp/diff_new_pack.Q4yI46/_new 2021-08-16 10:14:11.674909699 +0200
@@ -20,7 +20,7 @@
%define sover 1
Name: deepin-network-utils
-Version: 5.4.6
+Version: 5.4.9
Release: 0
License: GPL-3.0+
Summary: Deepin Network Utils
++++++ dde-network-utils-5.4.6.tar.gz -> dde-network-utils-5.4.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-network-utils-5.4.6/dde-network-utils/networkmodel.cpp
new/dde-network-utils-5.4.9/dde-network-utils/networkmodel.cpp
--- old/dde-network-utils-5.4.6/dde-network-utils/networkmodel.cpp
2021-03-23 10:15:51.000000000 +0100
+++ new/dde-network-utils-5.4.9/dde-network-utils/networkmodel.cpp
2021-05-18 14:54:01.000000000 +0200
@@ -38,6 +38,7 @@
#define CONNECTED 2
Connectivity NetworkModel::m_Connectivity(Connectivity::Full);
+QStringList NetworkModel::m_deviceInterface;
NetworkDevice::DeviceType parseDeviceType(const QString &type)
{
@@ -226,6 +227,8 @@
bool changed = false;
+ m_deviceInterface.clear();
+
for (auto it(data.constBegin()); it != data.constEnd(); ++it) {
const auto type = parseDeviceType(it.key());
const auto list = it.value().toArray();
@@ -237,6 +240,16 @@
{
const auto info = l.toObject();
const QString path = info.value("Path").toString();
+ bool managed = info.value("Managed").toBool();
+ QString interface = info.value("Interface").toString();
+
+ if (!m_deviceInterface.contains(interface))
+ m_deviceInterface << interface;
+
+ if (!managed) {
+ qDebug() << "device: " << path << "ignored due to unmanged";
+ continue;
+ }
// ???????????????InterfaceFlags??????????????????????????????
if (type != NetworkDevice::Wireless) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-network-utils-5.4.6/dde-network-utils/networkmodel.h
new/dde-network-utils-5.4.9/dde-network-utils/networkmodel.h
--- old/dde-network-utils-5.4.6/dde-network-utils/networkmodel.h
2021-03-23 10:15:51.000000000 +0100
+++ new/dde-network-utils-5.4.9/dde-network-utils/networkmodel.h
2021-05-18 14:54:01.000000000 +0200
@@ -102,6 +102,7 @@
const QJsonObject connectionByUuid(const QString &uuid) const;
const QJsonObject connectionByPath(const QString &connPath) const;
const QJsonObject activeConnObjectByUuid(const QString &uuid) const;
+ const QStringList deviceInterface() const { return m_deviceInterface; }
Q_SIGNALS:
void connectionListChanged() const;
@@ -183,6 +184,7 @@
QMap<QString, ProxyConfig> m_proxies;
QMap<QString, QList<QJsonObject>> m_connections;
+ static QStringList m_deviceInterface;
static Connectivity m_Connectivity;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-network-utils-5.4.6/dde-network-utils/networkworker.cpp
new/dde-network-utils-5.4.9/dde-network-utils/networkworker.cpp
--- old/dde-network-utils-5.4.6/dde-network-utils/networkworker.cpp
2021-03-23 10:15:51.000000000 +0100
+++ new/dde-network-utils-5.4.9/dde-network-utils/networkworker.cpp
2021-05-18 14:54:01.000000000 +0200
@@ -29,17 +29,39 @@
using namespace dde::network;
+const QString networkService = "com.deepin.daemon.Network";
+const QString networkPath = "/com/deepin/daemon/Network";
+
NetworkWorker::NetworkWorker(NetworkModel *model, QObject *parent, bool sync)
: QObject(parent),
- m_networkInter("com.deepin.daemon.Network",
"/com/deepin/daemon/Network", QDBusConnection::sessionBus(), this),
- m_chainsInter(new ProxyChains("com.deepin.daemon.Network",
"/com/deepin/daemon/Network/ProxyChains", QDBusConnection::sessionBus(), this)),
+ m_networkInter(networkService, networkPath,
QDBusConnection::sessionBus(), this),
+ m_chainsInter(new ProxyChains(networkService,
"/com/deepin/daemon/Network/ProxyChains", QDBusConnection::sessionBus(), this)),
m_networkModel(model)
{
+ // ???????????????????????????????????????
??????????????????????????????????????????
+ auto req =
QDBusConnection::sessionBus().interface()->isServiceRegistered(networkService);
+ if (!req.value()) {
+ qInfo() << networkService << "is not registered, waiting for
registration";
+ QDBusServiceWatcher *serviceWatcher = new QDBusServiceWatcher(this);
+ serviceWatcher->setConnection(QDBusConnection::sessionBus());
+ serviceWatcher->addWatchedService(networkService);
+ connect(serviceWatcher, &QDBusServiceWatcher::serviceRegistered,
[this] {
+ NetworkInter netInter(networkService, networkPath,
QDBusConnection::sessionBus(), this);
+ QString devices = netInter.devices();
+ qInfo() << networkService << "is registered";
+ if (!devices.isEmpty()){
+ m_networkModel->onDevicesChanged(netInter.devices());
+ } else {
+ qInfo() << "network devices is empty";
+ }
+ });
+ }
+
//????????????????????????????????????????????????????????????
connect(&m_networkInter, &NetworkInter::ActiveConnectionsChanged, this,
&NetworkWorker::queryActiveConnInfo, Qt::QueuedConnection);
connect(&m_networkInter, &NetworkInter::ActiveConnectionsChanged,
m_networkModel, &NetworkModel::onActiveConnectionsChanged);
connect(&m_networkInter, &NetworkInter::DevicesChanged, m_networkModel,
&NetworkModel::onDevicesChanged);
-
+
connect(&m_networkInter, &NetworkInter::ConnectionsChanged,
m_networkModel, &NetworkModel::onConnectionListChanged);
connect(&m_networkInter, &NetworkInter::DeviceEnabled, m_networkModel,
&NetworkModel::onDeviceEnableChanged);
connect(&m_networkInter, &NetworkInter::ConnectivityChanged,
m_networkModel, &NetworkModel::onConnectivityChanged);
@@ -72,9 +94,9 @@
//???????????????????????????????????????????????????active?????????????????????????????????????????????
if (bSync) {
- QDBusInterface inter("com.deepin.daemon.Network",
- "/com/deepin/daemon/Network",
- "com.deepin.daemon.Network",
+ QDBusInterface inter(networkService,
+ networkPath,
+ networkService,
QDBusConnection::sessionBus());
QVariant req = inter.property("Devices");
m_networkModel->onDevicesChanged(req.toString());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-network-utils-5.4.6/rpm/deepin-network-utils.spec
new/dde-network-utils-5.4.9/rpm/deepin-network-utils.spec
--- old/dde-network-utils-5.4.6/rpm/deepin-network-utils.spec 2021-03-23
10:15:51.000000000 +0100
+++ new/dde-network-utils-5.4.9/rpm/deepin-network-utils.spec 1970-01-01
01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-%global repo dde-network-utils
-
-%if 0%{?fedora}
-Name: deepin-network-utils
-%else
-Name: %{repo}
-%endif
-Version: 5.3.0.5
-Release: 1%{?dist}
-Summary: Deepin desktop-environment - network utils
-License: GPLv3
-URL: https://github.com/linuxdeepin/dde-network-utils
-%if 0%{?fedora}
-Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
-%else
-Source0: %{name}_%{version}.orig.tar.xz
-%endif
-
-BuildRequires: gcc-c++
-BuildRequires: pkgconfig(dframeworkdbus)
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: qt5-linguist
-BuildRequires: pkgconfig(gsettings-qt)
-
-%description
-Deepin desktop-environment - network utils.
-
-%package devel
-Summary: Development package for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-Header files and libraries for %{name}.
-
-%prep
-%autosetup -p1 -n %{repo}-%{version}
-sed -i 's|/lib$|/%{_lib}|' dde-network-utils.pro
-
-%build
-# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
-export PATH=%{_qt5_bindir}:$PATH
-%qmake_qt5 PREFIX=%{_prefix}
-%make_build
-
-%install
-%make_install INSTALL_ROOT=%{buildroot}
-
-%files
-%doc README.md
-%{_libdir}/lib*.so.1
-%{_libdir}/lib*.so.1.*
-%{_datadir}/%{repo}/
-
-%files devel
-%{_includedir}/libddenetworkutils/
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/lib*.so
-
-%changelog
-* Thu Jan 31 2019 mosquito <[email protected]> - 0.0.9-1
-- Update to 0.0.9
-
-* Thu Jan 31 2019 Fedora Release Engineering <[email protected]> -
0.0.8.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Dec 12 2018 mosquito <[email protected]> - 0.0.8.1-1
-- Update to 0.0.8.1
-
-* Fri Nov 9 2018 mosquito <[email protected]> - 0.0.7-1
-- Update to 0.0.7
-
-* Thu Aug 2 2018 mosquito <[email protected]> - 0.0.4-1
-- Update to 0.0.4
-
-* Mon Jul 23 2018 mosquito <[email protected]> - 0.0.3-1
-- Initial package build
-
