Hello community, here is the log from the commit of package kdepim-runtime for openSUSE:Factory checked in at 2016-02-22 10:16:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-23 01:06:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim-runtime.new/kdepim-runtime.changes 2016-02-22 10:16:10.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Feb 13 08:08:54 UTC 2016 - [email protected] + +- Update to KDE Applications 15.12.2 + * KDE Applications 15.12.2 + * https://www.kde.org/announcements/announce-applications-15.12.2.php + * boo#966605 + + +------------------------------------------------------------------- Old: ---- kdepim-runtime-15.12.1.tar.xz New: ---- kdepim-runtime-15.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-runtime.spec ++++++ --- /var/tmp/diff_new_pack.KaWgMC/_old 2016-02-22 10:16:10.000000000 +0100 +++ /var/tmp/diff_new_pack.KaWgMC/_new 2016-02-22 10:16:10.000000000 +0100 @@ -17,9 +17,9 @@ %define kf5_version 5.1.0 -%define kf5_pimlibs_version 15.12.1 +%define kf5_pimlibs_version 15.12.2 Name: kdepim-runtime -Version: 15.12.1 +Version: 15.12.2 Release: 0 Summary: Runtime modules for kdepim License: GPL-2.0 @@ -77,7 +77,11 @@ Requires: kio-pimlibs Requires(post): shared-mime-info Requires(postun): shared-mime-info +%if 0%{?suse_version} > 1320 Obsoletes: kdepim4-runtime < %{version} +%else +Conflicts: kdepim4-runtime +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ kdepim-runtime-15.12.1.tar.xz -> kdepim-runtime-15.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-15.12.1/CMakeLists.txt new/kdepim-runtime-15.12.2/CMakeLists.txt --- old/kdepim-runtime-15.12.1/CMakeLists.txt 2015-12-30 13:16:45.000000000 +0100 +++ new/kdepim-runtime-15.12.2/CMakeLists.txt 2016-02-10 21:25:15.000000000 +0100 @@ -35,7 +35,7 @@ set(KDEPIM_RUNTIME_DEV_VERSION "") endif() -set(KDEPIM_RUNTIME_VERSION_NUMBER "5.1.1") +set(KDEPIM_RUNTIME_VERSION_NUMBER "5.1.2") set(KDEPIM_RUNTIME_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}${KDEPIM_RUNTIME_DEV_VERSION}") configure_file(kdepim-runtime-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-runtime-version.h @ONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-15.12.1/resources/dav/resource/davgroupwareresource.cpp new/kdepim-runtime-15.12.2/resources/dav/resource/davgroupwareresource.cpp --- old/kdepim-runtime-15.12.1/resources/dav/resource/davgroupwareresource.cpp 2015-12-30 13:16:45.000000000 +0100 +++ new/kdepim-runtime-15.12.2/resources/dav/resource/davgroupwareresource.cpp 2016-02-10 21:25:15.000000000 +0100 @@ -114,7 +114,8 @@ connect(this, &DavGroupwareResource::reloadConfiguration, this, &DavGroupwareResource::onReloadConfig); - scheduleCustomTask(this, "createInitialCache", QVariant(), ResourceBase::AfterChangeReplay); + scheduleCustomTask(this, "retrieveCollections", QVariant(), ResourceBase::Prepend); + scheduleCustomTask(this, "createInitialCache", QVariant(), ResourceBase::Prepend); } DavGroupwareResource::~DavGroupwareResource() @@ -257,6 +258,11 @@ void DavGroupwareResource::retrieveItems(const Akonadi::Collection &collection) { + if (!collection.isValid()) { + itemsRetrievalDone(); + return; + } + qCDebug(DAVRESOURCE_LOG) << "Retrieving items for collection " << collection.remoteId(); if (!configurationIsValid()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-15.12.1/resources/dav/resource/settings.cpp new/kdepim-runtime-15.12.2/resources/dav/resource/settings.cpp --- old/kdepim-runtime-15.12.1/resources/dav/resource/settings.cpp 2015-12-30 13:16:45.000000000 +0100 +++ new/kdepim-runtime-15.12.2/resources/dav/resource/settings.cpp 2016-02-10 21:25:15.000000000 +0100 @@ -36,6 +36,7 @@ #include <QtCore/QByteArray> #include <QtCore/QDataStream> #include <QtCore/QFile> +#include <QtCore/QFileInfo> #include <QtCore/QPointer> #include <QtCore/QRegExp> #include <QtCore/QUrl> @@ -240,6 +241,11 @@ // Update the cache now //QMap<QString, QString> tmp( mCollectionsUrlsMapping ); + QFileInfo cacheFileInfo = QFileInfo(mCollectionsUrlsMappingCache); + if (!cacheFileInfo.dir().exists()) { + QDir::root().mkpath(cacheFileInfo.dir().absolutePath()); + } + QFile cacheFile(mCollectionsUrlsMappingCache); if (cacheFile.open(QIODevice::WriteOnly)) { QDataStream cache(&cacheFile); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-15.12.1/resources/vcard/wizard/vcardwizard.desktop new/kdepim-runtime-15.12.2/resources/vcard/wizard/vcardwizard.desktop --- old/kdepim-runtime-15.12.1/resources/vcard/wizard/vcardwizard.desktop 2015-12-30 13:16:45.000000000 +0100 +++ new/kdepim-runtime-15.12.2/resources/vcard/wizard/vcardwizard.desktop 2016-02-10 21:25:15.000000000 +0100 @@ -47,6 +47,7 @@ Comment[el]=Φορτώνει επαφή από αρχείο VCard Comment[en_GB]=Loads contact from vCard File Comment[es]=Carga contactos desde un archivo vCard +Comment[et]=Kontakti laadimine vCard-failist Comment[fi]=Lataa yhteystiedon vCard-tiedostosta Comment[fr]=Charge un contact depuis un fichier au format « vCard » Comment[gl]=Cargar os contactos dun ficheiro vCard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-15.12.1/resources/vcarddir/wizard/vcarddirwizard.desktop new/kdepim-runtime-15.12.2/resources/vcarddir/wizard/vcarddirwizard.desktop --- old/kdepim-runtime-15.12.1/resources/vcarddir/wizard/vcarddirwizard.desktop 2015-12-30 13:16:45.000000000 +0100 +++ new/kdepim-runtime-15.12.2/resources/vcarddir/wizard/vcarddirwizard.desktop 2016-02-10 21:25:15.000000000 +0100 @@ -50,6 +50,7 @@ Comment[el]=Φορτώνει επαφή από κατάλογο VCard Comment[en_GB]=Loads contact from VCard Directory Comment[es]=Carga contactos desde un directorio VCard +Comment[et]=Kontakti laadimine vCardide kataloogist Comment[fi]=Lataa yhteystiedon VCard-kansiosta Comment[fr]=Charge des données depuis un dossier « vCard » Comment[gl]=Carga contactos dun cartafol vCard
