diff --git a/kdelibs-4.5.3-kde246652.patch b/kdelibs-4.5.3-kde246652.patch new file mode 100644 index 0000000..8b1110e --- /dev/null +++ b/kdelibs-4.5.3-kde246652.patch @@ -0,0 +1,46 @@ +--- 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 5346ccb..2884314 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -12,7 +12,7 @@ Summary: KDE Libraries Version: 4.5.3 -Release: 1%{?dist} +Release: 3%{?dist} Name: kdelibs Epoch: 6 @@ -90,6 +90,8 @@ Patch27: kdelibs-4.4.80-no_rpath.patch 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 ## trunk upstream # http://websvn.kde.org/?view=revision&revision=1185912 @@ -260,6 +262,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch50 -p1 -b .knewstuff_gpg2 # upstream patches +%patch100 -p4 -b .kde246652 %patch151 -p3 -b .plasma_wallpaper_configchanged # security fix @@ -505,6 +508,12 @@ rm -rf %{buildroot} %changelog +* Mon Nov 15 2010 Rex Dieter - 4.5.3-3 +- Closing a konsolepart shell crashes (kde#256652) + +* Fri Nov 05 2010 Thomas janssen 4.5.3-2 +- rebuild for new libxml2 + * Fri Oct 29 2010 Than Ngo - 4.5.3-1 - 4.5.3