From 739924aa3b8c21ada9df4a995d9ef5ec18dcc8f8 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Fri, 3 Dec 2010 15:44:55 +0100
Subject: [PATCH] 4.5.4

---
 kdelibs-4.5.3-kde246652.patch | 46 -----------------------------------
 kdelibs.spec                  |  5 +---
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 kdelibs-4.5.3-kde246652.patch

diff --git a/kdelibs-4.5.3-kde246652.patch b/kdelibs-4.5.3-kde246652.patch
deleted file mode 100644
index 8b1110e..0000000
--- a/kdelibs-4.5.3-kde246652.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguiclient.cpp	2010/11/16 00:37:04	1197481
-+++ branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguiclient.cpp	2010/11/16 00:37:17	1197482
-@@ -97,10 +97,12 @@
-   }
- 
-   if ( d->m_factory ) {
--    d->m_factory->removeClient ( this );
-+    d->m_factory->forgetClient(this);
-   }
-- 
-+
-   foreach (KXMLGUIClient* client, d->m_children) {
-+      if (d->m_factory)
-+          d->m_factory->forgetClient(client);
-       assert( client->d->m_parent == this );
-       client->d->m_parent = 0;
-   }
---- branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguifactory.cpp	2010/11/16 00:37:04	1197481
-+++ branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguifactory.cpp	2010/11/16 00:37:17	1197482
-@@ -388,6 +388,11 @@
-     refreshActionProperties();
- }
- 
-+void KXMLGUIFactory::forgetClient( KXMLGUIClient *client )
-+{
-+    d->m_clients.removeAll( client );
-+}
-+
- void KXMLGUIFactory::removeClient( KXMLGUIClient *client )
- {
-     //kDebug(260) << client;
---- branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguifactory.h	2010/11/16 00:37:04	1197481
-+++ branches/KDE/4.5/kdelibs/kdeui/xmlgui/kxmlguifactory.h	2010/11/16 00:37:17	1197482
-@@ -216,7 +216,11 @@
-     void makingChanges(bool);
- 
- private:
--  KXMLGUIFactoryPrivate *const d;
-+    friend class KXMLGUIClient;
-+    /// Internal, called by KXMLGUIClient destructor
-+    void forgetClient(KXMLGUIClient *client);
-+
-+    KXMLGUIFactoryPrivate *const d;
- };
- 
- #endif
diff --git a/kdelibs.spec b/kdelibs.spec
index cc68dff..fc6cec2 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -101,9 +101,7 @@ Patch27: kdelibs-4.4.80-no_rpath.patch
 # TODO: try to use either gpg or gpg2, whichever is available
 Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
 
-## 4.5 upstream
-# http://websvn.kde.org/?view=revision&revision=1197482
-Patch100: kdelibs-4.5.3-kde246652.patch
+## 4.5 upstream, stable branch
 
 ## trunk upstream
 # http://websvn.kde.org/?view=revision&revision=1185912
@@ -272,7 +270,6 @@ format for use with the Qt 4 Assistant or KDevelop 4.
 %patch50 -p1 -b .knewstuff_gpg2
 
 # upstream patches, stable branch
-%patch100 -p4 -b .kde246652
 
 # upstream patches, trunk
 %patch151 -p3 -b .plasma_wallpaper_configchanged