Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2013-07-30 15:59:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepimlibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2013-07-22 17:16:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2013-07-30 16:00:33.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 25 21:58:45 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to 4.10.97 + * KDE 4.11 RC 2 release + * See http://www.kde.org/announcements/announce-4.11-rc2.php + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.10.95.tar.xz New: ---- kdepimlibs-4.10.97.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.d0asHX/_old 2013-07-30 16:00:34.000000000 +0200 +++ /var/tmp/diff_new_pack.d0asHX/_new 2013-07-30 16:00:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepimlibs4 -Version: 4.10.95 +Version: 4.10.97 Release: 0 Summary: KDE PIM Libraries License: LGPL-2.1+ ++++++ kdepimlibs-4.10.95.tar.xz -> kdepimlibs-4.10.97.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/CMakeLists.txt new/kdepimlibs-4.10.97/CMakeLists.txt --- old/kdepimlibs-4.10.95/CMakeLists.txt 2013-07-10 01:12:37.000000000 +0200 +++ new/kdepimlibs-4.10.97/CMakeLists.txt 2013-07-24 00:20:07.000000000 +0200 @@ -7,7 +7,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 10) -set(KDEPIMLIBS_VERSION_PATCH 95) +set(KDEPIMLIBS_VERSION_PATCH 97) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) @@ -79,7 +79,7 @@ if (NOT KDEPIM_ONLY_KLEO) #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that. - set(Akonadi_MIN_VERSION "1.9.80") + set(Akonadi_MIN_VERSION "1.10.1") find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET NO_MODULE) set_package_properties(Akonadi PROPERTIES DESCRIPTION "Akonadi server libraries" URL "http://pim.kde.org/akonadi"; TYPE REQUIRED PURPOSE "Access to PIM storage and services") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/collectionselectjob.cpp new/kdepimlibs-4.10.97/akonadi/collectionselectjob.cpp --- old/kdepimlibs-4.10.95/akonadi/collectionselectjob.cpp 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/collectionselectjob.cpp 2013-07-23 11:00:40.000000000 +0200 @@ -35,6 +35,13 @@ { } + QString jobDebuggingString() const /*Q_DECL_OVERRIDE*/ { + if ( mCollection.id() > 0 ) + return QString::number( mCollection.id() ); + else + return QString::fromLatin1( "RemoteID " ) + QString::number( mCollection.id() ); + } + Collection mCollection; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/collectionstatisticsjob.cpp new/kdepimlibs-4.10.97/akonadi/collectionstatisticsjob.cpp --- old/kdepimlibs-4.10.95/akonadi/collectionstatisticsjob.cpp 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/collectionstatisticsjob.cpp 2013-07-23 11:00:40.000000000 +0200 @@ -36,6 +36,10 @@ { } + QString jobDebuggingString() const /*Q_DECL_OVERRIDE*/ { + return QString::number( mCollection.id() ); + } + Collection mCollection; CollectionStatistics mStatistics; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/itemfetchjob.cpp new/kdepimlibs-4.10.97/akonadi/itemfetchjob.cpp --- old/kdepimlibs-4.10.95/akonadi/itemfetchjob.cpp 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/itemfetchjob.cpp 2013-07-23 11:00:40.000000000 +0200 @@ -78,6 +78,18 @@ void startFetchJob(); void selectDone( KJob * job ); + QString jobDebuggingString() const /*Q_DECL_OVERRIDE*/ { + if ( mRequestedItems.isEmpty() ) { + return QString::fromLatin1( "All items from collection %1" ).arg( mCollection.id() ); + } else { + try { + return QString::fromLatin1( ProtocolHelper::entitySetToByteArray( mRequestedItems, AKONADI_CMD_ITEMFETCH ) ); + } catch ( const Exception &e ) { + return QString::fromUtf8( e.what() ); + } + } + } + Q_DECLARE_PUBLIC( ItemFetchJob ) Collection mCollection; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/itemfetchscope.cpp new/kdepimlibs-4.10.97/akonadi/itemfetchscope.cpp --- old/kdepimlibs-4.10.95/akonadi/itemfetchscope.cpp 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/itemfetchscope.cpp 2013-07-24 00:20:07.000000000 +0200 @@ -151,3 +151,12 @@ return d->mIgnoreRetrievalErrors; } +void ItemFetchScope::setFetchChangedSince( const KDateTime &changedSince ) +{ + d->mChangedSince = changedSince; +} + +KDateTime ItemFetchScope::fetchChangedSince() const +{ + return d->mChangedSince; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/itemfetchscope.h new/kdepimlibs-4.10.97/akonadi/itemfetchscope.h --- old/kdepimlibs-4.10.95/akonadi/itemfetchscope.h 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/itemfetchscope.h 2013-07-24 00:20:07.000000000 +0200 @@ -23,6 +23,7 @@ #include "akonadi_export.h" #include <QtCore/QSharedDataPointer> +#include <KDE/KDateTime> class QStringList; template <typename T> class QSet; @@ -269,6 +270,23 @@ */ bool isEmpty() const; + /** + * Only fetch items that were added or modified after given timestamp + * + * When this property is set, all results are filtered, i.e. even when you + * request an item with a specific ID, it will not be fetched unless it was + * modified after @p changedSince timestamp. + * + * @param changedSince The timestamp of oldest modified item to fetch + * @since 4.11 + */ + void setFetchChangedSince( const KDateTime &changedSince ); + + /** + * Returns timestamp of the oldest item to fetch. + */ + KDateTime fetchChangedSince() const; + private: //@cond PRIVATE QSharedDataPointer<ItemFetchScopePrivate> d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/itemfetchscope_p.h new/kdepimlibs-4.10.97/akonadi/itemfetchscope_p.h --- old/kdepimlibs-4.10.95/akonadi/itemfetchscope_p.h 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/itemfetchscope_p.h 2013-07-24 00:20:07.000000000 +0200 @@ -22,6 +22,7 @@ #include <QtCore/QSet> #include <QtCore/QString> +#include <KDE/KDateTime> #include "itemfetchscope.h" namespace Akonadi { @@ -55,6 +56,7 @@ mCheckCachedPayloadPartsOnly = other.mCheckCachedPayloadPartsOnly; mFetchMtime = other.mFetchMtime; mIgnoreRetrievalErrors = other.mIgnoreRetrievalErrors; + mChangedSince = other.mChangedSince; } public: @@ -67,6 +69,7 @@ bool mCheckCachedPayloadPartsOnly; bool mFetchMtime; bool mIgnoreRetrievalErrors; + KDateTime mChangedSince; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/job.cpp new/kdepimlibs-4.10.97/akonadi/job.cpp --- old/kdepimlibs-4.10.95/akonadi/job.cpp 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/job.cpp 2013-07-23 11:00:40.000000000 +0200 @@ -133,11 +133,23 @@ argumentList << QLatin1String( mSession->sessionId() ) << QString::number(reinterpret_cast<quintptr>( q ), 16) << ( mParentJob ? QString::number( reinterpret_cast<quintptr>( mParentJob ), 16) : QString() ) - << QString::fromLatin1( q->metaObject()->className() ); + << QString::fromLatin1( q->metaObject()->className() ) + << jobDebuggingString(); s_jobtracker->callWithArgumentList(QDBus::NoBlock, QLatin1String( "jobCreated" ), argumentList); } } +void JobPrivate::signalStartedToJobTracker() +{ + Q_Q( Job ); + if ( s_jobtracker ) { + // if there's a job tracker running, tell it a job started + QList<QVariant> argumentList; + argumentList << QString::number(reinterpret_cast<quintptr>( q ), 16); + s_jobtracker->callWithArgumentList(QDBus::NoBlock, QLatin1String( "jobStarted" ), argumentList); + } +} + void JobPrivate::delayedEmitResult() { Q_Q( Job ); @@ -152,13 +164,7 @@ emit q->aboutToStart( q ); q->doStart(); QTimer::singleShot( 0, q, SLOT(startNext()) ); - - // if there's a job tracker running, tell it a job started - if ( s_jobtracker ) { - QList<QVariant> argumentList; - argumentList << QString::number(reinterpret_cast<quintptr>( q ), 16); - s_jobtracker->callWithArgumentList(QDBus::NoBlock, QLatin1String( "jobStarted" ), argumentList); - } + QMetaObject::invokeMethod( q, "signalStartedToJobTracker", Qt::QueuedConnection ); } void JobPrivate::lostConnection() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/job.h new/kdepimlibs-4.10.97/akonadi/job.h --- old/kdepimlibs-4.10.95/akonadi/job.h 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/job.h 2013-07-23 11:00:40.000000000 +0200 @@ -218,6 +218,7 @@ Q_PRIVATE_SLOT( d_func(), void slotSubJobAboutToStart( Akonadi::Job* ) ) Q_PRIVATE_SLOT( d_func(), void startNext() ) Q_PRIVATE_SLOT( d_func(), void signalCreationToJobTracker() ) + Q_PRIVATE_SLOT( d_func(), void signalStartedToJobTracker() ) Q_PRIVATE_SLOT( d_func(), void delayedEmitResult() ) //@endcond }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/job_p.h new/kdepimlibs-4.10.97/akonadi/job_p.h --- old/kdepimlibs-4.10.95/akonadi/job_p.h 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/job_p.h 2013-07-23 11:00:40.000000000 +0200 @@ -52,7 +52,12 @@ void slotSubJobAboutToStart( Akonadi::Job* ); void startNext(); void signalCreationToJobTracker(); + void signalStartedToJobTracker(); void delayedEmitResult(); + /* + Returns a string to display in akonadi console's job tracker. E.g. item ID. + */ + virtual QString jobDebuggingString() const { return QString(); } /** Returns a new unique command tag for communication with the backend. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/protocolhelper.cpp new/kdepimlibs-4.10.97/akonadi/protocolhelper.cpp --- old/kdepimlibs-4.10.95/akonadi/protocolhelper.cpp 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/protocolhelper.cpp 2013-07-24 00:20:07.000000000 +0200 @@ -285,6 +285,9 @@ Q_ASSERT( false ); } } + if ( fetchScope.fetchChangedSince().isValid() ) { + command += " " AKONADI_PARAM_CHANGEDSINCE " " + QByteArray::number( fetchScope.fetchChangedSince().toTime_t() ); + } //TODO: detect somehow if server supports external payload attribute command += " " AKONADI_PARAM_EXTERNALPAYLOAD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/akonadi/session_p.h new/kdepimlibs-4.10.97/akonadi/session_p.h --- old/kdepimlibs-4.10.95/akonadi/session_p.h 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/akonadi/session_p.h 2013-07-24 00:20:07.000000000 +0200 @@ -113,7 +113,7 @@ */ void itemRevisionChanged( Akonadi::Item::Id itemId, int oldRevision, int newRevision ); - static int minimumProtocolVersion() { return 32; } + static int minimumProtocolVersion() { return 33; } /** * Default location for akonadiconnectionrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/kabc/plugins/dir/dir.desktop new/kdepimlibs-4.10.97/kabc/plugins/dir/dir.desktop --- old/kdepimlibs-4.10.95/kabc/plugins/dir/dir.desktop 2013-07-14 12:02:21.000000000 +0200 +++ new/kdepimlibs-4.10.97/kabc/plugins/dir/dir.desktop 2013-07-23 11:00:40.000000000 +0200 @@ -51,6 +51,7 @@ Name[zh_CN]=文件夹 Name[zh_TW]=資料夾 Comment=Provides access to contacts, each stored in a single file, in a given folder. Supports standard vCard file and other formats depending on availability of plugins. +Comment[bs]=Pruža pristup kontaktima skladištenim u poјedinačnim datotekama u datom direktoriju. Podržava standardne VCard datoteke i druge formate, prema raspoloživim priključcima. Comment[ca]=Proporciona l'accés als contactes, cada un emmagatzemat en un fitxer individual, en una carpeta proporcionada. Accepta els fitxers estàndard vCard i altres formats depenent de la disponibilitat dels connectors. Comment[cs]=Poskytuje přístup ke kontaktům, každém uloženém v jednom souboru v dané složce. Podporuje standardní soubory s vizitkou a jiným formátům podle dostupných modulů. Comment[da]=Giver adgang til kontakter, hver lagret i en enkelt fil, i en given mappe. Understøtter standard vCard-fil og andre formater afhængigt af tilgængeligheden af plugins. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/kabc/plugins/file/file.desktop new/kdepimlibs-4.10.97/kabc/plugins/file/file.desktop --- old/kdepimlibs-4.10.95/kabc/plugins/file/file.desktop 2013-07-14 12:02:21.000000000 +0200 +++ new/kdepimlibs-4.10.97/kabc/plugins/file/file.desktop 2013-07-23 11:00:40.000000000 +0200 @@ -56,6 +56,7 @@ Name[zh_CN]=文件 Name[zh_TW]=檔案 Comment=Provides access to contacts stored in a single local file. Supports standard vCard files and other formats depending on available plugins. +Comment[bs]=Pruža pristup kontaktima skladištenim u јednoj lokalnoj datoteci. Podržava standardne VCard faјlove i druge formate, prema raspoloživim priključcima. Comment[ca]=Proporciona l'accés als contactes emmagatzemats en un fitxer individual. Accepta els fitxers estàndard vCard i altres formats, depenent dels connectors disponibles. Comment[cs]=Poskytuje přístup ke kontaktům uloženým v jednom lokálním souboru. Podporuje standardní soubory s vizitkou a jiným formátům podle dostupných modulů. Comment[da]=Giver adgang til kontakter, hver lagret i en enkelt fil. Understøtter standard vCard-fil og andre formater afhængigt af tilgængelige af plugins. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/kabc/plugins/net/net.desktop new/kdepimlibs-4.10.97/kabc/plugins/net/net.desktop --- old/kdepimlibs-4.10.95/kabc/plugins/net/net.desktop 2013-07-14 12:02:21.000000000 +0200 +++ new/kdepimlibs-4.10.97/kabc/plugins/net/net.desktop 2013-07-23 11:00:40.000000000 +0200 @@ -56,6 +56,7 @@ Name[zh_CN]=网络 Name[zh_TW]=網路 Comment=Provides access to contacts in remote files using KDE's network framework KIO. Supports standard vCard files and other formats depending on available plugins. +Comment[bs]=Pruža pristup kontaktima u udaljenim datotekama preko KDE-ovog mrežnog radnog okvira KIO. Podržava standardne VCard datoteke i druge formate, prema raspoloživim priključcima. Comment[ca]=Proporciona l'accés als contactes en fitxers remots usant la infraestructura KIO de xarxa del KDE. Accepta els fitxers estàndard vCard i altres formats, depenent dels connectors disponibles. Comment[cs]=Poskytuje přístup ke vzdáleným kontaktům pomocí síťového frameworku KDE KIO. Podporuje standardní soubory s vizitkou a jiným formátům podle dostupných modulů. Comment[da]=Giver adgang til kontakter i eksterne filer med brug af KDE's netværks-framework KIO. Understøtter standard vCard-filer og andre formater afhængigt af tilgængelige plugins. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/kabc/vcardparser/tests/vcard1.vcf.ref new/kdepimlibs-4.10.97/kabc/vcardparser/tests/vcard1.vcf.ref --- old/kdepimlibs-4.10.95/kabc/vcardparser/tests/vcard1.vcf.ref 2013-07-10 01:12:36.000000000 +0200 +++ new/kdepimlibs-4.10.97/kabc/vcardparser/tests/vcard1.vcf.ref 2013-07-23 11:00:40.000000000 +0200 @@ -1,7 +1,7 @@ BEGIN:VCARD ADR;TYPE=parcel;TYPE=postal;TYPE=work:;;6544 Battleford Drive;Raleigh;NC;27 613-3502;U.S.A. -EMAIL;TYPE=PREF:frank_daw...@lotus.com +EMAIL;TYPE=PREF:frank_daw...@lotus.com EMAIL:fdaw...@earthlink.net FN:Frank Dawson N:;;;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/kimap/loginjob.cpp new/kdepimlibs-4.10.97/kimap/loginjob.cpp --- old/kdepimlibs-4.10.95/kimap/loginjob.cpp 2013-07-10 01:12:37.000000000 +0200 +++ new/kdepimlibs-4.10.97/kimap/loginjob.cpp 2013-07-23 11:00:40.000000000 +0200 @@ -141,10 +141,12 @@ { Q_D( LoginJob ); connect( d->sessionInternal(), SIGNAL(encryptionNegotiationResult(bool)), this, SLOT(sslResponse(bool)) ); + kDebug() << this; } LoginJob::~LoginJob() { + kDebug() << this; } QString LoginJob::userName() const @@ -187,6 +189,7 @@ { Q_D( LoginJob ); + kDebug() << this; // Don't authenticate on a session in the authenticated state if ( session()->state() == Session::Authenticated || session()->state() == Session::Selected ) { setError( UserDefinedError ); @@ -251,6 +254,7 @@ } else if ( encryptionMode == Unencrypted ) { if ( d->authMode.isEmpty() ) { d->authState = LoginJobPrivate::Login; + kDebug() << "sending LOGIN"; d->tags << d->sessionInternal()->sendCommand( "LOGIN", '"' + quoteIMAP( d->userName ).toUtf8() + '"' + ' ' + @@ -290,6 +294,8 @@ QByteArray tag = response.content.first().toString(); ResponseCode code = OK; + kDebug() << commandName << tag; + if ( tag == "+" ) { code = CONTINUATION; } else if ( tag == "*" ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.95/kimap/sessionthread.cpp new/kdepimlibs-4.10.97/kimap/sessionthread.cpp --- old/kdepimlibs-4.10.95/kimap/sessionthread.cpp 2013-07-10 01:12:37.000000000 +0200 +++ new/kdepimlibs-4.10.97/kimap/sessionthread.cpp 2013-07-23 11:00:40.000000000 +0200 @@ -148,6 +148,7 @@ if ( !m_socket ) return; m_encryptedMode = false; + kDebug() << "close"; m_socket->close(); } @@ -160,8 +161,10 @@ if ( m_socket->state() != SessionSocket::ConnectedState && m_socket->state() != SessionSocket::ConnectingState ) { if ( m_encryptedMode ) { + kDebug() << "connectToHostEncrypted" << m_hostName << m_port; m_socket->connectToHostEncrypted( m_hostName, m_port ); } else { + kDebug() << "connectToHost" << m_hostName << m_port; m_socket->connectToHost( m_hostName, m_port ); } } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
