Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Thu Nov 18 16:08:43 CET 2010. -------- --- KDE/kdelibs4/kdelibs4-apidocs.changes 2010-11-08 14:46:55.000000000 +0100 +++ kdelibs4/kdelibs4-apidocs.changes 2010-11-18 16:08:07.606439000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 16 13:31:31 UTC 2010 - cristian.rodriguez@opensuse.org + +- Closing the shell via CTRL+D crashes [bko#246652] + +------------------------------------------------------------------- +Thu Nov 11 16:25:51 CET 2010 - dmueller@suse.de + +- fix build with gcc 4.6 + +------------------------------------------------------------------- kdelibs4.changes: same change calling whatdependson for head-i586 New: ---- kdelibs-4.5.3-bko246652.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.eaW33C/_old 2010-11-18 16:08:18.000000000 +0100 +++ /var/tmp/diff_new_pack.eaW33C/_new 2010-11-18 16:08:18.000000000 +0100 @@ -26,7 +26,7 @@ Summary: KDE 4 API documentation Url: http://www.kde.org Version: 4.5.3 -Release: 2 +Release: 3 Requires: kde4-filesystem Source0: kdelibs-%version.tar.bz2 Source1: baselibs.conf ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.eaW33C/_old 2010-11-18 16:08:18.000000000 +0100 +++ /var/tmp/diff_new_pack.eaW33C/_new 2010-11-18 16:08:18.000000000 +0100 @@ -44,7 +44,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.5.3 -Release: 2 +Release: 3 Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: kdelibs4-core = %version @@ -74,6 +74,7 @@ Patch24: ksuseinstall.diff Patch25: ksuseinstall_11.2.diff Patch26: nepomuk-final.diff +Patch27: kdelibs-4.5.3-bko246652.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %requires_ge libqt4-x11 %if 0%{?opensuse_bs} @@ -148,6 +149,7 @@ %patch25 %endif %patch26 +%patch27 # # define KDE version exactly # ++++++ 4_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.eaW33C/_old 2010-11-18 16:08:19.000000000 +0100 +++ /var/tmp/diff_new_pack.eaW33C/_new 2010-11-18 16:08:19.000000000 +0100 @@ -5,3 +5,21 @@ +svn di between //tags/KDE/4.5.2/kdelibs and //branches/KDE/4.5/kdelibs Index: doc/kded4/man-kded4.8.docbook +------------------------------------------------------------------------ +r1195598 | mueller | 2010-11-11 16:24:29 +0100 (Do, 11. Nov 2010) | 2 Zeilen + +gcc 4.6 build fix + +------------------------------------------------------------------------ +Index: kjs/collector.h +=================================================================== +--- kjs/collector.h (Revision 1195597) ++++ kjs/collector.h (Revision 1195598) +@@ -27,6 +27,7 @@ + + #include <wtf/HashCountedSet.h> + #include <cstring> ++#include <cstddef> + + #define KJS_MEM_LIMIT 500000 + ++++++ kdelibs-4.5.3-bko246652.patch ++++++ --- kdeui/xmlgui/kxmlguifactory.cpp.orig +++ kdeui/xmlgui/kxmlguifactory.cpp @@ -388,6 +388,11 @@ void KXMLGUIFactory::changeShortcutSchem refreshActionProperties(); } +void KXMLGUIFactory::forgetClient( KXMLGUIClient *client ) +{ + d->m_clients.removeAll( client ); +} + void KXMLGUIFactory::removeClient( KXMLGUIClient *client ) { //kDebug(260) << client; --- kdeui/xmlgui/kxmlguifactory.h.orig +++ kdeui/xmlgui/kxmlguifactory.h @@ -216,7 +216,11 @@ Q_SIGNALS: void makingChanges(bool); private: - KXMLGUIFactoryPrivate *const d; + friend class KXMLGUIClient; + /// Internal, called by KXMLGUIClient destructor + void forgetClient(KXMLGUIClient *client); + + KXMLGUIFactoryPrivate *const d; }; #endif --- kdeui/xmlgui/kxmlguiclient.cpp.orig +++ kdeui/xmlgui/kxmlguiclient.cpp @@ -97,10 +97,12 @@ KXMLGUIClient::~KXMLGUIClient() } 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; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org