Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2012-03-19 10:11:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2012-03-13 11:24:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2012-03-19 10:12:02.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 14 09:47:52 UTC 2012 - kru...@zib.de + +- added fix for KMail2 crashes from + https://bugs.kde.org/show_bug.cgi?id=295474#c27 + +------------------------------------------------------------------- New: ---- kmail2-crash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.Pm9sab/_old 2012-03-19 10:12:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Pm9sab/_new 2012-03-19 10:12:04.000000000 +0100 @@ -109,6 +109,8 @@ Patch18: plasma-libs.diff Patch20: ignore-inline-menu.diff Patch24: ksuseinstall.diff +# fix for KDE Bug 295474 from https://bugs.kde.org/show_bug.cgi?id=295474#c27 +Patch25: kmail2-crash.diff PreReq: permissions Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -173,6 +175,7 @@ %patch18 %patch20 %patch24 +%patch25 -p1 # # define KDE version exactly ++++++ kmail2-crash.diff ++++++ diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp index abe55ea..e65e66e 100644 --- a/nepomuk/core/resourcedata.cpp +++ b/nepomuk/core/resourcedata.cpp @@ -175,7 +175,7 @@ void Nepomuk::ResourceData::resetAll( bool isDelete ) if( !m_uri.isEmpty() ) { m_rm->m_initializedData.remove( m_uri ); if( m_rm->m_watcher && m_addedToWatcher ) { - m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri)); + QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri))); m_addedToWatcher = false; } } @@ -394,15 +394,16 @@ bool Nepomuk::ResourceData::load() if(!m_rm->m_watcher) { m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager); + m_rm->m_watcher->moveToThread(m_rm->m_manager->thread()); QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)), m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) ); QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)), m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) ); m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) ); - m_rm->m_watcher->start(); + QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection); } else { - m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) ); + QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) ); } m_addedToWatcher = true; diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h index 06b9622..92b12f5 100644 --- a/nepomuk/core/resourcewatcher.h +++ b/nepomuk/core/resourcewatcher.h @@ -93,6 +93,7 @@ namespace Nepomuk { */ virtual ~ResourceWatcher(); + public Q_SLOTS: /** * \brief Add a type to be watched. * @@ -204,7 +205,6 @@ namespace Nepomuk { */ QList<Types::Property> properties() const; - public Q_SLOTS: /** * \brief Start the signalling of changes. * -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
