drop unneeded kstatusnotify_dbus_leak.patch (upstream fixed better)

This commit is contained in:
Rex Dieter 2011-06-30 14:43:41 -05:00
parent f77ddf6e76
commit d76f7f2765
2 changed files with 4 additions and 16 deletions

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();
}

View File

@ -13,7 +13,7 @@
Summary: KDE Libraries
Version: 4.6.90
Release: 3%{?dist}
Release: 4%{?dist}
Name: kdelibs
Epoch: 6
@ -103,9 +103,6 @@ Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
# https://bugs.kde.org/show_bug.cgi?id=269045
# https://git.reviewboard.kde.org/r/101231/
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
# http://bugzilla.redhat.com/667787
# http://bugs.kde.org/261180
Patch52: kdelibs-4.6.80-kstatusnotifieritem_dbus_leak.patch
## upstream
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/d44186bce4670d2985fb6aba8dba59bbd2c4c77a
@ -304,7 +301,6 @@ 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
# upstream patches
%patch100 -p1 -b .kconfigxt-qt48
@ -563,6 +559,9 @@ rm -rf %{buildroot}
%changelog
* Thu Jun 30 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.90-4
- drop unneeded kstatusnotify_dbus_leak.patch (upstream fixed better)
* Wed Jun 29 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.90-3
- fix %%shared_desktop_ontologies_ver(sion) usage
- upstream kdoctools/docbook patch (#690124)