Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2013-07-23 12:31:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2013-07-22 17:16:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2013-07-23 12:31:43.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 23 09:37:17 UTC 2013 - hrvoje.sen...@gmail.com + +- Added revert-53f531d54.diff, fixes regression in maildir handling + +------------------------------------------------------------------- New: ---- revert-53f531d54.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.SDA5PI/_old 2013-07-23 12:31:43.000000000 +0200 +++ /var/tmp/diff_new_pack.SDA5PI/_new 2013-07-23 12:31:43.000000000 +0200 @@ -26,6 +26,8 @@ Source0: kdepim-runtime-%{version}.tar.xz Source1: akonadi.png Patch1: disable-knut.diff +# PATCH-FIX-UPSTREAM revert-53f531d54.diff -- fixes regression in maildir handling +Patch2: revert-53f531d54.diff BuildRequires: fdupes BuildRequires: libkdepimlibs4-devel >= %{version} BuildRequires: libkfbapi-devel @@ -51,6 +53,7 @@ %prep %setup -q -n kdepim-runtime-%{version} %patch1 +%patch2 -p1 %build %ifarch ppc64 ++++++ revert-53f531d54.diff ++++++ diff -urNB kdepim-runtime-4.10.95.orig/resources/maildir/retrieveitemsjob.cpp kdepim-runtime-4.10.95/resources/maildir/retrieveitemsjob.cpp --- kdepim-runtime-4.10.95.orig/resources/maildir/retrieveitemsjob.cpp 2013-07-14 12:02:24.000000000 +0200 +++ kdepim-runtime-4.10.95/resources/maildir/retrieveitemsjob.cpp 2013-07-23 11:34:16.213908024 +0200 @@ -28,10 +28,6 @@ #include <QDateTime> #include <KMime/Message> -enum { - MaxSubJobs = 300 // To save memory -}; - RetrieveItemsJob::RetrieveItemsJob ( const Akonadi::Collection& collection, const KPIM::Maildir& md, QObject* parent ) : Job ( parent ), m_collection( collection ), @@ -39,9 +35,7 @@ m_mimeType( KMime::Message::mimeType() ), m_transaction( 0 ), m_previousMtime( 0 ), - m_highestMtime( 0 ), - m_jobCount( 0 ), - m_nextIndex( 0 ) + m_highestMtime( 0 ) { Q_ASSERT( m_collection.isValid() ); Q_ASSERT( m_maildir.isValid() ); @@ -122,29 +116,19 @@ item.setPayload( KMime::Message::Ptr( msg ) ); - KJob *job = 0; if ( m_localItems.contains( entry ) ) { // modification item.setId( m_localItems.value( entry ).id() ); - job = new Akonadi::ItemModifyJob( item, transaction() ); + new Akonadi::ItemModifyJob( item, transaction() ); m_localItems.remove( entry ); } else { // new item - job = new Akonadi::ItemCreateJob( item, m_collection, transaction() ); + new Akonadi::ItemCreateJob( item, m_collection, transaction() ); } - m_jobCount++; - connect(job, SIGNAL(result(KJob*)), SLOT(processEntryDone(KJob*)) ); + if ( index % 20 == 0 ) { + QMetaObject::invokeMethod( this, "processEntry", Qt::QueuedConnection, Q_ARG( qint64, index + 1 ) ); + } else + processEntry( index + 1 ); - m_nextIndex = index + 1; - if ( m_jobCount < MaxSubJobs ) { - processEntry( m_nextIndex ); - } -} - -void RetrieveItemsJob::processEntryDone( KJob* ) -{ - m_jobCount--; - if ( m_jobCount == 0 ) - processEntry( m_nextIndex ); } void RetrieveItemsJob::entriesProcessed() diff -urNB kdepim-runtime-4.10.95.orig/resources/maildir/retrieveitemsjob.h kdepim-runtime-4.10.95/resources/maildir/retrieveitemsjob.h --- kdepim-runtime-4.10.95.orig/resources/maildir/retrieveitemsjob.h 2013-07-14 12:02:24.000000000 +0200 +++ kdepim-runtime-4.10.95/resources/maildir/retrieveitemsjob.h 2013-07-23 11:35:01.054347442 +0200 @@ -52,9 +52,7 @@ private slots: void localListDone( KJob *job ); void transactionDone( KJob *job ); - void processEntry( qint64 index ); - void processEntryDone( KJob *job ); private: Akonadi::Collection m_collection; @@ -66,8 +64,6 @@ qint64 m_previousMtime; qint64 m_highestMtime; QString m_listingPath; - int m_jobCount; - int m_nextIndex; }; #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org