Hello community, here is the log from the commit of package kdepimlibs4 checked in at Tue May 6 22:57:58 CEST 2008. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2008-04-28 22:33:31.000000000 +0200 +++ kdepimlibs4/kdepimlibs4.changes 2008-05-06 13:19:51.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 6 13:19:32 CEST 2008 - dmueller@suse.de + +- update to 4.0.72+svn of today to adopt akonadi API change + +------------------------------------------------------------------- +Wed Apr 30 16:24:21 CEST 2008 - dmueller@suse.de + +- update to 4.0.72 + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.0.71.tar.bz2 New: ---- kdepimlibs-4.0.72.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.LY3607/_old 2008-05-06 22:56:43.000000000 +0200 +++ /var/tmp/diff_new_pack.LY3607/_new 2008-05-06 22:56:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 4.0.71) +# spec file for package kdepimlibs4 (Version 4.0.72) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org -Version: 4.0.71 -Release: 3 +Version: 4.0.72 +Release: 1 Source0: kdepimlibs-%version.tar.bz2 Source1: _upstream Patch0: 4_1_BRANCH.diff @@ -184,6 +184,10 @@ %_kde_share_dir/config.kcfg/mailtransport.kcfg %changelog +* Tue May 06 2008 dmueller@suse.de +- update to 4.0.72+svn of today to adopt akonadi API change +* Wed Apr 30 2008 dmueller@suse.de +- update to 4.0.72 * Tue Apr 29 2008 dmueller@suse.de - adapt to akonadi -> akonadi-runtime rename * Fri Apr 18 2008 dmueller@suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 652 lines (skipped) ++++ between KDE/kdepimlibs4/4_1_BRANCH.diff ++++ and kdepimlibs4/4_1_BRANCH.diff ++++++ kdepimlibs-4.0.71.tar.bz2 -> kdepimlibs-4.0.72.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/agentfilterproxymodel.cpp new/kdepimlibs-4.0.72/akonadi/agentfilterproxymodel.cpp --- old/kdepimlibs-4.0.71/akonadi/agentfilterproxymodel.cpp 2008-03-25 18:22:02.000000000 +0100 +++ new/kdepimlibs-4.0.72/akonadi/agentfilterproxymodel.cpp 2008-04-30 15:58:15.000000000 +0200 @@ -78,13 +78,13 @@ QModelIndex index = sourceModel()->index( row, 0 ); if ( !d->mimeTypes.isEmpty() ) { bool found = false; - foreach ( const QString mt, index.data( AgentTypeModel::MimeTypesRole ).toStringList() ) { + foreach ( const QString &mt, index.data( AgentTypeModel::MimeTypesRole ).toStringList() ) { if ( d->mimeTypes.contains( mt ) ) { found = true; } else { KMimeType::Ptr mimeType = KMimeType::mimeType( mt, KMimeType::ResolveAliases ); if ( !mimeType.isNull() ) { - foreach ( const QString type, d->mimeTypes ) { + foreach ( const QString &type, d->mimeTypes ) { if ( mimeType->is( type )) { found = true; break; @@ -100,7 +100,7 @@ if ( !d->capabilities.isEmpty() ) { bool found = false; - foreach ( const QString cap, index.data( AgentTypeModel::CapabilitiesRole ).toStringList() ) { + foreach ( const QString &cap, index.data( AgentTypeModel::CapabilitiesRole ).toStringList() ) { if ( d->capabilities.contains( cap ) ) { found = true; break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/changerecorder.cpp new/kdepimlibs-4.0.72/akonadi/changerecorder.cpp --- old/kdepimlibs-4.0.71/akonadi/changerecorder.cpp 2008-04-02 14:18:10.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/changerecorder.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -43,14 +43,14 @@ virtual void slotNotify( const NotificationMessage::List &msgs ) { if ( !enableChangeRecording ) { - foreach( const NotificationMessage msg, msgs ) + foreach( const NotificationMessage &msg, msgs ) processNotification( msg ); return; } Q_Q( ChangeRecorder ); int oldChanges = pendingNotifications.count(); - foreach ( const NotificationMessage msg, msgs ) { + foreach ( const NotificationMessage &msg, msgs ) { if ( acceptNotification( msg ) ) NotificationMessage::appendAndCompress( pendingNotifications, msg ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/CMakeLists.txt new/kdepimlibs-4.0.72/akonadi/CMakeLists.txt --- old/kdepimlibs-4.0.71/akonadi/CMakeLists.txt 2008-04-24 14:27:52.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/CMakeLists.txt 2008-04-30 15:58:15.000000000 +0200 @@ -9,13 +9,12 @@ add_subdirectory( tests ) include_directories( - ${CMAKE_SOURCE_DIR}/ - ${CMAKE_SOURCE_DIR}/akonadi - ${CMAKE_BINARY_DIR}/akonadi + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ${QT_QTDBUS_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${KDE4_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR}/akonadi/private + ${AKONADI_INCLUDE_DIR}/akonadi/private ) # libakonadi-kde @@ -96,14 +95,14 @@ ) # DBus interfaces and adaptors -set(akonadi_xml ${KDE4_DBUS_INTERFACES_DIR}/org.kde.Akonadi.NotificationManager.xml) +set(akonadi_xml ${AKONADI_DBUS_INTERFACES_DIR}/org.kde.Akonadi.NotificationManager.xml) set_source_files_properties(${akonadi_xml} PROPERTIES INCLUDE "notificationmessage_p.h") qt4_add_dbus_interface( akonadikde_LIB_SRC ${akonadi_xml} notificationmanagerinterface ) -qt4_add_dbus_interfaces( akonadikde_LIB_SRC ${KDE4_DBUS_INTERFACES_DIR}/org.kde.Akonadi.AgentManager.xml ) -qt4_add_dbus_interfaces( akonadikde_LIB_SRC ${KDE4_DBUS_INTERFACES_DIR}/org.kde.Akonadi.Tracer.xml ) -qt4_add_dbus_adaptor( akonadikde_LIB_SRC ${KDE4_DBUS_INTERFACES_DIR}/org.kde.Akonadi.Resource.xml resourcebase.h Akonadi::ResourceBase ) -qt4_add_dbus_adaptor( akonadikde_LIB_SRC ${KDE4_DBUS_INTERFACES_DIR}/org.kde.Akonadi.Agent.Status.xml agentbase.h Akonadi::AgentBase ) -qt4_add_dbus_adaptor( akonadikde_LIB_SRC ${KDE4_DBUS_INTERFACES_DIR}/org.kde.Akonadi.Agent.Control.xml agentbase.h Akonadi::AgentBase ) +qt4_add_dbus_interfaces( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.kde.Akonadi.AgentManager.xml ) +qt4_add_dbus_interfaces( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.kde.Akonadi.Tracer.xml ) +qt4_add_dbus_adaptor( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.kde.Akonadi.Resource.xml resourcebase.h Akonadi::ResourceBase ) +qt4_add_dbus_adaptor( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.kde.Akonadi.Agent.Status.xml agentbase.h Akonadi::AgentBase ) +qt4_add_dbus_adaptor( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.kde.Akonadi.Agent.Control.xml agentbase.h Akonadi::AgentBase ) kde4_add_ui_files( akonadikde_LIB_SRC cachepolicypage.ui @@ -113,7 +112,7 @@ kde4_add_library( akonadi-kde SHARED ${akonadikde_LIB_SRC} ) -target_link_libraries( akonadi-kde ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} akonadiprotocolinternals ) +target_link_libraries( akonadi-kde ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${AKONADI_COMMON_LIBRARIES} ) set_target_properties( akonadi-kde PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install( TARGETS akonadi-kde ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/collectioncreatejob.cpp new/kdepimlibs-4.0.72/akonadi/collectioncreatejob.cpp --- old/kdepimlibs-4.0.71/akonadi/collectioncreatejob.cpp 2008-03-25 18:22:02.000000000 +0100 +++ new/kdepimlibs-4.0.72/akonadi/collectioncreatejob.cpp 2008-04-30 15:58:15.000000000 +0200 @@ -60,7 +60,7 @@ if ( !d->mCollection.contentMimeTypes().isEmpty() ) { QList<QByteArray> cList; - foreach( QString s, d->mCollection.contentMimeTypes() ) cList << s.toLatin1(); + foreach( const QString &s, d->mCollection.contentMimeTypes() ) cList << s.toLatin1(); command += "MIMETYPE (" + ImapParser::join( cList, QByteArray(" ") ) + ')'; } command += " REMOTEID "" + d->mCollection.remoteId().toUtf8() + '"'; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/collectionfetchjob.cpp new/kdepimlibs-4.0.72/akonadi/collectionfetchjob.cpp --- old/kdepimlibs-4.0.71/akonadi/collectionfetchjob.cpp 2008-03-25 18:22:02.000000000 +0100 +++ new/kdepimlibs-4.0.72/akonadi/collectionfetchjob.cpp 2008-04-30 15:58:15.000000000 +0200 @@ -111,7 +111,7 @@ Q_D( CollectionFetchJob ); if ( !d->mBaseList.isEmpty() ) { - foreach ( const Collection col, d->mBaseList ) { + foreach ( const Collection &col, d->mBaseList ) { new CollectionFetchJob( col, CollectionFetchJob::Base, this ); } return; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/collectionfilterproxymodel.cpp new/kdepimlibs-4.0.72/akonadi/collectionfilterproxymodel.cpp --- old/kdepimlibs-4.0.71/akonadi/collectionfilterproxymodel.cpp 2008-03-25 18:22:02.000000000 +0100 +++ new/kdepimlibs-4.0.72/akonadi/collectionfilterproxymodel.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -49,13 +49,13 @@ QStringList collectionMimeTypes = mParent->sourceModel()->data( index, CollectionModel::CollectionRole ).value<Collection>().contentMimeTypes(); // If this collection directly contains one valid mimetype, it is accepted - foreach ( QString type, collectionMimeTypes ) { + foreach ( const QString &type, collectionMimeTypes ) { if ( mimeTypes.contains( type ) ) return true; KMimeType::Ptr mimeType = KMimeType::mimeType( type, KMimeType::ResolveAliases ); if ( !mimeType.isNull() ) { - foreach ( const QString mt, mimeTypes ) { + foreach ( const QString &mt, mimeTypes ) { if ( mimeType->is( mt ) ) return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/collectionmodel.cpp new/kdepimlibs-4.0.72/akonadi/collectionmodel.cpp --- old/kdepimlibs-4.0.71/akonadi/collectionmodel.cpp 2008-04-18 09:21:12.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/collectionmodel.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -247,7 +247,7 @@ { QMimeData *data = new QMimeData(); KUrl::List urls; - foreach ( QModelIndex index, indexes ) { + foreach ( const QModelIndex &index, indexes ) { if ( index.column() != 0 ) continue; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/collectionmodel_p.cpp new/kdepimlibs-4.0.72/akonadi/collectionmodel_p.cpp --- old/kdepimlibs-4.0.71/akonadi/collectionmodel_p.cpp 2008-04-18 09:21:12.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/collectionmodel_p.cpp 2008-04-30 15:58:15.000000000 +0200 @@ -228,7 +228,7 @@ Collection col = collections.value( index.internalId() ); Q_ASSERT( col.isValid() ); QStringList ct = col.contentMimeTypes(); - foreach ( QString a, ct ) { + foreach ( const QString &a, ct ) { if ( contentTypes.contains( a ) ) return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/collectionmodifyjob.cpp new/kdepimlibs-4.0.72/akonadi/collectionmodifyjob.cpp --- old/kdepimlibs-4.0.71/akonadi/collectionmodifyjob.cpp 2008-03-25 18:22:01.000000000 +0100 +++ new/kdepimlibs-4.0.72/akonadi/collectionmodifyjob.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -58,7 +58,7 @@ QByteArray changes; if ( d->mCollection.d_func()->contentTypesChanged ) { QList<QByteArray> bList; - foreach( QString s, d->mCollection.contentMimeTypes() ) bList << s.toLatin1(); + foreach( const QString &s, d->mCollection.contentMimeTypes() ) bList << s.toLatin1(); changes += " MIMETYPE (" + ImapParser::join( bList, " " ) + ')'; } if ( d->mCollection.parent() >= 0 ) @@ -71,7 +71,7 @@ changes += ' ' + ProtocolHelper::cachePolicyToByteArray( d->mCollection.cachePolicy() ); if ( d->mCollection.attributes().count() > 0 ) changes += ' ' + ProtocolHelper::attributesToByteArray( d->mCollection ); - foreach ( const QByteArray b, d->mCollection.d_func()->mDeletedAttributes ) + foreach ( const QByteArray &b, d->mCollection.d_func()->mDeletedAttributes ) changes += " -" + b; if ( changes.isEmpty() ) { emitResult(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/collectionpathresolver.cpp new/kdepimlibs-4.0.72/akonadi/collectionpathresolver.cpp --- old/kdepimlibs-4.0.71/akonadi/collectionpathresolver.cpp 2008-04-02 14:18:10.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/collectionpathresolver.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -67,7 +67,7 @@ if ( mPathToId ) { const QString currentPart = mPathParts.takeFirst(); bool found = false; - foreach ( const Collection c, cols ) { + foreach ( const Collection &c, cols ) { if ( c.name() == currentPart ) { mCurrentNode = c; found = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/collectionsync.cpp new/kdepimlibs-4.0.72/akonadi/collectionsync.cpp --- old/kdepimlibs-4.0.71/akonadi/collectionsync.cpp 2008-03-25 18:22:01.000000000 +0100 +++ new/kdepimlibs-4.0.72/akonadi/collectionsync.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -74,7 +74,7 @@ void CollectionSync::setRemoteCollections(const Collection::List & remoteCollections) { - foreach ( const Collection c, remoteCollections ) { + foreach ( const Collection &c, remoteCollections ) { d->remoteCollections.insert( c.id(), c ); } } @@ -82,7 +82,7 @@ void CollectionSync::setRemoteCollections(const Collection::List & changedCollections, const Collection::List & removedCollections) { d->incremental = true; - foreach ( const Collection c, changedCollections ) { + foreach ( const Collection &c, changedCollections ) { d->remoteCollections.insert( c.id(), c ); } d->removedRemoteCollections = removedCollections; @@ -101,14 +101,14 @@ return; Collection::List list = static_cast<CollectionFetchJob*>( job )->collections(); - foreach ( const Collection c, list ) { + foreach ( const Collection &c, list ) { d->localCollections.insert( c.remoteId(), c ); d->unprocessedLocalCollections.insert( c ); } // added / updated - foreach ( const Collection c, d->remoteCollections ) { + foreach ( const Collection &c, d->remoteCollections ) { if ( c.remoteId().isEmpty() ) { kWarning( 5250 ) << "Collection '" << c.name() <<"' does not have a remote identifier - skipping"; continue; @@ -146,7 +146,7 @@ // removed if ( !d->incremental ) d->removedRemoteCollections = d->unprocessedLocalCollections.toList(); - foreach ( const Collection c, d->removedRemoteCollections ) { + foreach ( const Collection &c, d->removedRemoteCollections ) { d->pendingJobs++; CollectionDeleteJob *job = new CollectionDeleteJob( c, this ); connect( job, SIGNAL(result(KJob*)), SLOT(slotLocalChangeDone(KJob*)) ); @@ -167,7 +167,7 @@ // search for children we can create now Collection::List stillOrphans; - foreach ( Collection orphan, d->orphanRemoteCollections ) { + foreach ( const Collection &orphan, d->orphanRemoteCollections ) { if ( orphan.parentRemoteId() == newLocal.remoteId() ) { createLocalCollection( orphan, newLocal ); } else { @@ -198,7 +198,7 @@ if ( !d->orphanRemoteCollections.isEmpty() ) { setError( Unknown ); setErrorText( QLatin1String( "Found unresolved orphan collections" ) ); - foreach ( const Collection col, d->orphanRemoteCollections ) + foreach ( const Collection &col, d->orphanRemoteCollections ) kDebug() << "found orphan collection:" << col.remoteId() << "parent:" << col.parentRemoteId(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/collectionview.cpp new/kdepimlibs-4.0.72/akonadi/collectionview.cpp --- old/kdepimlibs-4.0.71/akonadi/collectionview.cpp 2008-04-10 11:29:56.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/collectionview.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -166,7 +166,7 @@ QStringList supportedContentTypes = model()->data( index, CollectionModel::CollectionRole ).value<Collection>().contentMimeTypes(); const QMimeData *data = event->mimeData(); KUrl::List urls = KUrl::List::fromMimeData( data ); - foreach( KUrl url, urls ) { + foreach( const KUrl &url, urls ) { const Collection collection = Collection::fromUrl( url ); if ( collection.isValid() ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/itemcopyjob.cpp new/kdepimlibs-4.0.72/akonadi/itemcopyjob.cpp --- old/kdepimlibs-4.0.71/akonadi/itemcopyjob.cpp 2008-03-25 18:22:01.000000000 +0100 +++ new/kdepimlibs-4.0.72/akonadi/itemcopyjob.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -64,7 +64,7 @@ Q_D( ItemCopyJob ); QListItem::Id ids; - foreach ( const Item item, d->mItems ) + foreach ( const Item &item, d->mItems ) ids << item.id(); ImapSet set; set.add( ids ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/itemcreatejob.cpp new/kdepimlibs-4.0.72/akonadi/itemcreatejob.cpp --- old/kdepimlibs-4.0.71/akonadi/itemcreatejob.cpp 2008-04-18 09:21:12.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/itemcreatejob.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -86,7 +86,7 @@ QList<QByteArray> partSpecs; int totalSize = 0; - foreach( const QByteArray partName, d->mParts ) { + foreach( const QByteArray &partName, d->mParts ) { QByteArray partData; ItemSerializer::serialize( d->mItem, partName, partData ); totalSize += partData.size(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/itemfetchjob.cpp new/kdepimlibs-4.0.72/akonadi/itemfetchjob.cpp --- old/kdepimlibs-4.0.71/akonadi/itemfetchjob.cpp 2008-04-10 11:29:56.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/itemfetchjob.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -84,9 +84,9 @@ command += " " AKONADI_PARAM_CACHEONLY; command += " (UID REMOTEID FLAGS"; - foreach ( const QByteArray part, mFetchScope.payloadParts() ) + foreach ( const QByteArray &part, mFetchScope.payloadParts() ) command += ' ' + part; - foreach ( const QByteArray part, mFetchScope.attributes() ) + foreach ( const QByteArray &part, mFetchScope.attributes() ) command += ' ' + part; command += ")\n"; @@ -204,7 +204,7 @@ if ( key == "FLAGS" ) { QList<QByteArray> flags; ImapParser::parseParenthesizedList( fetchResponse[i + 1], flags ); - foreach ( const QByteArray flag, flags ) { + foreach ( const QByteArray &flag, flags ) { item.setFlag( flag ); } } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/itemmodel.cpp new/kdepimlibs-4.0.72/akonadi/itemmodel.cpp --- old/kdepimlibs-4.0.71/akonadi/itemmodel.cpp 2008-04-18 09:21:12.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/itemmodel.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -164,7 +164,7 @@ if ( list.isEmpty() ) return; mParent->beginInsertRows( QModelIndex(), items.count(), items.count() + list.count() - 1 ); - foreach( Item item, list ) { + foreach( const Item &item, list ) { ItemContainer *c = new ItemContainer( item, items.count() ); items.append( c ); itemHash[ item ] = c; @@ -349,7 +349,7 @@ QMimeData *data = new QMimeData(); // Add item uri to the mimedata for dropping in external applications KUrl::List urls; - foreach ( QModelIndex index, indexes ) { + foreach ( const QModelIndex &index, indexes ) { if ( index.column() != 0 ) continue; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/itemserializer.cpp new/kdepimlibs-4.0.72/akonadi/itemserializer.cpp --- old/kdepimlibs-4.0.71/akonadi/itemserializer.cpp 2008-04-23 17:51:17.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/itemserializer.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -217,7 +217,7 @@ KMimeType::Ptr mimeType = KMimeType::mimeType( mimetype, KMimeType::ResolveAliases ); if ( !mimeType.isNull() ) { - foreach ( const QString type, all->keys() ) { + foreach ( const QString &type, all->keys() ) { if ( mimeType->is( type ) ) { return *(all->value( type ).plugin() ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/itemsync.cpp new/kdepimlibs-4.0.72/akonadi/itemsync.cpp --- old/kdepimlibs-4.0.71/akonadi/itemsync.cpp 2008-04-23 17:51:17.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/itemsync.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -185,7 +185,7 @@ return; const Item::List list = static_cast<ItemFetchJob*>( job )->items(); - foreach ( const Item item, list ) { + foreach ( const Item &item, list ) { mLocalItemsById.insert( item.id(), item ); mLocalItemsByRemoteId.insert( item.remoteId(), item ); mUnprocessedLocalItems.insert( item ); @@ -195,7 +195,7 @@ void ItemSync::Private::execute() { // added / updated - foreach ( const Item remoteItem, mRemoteItems ) { + foreach ( const Item &remoteItem, mRemoteItems ) { #ifndef NDEBUG if ( remoteItem.remoteId().isEmpty() ) { kWarning( 5250 ) << "Item " << remoteItem.id() << " does not have a remote identifier"; @@ -244,7 +244,7 @@ if ( !mIncremental ) mRemovedRemoteItems = mUnprocessedLocalItems.toList(); - foreach ( const Item item, mRemovedRemoteItems ) { + foreach ( const Item &item, mRemovedRemoteItems ) { mPendingJobs++; ItemDeleteJob *job = new ItemDeleteJob( item, q ); q->connect( job, SIGNAL( result( KJob* ) ), q, SLOT( slotLocalChangeDone( KJob* ) ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/kmime/messagethreadingattribute.cpp new/kdepimlibs-4.0.72/akonadi/kmime/messagethreadingattribute.cpp --- old/kdepimlibs-4.0.71/akonadi/kmime/messagethreadingattribute.cpp 2008-04-02 14:18:09.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/kmime/messagethreadingattribute.cpp 2008-04-30 15:58:13.000000000 +0200 @@ -81,7 +81,7 @@ static void parseIdList( const QByteArray &data, QListItem::Id &result ) { bool ok = false; - foreach( const QByteArray s, data.split( ',' ) ) { + foreach( const QByteArray &s, data.split( ',' ) ) { Item::Id id = s.toLongLong( &ok ); if( !ok ) continue; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/monitor_p.cpp new/kdepimlibs-4.0.72/akonadi/monitor_p.cpp --- old/kdepimlibs-4.0.71/akonadi/monitor_p.cpp 2008-04-10 11:29:56.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/monitor_p.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -167,7 +167,7 @@ void MonitorPrivate::slotNotify( const NotificationMessage::List &msgs ) { - foreach ( const NotificationMessage msg, msgs ) + foreach ( const NotificationMessage &msg, msgs ) processNotification( msg ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/monitor_p.h new/kdepimlibs-4.0.72/akonadi/monitor_p.h --- old/kdepimlibs-4.0.71/akonadi/monitor_p.h 2008-04-02 14:18:10.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/monitor_p.h 2008-04-30 15:58:14.000000000 +0200 @@ -122,7 +122,7 @@ if ( mimeType.isNull() ) return false; - foreach ( const QString mt, mimetypes ) { + foreach ( const QString &mt, mimetypes ) { if ( mimeType->is( mt ) ) return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/pastehelper.cpp new/kdepimlibs-4.0.72/akonadi/pastehelper.cpp --- old/kdepimlibs-4.0.71/akonadi/pastehelper.cpp 2008-04-10 11:29:56.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/pastehelper.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -45,7 +45,7 @@ if ( KUrl::List::canDecode( mimeData ) ) return true; - foreach ( const QString format, mimeData->formats() ) + foreach ( const QString &format, mimeData->formats() ) if ( collection.contentMimeTypes().contains( format ) ) return true; @@ -59,7 +59,7 @@ // we try to drop data not coming with the akonadi:// url // find a type the target collection supports - foreach ( const QString type, mimeData->formats() ) { + foreach ( const QString &type, mimeData->formats() ) { if ( !collection.contentMimeTypes().contains( type ) ) continue; @@ -82,7 +82,7 @@ // data contains an url list TransactionSequence *transaction = new TransactionSequence(); KUrl::List urls = KUrl::List::fromMimeData( mimeData ); - foreach ( const KUrl url, urls ) { + foreach ( const KUrl &url, urls ) { if ( Collection::fromUrl( url ).isValid() ) { Collection col = Collection::fromUrl( url ); if ( !copy ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/protocolhelper.cpp new/kdepimlibs-4.0.72/akonadi/protocolhelper.cpp --- old/kdepimlibs-4.0.71/akonadi/protocolhelper.cpp 2008-04-18 09:21:12.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/protocolhelper.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -46,7 +46,7 @@ QList<QByteArray> tmp; QStringList parts; Akonadi::ImapParser::parseParenthesizedList( value, tmp ); - foreach ( const QByteArray ba, tmp ) + foreach ( const QByteArray &ba, tmp ) parts << QString::fromLatin1( ba ); policy.setLocalParts( parts ); } @@ -111,7 +111,7 @@ QList<QByteArray> ct; ImapParser::parseParenthesizedList( value, ct ); QStringList ct2; - foreach ( const QByteArray b, ct ) + foreach ( const QByteArray &b, ct ) ct2 << QString::fromLatin1( b ); collection.setContentMimeTypes( ct2 ); } else if ( key == "CACHEPOLICY" ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/resourcebase.cpp new/kdepimlibs-4.0.72/akonadi/resourcebase.cpp --- old/kdepimlibs-4.0.71/akonadi/resourcebase.cpp 2008-04-23 17:51:17.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/resourcebase.cpp 2008-04-30 15:58:15.000000000 +0200 @@ -227,7 +227,7 @@ Item i( item ); QSet<QByteArray> requestedParts = d->scheduler->currentTask().itemParts; - foreach ( QByteArray part, requestedParts ) { + foreach ( const QByteArray &part, requestedParts ) { if ( !item.loadedPayloadParts().contains( part ) ) { kWarning( 5250 ) << "Item does not provide part" << part; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/standardactionmanager.cpp new/kdepimlibs-4.0.72/akonadi/standardactionmanager.cpp --- old/kdepimlibs-4.0.71/akonadi/standardactionmanager.cpp 2008-04-18 09:21:12.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/standardactionmanager.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -268,7 +268,7 @@ Q_ASSERT( itemSelectionModel ); // TODO: fix this once ItemModifyJob can handle item lists - foreach ( const QModelIndex index, itemSelectionModel->selectedRows() ) { + foreach ( const QModelIndex &index, itemSelectionModel->selectedRows() ) { new ItemDeleteJob( Item( index.data( ItemModel::IdRole ).toLongLong() ), q ); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/subscriptiondialog.cpp new/kdepimlibs-4.0.72/akonadi/subscriptiondialog.cpp --- old/kdepimlibs-4.0.71/akonadi/subscriptiondialog.cpp 2008-03-25 18:22:02.000000000 +0100 +++ new/kdepimlibs-4.0.72/akonadi/subscriptiondialog.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -61,13 +61,13 @@ void subscribeClicked() { - foreach( const QModelIndex index, ui.collectionView->selectionModel()->selectedIndexes() ) + foreach( const QModelIndex &index, ui.collectionView->selectionModel()->selectedIndexes() ) model->setData( index, Qt::Checked, Qt::CheckStateRole ); } void unsubscribeClicked() { - foreach( const QModelIndex index, ui.collectionView->selectionModel()->selectedIndexes() ) + foreach( const QModelIndex &index, ui.collectionView->selectionModel()->selectedIndexes() ) model->setData( index, Qt::Unchecked, Qt::CheckStateRole ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/subscriptionjob.cpp new/kdepimlibs-4.0.72/akonadi/subscriptionjob.cpp --- old/kdepimlibs-4.0.71/akonadi/subscriptionjob.cpp 2008-03-25 18:22:01.000000000 +0100 +++ new/kdepimlibs-4.0.72/akonadi/subscriptionjob.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -37,7 +37,7 @@ mTag = newTag(); QByteArray line = mTag + ' ' + cmd; - foreach ( const Collection col, list ) + foreach ( const Collection &col, list ) line += ' ' + QByteArray::number( col.id() ); line += '\n'; writeData( line ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/subscriptionmodel.cpp new/kdepimlibs-4.0.72/akonadi/subscriptionmodel.cpp --- old/kdepimlibs-4.0.71/akonadi/subscriptionmodel.cpp 2008-04-18 09:21:12.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/subscriptionmodel.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -53,7 +53,7 @@ return; } Collection::List cols = static_cast<CollectionFetchJob*>( job )->collections(); - foreach( const Collection col, cols ) + foreach( const Collection &col, cols ) if ( !CollectionUtils::isStructural( col ) ) subscriptions[ col.id() ] = true; q->reset(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/tests/benchmarker.cpp new/kdepimlibs-4.0.72/akonadi/tests/benchmarker.cpp --- old/kdepimlibs-4.0.71/akonadi/tests/benchmarker.cpp 2008-04-10 11:29:55.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/tests/benchmarker.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -153,12 +153,12 @@ clj->setResource( currentInstance.identifier() ); clj->exec(); Collection::List list = clj->collections(); - foreach ( Collection collection, list ) { + foreach ( const Collection &collection, list ) { ItemFetchJob *ifj = new ItemFetchJob( collection, this ); ifj->fetchScope().fetchPayloadPart( MessagePart::Envelope ); ifj->exec(); QString a; - foreach ( Item item, ifj->items() ) { + foreach ( const Item &item, ifj->items() ) { a = item.payload<MessagePtr>()->subject()->asUnicodeString(); } } @@ -171,7 +171,7 @@ clj2->setResource( currentInstance.identifier() ); clj2->exec(); Collection::List list2 = clj2->collections(); - foreach ( Collection collection, list2 ) { + foreach ( const Collection &collection, list2 ) { ItemFetchJob *ifj = new ItemFetchJob( collection, this ); ifj->exec(); Item::List itemlist = ifj->items(); @@ -191,12 +191,12 @@ clj3->setResource( currentInstance.identifier() ); clj3->exec(); Collection::List list3 = clj3->collections(); - foreach ( Collection collection, list3 ) { + foreach ( const Collection &collection, list3 ) { ItemFetchJob *ifj = new ItemFetchJob( collection, this ); ifj->fetchScope().fetchPayloadPart( MessagePart::Envelope ); ifj->exec(); QString a; - foreach ( Item item, ifj->items() ) { + foreach ( const Item &item, ifj->items() ) { // filter read messages if( !item.hasFlag( "\Seen" ) ) { a = item.payload<MessagePtr>()->subject()->asUnicodeString(); @@ -212,10 +212,10 @@ clj4->setResource( currentInstance.identifier() ); clj4->exec(); Collection::List list4 = clj4->collections(); - foreach ( Collection collection, list4 ) { + foreach ( const Collection &collection, list4 ) { ItemFetchJob *ifj = new ItemFetchJob( collection, this ); ifj->exec(); - foreach ( Item item, ifj->items() ) { + foreach ( const Item &item, ifj->items() ) { // delete read messages if( item.hasFlag( "\Seen" ) ) { ItemDeleteJob *idj = new ItemDeleteJob( item, this); @@ -232,7 +232,7 @@ clj5->setResource( currentInstance.identifier() ); clj5->exec(); Collection::List list5 = clj5->collections(); - foreach ( Collection collection, list5 ) { + foreach ( const Collection &collection, list5 ) { CollectionDeleteJob *cdj = new CollectionDeleteJob( collection, this ); cdj->exec(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/tests/CMakeLists.txt new/kdepimlibs-4.0.72/akonadi/tests/CMakeLists.txt --- old/kdepimlibs-4.0.71/akonadi/tests/CMakeLists.txt 2008-04-24 14:27:52.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/tests/CMakeLists.txt 2008-04-30 15:58:14.000000000 +0200 @@ -7,6 +7,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIR} + ${AKONADI_INCLUDE_DIR} ) # convenience macro to add akonadi demo application diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/tests/collectionjobtest.cpp new/kdepimlibs-4.0.72/akonadi/tests/collectionjobtest.cpp --- old/kdepimlibs-4.0.71/akonadi/tests/collectionjobtest.cpp 2008-04-18 09:21:11.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/tests/collectionjobtest.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -53,7 +53,7 @@ } static Collection findCol( const Collection::List &list, const QString &name ) { - foreach ( const Collection col, list ) + foreach ( const Collection &col, list ) if ( col.name() == name ) return col; return Collection(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/tests/headfetcher.cpp new/kdepimlibs-4.0.72/akonadi/tests/headfetcher.cpp --- old/kdepimlibs-4.0.71/akonadi/tests/headfetcher.cpp 2008-04-10 11:29:55.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/tests/headfetcher.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -47,7 +47,7 @@ CollectionFetchJob *clj = new CollectionFetchJob( Collection::root() , CollectionFetchJob::Recursive ); clj->exec(); Collection::List list = clj->collections(); - foreach ( Collection collection, list ) { + foreach ( const Collection &collection, list ) { ItemFetchJob *ifj = new ItemFetchJob( collection, this ); if ( multipart ) { ifj->fetchScope().fetchPayloadPart( MessagePart::Envelope ); @@ -56,7 +56,7 @@ } ifj->exec(); qDebug() << " Listing" << ifj->items().count() << "item headers."; - foreach ( Item item, ifj->items() ) { + foreach ( const Item &item, ifj->items() ) { qDebug() << item.payload< boost::shared_ptrKMime::Message >()->subject()->asUnicodeString(); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/tests/itemappendtest.cpp new/kdepimlibs-4.0.72/akonadi/tests/itemappendtest.cpp --- old/kdepimlibs-4.0.71/akonadi/tests/itemappendtest.cpp 2008-04-10 11:29:55.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/tests/itemappendtest.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -48,10 +48,10 @@ QVERIFY( job->exec() ); Collection::List list = job->collections(); Collection res2; - foreach ( const Collection col, list ) + foreach ( const Collection &col, list ) if ( col.name() == "res2" ) res2 = col; - foreach ( const Collection col, list ) + foreach ( const Collection &col, list ) if ( col.name() == "space folder" && col.parent() == res2.id() ) testFolder1 = col; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/tests/itemstoretest.cpp new/kdepimlibs-4.0.72/akonadi/tests/itemstoretest.cpp --- old/kdepimlibs-4.0.71/akonadi/tests/itemstoretest.cpp 2008-04-10 11:29:55.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/tests/itemstoretest.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -49,7 +49,7 @@ QVERIFY( job->exec() ); Collection::List list = job->collections(); Collection res1; - foreach ( const Collection col, list ) { + foreach ( const Collection &col, list ) { if ( col.name() == "res1" ) res1 = col; if ( col.name() == "res2" ) @@ -57,7 +57,7 @@ if ( col.name() == "res3" ) res3 = col; } - foreach ( const Collection col, list ) { + foreach ( const Collection &col, list ) { if ( col.name() == "foo" && col.parent() == res1.id() ) res1_foo = col; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/tests/monitortest.cpp new/kdepimlibs-4.0.72/akonadi/tests/monitortest.cpp --- old/kdepimlibs-4.0.71/akonadi/tests/monitortest.cpp 2008-04-10 11:29:55.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/tests/monitortest.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -53,7 +53,7 @@ CollectionFetchJob *job = new CollectionFetchJob( Collection::root(), CollectionFetchJob::Recursive ); QVERIFY( job->exec() ); Collection::List list = job->collections(); - foreach ( const Collection col, list ) + foreach ( const Collection &col, list ) if ( col.name() == "res3" ) res3 = col; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/tests/searchjobtest.cpp new/kdepimlibs-4.0.72/akonadi/tests/searchjobtest.cpp --- old/kdepimlibs-4.0.71/akonadi/tests/searchjobtest.cpp 2008-04-18 09:21:11.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/tests/searchjobtest.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -42,7 +42,7 @@ QVERIFY( list->exec() ); Collection::List cols = list->collections(); Collection col; - foreach ( const Collection c, cols ) { + foreach ( const Collection &c, cols ) { if ( c.name() == "search123456" ) col = c; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/akonadi/tests/transactiontest.cpp new/kdepimlibs-4.0.72/akonadi/tests/transactiontest.cpp --- old/kdepimlibs-4.0.71/akonadi/tests/transactiontest.cpp 2008-04-02 14:18:09.000000000 +0200 +++ new/kdepimlibs-4.0.72/akonadi/tests/transactiontest.cpp 2008-04-30 15:58:14.000000000 +0200 @@ -49,7 +49,7 @@ CollectionFetchJob *listJob = new CollectionFetchJob( Collection::root(), CollectionFetchJob::Recursive ); QVERIFY( listJob->exec() ); Collection::List list = listJob->collections(); - foreach ( const Collection col, list ) + foreach ( const Collection &col, list ) if ( col.name() == "res3" ) basisCollection = col; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/cmake/modules/FindAkonadi.cmake new/kdepimlibs-4.0.72/cmake/modules/FindAkonadi.cmake --- old/kdepimlibs-4.0.71/cmake/modules/FindAkonadi.cmake 2008-04-24 21:57:16.000000000 +0200 +++ new/kdepimlibs-4.0.72/cmake/modules/FindAkonadi.cmake 2008-04-30 15:58:12.000000000 +0200 @@ -40,13 +40,16 @@ if(AKONADI_INCLUDE_DIR AND AKONADI_COMMON_LIBRARIES) set(Akonadi_FOUND TRUE) + get_filename_component(AKONADI_PREFIX ${AKONADI_INCLUDE_DIR} PATH) + set(AKONADI_DBUS_INTERFACES_DIR ${AKONADI_PREFIX}/share/dbus-1/interfaces) + set(AKONADI_DBUS_SERVICES_DIR ${AKONADI_PREFIX}/share/dbus-1/services) endif(AKONADI_INCLUDE_DIR AND AKONADI_COMMON_LIBRARIES) # check Akonadi version # We set a default for the minimum required version to be backwards compatible IF(NOT AKONADI_MIN_VERSION) - SET(AKONADI_MIN_VERSION "1.99") + SET(AKONADI_MIN_VERSION "0.80") ENDIF(NOT AKONADI_MIN_VERSION) #if(Akonadi_FOUND) @@ -73,6 +76,7 @@ message(STATUS "Found Akonadi: ${AKONADI_COMMON_LIBRARIES}") message(STATUS "Found Akonadi includes: ${AKONADI_INCLUDE_DIR}") message(STATUS "Found Akonadi common libraries: ${AKONADI_COMMON_LIBRARIES}") + message(STATUS "Found Akonadi dbus-interfaces: ${AKONADI_DBUS_INTERFACES_DIR}") endif(NOT Akonadi_FIND_QUIETLY) else(Akonadi_FOUND) if(Akonadi_FIND_REQUIRED) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/CMakeLists.txt new/kdepimlibs-4.0.72/CMakeLists.txt --- old/kdepimlibs-4.0.71/CMakeLists.txt 2008-04-24 15:36:33.000000000 +0200 +++ new/kdepimlibs-4.0.72/CMakeLists.txt 2008-04-30 15:58:15.000000000 +0200 @@ -18,9 +18,10 @@ find_package(Boost) macro_log_feature(Boost_FOUND "boost" "Boost C++ Libraries" "http://www.boost.org" TRUE "1_33_0" "Needed by several critical PIM libraries.") + if (NOT ONLY_KLEO) -macro_optional_find_package(Sasl2) -macro_log_feature(SASL2_FOUND "cyrus-sasl" "Cyrus SASL API" "http://asg.web.cmu.edu/sasl/sasl-library.html" FALSE "" "Needed to support authentication of logins. IMAP and Sieve kioslaves will not be built.") + macro_optional_find_package(Sasl2) + macro_log_feature(SASL2_FOUND "cyrus-sasl" "Cyrus SASL API" "http://asg.web.cmu.edu/sasl/sasl-library.html" FALSE "" "Needed to support authentication of logins. IMAP and Sieve kioslaves will not be built.") endif (NOT ONLY_KLEO) # gpgme is a hard dependency @@ -45,7 +46,6 @@ if (NOT ONLY_KLEO) find_package(Akonadi REQUIRED) -macro_log_feature(Akonadi_FOUND "akonadi" "Akonadi shared libraries" "http://pim.kde.org/akonadi" FALSE "" "Needed to support Akonadi KDE client libraries. These are an essential part of the platform.") if(Akonadi_FOUND) add_subdirectory(akonadi) endif(Akonadi_FOUND) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/gpgme++/CMakeLists.txt new/kdepimlibs-4.0.72/gpgme++/CMakeLists.txt --- old/kdepimlibs-4.0.71/gpgme++/CMakeLists.txt 2008-02-21 10:27:40.000000000 +0100 +++ new/kdepimlibs-4.0.72/gpgme++/CMakeLists.txt 2008-04-30 15:58:13.000000000 +0200 @@ -30,7 +30,7 @@ gpgsetownertrusteditinteractor.cpp ) -set( _gpgmepp_version 1.1.0 ) +set( _gpgmepp_version 1.2.0 ) set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/gpgme++/ConfigureChecks.cmake new/kdepimlibs-4.0.72/gpgme++/ConfigureChecks.cmake --- old/kdepimlibs-4.0.71/gpgme++/ConfigureChecks.cmake 2008-02-07 14:18:47.000000000 +0100 +++ new/kdepimlibs-4.0.72/gpgme++/ConfigureChecks.cmake 2008-04-30 15:58:13.000000000 +0200 @@ -258,6 +258,16 @@ " HAVE_GPGME_PROTOCOL_GPGCONF ) +# check if gpgme has GPGME_ENCRYPT_NO_ENCRYPT_TO +check_cxx_source_compiles (" + #include <gpgme.h> + int main() { + gpgme_encrypt_flags_t flags = GPGME_ENCRYPT_NO_ENCRYPT_TO; + return 0; + } +" HAVE_GPGME_NO_ENCRYPT_TO_FLAG +) + set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_LIBRARIES) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/gpgme++/context.cpp new/kdepimlibs-4.0.72/gpgme++/context.cpp --- old/kdepimlibs-4.0.71/gpgme++/context.cpp 2008-04-24 14:27:52.000000000 +0200 +++ new/kdepimlibs-4.0.72/gpgme++/context.cpp 2008-04-30 15:58:13.000000000 +0200 @@ -689,6 +689,16 @@ return SigningResult(); } + static gpgme_encrypt_flags_t encryptflags2encryptflags( Context::EncryptionFlags flags ) { + unsigned int result = 0; + if ( flags & Context::AlwaysTrust ) + result |= GPGME_ENCRYPT_ALWAYS_TRUST; +#ifdef HAVE_GPGME_NO_ENCRYPT_TO_FLAG + if ( flags & Context::NoEncryptTo ) + result |= GPGME_ENCRYPT_NO_ENCRYPT_TO; +#endif + return static_cast<gpgme_encrypt_flags_t>( result ); + } EncryptionResult Context::encrypt( const std::vector<Key> & recipients, const Data & plainText, Data & cipherText, EncryptionFlags flags ) { d->lastop = Private::Encrypt; @@ -700,8 +710,7 @@ if ( it->impl() ) *keys_it++ = it->impl(); *keys_it++ = 0; - d->lasterr = gpgme_op_encrypt( d->ctx, keys, - flags & AlwaysTrust ? GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0, + d->lasterr = gpgme_op_encrypt( d->ctx, keys, encryptflags2encryptflags( flags ), pdp ? pdp->data : 0, cdp ? cdp->data : 0 ); delete[] keys; return EncryptionResult( d->ctx, Error(d->lasterr) ); @@ -725,8 +734,7 @@ if ( it->impl() ) *keys_it++ = it->impl(); *keys_it++ = 0; - d->lasterr = gpgme_op_encrypt_start( d->ctx, keys, - flags & AlwaysTrust ? GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0, + d->lasterr = gpgme_op_encrypt_start( d->ctx, keys, encryptflags2encryptflags( flags ), pdp ? pdp->data : 0, cdp ? cdp->data : 0 ); delete[] keys; return Error( d->lasterr ); @@ -749,8 +757,7 @@ if ( it->impl() ) *keys_it++ = it->impl(); *keys_it++ = 0; - d->lasterr = gpgme_op_encrypt_sign( d->ctx, keys, - flags & AlwaysTrust ? GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0, + d->lasterr = gpgme_op_encrypt_sign( d->ctx, keys, encryptflags2encryptflags( flags ), pdp ? pdp->data : 0, cdp ? cdp->data : 0 ); delete[] keys; return std::make_pair( SigningResult( d->ctx, Error(d->lasterr) ), @@ -767,8 +774,7 @@ if ( it->impl() ) *keys_it++ = it->impl(); *keys_it++ = 0; - d->lasterr = gpgme_op_encrypt_sign_start( d->ctx, keys, - flags & AlwaysTrust ? GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0, + d->lasterr = gpgme_op_encrypt_sign_start( d->ctx, keys, encryptflags2encryptflags( flags ), pdp ? pdp->data : 0, cdp ? cdp->data : 0 ); delete[] keys; return Error( d->lasterr ); @@ -860,3 +866,75 @@ return Error( gpgme_engine_check_version( p ) ); } +static const unsigned long supported_features = 0 + | GpgME::ValidatingKeylistModeFeature + | GpgME::CancelOperationFeature + | GpgME::WrongKeyUsageFeature +#ifdef HAVE_GPGME_INCLUDE_CERTS_DEFAULT + | GpgME::DefaultCertificateInclusionFeature +#endif +#ifdef HAVE_GPGME_CTX_GETSET_ENGINE_INFO + | GpgME::GetSetEngineInfoFeature +#endif +#ifdef HAVE_GPGME_SIG_NOTATION_CLEARADDGET + | GpgME::ClearAddGetSignatureNotationsFeature +#endif +#ifdef HAVE_GPGME_DATA_SET_FILE_NAME + | GpgME::SetDataFileNameFeeature +#endif +#ifdef HAVE_GPGME_KEYLIST_MODE_SIG_NOTATIONS + | GpgME::SignatureNotationsKeylistModeFeature +#endif +#ifdef HAVE_GPGME_KEY_SIG_NOTATIONS + | GpgME::KeySignatureNotationsFeature +#endif +#ifdef HAVE_GPGME_KEY_T_IS_QUALIFIED + | GpgME::KeyIsQualifiedFeature +#endif +#ifdef HAVE_GPGME_SIG_NOTATION_CRITICAL + | GpgME::SignatureNotationsCriticalFlagFeature +#endif +#ifdef HAVE_GPGME_SIG_NOTATION_FLAGS_T + | GpgME::SignatureNotationsFlagsFeature +#endif +#ifdef HAVE_GPGME_SIG_NOTATION_HUMAN_READABLE + | GpgME::SignatureNotationsHumanReadableFlagFeature +#endif +#ifdef HAVE_GPGME_SUBKEY_T_IS_QUALIFIED + | GpgME::SubkeyIsQualifiedFeature +#endif +#ifdef HAVE_GPGME_ENGINE_INFO_T_HOME_DIR + | GpgME::EngineInfoHomeDirFeature +#endif +#ifdef HAVE_GPGME_DECRYPT_RESULT_T_FILE_NAME + | GpgME::DecryptionResultFileNameFeature +#endif +#ifdef HAVE_GPGME_DECRYPT_RESULT_T_RECIPIENTS + | GpgME::DecryptionResultRecipientsFeature +#endif +#ifdef HAVE_GPGME_VERIFY_RESULT_T_FILE_NAME + | GpgME::VerificationResultFileNameFeature +#endif +#ifdef HAVE_GPGME_SIGNATURE_T_PKA_FIELDS + | GpgME::SignaturePkaFieldsFeature +#endif +#ifdef HAVE_GPGME_SIGNATURE_T_ALGORITHM_FIELDS + | GpgME::SignatureAlgorithmFieldsFeature +#endif +#ifdef HAVE_GPGME_GET_FDPTR + | GpgME::FdPointerFeature +#endif +#ifdef HAVE_GPGME_OP_GETAUDITLOG + | GpgME::AuditLogFeature +#endif +#ifdef HAVE_GPGME_PROTOCOL_GPGCONF + | GpgME::GpgConfEngineFeature +#endif +#ifdef HAVE_GPGME_NO_ENCRYPT_TO_FLAG + | GpgME::NoEncryptToFlagFeature +#endif + ; + +bool GpgME::hasFeature( unsigned long features ) { + return features == ( features & supported_features ); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/gpgme++/context.h new/kdepimlibs-4.0.72/gpgme++/context.h --- old/kdepimlibs-4.0.71/gpgme++/context.h 2008-01-15 02:47:36.000000000 +0100 +++ new/kdepimlibs-4.0.72/gpgme++/context.h 2008-04-30 15:58:13.000000000 +0200 @@ -248,7 +248,7 @@ // Encryption // - enum EncryptionFlags { None=0, AlwaysTrust=1 }; + enum EncryptionFlags { None=0, AlwaysTrust=1, NoEncryptTo=2 }; EncryptionResult encrypt( const std::vector<Key> & recipients, const Data & plainText, Data & cipherText, EncryptionFlags flags ); GpgME::Error encryptSymmetrically( const Data & plainText, Data & cipherText ); GpgME::Error startEncryption( const std::vector<Key> & recipients, const Data & plainText, Data & cipherText, EncryptionFlags flags ); @@ -296,7 +296,6 @@ const Context & operator=( const Context & ); }; - } // namespace GpgME #endif // __GPGMEPP_CONTEXT_H__ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/gpgme++/global.h new/kdepimlibs-4.0.72/gpgme++/global.h --- old/kdepimlibs-4.0.71/gpgme++/global.h 2008-02-07 14:18:48.000000000 +0100 +++ new/kdepimlibs-4.0.72/gpgme++/global.h 2008-04-30 15:58:13.000000000 +0200 @@ -72,6 +72,50 @@ GPGMEPP_EXPORT GIOChannel * getGIOChannel( int fd ); GPGMEPP_EXPORT QIODevice * getQIODevice( int fd ); + enum Feature { + ValidatingKeylistModeFeature = 0x00000001, + CancelOperationFeature = 0x00000002, + WrongKeyUsageFeature = 0x00000004, + DefaultCertificateInclusionFeature = 0x00000008, + + GetSetEngineInfoFeature = 0x00000010, + EngineInfoHomeDirFeature = 0x00000020, + // reserved + // reserved + + SetDataFileNameFeeature = 0x00000100, + VerificationResultFileNameFeature = 0x00000200, + DecryptionResultFileNameFeature = 0x00000400, + DecryptionResultRecipientsFeature = 0x00000800, + + AuditLogFeature = 0x00001000, + GpgConfEngineFeature = 0x00002000, + // reserved + // reserved + + ClearAddGetSignatureNotationsFeature = 0x00010000, + SignatureNotationsKeylistModeFeature = 0x00020000, + KeySignatureNotationsFeature = 0x00040000, + SignatureNotationsFlagsFeature = 0x00080000, + SignatureNotationsCriticalFlagFeature = 0x00100000, + SignatureNotationsHumanReadableFlagFeature = 0x00200000, + // reserved + // reserved + + KeyIsQualifiedFeature = 0x01000200, + SubkeyIsQualifiedFeature = 0x02000000, + SignaturePkaFieldsFeature = 0x04000000, + SignatureAlgorithmFieldsFeature = 0x08000000, + + FdPointerFeature = 0x10000000, + NoEncryptToFlagFeature = 0x20000000, + // reserved + // unusable (max value) + + FeatureMaxValue = 0x80000000 + }; + GPGMEPP_EXPORT bool hasFeature( unsigned long feature ); + } // namespace GpgME #endif // __GPGMEPP_GLOBAL_H__ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/kcal/icaltimezones.cpp new/kdepimlibs-4.0.72/kcal/icaltimezones.cpp --- old/kdepimlibs-4.0.71/kcal/icaltimezones.cpp 2008-01-29 10:14:56.000000000 +0100 +++ new/kdepimlibs-4.0.72/kcal/icaltimezones.cpp 2008-04-30 15:58:13.000000000 +0200 @@ -417,7 +417,9 @@ dtperiod.period = icalperiodtype_null_period(); for ( ; ; ) { int i = 0; - for ( ; i < trcount && transitionsDone[i]; ++i ); + for ( ; i < trcount && transitionsDone[i]; ++i ) { + ; + } if ( i >= trcount ) { break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/kcal/.krazy new/kdepimlibs-4.0.72/kcal/.krazy --- old/kdepimlibs-4.0.71/kcal/.krazy 2008-01-29 10:14:56.000000000 +0100 +++ new/kdepimlibs-4.0.72/kcal/.krazy 2008-04-30 15:58:13.000000000 +0200 @@ -1,2 +1,2 @@ -SKIP /libical/|/versit/ +SKIP /libical.*/|/versit/|/tests/ EXTRA style diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/.krazy new/kdepimlibs-4.0.72/.krazy --- old/kdepimlibs-4.0.71/.krazy 2008-03-25 18:22:02.000000000 +0100 +++ new/kdepimlibs-4.0.72/.krazy 2008-04-30 15:58:15.000000000 +0200 @@ -1,2 +1 @@ -EXTRA null IGNORESUBS gpgme-qt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/kresources/kresources_manager.desktop new/kdepimlibs-4.0.72/kresources/kresources_manager.desktop --- old/kdepimlibs-4.0.71/kresources/kresources_manager.desktop 2008-04-23 17:51:16.000000000 +0200 +++ new/kdepimlibs-4.0.72/kresources/kresources_manager.desktop 2008-04-30 15:58:12.000000000 +0200 @@ -3,6 +3,7 @@ Name[ca]=Gestor del KResources Name[da]=KResources-håndtering Name[el]=Διαχειριστής KResources +Name[es]=Administrador KResource Name[ga]=Bainisteoir KResources Name[km]=កម្មវិធីគ្រប់គ្រង KResources Name[nds]=KResources-Pleger diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.71/kresources/kresources_plugin.desktop new/kdepimlibs-4.0.72/kresources/kresources_plugin.desktop --- old/kdepimlibs-4.0.71/kresources/kresources_plugin.desktop 2008-04-23 17:51:16.000000000 +0200 +++ new/kdepimlibs-4.0.72/kresources/kresources_plugin.desktop 2008-04-30 15:58:12.000000000 +0200 @@ -3,6 +3,7 @@ Name[ca]=Connector pel KResources Name[da]=KResources-plugin Name[el]=Πρόσθετο KResources +Name[es]=Complemento KResource Name[ga]=Breiseán KResources Name[km]=កម្មវិធីជំនួយរបស់ KResources Name[nds]=KResources-Moduul ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org