Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2013-07-30 15:59:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-23 12:31:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2013-07-30 16:00:30.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jul 25 22:44:51 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 +- Dropped revert-53f531d54.diff, included in this release + +------------------------------------------------------------------- Old: ---- kdepim-runtime-4.10.95.tar.xz revert-53f531d54.diff New: ---- kdepim-runtime-4.10.97.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.EbmpsO/_old 2013-07-30 16:00:32.000000000 +0200 +++ /var/tmp/diff_new_pack.EbmpsO/_new 2013-07-30 16:00:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepim4-runtime -Version: 4.10.95 +Version: 4.10.97 Release: 0 Summary: Base package of kdepim License: LGPL-2.1+ @@ -26,8 +26,6 @@ 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 @@ -53,7 +51,6 @@ %prep %setup -q -n kdepim-runtime-%{version} %patch1 -%patch2 -p1 %build %ifarch ppc64 ++++++ kdepim-runtime-4.10.95.tar.xz -> kdepim-runtime-4.10.97.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/CMakeLists.txt new/kdepim-runtime-4.10.97/CMakeLists.txt --- old/kdepim-runtime-4.10.95/CMakeLists.txt 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.10.97/CMakeLists.txt 2013-07-23 11:00:45.000000000 +0200 @@ -35,7 +35,7 @@ # 3.2 alpha1 if(NOT DEFINED KDEPIM_RUNTIME_DEV_VERSION) - set(KDEPIM_RUNTIME_DEV_VERSION "rc1") + set(KDEPIM_RUNTIME_DEV_VERSION "rc2") endif() set(KDEPIM_RUNTIME_VERSION "4.11${KDEPIM_RUNTIME_DEV_VERSION}") @@ -56,7 +56,7 @@ include(KDE4Defaults) # KdepimLibs -find_package(KdepimLibs 4.10.95) +find_package(KdepimLibs 4.10.97) set_package_properties(KdepimLibs PROPERTIES DESCRIPTION "The KDEPIM libraries" URL "http://www.kde.org"; TYPE REQUIRED) #Boost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/agents/newmailnotifier/newmailnotifieragent.desktop new/kdepim-runtime-4.10.97/agents/newmailnotifier/newmailnotifieragent.desktop --- old/kdepim-runtime-4.10.95/agents/newmailnotifier/newmailnotifieragent.desktop 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.10.97/agents/newmailnotifier/newmailnotifieragent.desktop 2013-07-23 11:00:45.000000000 +0200 @@ -10,7 +10,7 @@ Name[en_GB]=New Email Notifier Name[es]=Nuevo notificador de correo Name[et]=Uue kirja teavitaja -Name[fi]=Ilmoitus uudesta postista +Name[fi]=Uuden postin ilmoitin Name[fr]=Notification de nouveaux courriers électroniques Name[ga]=Fógra Ríomhphoist Nua Name[gl]=Novo notificador de correo electrónico diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/dav/services/owncloud-pre5.desktop new/kdepim-runtime-4.10.97/resources/dav/services/owncloud-pre5.desktop --- old/kdepim-runtime-4.10.95/resources/dav/services/owncloud-pre5.desktop 2013-07-14 12:02:24.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/dav/services/owncloud-pre5.desktop 2013-07-23 11:00:45.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=ownCloud (< 5.0) +Name[bs]=ownCloud (< 5.0) Name[cs]=ownCloud (< 5.0) Name[da]=ownCloud (< 5.0) Name[de]=ownCloud (< 5.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/facebook/akonadi_facebook_resource.notifyrc new/kdepim-runtime-4.10.97/resources/facebook/akonadi_facebook_resource.notifyrc --- old/kdepim-runtime-4.10.95/resources/facebook/akonadi_facebook_resource.notifyrc 2013-07-14 12:02:24.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/facebook/akonadi_facebook_resource.notifyrc 2013-07-23 11:00:45.000000000 +0200 @@ -1,5 +1,6 @@ [Global] Comment=Akonadi's Facebook integration +Comment[bs]=Akonadi Facebook integracija Comment[cs]=Integrace Facebooku do Akonadi Comment[da]=Akonadis Facebook-integration Comment[de]=Facebook-Integration für Akonadi @@ -29,6 +30,7 @@ Comment[x-test]=xxAkonadi's Facebook integrationxx Comment[zh_TW]=Akonadi Facebook 整合 Name=Facebook Resource +Name[bs]=Facebook resurs Name[cs]=Zdroj Facebooku Name[da]=Facebook-ressource Name[de]=Facebook-Ressource @@ -60,6 +62,7 @@ [Context/Application] Name=Facebook +Name[bs]=Facebook Name[cs]=Facebook Name[da]=Facebook Name[de]=Facebook @@ -90,6 +93,7 @@ Name[zh_CN]=Facebook Name[zh_TW]=Facebook Comment=Notification coming from Facebook +Comment[bs]=Poruka koju je poslao Facebook Comment[da]=Notifikation fra Facebook Comment[de]=Benachrichtigungen von Facebook Comment[el]=Η ειδοποίηση προέρχεαι από το Facebook @@ -119,6 +123,7 @@ [Event/facebookNotification] Name=New Facebook notification +Name[bs]=Nova Facebook poruka Name[da]=Ny Facebook-notifikation Name[de]=Neue Facebook-Benachrichtigung Name[el]=Νέα ειδοποίηση Facebook @@ -146,6 +151,7 @@ Name[x-test]=xxNew Facebook notificationxx Name[zh_TW]=新的 Facebook 通知器 Comment=You have new Facebook notification +Comment[bs]=Imate novu Facebook poruku Comment[da]=Du har en ny Facebook-notifikation Comment[de]=Sie haben eine Facebook-Benachrichtigungen Comment[el]=Έχετε νέα ειδοποίηση στο Facebook diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/facebook/facebookresource.desktop new/kdepim-runtime-4.10.97/resources/facebook/facebookresource.desktop --- old/kdepim-runtime-4.10.95/resources/facebook/facebookresource.desktop 2013-07-14 12:02:24.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/facebook/facebookresource.desktop 2013-07-23 11:00:45.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Facebook +Name[bs]=Facebook Name[cs]=Facebook Name[da]=Facebook Name[de]=Facebook @@ -30,6 +31,7 @@ Name[zh_CN]=Facebook Name[zh_TW]=Facebook Comment=Makes your Facebook data available in KDE +Comment[bs]=Čini vaše Facebook podatke dostupnim u KDE Comment[cs]=Zpřístupňuje váš Facebook v KDE Comment[da]=Gør dine Facebook-data tilgængelige i KDE Comment[de]=Stellt Ihre Facebook-Daten in KDE zur Verfügung diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/facebook/serializer/akonadi_serializer_socialnotification.desktop new/kdepim-runtime-4.10.97/resources/facebook/serializer/akonadi_serializer_socialnotification.desktop --- old/kdepim-runtime-4.10.95/resources/facebook/serializer/akonadi_serializer_socialnotification.desktop 2013-07-14 12:02:24.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/facebook/serializer/akonadi_serializer_socialnotification.desktop 2013-07-23 11:00:45.000000000 +0200 @@ -1,5 +1,6 @@ [Misc] Name=Facebook Notification Serializer +Name[bs]=Serializator Facebook poruka Name[cs]=Seřazovač upomínek Facebooku Name[da]=Facebook-notifikation-serializer Name[de]=Facebook-Benachrichtigungs-Serialisierung @@ -28,6 +29,7 @@ Name[zh_CN]=Facebook 通知序列化器 Name[zh_TW]=Facebook 通知序列器 Comment=An Akonadi serializer plugin for Facebook notifications +Comment[bs]=Akonadi dodatak serializatora za Facebook poruke Comment[cs]=Modul Akonadi pro seřazování upomínek Facebooku Comment[da]=Et Akonadi-serializerplugin til Facebook-notifikationer Comment[de]=Akonadi-Modul zur Serialisierung von Facebook-Benachrichtigungen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/maildir/retrieveitemsjob.cpp new/kdepim-runtime-4.10.97/resources/maildir/retrieveitemsjob.cpp --- old/kdepim-runtime-4.10.95/resources/maildir/retrieveitemsjob.cpp 2013-07-14 12:02:24.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/maildir/retrieveitemsjob.cpp 2013-07-23 11:00:45.000000000 +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/maildir/retrieveitemsjob.h new/kdepim-runtime-4.10.97/resources/maildir/retrieveitemsjob.h --- old/kdepim-runtime-4.10.95/resources/maildir/retrieveitemsjob.h 2013-07-14 12:02:24.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/maildir/retrieveitemsjob.h 2013-07-23 11:00:45.000000000 +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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/mixedmaildir/retrieveitemsjob.cpp new/kdepim-runtime-4.10.97/resources/mixedmaildir/retrieveitemsjob.cpp --- old/kdepim-runtime-4.10.95/resources/mixedmaildir/retrieveitemsjob.cpp 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/mixedmaildir/retrieveitemsjob.cpp 2013-07-23 11:00:45.000000000 +0200 @@ -42,6 +42,11 @@ using namespace Akonadi; +enum { + MaxItemCreateJobs = 100, + MaxItemModifyJobs = 100 +}; + class RetrieveItemsJob::Private { RetrieveItemsJob *const q; @@ -49,7 +54,7 @@ public: Private( RetrieveItemsJob *parent, const Collection &collection, MixedMaildirStore *store ) : q( parent ), mCollection( collection ), mStore( store ), - mTransaction( 0 ), mHighestModTime( -1 ) + mTransaction( 0 ), mHighestModTime( -1 ), mNumItemCreateJobs( 0 ), mNumItemModifyJobs( 0 ) { } @@ -75,8 +80,9 @@ QQueue<Item> mChangedItems; Item::List mAvailableItems; Item::List mItemsMarkedAsDeleted; - qint64 mHighestModTime; + int mNumItemCreateJobs; + int mNumItemModifyJobs; public: // slots void akonadiFetchResult( KJob *job ); @@ -86,8 +92,30 @@ void fetchNewResult( KJob* ); void processChangedItem(); void fetchChangedResult( KJob* ); + void itemCreateJobResult( KJob* ); + void itemModifyJobResult( KJob* ); }; +void RetrieveItemsJob::Private::itemCreateJobResult( KJob *job ) +{ + if ( job->error() ) { + kError() << "Error running ItemCreateJob: " << job->errorText(); + } + + mNumItemCreateJobs--; + QMetaObject::invokeMethod( q, "processNewItem", Qt::QueuedConnection ); +} + +void RetrieveItemsJob::Private::itemModifyJobResult( KJob *job ) +{ + if ( job->error() ) { + kError() << "Error running ItemModifyJob: " << job->errorText(); + } + + mNumItemModifyJobs--; + QMetaObject::invokeMethod( q, "processChangedItem", Qt::QueuedConnection ); +} + void RetrieveItemsJob::Private::akonadiFetchResult( KJob *job ) { if ( job->error() != 0 ) return; // handled by base class @@ -220,8 +248,12 @@ } ItemCreateJob *itemCreate = new ItemCreateJob( item, mCollection, transaction() ); - Q_UNUSED( itemCreate ); - QMetaObject::invokeMethod( q, "processNewItem", Qt::QueuedConnection ); + mNumItemCreateJobs++; + connect( itemCreate, SIGNAL(result(KJob*)), q, SLOT(itemCreateJobResult(KJob*)) ); + + if (mNumItemCreateJobs < MaxItemCreateJobs ) { + QMetaObject::invokeMethod( q, "processNewItem", Qt::QueuedConnection ); + } } void RetrieveItemsJob::Private::processChangedItem() @@ -273,8 +305,11 @@ } ItemModifyJob *itemModify = new ItemModifyJob( item, transaction() ); - Q_UNUSED( itemModify ); - QMetaObject::invokeMethod( q, "processChangedItem", Qt::QueuedConnection ); + connect( itemModify, SIGNAL(result(KJob*)), q, SLOT(itemModifyJobResult(KJob*)) ); + mNumItemModifyJobs++; + if ( mNumItemModifyJobs < MaxItemModifyJobs ) { + QMetaObject::invokeMethod( q, "processChangedItem", Qt::QueuedConnection ); + } } void RetrieveItemsJob::Private::transactionResult( KJob *job ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/mixedmaildir/retrieveitemsjob.h new/kdepim-runtime-4.10.97/resources/mixedmaildir/retrieveitemsjob.h --- old/kdepim-runtime-4.10.95/resources/mixedmaildir/retrieveitemsjob.h 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/mixedmaildir/retrieveitemsjob.h 2013-07-23 11:00:45.000000000 +0200 @@ -55,8 +55,10 @@ private: class Private; Private *const d; - - Q_PRIVATE_SLOT( d, void akonadiFetchResult( KJob* ) ) + + Q_PRIVATE_SLOT( d, void itemModifyJobResult( KJob* ) ) + Q_PRIVATE_SLOT( d, void itemCreateJobResult( KJob* ) ) + Q_PRIVATE_SLOT( d, void akonadiFetchResult( KJob* ) ) Q_PRIVATE_SLOT( d, void transactionResult( KJob* ) ) Q_PRIVATE_SLOT( d, void storeListResult( KJob* ) ) Q_PRIVATE_SLOT( d, void processNewItem() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/vcard/vcardresource.desktop new/kdepim-runtime-4.10.97/resources/vcard/vcardresource.desktop --- old/kdepim-runtime-4.10.95/resources/vcard/vcardresource.desktop 2013-07-14 12:02:24.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/vcard/vcardresource.desktop 2013-07-23 11:00:45.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=vCard File +Name[bs]=VCard datoteka Name[cs]=Soubor s vizitkou Name[da]=vCard-fil Name[de]=vCard-Datei @@ -30,6 +31,7 @@ Name[zh_CN]=vCard 文件 Name[zh_TW]=vCard 檔案 Comment=Loads data from a vCard file +Comment[bs]=Učitava podatke iz VCard datoteke Comment[cs]=Načítá data ze souboru vizitek (vCard) Comment[da]=Indlæser data fra en vCard-fil Comment[de]=Daten werden aus einer vCard-Datei geladen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.10.95/resources/vcarddir/vcarddirresource.desktop new/kdepim-runtime-4.10.97/resources/vcarddir/vcarddirresource.desktop --- old/kdepim-runtime-4.10.95/resources/vcarddir/vcarddirresource.desktop 2013-07-14 12:02:24.000000000 +0200 +++ new/kdepim-runtime-4.10.97/resources/vcarddir/vcarddirresource.desktop 2013-07-23 11:00:45.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=vCard Directory +Name[bs]=VCard direktorij Name[cs]=Adresář vizitek Name[da]=vCard-mappe Name[de]=vCard-Ordner @@ -30,6 +31,7 @@ Name[zh_CN]=vCard 目录 Name[zh_TW]=vCard 目錄 Comment=Loads data from a directory with vCards +Comment[bs]=Učitava podakte iz direktorija sa VCards Comment[cs]=Načítá data z adresáře vizitek (vCard) Comment[da]=Indlæser data fra en mappe med vCards Comment[de]=Daten werden aus einem Ordner mit vCard-Dateien geladen -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
