[kdelibs] pull in candidate fix for "kde deamon crash on wakeup" (kde#288410)

Rex Dieter rdieter at fedoraproject.org
Tue Dec 30 03:22:56 UTC 2014


commit dfe751c10cd02a693fbf8b4253eca5d8685fecd4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 29 21:23:00 2014 -0600

    pull in candidate fix for "kde deamon crash on wakeup" (kde#288410)

 kdelibs-kdebug288410.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 kdelibs.spec               |   10 +++++++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/kdelibs-kdebug288410.patch b/kdelibs-kdebug288410.patch
new file mode 100644
index 0000000..fc80f84
--- /dev/null
+++ b/kdelibs-kdebug288410.patch
@@ -0,0 +1,44 @@
+diff --git a/solid/solid/backends/upower/upowerbattery.cpp b/solid/solid/backends/upower/upowerbattery.cpp
+index 7b5bdc4..8bd9343 100644
+--- a/solid/solid/backends/upower/upowerbattery.cpp
++++ b/solid/solid/backends/upower/upowerbattery.cpp
+@@ -123,6 +123,7 @@ Solid::Battery::ChargeState Battery::chargeState() const
+ void Battery::slotChanged()
+ {
+     if (m_device) {
++        const QString udi = m_device.data()->udi();
+         const int old_chargePercent = m_chargePercent;
+         const int old_capacity = m_capacity;
+         const Solid::Battery::ChargeState old_chargeState = m_chargeState;
+@@ -132,26 +133,26 @@ void Battery::slotChanged()
+ 
+         if (old_chargePercent != m_chargePercent)
+         {
+-            emit chargePercentChanged(m_chargePercent, m_device.data()->udi());
++            emit chargePercentChanged(m_chargePercent, udi);
+         }
+ 
+         if (old_capacity != m_capacity) {
+-            emit capacityChanged(m_capacity, m_device.data()->udi());
++            emit capacityChanged(m_capacity, udi);
+         }
+ 
+         if (old_chargeState != m_chargeState)
+         {
+-            emit chargeStateChanged(m_chargeState, m_device.data()->udi());
++            emit chargeStateChanged(m_chargeState, udi);
+         }
+ 
+         if (old_isPlugged != m_isPlugged)
+         {
+-            emit plugStateChanged(m_isPlugged, m_device.data()->udi());
++            emit plugStateChanged(m_isPlugged, udi);
+         }
+ 
+         if (old_isPowerSupply != m_isPowerSupply)
+         {
+-            emit powerSupplyStateChanged(m_isPowerSupply, m_device.data()->udi());
++            emit powerSupplyStateChanged(m_isPowerSupply, udi);
+         }
+     }
+ }
diff --git a/kdelibs.spec b/kdelibs.spec
index 09810c1..52f4386 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -41,7 +41,7 @@
 
 Summary: KDE Libraries
 Version: 4.14.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -159,6 +159,10 @@ Patch54: kdelibs-4.8.4-kjs-locale.patch
 # https://build-test.opensuse.org/package/view_file/home:coolo:test/kdelibs4/0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch
 Patch55: Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch
 
+# candidate fix for: kde deamon crash on wakeup
+# https://bugs.kde.org/show_bug.cgi?id=288410
+Patch56: kdelibs-kdebug288410.patch
+
 # make filter working, TODO: upstream?  -- rex
 Patch59: kdelibs-4.9.3-kcm_ssl.patch
 
@@ -427,6 +431,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch53 -p1 -b .kjs-s390
 %patch54 -p1 -b .kjs-locale
 %patch55 -p1 -b .Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES
+%patch56 -p1 -b .kdebug288410
 %patch59 -p1 -b .filter
 %patch61 -p1 -b .dot
 %patch62 -p1 -b .arm-plasma
@@ -777,6 +782,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Dec 29 2014 Rex Dieter <rdieter at fedoraproject.org> 6:4.14.3-8
+- pull in candidate fix for "kde deamon crash on wakeup" (kde#288410)
+
 * Sat Dec 20 2014 Rex Dieter <rdieter at fedoraproject.org> - 6:4.14.3-7
 - borrow Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch from obs
 - start work to support -nepomuk, -nepomuk-devel subpkgs (wip)


More information about the scm-commits mailing list