Hello community, here is the log from the commit of package kdepim-runtime for openSUSE:Factory checked in at 2016-11-12 13:36:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-10-18 10:17:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim-runtime.new/kdepim-runtime.changes 2016-11-12 13:36:37.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 9 06:16:48 UTC 2016 - lbeltr...@kde.org + +- Update to KDE Applications 16.08.3 + * KDE Applications 16.08.3 + * https://www.kde.org/announcements/announce-applications-16.08.3.php + +------------------------------------------------------------------- Old: ---- kdepim-runtime-16.08.2.tar.xz New: ---- kdepim-runtime-16.08.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-runtime.spec ++++++ --- /var/tmp/diff_new_pack.Sk09PY/_old 2016-11-12 13:36:38.000000000 +0100 +++ /var/tmp/diff_new_pack.Sk09PY/_new 2016-11-12 13:36:38.000000000 +0100 @@ -17,9 +17,9 @@ %define kf5_version 5.19.0 -%define kf5_pimlibs_version 16.08.2 +%define kf5_pimlibs_version 16.08.3 Name: kdepim-runtime -Version: 16.08.2 +Version: 16.08.3 Release: 0 Summary: Runtime modules for kdepim License: GPL-2.0 ++++++ kdepim-runtime-16.08.2.tar.xz -> kdepim-runtime-16.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.08.2/CMakeLists.txt new/kdepim-runtime-16.08.3/CMakeLists.txt --- old/kdepim-runtime-16.08.2/CMakeLists.txt 2016-10-02 23:22:49.000000000 +0200 +++ new/kdepim-runtime-16.08.3/CMakeLists.txt 2016-10-31 21:39:11.000000000 +0100 @@ -67,7 +67,6 @@ set(KIMAP_LIB_VERSION "5.2.90") set(KMBOX_LIB_VERSION "5.2.90") set(AKONADICALENDAR_LIB_VERSION "5.2.90") -set(SYNDICATION_LIB_VERSION "5.2.90") set(KONTACTINTERFACE_LIB_VERSION "5.2.90") set(AKONADIKALARM_LIB_VERSION "5.2.90") set(KMIME_LIB_VERSION "5.2.90") @@ -121,7 +120,6 @@ find_package(KF5Mbox ${KMBOX_LIB_VERSION} CONFIG REQUIRED) find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5Syndication ${SYNDICATION_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiNotes ${AKONADINOTE_LIB_VERSION} CONFIG REQUIRED) option(KDEPIM_RUN_ISOLATED_TESTS "Run the isolated tests." FALSE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.08.2/resources/kalarm/kalarmdir/kalarmdirresource.cpp new/kdepim-runtime-16.08.3/resources/kalarm/kalarmdir/kalarmdirresource.cpp --- old/kdepim-runtime-16.08.2/resources/kalarm/kalarmdir/kalarmdirresource.cpp 2016-10-02 23:22:49.000000000 +0200 +++ new/kdepim-runtime-16.08.3/resources/kalarm/kalarmdir/kalarmdirresource.cpp 2016-10-31 21:39:11.000000000 +0100 @@ -1,7 +1,7 @@ /* * kalarmdirresource.cpp - Akonadi directory resource for KAlarm * Program: kalarm - * Copyright © 2011-2014 by David Jarvie <djar...@kde.org> + * Copyright © 2011-2016 by David Jarvie <djar...@kde.org> * Copyright (c) 2008 Tobias Koenig <to...@kde.org> * Copyright (c) 2008 Bertjan Broeksema <broeks...@kde.org> * @@ -58,8 +58,6 @@ using namespace Akonadi_KAlarm_Dir_Resource; using KAlarmResourceCommon::errorMessage; -static bool isFileValid(const QString &file); - static const char warningFile[] = "WARNING_README.txt"; #define DEBUG_DATA \ @@ -137,10 +135,10 @@ if (!recreate) { // Remote ID could be path or URL, depending on which version // of Akonadi created it. - QString rid = c.remoteId(); - QUrl url = QUrl::fromLocalFile(mSettings->path()); + const QString rid = c.remoteId(); + const QUrl url = QUrl::fromLocalFile(mSettings->path()); if (!url.isLocalFile() - || (rid != url.toLocalFile() && rid != url.url() && rid != url.toDisplayString())) { + || (rid != url.toLocalFile() && rid != url.url() && rid != url.toDisplayString())) { qCritical() << "Collection remote ID does not match settings: changing settings"; recreate = true; } @@ -175,6 +173,8 @@ } } +/****************************************************************************** +*/ void KAlarmDirResource::configure(WId windowId) { qCDebug(KALARMDIRRESOURCE_LOG); @@ -212,7 +212,7 @@ modify = true; } if (mSettings->readOnly() != readOnly - || mSettings->displayName() != name) { + || mSettings->displayName() != name) { // Need to change the collection's rights or name c.setRemoteId(directoryName()); setNameRights(c); @@ -436,6 +436,8 @@ /****************************************************************************** * Load and parse data a single file in the directory. +* 'path' is the full path of 'file'. +* 'file' should not contain any directory component. */ KAEvent KAlarmDirResource::loadFile(const QString &path, const QString &file) { @@ -443,7 +445,11 @@ MemoryCalendar::Ptr calendar(new MemoryCalendar(QStringLiteral("UTC"))); FileStorage::Ptr fileStorage(new FileStorage(calendar, path, new ICalFormat())); if (!fileStorage->load()) { - qCWarning(KALARMDIRRESOURCE_LOG) << "Error loading" << path; + // Don't output an error in the case of the creation of a temporary + // file which triggered fileChanged() but no longer exists. + if (QFile(path).exists()) { + qCWarning(KALARMDIRRESOURCE_LOG) << "Error loading" << path; + } return KAEvent(); } const Event::List events = calendar->events(); @@ -629,7 +635,6 @@ return; } - QString nextFile; removeEvent(item.remoteId(), true); setCompatibility(); changeProcessed(); @@ -872,9 +877,15 @@ mFileEventIds.erase(fit); } } - } else if (event.isValid()) { - // The file didn't contain an event before. Save details of the new event. - mFileEventIds.insert(file, event.id()); + } else { + // The file didn't contain an event before. + if (event.isValid()) { + // Save details of the new event. + mFileEventIds.insert(file, event.id()); + } else { + // The file still doesn't contain a recognised event. + return; + } } addEventFile(event, file); @@ -1052,6 +1063,10 @@ return mSettings->path(); } +/****************************************************************************** +* Return the full path of an event file. +* 'file' should not contain any directory component. +*/ QString KAlarmDirResource::filePath(const QString &file) const { return mSettings->path() + QDir::separator() + file; @@ -1147,11 +1162,12 @@ * Check whether a file is to be ignored. * Reply = false if file is to be ignored. */ -bool isFileValid(const QString &file) +bool KAlarmDirResource::isFileValid(const QString &file) const { return !file.isEmpty() - && !file.startsWith(QLatin1Char('.')) && !file.endsWith(QLatin1Char('~')) - && file != QLatin1String(warningFile); + && !file.startsWith(QLatin1Char('.')) && !file.endsWith(QLatin1Char('~')) + && file != QLatin1String(warningFile) + && QFile(filePath(file)).exists(); // a temporary file may no longer exist } AKONADI_RESOURCE_MAIN(KAlarmDirResource) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-16.08.2/resources/kalarm/kalarmdir/kalarmdirresource.h new/kdepim-runtime-16.08.3/resources/kalarm/kalarmdir/kalarmdirresource.h --- old/kdepim-runtime-16.08.2/resources/kalarm/kalarmdir/kalarmdirresource.h 2016-10-02 23:22:49.000000000 +0200 +++ new/kdepim-runtime-16.08.3/resources/kalarm/kalarmdir/kalarmdirresource.h 2016-10-31 21:39:11.000000000 +0100 @@ -1,7 +1,7 @@ /* * kalarmdirresource.h - Akonadi directory resource for KAlarm * Program: kalarm - * Copyright © 2011-2012 by David Jarvie <djar...@kde.org> + * Copyright © 2011-2016 by David Jarvie <djar...@kde.org> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Library General Public License as published by @@ -87,6 +87,7 @@ bool createItem(const KAEvent &); bool modifyItem(const KAEvent &); void deleteItem(const KAEvent &); + bool isFileValid(const QString &file) const; struct EventFile { // data to be indexed by event ID EventFile() {}
