[SCM] networkmanager-qt packaging branch, master, updated. debian/5.37.0-2-117-gf1fbbd9
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 2 18:58:50 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/networkmanager-qt.git;a=commitdiff;h=a4fa6f8
The following commit has been merged in the master branch:
commit a4fa6f8f8f9ff748e8d09ab261da30c8bedcecec
Author: Jonathan Riddell <jr at jriddell.org>
Date: Thu Jun 29 14:31:26 2017 +0100
remove patches in archive
---
...e-Use-SYSTEM-for-nm-glib-nm-util-includes.patch | 34 ------
.../Don-t-force-logging-with-setFilterRules.patch | 26 ----
debian/patches/Initialise-a-member-variable.patch | 21 ----
...itting-deviceAdded-twice-when-NM-restarts.patch | 134 ---------------------
debian/patches/series | 4 -
5 files changed, 219 deletions(-)
diff --git a/debian/patches/CMake-Use-SYSTEM-for-nm-glib-nm-util-includes.patch b/debian/patches/CMake-Use-SYSTEM-for-nm-glib-nm-util-includes.patch
deleted file mode 100644
index 86d3691..0000000
--- a/debian/patches/CMake-Use-SYSTEM-for-nm-glib-nm-util-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Kevin Funk <kfunk at kde.org>
-Date: Mon, 16 Jan 2017 09:40:05 +0100
-Subject: CMake: Use SYSTEM for nm-glib/nm-util includes
-
----
- src/CMakeLists.txt | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a8951ef..eb056a5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -7,8 +7,10 @@ include_directories(
- else()
- include_directories(
- ${NETWORKMANAGER_INCLUDE_DIRS}
-- ${NM-UTIL_INCLUDE_DIRS}
-- ${NM-GLIB_INCLUDE_DIRS}
-+
-+ SYSTEM
-+ ${NM-UTIL_INCLUDE_DIRS}
-+ ${NM-GLIB_INCLUDE_DIRS}
- )
- endif()
-
-@@ -143,7 +145,7 @@ set_target_properties(KF5NetworkManagerQt PROPERTIES VERSION ${NETWORKMANAGERQT_
- if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.0.0 OR ${NETWORKMANAGER_VERSION} VERSION_GREATER 1.0.0)
- target_include_directories(KF5NetworkManagerQt PUBLIC ${NM-CORE_INCLUDE_DIRS})
- else()
-- target_include_directories(KF5NetworkManagerQt PUBLIC ${NETWORKMANAGER_INCLUDE_DIRS} ${NM-UTIL_INCLUDE_DIRS} ${NM-GLIB_INCLUDE_DIRS})
-+ target_include_directories(KF5NetworkManagerQt PUBLIC ${NETWORKMANAGER_INCLUDE_DIRS} SYSTEM PUBLIC ${NM-UTIL_INCLUDE_DIRS} ${NM-GLIB_INCLUDE_DIRS})
- endif()
-
- ########### static lib for tests ###############
diff --git a/debian/patches/Don-t-force-logging-with-setFilterRules.patch b/debian/patches/Don-t-force-logging-with-setFilterRules.patch
deleted file mode 100644
index 005b690..0000000
--- a/debian/patches/Don-t-force-logging-with-setFilterRules.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: David Rosca <nowrep at gmail.com>
-Date: Mon, 12 Dec 2016 10:15:40 +0100
-Subject: Don't force logging with setFilterRules
-
-Don't set the logging rules from inside the library, so the user
-configuration (qtlogging.ini) is respected.
-
-REVIEW: 129630
----
- src/manager.cpp | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/manager.cpp b/src/manager.cpp
-index 6565299..c523e13 100644
---- a/src/manager.cpp
-+++ b/src/manager.cpp
-@@ -90,9 +90,6 @@ NetworkManager::NetworkManagerPrivate::NetworkManagerPrivate()
- , m_isWwanHardwareEnabled(false)
- , m_supportedInterfaceTypes(NetworkManager::Device::UnknownType)
- {
-- QLoggingCategory::setFilterRules(QStringLiteral("networkmanager-qt.debug = true"));
-- QLoggingCategory::setFilterRules(QStringLiteral("networkmanager-qt.warning = true"));
--
- connect(&iface, &OrgFreedesktopNetworkManagerInterface::DeviceAdded,
- this, &NetworkManagerPrivate::onDeviceAdded);
- connect(&iface, &OrgFreedesktopNetworkManagerInterface::DeviceRemoved,
diff --git a/debian/patches/Initialise-a-member-variable.patch b/debian/patches/Initialise-a-member-variable.patch
deleted file mode 100644
index 3acb2f7..0000000
--- a/debian/patches/Initialise-a-member-variable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: David Edmundson <kde at davidedmundson.co.uk>
-Date: Thu, 5 Jan 2017 02:42:01 +0000
-Subject: Initialise a member variable
-
-REVIEW: 129777
----
- src/activeconnection.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/activeconnection.cpp b/src/activeconnection.cpp
-index 22ab7d0..d797f6f 100644
---- a/src/activeconnection.cpp
-+++ b/src/activeconnection.cpp
-@@ -41,6 +41,7 @@ NetworkManager::ActiveConnectionPrivate::ActiveConnectionPrivate(const QString &
- #endif
- , dhcp4Config(0)
- , dhcp6Config(0)
-+ , state(ActiveConnection::Unknown)
- , q_ptr(q)
- {
- path = dbusPath;
diff --git a/debian/patches/Manager-Fix-emitting-deviceAdded-twice-when-NM-restarts.patch b/debian/patches/Manager-Fix-emitting-deviceAdded-twice-when-NM-restarts.patch
deleted file mode 100644
index 6d763a1..0000000
--- a/debian/patches/Manager-Fix-emitting-deviceAdded-twice-when-NM-restarts.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: David Rosca <nowrep at gmail.com>
-Date: Fri, 17 Feb 2017 12:34:58 +0100
-Subject: Manager: Fix emitting deviceAdded twice when NM restarts
-
-Differential Revision: https://phabricator.kde.org/D4646
----
- autotests/managertest.cpp | 20 ++++++++++++++++++++
- src/fakenetwork/fakenetwork.cpp | 38 ++++++++++++++++++++++++++------------
- src/fakenetwork/fakenetwork.h | 2 ++
- src/manager.cpp | 2 +-
- 4 files changed, 49 insertions(+), 13 deletions(-)
-
-diff --git a/autotests/managertest.cpp b/autotests/managertest.cpp
-index 6cc2429..0759a77 100644
---- a/autotests/managertest.cpp
-+++ b/autotests/managertest.cpp
-@@ -68,6 +68,26 @@ void ManagerTest::testDevices()
- QVERIFY(NetworkManager::networkInterfaces().isEmpty());
- QCOMPARE(removeDeviceSpy.at(0).at(0).toString(), addedDevicePath);
-
-+ addDeviceSpy.clear();
-+
-+ fakeNetwork->addDevice(device);
-+ QVERIFY(addDeviceSpy.wait());
-+ QCOMPARE(NetworkManager::networkInterfaces().count(), 1);
-+ QCOMPARE(NetworkManager::networkInterfaces().first()->uni(), addDeviceSpy.at(0).at(0).toString());
-+
-+ addDeviceSpy.clear();
-+ removeDeviceSpy.clear();
-+
-+ fakeNetwork->unregisterService();
-+ QTRY_COMPARE(removeDeviceSpy.count(), 1);
-+
-+ fakeNetwork->registerService();
-+ QTRY_COMPARE(addDeviceSpy.count(), 1);
-+
-+ // Make sure deviceAdded is emitted only once
-+ addDeviceSpy.wait(100);
-+ QCOMPARE(addDeviceSpy.count(), 1);
-+
- delete device;
- }
-
-diff --git a/src/fakenetwork/fakenetwork.cpp b/src/fakenetwork/fakenetwork.cpp
-index c7a29fd..72cf479 100644
---- a/src/fakenetwork/fakenetwork.cpp
-+++ b/src/fakenetwork/fakenetwork.cpp
-@@ -46,26 +46,16 @@ FakeNetwork::FakeNetwork(QObject *parent)
- , m_deviceCounter(0)
- , m_settings(new Settings(this))
- {
-- QDBusConnection::sessionBus().registerService(QLatin1Literal("org.kde.fakenetwork"));
-- QDBusConnection::sessionBus().registerObject(QLatin1Literal("/org/kde/fakenetwork"), this, QDBusConnection::ExportScriptableContents);
-- QDBusConnection::sessionBus().registerObject(QLatin1Literal("/org/kde/fakenetwork/Settings"), m_settings, QDBusConnection::ExportScriptableContents);
--
-+ registerService();
- connect(m_settings, &Settings::connectionAdded, this, &FakeNetwork::onConnectionAdded);
- connect(m_settings, &Settings::connectionRemoved, this, &FakeNetwork::onConnectionRemoved);
- }
-
- FakeNetwork::~FakeNetwork()
- {
-- Q_FOREACH (const QDBusObjectPath & devicePath, m_devices.keys()) {
-- QDBusConnection::sessionBus().unregisterObject(devicePath.path());
-- Q_EMIT DeviceRemoved(devicePath);
-- }
-+ unregisterService();
- qDeleteAll(m_devices);
--
- delete m_settings;
-- QDBusConnection::sessionBus().unregisterObject(QLatin1Literal("/org/kde/fakenetwork/Settings"));
-- QDBusConnection::sessionBus().unregisterObject(QLatin1Literal("/org/kde/fakenetwork"));
-- QDBusConnection::sessionBus().unregisterService(QLatin1Literal("org.kde.fakenetwork"));
- }
-
- QDBusObjectPath FakeNetwork::activatingConnection() const
-@@ -199,6 +189,30 @@ void FakeNetwork::removeDevice(Device *device)
- Q_EMIT DeviceRemoved(QDBusObjectPath(device->devicePath()));
- }
-
-+void FakeNetwork::registerService()
-+{
-+ QDBusConnection::sessionBus().registerService(QLatin1Literal("org.kde.fakenetwork"));
-+ QDBusConnection::sessionBus().registerObject(QLatin1Literal("/org/kde/fakenetwork"), this, QDBusConnection::ExportScriptableContents);
-+ QDBusConnection::sessionBus().registerObject(QLatin1Literal("/org/kde/fakenetwork/Settings"), m_settings, QDBusConnection::ExportScriptableContents);
-+
-+ Q_FOREACH (const QDBusObjectPath & devicePath, m_devices.keys()) {
-+ QDBusConnection::sessionBus().registerObject(devicePath.path(), m_devices.value(devicePath), QDBusConnection::ExportScriptableContents);
-+ Q_EMIT DeviceAdded(devicePath);
-+ }
-+}
-+
-+void FakeNetwork::unregisterService()
-+{
-+ Q_FOREACH (const QDBusObjectPath & devicePath, m_devices.keys()) {
-+ QDBusConnection::sessionBus().unregisterObject(devicePath.path());
-+ Q_EMIT DeviceRemoved(devicePath);
-+ }
-+
-+ QDBusConnection::sessionBus().unregisterObject(QLatin1Literal("/org/kde/fakenetwork/Settings"));
-+ QDBusConnection::sessionBus().unregisterObject(QLatin1Literal("/org/kde/fakenetwork"));
-+ QDBusConnection::sessionBus().unregisterService(QLatin1Literal("org.kde.fakenetwork"));
-+}
-+
- QDBusObjectPath FakeNetwork::ActivateConnection(const QDBusObjectPath &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object)
- {
- ActiveConnection *newActiveConnection = new ActiveConnection(this);
-diff --git a/src/fakenetwork/fakenetwork.h b/src/fakenetwork/fakenetwork.h
-index 64077a9..2ade01e 100644
---- a/src/fakenetwork/fakenetwork.h
-+++ b/src/fakenetwork/fakenetwork.h
-@@ -80,6 +80,8 @@ public:
- /* Not part of DBus interface */
- void addDevice(Device *device);
- void removeDevice(Device *device);
-+ void registerService();
-+ void unregisterService();
-
- private Q_SLOTS:
- void onConnectionAdded(const QDBusObjectPath &connection);
-diff --git a/src/manager.cpp b/src/manager.cpp
-index c523e13..2b16e9d 100644
---- a/src/manager.cpp
-+++ b/src/manager.cpp
-@@ -680,8 +680,8 @@ void NetworkManager::NetworkManagerPrivate::onDeviceAdded(const QDBusObjectPath
- // qCDebug(NMQT);
- if (!networkInterfaceMap.contains(objpath.path())) {
- networkInterfaceMap.insert(objpath.path(), Device::Ptr());
-+ Q_EMIT deviceAdded(objpath.path());
- }
-- Q_EMIT deviceAdded(objpath.path());
- }
-
- void NetworkManager::NetworkManagerPrivate::onDeviceRemoved(const QDBusObjectPath &objpath)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index df44a0f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-Don-t-force-logging-with-setFilterRules.patch
-Initialise-a-member-variable.patch
-CMake-Use-SYSTEM-for-nm-glib-nm-util-includes.patch
-Manager-Fix-emitting-deviceAdded-twice-when-NM-restarts.patch
--
networkmanager-qt packaging
More information about the pkg-kde-commits
mailing list