diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2017-05-15 11:46:05 +0200 |
---|---|---|
committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2017-05-15 12:41:08 +0200 |
commit | 9eb0f43031c76afcb678f4473861456c3dd32633 (patch) | |
tree | 35901edc1be74c34ac8dddf3bf52fd75aab327c0 /gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch | |
parent | d0abaf8960ef0fb8a85f43c399a7ca9281c56142 (diff) |
gnu: Update kde frameworks to 5.34.0.
* gnu/packages/kde-frameworks.scm (solid): Update to 5.34.0 [native-inputs]:
Add dbus. <check>: Replace standard phase.
(networkmanager-qt): Update to 5.34.0. [source]: Remove patches.
(kfilemetadata) Update to 5.32.0. <check-setup>: New phase <check> Move
phase after install phase. [inputs] Add catdoc, exiv2, ffmpeg, poppler,
taglib.
(attica, baloo, bluez-qt, breeze-icons, 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,
kglobalaccel, kguiaddons, ki18n, kiconthemes, kidletime, kimageformats,
kinit, kio, kitemmodels, kitemviews, kjobwidgets, knewstuff, knotification,
knotifyconfig, kpackages, kparts, kpeople, kplotting, kpty, krunner,
kservice, ksyntaxhighlighting, ktexteditor, ktextwidgets, kunitconversion,
kwallet, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, kxmlrpcclient,
modemmanager-qt, networkmanager-qt, oxygen-icons, plasma-framework, sonnet,
threadweaver): Update to 5.34.0.
* gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch,
gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch:
Remove files.
* gnu/local.mk (dist_patch_DATA): Remove the patch files.
Diffstat (limited to 'gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch')
-rw-r--r-- | gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch b/gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch deleted file mode 100644 index af3cdff729..0000000000 --- a/gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 3f6155389abc8e2b3dafc5eefa1ce0c929b007fa Mon Sep 17 00:00:00 2001 -From: Jan Grulich <jgrulich@redhat.com> -Date: Mon, 3 Apr 2017 14:13:54 +0200 -Subject: One more attempt to fix unit test for active connections - ---- - src/activeconnection.cpp | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/activeconnection.cpp b/src/activeconnection.cpp -index 05582fa..3a8e6b2 100644 ---- a/src/activeconnection.cpp -+++ b/src/activeconnection.cpp -@@ -79,11 +79,13 @@ NetworkManager::ActiveConnection::ActiveConnection(const QString &path, QObject - connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); - #endif - -+#ifndef NMQT_STATIC - /* - * Workaround: Re-check connection state before we watch changes in case it gets changed too quickly - * BUG:352326 - */ - d->recheckProperties(); -+#endif - } - - NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, QObject *parent) -@@ -91,18 +93,26 @@ NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, - { - Q_D(ActiveConnection); - -+#ifndef NMQT_STATIC - #if NM_CHECK_VERSION(1, 4, 0) - QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, - QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); - #else - connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); - #endif -+#endif -+ -+#ifdef NMQT_STATIC -+ connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); -+#endif - -+#ifndef NMQT_STATIC - /* - * Workaround: Re-check connection state before we watch changes in case it gets changed too quickly - * BUG:352326 - */ - d->recheckProperties(); -+#endif - } - - NetworkManager::ActiveConnection::~ActiveConnection() --- -cgit v0.11.2 - |