Hello community, here is the log from the commit of package kdepim-runtime for openSUSE:Factory checked in at 2017-01-25 22:54:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-runtime/kdepim-runtime.changes 2017-01-04 17:20:09.608635193 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim-runtime.new/kdepim-runtime.changes 2017-01-25 22:54:26.952462803 +0100 @@ -1,0 +2,9 @@ +Sat Jan 14 08:54:50 UTC 2017 - [email protected] + +- - Update to KDE Applications 16.12.1 + * KDE Applications 16.12.1 + * https://www.kde.org/announcements/announce-applications-16.12.1.php + +- Drop fix-data-loss-bug-in-ical.patch due to upstream inclusion + +------------------------------------------------------------------- Old: ---- fix-data-loss-bug-in-ical.patch kdepim-runtime-16.12.0.tar.xz New: ---- kdepim-runtime-16.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-runtime.spec ++++++ --- /var/tmp/diff_new_pack.5chXkN/_old 2017-01-25 22:54:27.604364106 +0100 +++ /var/tmp/diff_new_pack.5chXkN/_new 2017-01-25 22:54:27.608363500 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdepim-runtime # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,16 @@ %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Name: kdepim-runtime -Version: 16.12.0 +Version: 16.12.1 Release: 0 Summary: Base package of kdepim License: GPL-2.0 Group: System/GUI/KDE Url: http://www.kde.org Source: kdepim-runtime-%{version}.tar.xz -#PATCH-FIX-UPSTREAM fix-data-loss-bug-in-ical.patch [email protected] -Patch1: fix-data-loss-bug-in-ical.patch BuildRequires: akonadi-calendar-devel >= %{_kapp_version} BuildRequires: akonadi-contact-devel >= %{_kapp_version} BuildRequires: akonadi-mime-devel >= %{_kapp_version} @@ -91,7 +89,6 @@ %prep %setup -q -n kdepim-runtime-%{version} -%patch1 -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} ++++++ kdepim-runtime-16.12.0.tar.xz -> kdepim-runtime-16.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.12.0/resources/google/calendar/googlecalendarresource.desktop new/kdepim-runtime-16.12.1/resources/google/calendar/googlecalendarresource.desktop --- old/kdepim-runtime-16.12.0/resources/google/calendar/googlecalendarresource.desktop 2016-12-08 07:06:24.000000000 +0100 +++ new/kdepim-runtime-16.12.1/resources/google/calendar/googlecalendarresource.desktop 2017-01-08 07:59:41.000000000 +0100 @@ -6,7 +6,7 @@ Name[ca@valencia]=Calendaris i tasques de Google Name[cs]=Kalendáře a úkoly Google Name[da]=Google kalendere og opgaver -Name[de]=Google-Kalender und -Tasks +Name[de]=Google-Kalender und -Aufgaben Name[el]=Google ημερολόγια και εργασίες Name[en_GB]=Google Calendars and Tasks Name[es]=Calendarios Google y tareas @@ -47,7 +47,7 @@ Comment[ca]=Accediu als calendaris i tasques de Google des del KDE Comment[ca@valencia]=Accediu als calendaris i tasques de Google des del KDE Comment[da]=Tilgå dine Google kalendere og opgaver fra KDE -Comment[de]=Greifen Sie in KDE auf Ihre Google-Kalender und -Tasks zu +Comment[de]=Greifen Sie in KDE auf Ihre Google-Kalender und -Aufgaben zu Comment[el]=Αποκτήστε πρόσβαση στα Google ημερολόγια και τις εργασίες σας από το KDE Comment[en_GB]=Access your Google Calendars and Tasks from KDE Comment[es]=Acceda a sus calendarios Google y tareas desde KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.12.0/resources/icaldir/icaldirresource.desktop new/kdepim-runtime-16.12.1/resources/icaldir/icaldirresource.desktop --- old/kdepim-runtime-16.12.0/resources/icaldir/icaldirresource.desktop 2016-12-08 07:06:24.000000000 +0100 +++ new/kdepim-runtime-16.12.1/resources/icaldir/icaldirresource.desktop 2017-01-08 07:59:41.000000000 +0100 @@ -46,7 +46,7 @@ Comment[ca@valencia]=«Proporciona accés als elements d'un calendari, cadascun emmagatzemat en un fitxer individual, en un directori proporcionat» Comment[cs]="Poskytuje přístup k položkám kalendáře, každé uložené v jednom souboru v daném adresáři" Comment[da]="Giver adgang til en kalenderelementer, hver især gemt i en enkelt fil i en given mappe" -Comment[de]="Ermöglicht Zugriff auf Kalender, die jeweils in einzelnen Dateien in einem vorgegebenen Ordner gespeichert sind" +Comment[de]=Ermöglicht Zugriff auf Kalender, die jeweils in einzelnen Dateien in einem vorgegebenen Ordner gespeichert sind Comment[el]="Παρέχει πρόσβαση σε αντικείμενα ημερολογίου, με το καθένα αποθηκευμένο σε ένα αρχείο, σε δοσμένο κατάλογο" Comment[en_GB]="Provides access to calendar items, each stored in a single file, in a given directory" Comment[es]=«Proporciona acceso a elementos de calendario, cada uno almacenado en un solo archivo, en un directorio dado» diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.12.0/resources/imap/changeitemsflagstask.cpp new/kdepim-runtime-16.12.1/resources/imap/changeitemsflagstask.cpp --- old/kdepim-runtime-16.12.0/resources/imap/changeitemsflagstask.cpp 2016-12-08 07:06:24.000000000 +0100 +++ new/kdepim-runtime-16.12.1/resources/imap/changeitemsflagstask.cpp 2017-01-08 07:59:41.000000000 +0100 @@ -102,20 +102,35 @@ void ChangeItemsFlagsTask::triggerAppendFlagsJob(KIMAP::Session *session) { - KIMAP::StoreJob *store = prepareJob(session); - store->setFlags(fromAkonadiToSupportedImapFlags(addedFlags().toList(), items().at(0).parentCollection())); - store->setMode(KIMAP::StoreJob::AppendFlags); - connect(store, &KIMAP::StoreJob::result, this, &ChangeItemsFlagsTask::onAppendFlagsDone); - store->start(); + const auto supportedFlags = fromAkonadiToSupportedImapFlags(addedFlags().toList(), items().at(0).parentCollection()); + if (supportedFlags.isEmpty()) { + if (!removedFlags().isEmpty()) { + m_processedItems = 0; + triggerRemoveFlagsJob(session); + } else { + changeProcessed(); + } + } else { + KIMAP::StoreJob *store = prepareJob(session); + store->setFlags(supportedFlags); + store->setMode(KIMAP::StoreJob::AppendFlags); + connect(store, &KIMAP::StoreJob::result, this, &ChangeItemsFlagsTask::onAppendFlagsDone); + store->start(); + } } void ChangeItemsFlagsTask::triggerRemoveFlagsJob(KIMAP::Session *session) { - KIMAP::StoreJob *store = prepareJob(session); - store->setFlags(fromAkonadiToSupportedImapFlags(removedFlags().toList(), items().at(0).parentCollection())); - store->setMode(KIMAP::StoreJob::RemoveFlags); - connect(store, &KIMAP::StoreJob::result, this, &ChangeItemsFlagsTask::onRemoveFlagsDone); - store->start(); + const auto supportedFlags = fromAkonadiToSupportedImapFlags(removedFlags().toList(), items().at(0).parentCollection()); + if (supportedFlags.isEmpty()) { + changeProcessed(); + } else { + KIMAP::StoreJob *store = prepareJob(session); + store->setFlags(supportedFlags); + store->setMode(KIMAP::StoreJob::RemoveFlags); + connect(store, &KIMAP::StoreJob::result, this, &ChangeItemsFlagsTask::onRemoveFlagsDone); + store->start(); + } } void ChangeItemsFlagsTask::onAppendFlagsDone(KJob *job) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.12.0/resources/imap/sessionpool.cpp new/kdepim-runtime-16.12.1/resources/imap/sessionpool.cpp --- old/kdepim-runtime-16.12.0/resources/imap/sessionpool.cpp 2016-12-08 07:06:24.000000000 +0100 +++ new/kdepim-runtime-16.12.1/resources/imap/sessionpool.cpp 2017-01-08 07:59:41.000000000 +0100 @@ -195,6 +195,8 @@ void SessionPool::killSession(KIMAP::Session *session, SessionTermination termination) { + Q_ASSERT(session); + if (!m_unusedPool.contains(session) && !m_reservedPool.contains(session) && !m_connectingPool.contains(session)) { qCWarning(IMAPRESOURCE_LOG) << "Unmanaged session" << session; Q_ASSERT(false); @@ -264,7 +266,9 @@ if (!m_initialConnectDone) { disconnect(); // kills all sessions, including \a session } else { - killSession(session, LogoutSession); + if (session) { + killSession(session, LogoutSession); + } if (!m_pendingRequests.isEmpty()) { Q_EMIT sessionRequestDone(m_pendingRequests.takeFirst(), Q_NULLPTR, errorCode, errorMessage); if (!m_pendingRequests.isEmpty()) { @@ -325,7 +329,6 @@ // All is fine break; case PasswordRequesterInterface::ReconnectNeeded: - Q_ASSERT(m_pendingInitialSession != 0); cancelSessionCreation(m_pendingInitialSession, ReconnectNeededError, errorMessage); return; case PasswordRequesterInterface::UserRejected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.12.0/resources/kalarm/kalarmdir/kalarmdirresource.desktop new/kdepim-runtime-16.12.1/resources/kalarm/kalarmdir/kalarmdirresource.desktop --- old/kdepim-runtime-16.12.0/resources/kalarm/kalarmdir/kalarmdirresource.desktop 2016-12-08 07:06:24.000000000 +0100 +++ new/kdepim-runtime-16.12.1/resources/kalarm/kalarmdir/kalarmdirresource.desktop 2017-01-08 07:59:41.000000000 +0100 @@ -46,8 +46,8 @@ Comment[ast]=Carga datos dende una carpeta llocal de KAlarm Comment[bg]=Зареждане на данни от локална папка KAlarm Comment[bs]=Čita podatke iz lokalnog KAlarm direktorija -Comment[ca]=Carrega les dades des d'una carpeta KAlarm local -Comment[ca@valencia]=Carrega les dades des d'una carpeta KAlarm local +Comment[ca]=Carrega les dades des d'una carpeta local del KAlarm +Comment[ca@valencia]=Carrega les dades des d'una carpeta local del KAlarm Comment[cs]=Načítá data z místní složky KAlarmu Comment[da]=Indlæser data fra en lokal KAlarm-mappe Comment[de]=Laden von Daten aus einem lokalen KAlarm-Ordner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.12.0/resources/shared/singlefileresource/singlefileresource.h new/kdepim-runtime-16.12.1/resources/shared/singlefileresource/singlefileresource.h --- old/kdepim-runtime-16.12.0/resources/shared/singlefileresource/singlefileresource.h 2016-12-08 07:06:24.000000000 +0100 +++ new/kdepim-runtime-16.12.1/resources/shared/singlefileresource/singlefileresource.h 2017-01-08 07:59:41.000000000 +0100 @@ -55,7 +55,7 @@ , mSettings(new Settings(config())) { // The resource needs network when the path refers to a non local file. - setNeedsNetwork(!QUrl(mSettings->path()).isLocalFile()); + setNeedsNetwork(!QUrl::fromUserInput(mSettings->path()).isLocalFile()); } ~SingleFileResource() { @@ -82,7 +82,7 @@ return; } - mCurrentUrl = QUrl(mSettings->path()); // path already has scheme + mCurrentUrl = QUrl::fromUserInput(mSettings->path()); // the string contains the scheme if remote, doesn't if local path if (mCurrentHash.isEmpty()) { // First call to readFile() lets see if there is a hash stored in a
