Merge remote-tracking branch 'origin/f15' into f14
This commit is contained in:
commit
c4b64c1996
13
kdelibs-4.6.4-kstatusnotifieritemdbus_leak.patch
Normal file
13
kdelibs-4.6.4-kstatusnotifieritemdbus_leak.patch
Normal 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
|
@ -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();
|
|
||||||
}
|
|
17
kdelibs.spec
17
kdelibs.spec
@ -12,13 +12,11 @@
|
|||||||
# to build/include QCH apidocs or not (currently broken)
|
# to build/include QCH apidocs or not (currently broken)
|
||||||
#define apidocs_qch 1
|
#define apidocs_qch 1
|
||||||
|
|
||||||
%if 0%{?fedora} > 13
|
|
||||||
%define halectomy 1
|
%define halectomy 1
|
||||||
%endif
|
|
||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.6.4
|
Version: 4.6.4
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -108,6 +106,9 @@ Patch52: kdelibs-4.6.80-kstatusnotifieritem_dbus_leak.patch
|
|||||||
Patch100: kdelibs-4.6.80-kconfigxt-qt48.patch
|
Patch100: kdelibs-4.6.80-kconfigxt-qt48.patch
|
||||||
# fix docbook-style-xsl borkage
|
# fix docbook-style-xsl borkage
|
||||||
Patch101: kdelibs-4.6.4-kdoctools_docbook.patch
|
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
|
## security fix
|
||||||
# Not Upstreamed? why not ? -- Rex
|
# Not Upstreamed? why not ? -- Rex
|
||||||
@ -117,11 +118,6 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
|||||||
# make forcefully hal-free build
|
# make forcefully hal-free build
|
||||||
Patch300: kdelibs-4.5.90-halectomy.patch
|
Patch300: kdelibs-4.5.90-halectomy.patch
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?fedora} && 0%{?fedora} < 13
|
|
||||||
Conflicts: kdebase-workspace-libs < 4.3.80
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# force upgrade of apps using the discontinued KatePart Smart* interfaces to
|
# force upgrade of apps using the discontinued KatePart Smart* interfaces to
|
||||||
# versions using the new Moving* interfaces instead
|
# versions using the new Moving* interfaces instead
|
||||||
Conflicts: kdevplatform < 1.1.80
|
Conflicts: kdevplatform < 1.1.80
|
||||||
@ -292,11 +288,11 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
# upstreamable patches
|
# upstreamable patches
|
||||||
%patch50 -p1 -b .knewstuff_gpg2
|
%patch50 -p1 -b .knewstuff_gpg2
|
||||||
%patch51 -p1 -b .uri_mimetypes
|
%patch51 -p1 -b .uri_mimetypes
|
||||||
%patch52 -p1 -b .kstatusnotifieritem_dbus_leak
|
|
||||||
|
|
||||||
# 4.6 upstream patches
|
# 4.6 upstream patches
|
||||||
%patch100 -p1 -b .kconfigxt-qt48
|
%patch100 -p1 -b .kconfigxt-qt48
|
||||||
%patch101 -p1 -b .kdoctools_docbook
|
%patch101 -p1 -b .kdoctools_docbook
|
||||||
|
%patch102 -p1 -b .kstatusnotifieritemdbus_leak
|
||||||
|
|
||||||
# security fix
|
# security fix
|
||||||
%patch200 -p1 -b .CVE-2009-2702
|
%patch200 -p1 -b .CVE-2009-2702
|
||||||
@ -552,6 +548,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon Jun 27 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.4-5
|
||||||
- (Build)Requires: docbook-style-xsl >= 1.76
|
- (Build)Requires: docbook-style-xsl >= 1.76
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user