commit e37471e21f44109a4bd04cb02dc9db3076019e54
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jun 30 14:48:32 2011 -0500
better (upstream) fix for kstatusnotifieritemdbus leak (#667787, kde#261180)
kdelibs-4.6.4-kstatusnotifieritemdbus_leak.patch | 13 +++++++++++++
kdelibs-4.6.80-kstatusnotifieritem_dbus_leak.patch | 11 -----------
kdelibs.spec | 10 ++++++++--
3 files changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/kdelibs-4.6.4-kstatusnotifieritemdbus_leak.patch
b/kdelibs-4.6.4-kstatusnotifieritemdbus_leak.patch
new file mode 100644
index 0000000..f8eb177
--- /dev/null
+++ b/kdelibs-4.6.4-kstatusnotifieritemdbus_leak.patch
@@ -0,0 +1,13 @@
+diff -up
kdelibs-4.6.4/kdeui/notifications/kstatusnotifieritemdbus_p.cpp.kstatusnotifieritemdbus_leak
kdelibs-4.6.4/kdeui/notifications/kstatusnotifieritemdbus_p.cpp
+---
kdelibs-4.6.4/kdeui/notifications/kstatusnotifieritemdbus_p.cpp.kstatusnotifieritemdbus_leak 2011-04-01
08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdeui/notifications/kstatusnotifieritemdbus_p.cpp 2011-06-30
14:45:28.256526029 -0500
+@@ -174,7 +174,9 @@ KStatusNotifierItemDBus::KStatusNotifier
+
+ KStatusNotifierItemDBus::~KStatusNotifierItemDBus()
+ {
++ m_dbus.unregisterObject("/StatusNotifierItem");
+ m_dbus.unregisterService(m_service);
++ m_dbus.disconnectFromBus(m_service);
+ }
+
+ QDBusConnection KStatusNotifierItemDBus::dbusConnection() const
diff --git a/kdelibs.spec b/kdelibs.spec
index fe2a333..f010f54 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -18,7 +18,7 @@
Summary: KDE Libraries
Version: 4.6.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Name: kdelibs
Epoch: 6
@@ -108,6 +108,9 @@ Patch52: kdelibs-4.6.80-kstatusnotifieritem_dbus_leak.patch
Patch100: kdelibs-4.6.80-kconfigxt-qt48.patch
# fix docbook-style-xsl borkage
Patch101: kdelibs-4.6.4-kdoctools_docbook.patch
+#
http://bugzilla.redhat.com/667787
+#
http://bugs.kde.org/261180
+Patch102: kdelibs-4.6.4-kstatusnotifieritemdbus_leak.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@@ -292,11 +295,11 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|"
kio/kio/kprotocolmanage
# upstreamable patches
%patch50 -p1 -b .knewstuff_gpg2
%patch51 -p1 -b .uri_mimetypes
-%patch52 -p1 -b .kstatusnotifieritem_dbus_leak
# 4.6 upstream patches
%patch100 -p1 -b .kconfigxt-qt48
%patch101 -p1 -b .kdoctools_docbook
+%patch102 -p1 -b .kstatusnotifieritemdbus_leak
# security fix
%patch200 -p1 -b .CVE-2009-2702
@@ -552,6 +555,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 30 2011 Rex Dieter <rdieter(a)fedoraproject.org> 4.6.4-6
+- better (upstream) fix for kstatusnotifieritemdbus leak (#667787, kde#261180)
+
* Mon Jun 27 2011 Rex Dieter <rdieter(a)fedoraproject.org> 4.6.4-5
- (Build)Requires: docbook-style-xsl >= 1.76