rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better (upstream) fix for kstatusnotifieritemdbus leak (#667787, kde#261180)

This commit is contained in:
Rex Dieter 2011-06-30 14:48:32 -05:00
parent 770c3232b2
commit e37471e21f
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kdelibs-4.6.4-kstatusnotifieritemdbus_leak.patch Normal file
View File

@ -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

11
kdelibs-4.6.80-kstatusnotifieritem_dbus_leak.patch
View File

@ -1,11 +0,0 @@
diff -up kdelibs-4.6.80/kdeui/notifications/kstatusnotifieritem.cpp.dbus_leak kdelibs-4.6.80/kdeui/notifications/kstatusnotifieritem.cpp
--- kdelibs-4.6.80/kdeui/notifications/kstatusnotifieritem.cpp.dbus_leak 2011-05-20 15:24:54.000000000 -0500
+++ kdelibs-4.6.80/kdeui/notifications/kstatusnotifieritem.cpp 2011-06-14 09:13:40.010087693 -0500
@@ -119,6 +119,7 @@ KStatusNotifierItem::~KStatusNotifierIte
delete d->notificationsClient;
delete d->systemTrayIcon;
delete d->menu;
+ delete d->statusNotifierItemDBus;
delete d;
KGlobal::deref();
}

10
kdelibs.spec
View File

@ -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@fedoraproject.org> 4.6.4-6
- better (upstream) fix for kstatusnotifieritemdbus leak (#667787, kde#261180)
* Mon Jun 27 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.4-5
- (Build)Requires: docbook-style-xsl >= 1.76