commit akonadi-runtime for openSUSE:Factory
Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Fri Jan 29 16:06:35 CET 2010. -------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2010-01-06 20:15:00.000000000 +0100 +++ akonadi-runtime/akonadi-runtime.changes 2010-01-20 21:42:15.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 20 21:44:27 CET 2010 - dmueller@suse.de + +- update to 1.3.0: + - Work around D-Bus bug that could cause SEARCH to hang. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- akonadi-1.2.90.tar.bz2 New: ---- akonadi-1.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.v7smg6/_old 2010-01-29 16:05:31.000000000 +0100 +++ /var/tmp/diff_new_pack.v7smg6/_new 2010-01-29 16:05:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package akonadi-runtime (Version 1.2.90) +# spec file for package akonadi-runtime (Version 1.3.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -Version: 1.2.90 +Version: 1.3.0 Release: 1 %define rversion %version License: LGPLv2.1+ ++++++ akonadi-1.2.90.tar.bz2 -> akonadi-1.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.2.90/CMakeLists.txt new/akonadi-1.3.0/CMakeLists.txt --- old/akonadi-1.2.90/CMakeLists.txt 2010-01-06 19:37:21.000000000 +0100 +++ new/akonadi-1.3.0/CMakeLists.txt 2010-01-20 10:13:55.000000000 +0100 @@ -31,8 +31,8 @@ ############### The Akonadi version (used in AkonadiConfig.cmake) ############### set(AKONADI_VERSION_MAJOR "1") -set(AKONADI_VERSION_MINOR "2") -set(AKONADI_VERSION_PATCH "90") +set(AKONADI_VERSION_MINOR "3") +set(AKONADI_VERSION_PATCH "0") set(AKONADI_VERSION "${AKONADI_VERSION_MAJOR}.${AKONADI_VERSION_MINOR}.${AKONADI_VERSION_PATCH}") # If Subversion is installed, and a '.svn' directory is found, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.2.90/ChangeLog new/akonadi-1.3.0/ChangeLog --- old/akonadi-1.2.90/ChangeLog 2010-01-06 19:37:21.000000000 +0100 +++ new/akonadi-1.3.0/ChangeLog 2010-01-20 10:13:54.000000000 +0100 @@ -1,3 +1,28 @@ +2010-01-20 08:23 +0000 [r1077436] Volker Krause vkrause@kde.org + + * branches/akonadi/1.3/server/src/nepomuksearch.cpp: Backport from + trunk. r1077216 | tmcguire | 2010-01-19 18:57:13 +0100 (Tue, 19 + Jan 2010) | 12 lines Work around a DBus bug that using a + connection from within multiple threads can cause freezes. In + this case, that connection was the session bus, on which we + called isServiceRegistered. The workaround: Just don't check if + the search service is available, just call the methods. They'll + fail properly if the service is not there. Volker, can you + backport this fix to older Akonadi releases and prepare tarballs, + so that we can notify the release team about this? Should fix + CCBUG: 219687 + +2010-01-08 13:22 +0000 [r1071627] Volker Krause vkrause@kde.org + + * branches/akonadi/1.3 (added): branch Akonadi 1.3 + +2010-01-06 18:32 +0000 [r1070782] Volker Krause vkrause@kde.org + + * trunk/kdesupport/akonadi/ChangeLog, + trunk/kdesupport/akonadi/NEWS, + trunk/kdesupport/akonadi/CMakeLists.txt: prepare the 1.2.90 + release + 2010-01-01 15:45 +0000 [r1068573] Allen Winter winter@kde.org * trunk/kdesupport/akonadi/server/tests/unittest/CMakeLists.txt: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.2.90/NEWS new/akonadi-1.3.0/NEWS --- old/akonadi-1.2.90/NEWS 2010-01-06 19:37:21.000000000 +0100 +++ new/akonadi-1.3.0/NEWS 2010-01-20 10:13:55.000000000 +0100 @@ -1,3 +1,7 @@ +1.3.0 20-January-2010 +--------------------------------------------- +- Work around D-Bus bug that could cause SEARCH to hang. + 1.2.90 06-January-2010 --------------------------------------------- - Fix change notifications for search results. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.2.90/server/src/nepomuksearch.cpp new/akonadi-1.3.0/server/src/nepomuksearch.cpp --- old/akonadi-1.2.90/server/src/nepomuksearch.cpp 2010-01-06 19:37:20.000000000 +0100 +++ new/akonadi-1.3.0/server/src/nepomuksearch.cpp 2010-01-20 10:13:54.000000000 +0100 @@ -42,13 +42,9 @@ NepomukSearch::NepomukSearch( QObject* parent ) : QObject( parent ), mSearchService( 0 ) { - if ( !Nepomuk::Search::QueryServiceClient::serviceAvailable() ) { - qWarning() << "Nepomuk QueryServer interface not available!"; - } else { - mSearchService = new Nepomuk::Search::QueryServiceClient( this ); - connect( mSearchService, SIGNAL( newEntries( const QListNepomuk::Search::Result& ) ), - this, SLOT( hitsAdded( const QListNepomuk::Search::Result& ) ) ); - } + mSearchService = new Nepomuk::Search::QueryServiceClient( this ); + connect( mSearchService, SIGNAL( newEntries( const QListNepomuk::Search::Result& ) ), + this, SLOT( hitsAdded( const QListNepomuk::Search::Result& ) ) ); } NepomukSearch::~NepomukSearch() @@ -66,7 +62,10 @@ return QStringList(); } - mSearchService->blockingQuery( query ); + if ( !mSearchService->blockingQuery( query ) ) { + qWarning() << Q_FUNC_INFO << "Calling blockingQuery() failed!"; + return QStringList(); + } return mMatchingUIDs.toList(); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de