From 23f43378ed9916e104285c26c0bfba5a5b151b3d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 19 Apr 2011 14:33:19 -0500 Subject: [PATCH] Solid::Networking::status() returning Solid::Networking::Status::Unknown (kde#270538) --- kdelibs-4.6.2-kde270538.patch | 22 ++++++++++++++++++++++ kdelibs.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 kdelibs-4.6.2-kde270538.patch diff --git a/kdelibs-4.6.2-kde270538.patch b/kdelibs-4.6.2-kde270538.patch new file mode 100644 index 0000000..39aff03 --- /dev/null +++ b/kdelibs-4.6.2-kde270538.patch @@ -0,0 +1,22 @@ +commit 72cbad117d0abb4b47a5d00754ea465eda6c06b5 +Author: Lamarque V. Souza +Date: Sun Apr 10 18:34:17 2011 -0300 + + Fix Solid::Networking::status() returning Solid::Networking::Unknown + sometimes. + + BUG: 270538 + FIXED-IN: 4.6.3 + +diff --git a/solid/solid/networking.cpp b/solid/solid/networking.cpp +index 6dd6553..02c7714 100644 +--- a/solid/solid/networking.cpp ++++ b/solid/solid/networking.cpp +@@ -59,6 +59,7 @@ Solid::Networking::Notifier::Notifier() + void Solid::NetworkingPrivate::initialize() + { + QDBusPendingReply reply = iface->status(); ++ reply.waitForFinished(); + if (reply.isValid()) { + netStatus = ( Solid::Networking::Status )reply.value(); + } else { diff --git a/kdelibs.spec b/kdelibs.spec index 29a5578..5dbaadf 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -16,7 +16,7 @@ Summary: KDE Libraries Version: 4.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -91,6 +91,8 @@ Patch27: kdelibs-4.5.80-no_rpath.patch Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch ## upstream +# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/72cbad117d0abb4b47a5d00754ea465eda6c06b5 +Patch100: kdelibs-4.6.2-kde270538.patch ## security fix # Not Upstreamed? why not ? -- Rex @@ -275,6 +277,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch50 -p1 -b .knewstuff_gpg2 # upstream patches +%patch100 -p1 -b .kde270538 # security fix %patch200 -p1 -b .CVE-2009-2702 @@ -530,6 +533,9 @@ rm -rf %{buildroot} %changelog +* Tue Apr 19 2011 Rex Dieter 4.6.2-2 +- Solid::Networking::status() returning Solid::Networking::Status::Unknown (kde#270538) + * Wed Apr 06 2011 Jaroslav Reznik 4.6.2-1 - 4.6.2