diff options
| author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2017-03-28 17:49:41 +0200 |
|---|---|---|
| committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2017-04-12 10:08:52 +0200 |
| commit | 4467c2d1dcbf88e26767616a49ed49de8ee48f57 (patch) | |
| tree | 1974036a11a2452a23014d1afcb44a1486dd374c /gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch | |
| parent | 446809fb359fb7089ebc8db7843c84377c046905 (diff) | |
| download | guix-4467c2d1dcbf88e26767616a49ed49de8ee48f57.tar.gz | |
gnu: Update kde-frameworks to 5.32.0
* gnu/packages/kde-frameworks.scm (breeze-icons): Update to 5.32.0. [arguments]: Re-enable tests. (kio): Update to 5.32.0. [source]: Remove patch. (ktexteditor): Update to 5.32.0. [inputs]: Add ksyntaxhighlighting. (networkmanager-qt): Update to 5.32.0. [source]: Add patches. (kunitconversion): Update to 5.32.0. [arguments] <disable-a-failing-test-case>: New phase. (ksyntaxhighlighting): Update to 5.32.0.[native-iputs]: Add qtools. (knewstuff): Update to 5.32.0. [inputs]: Add qtdeclarative. (attica, baloo, bluez-qt, extra-cmake-modules, kactivities, kactivities-stats, kapidox, karchive, kauth, kbookmarks, kcmutils, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, kdeclarative, kded, kdesignerplugin, kdesu, kdnssd, kdoctools, kemoticons, kfilemetadata, kglobalaccel, kguiaddons, ki18n, kiconthemes, kidletime, kimageformats, kinit, kitemmodels, kitemviews, kjobwidgets, knotifications, knotifyconfig, kpackage, kparts, kpeople, kplotting, kpty, krunner, kservice, ktextwidgets, kwallet, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, kxmlrpcclient, modemmanager-qt, oxygen-icons, plasma-framework, solid, sonnet, threadweaver): Update to 5.32.0. * gnu/packages/patches/kio-CVE-2017-6410.patch: Delete file. * gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch, gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch: New files. * gnu/local.mk (dist_patch_DATA): Remove resp. add the patch files.
Diffstat (limited to 'gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch')
| -rw-r--r-- | gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch b/gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch new file mode 100644 index 0000000000..2dd39294ea --- /dev/null +++ b/gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch @@ -0,0 +1,60 @@ +From 61337983ba74361938b7d5323de5d2819a235fdc Mon Sep 17 00:00:00 2001 +From: Jan Grulich <jgrulich@redhat.com> +Date: Mon, 3 Apr 2017 12:53:12 +0200 +Subject: Fix unit test for active connections + +Instead of sending PropertiesChanged signal for an active connection we +added recently we should set all properties initially and just advertise +that we have a new active connection once everything is set +--- + src/fakenetwork/fakenetwork.cpp | 26 +++++++------------------- + 1 file changed, 7 insertions(+), 19 deletions(-) + +diff --git a/src/fakenetwork/fakenetwork.cpp b/src/fakenetwork/fakenetwork.cpp +index bc1144e..261fe8e 100644 +--- a/src/fakenetwork/fakenetwork.cpp ++++ b/src/fakenetwork/fakenetwork.cpp +@@ -215,8 +215,14 @@ void FakeNetwork::unregisterService() + + QDBusObjectPath FakeNetwork::ActivateConnection(const QDBusObjectPath &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object) + { +- ActiveConnection *newActiveConnection = new ActiveConnection(this); + QString newActiveConnectionPath = QString("/org/kde/fakenetwork/ActiveConnection/") + QString::number(m_activeConnectionsCounter++); ++ ActiveConnection *newActiveConnection = new ActiveConnection(this); ++ newActiveConnection->addDevice(device); ++ newActiveConnection->setActiveConnectionPath(newActiveConnectionPath); ++ newActiveConnection->setConnection(connection); ++ newActiveConnection->setSpecificObject(specific_object); ++ newActiveConnection->setState(NetworkManager::ActiveConnection::Activating); ++ + m_activeConnections.insert(QDBusObjectPath(newActiveConnectionPath), newActiveConnection); + QDBusConnection::sessionBus().registerObject(newActiveConnectionPath, newActiveConnection, QDBusConnection::ExportScriptableContents); + +@@ -227,24 +233,6 @@ QDBusObjectPath FakeNetwork::ActivateConnection(const QDBusObjectPath &connectio + map.insert(QLatin1Literal("ActivatingConnection"), QVariant::fromValue(QDBusObjectPath(newActiveConnectionPath))); + Q_EMIT PropertiesChanged(map); + +- newActiveConnection->addDevice(device); +- newActiveConnection->setActiveConnectionPath(newActiveConnectionPath); +- newActiveConnection->setConnection(connection); +- newActiveConnection->setSpecificObject(specific_object); +- newActiveConnection->setState(NetworkManager::ActiveConnection::Activating); +- +- map.clear(); +- const QList<QDBusObjectPath> deviceList { device }; +- map.insert(QLatin1Literal("Devices"), QVariant::fromValue<QList<QDBusObjectPath> >(deviceList)); +- map.insert(QLatin1Literal("Connection"), QVariant::fromValue<QDBusObjectPath>(connection)); +- if (!specific_object.path().isEmpty()) { +- map.insert(QLatin1Literal("SpecificObject"), QVariant::fromValue<QDBusObjectPath>(connection)); +- } +- map.insert(QLatin1Literal("State"), NetworkManager::ActiveConnection::Activating); +- QDBusMessage message = QDBusMessage::createSignal(newActiveConnectionPath, QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("PropertiesChanged")); +- message << map; +- QDBusConnection::sessionBus().send(message); +- + Device *usedDevice = static_cast<Device *>(QDBusConnection::sessionBus().objectRegisteredAt(device.path())); + if (usedDevice) { + m_activatedDevice = usedDevice->devicePath(); +-- +cgit v0.11.2 + |