Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2015-05-02 17:28:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-03-11 09:43:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2015-05-02 17:28:16.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Apr 11 14:07:08 UTC 2015 - tittiatc...@gmail.com + +- Update to 4.14.7 + * KDE Applications 15.04.0 + * See https://www.kde.org/announcements/announce-applications-15.04.0.php + +------------------------------------------------------------------- Old: ---- kdepim-runtime-4.14.6.tar.xz New: ---- kdepim-runtime-4.14.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.0AqAeM/_old 2015-05-02 17:28:18.000000000 +0200 +++ /var/tmp/diff_new_pack.0AqAeM/_new 2015-05-02 17:28:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepim4-runtime -Version: 4.14.6 +Version: 4.14.7 Release: 0 Summary: Base package of kdepim License: LGPL-2.1+ ++++++ kdepim-runtime-4.14.6.tar.xz -> kdepim-runtime-4.14.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.6/CMakeLists.txt new/kdepim-runtime-4.14.7/CMakeLists.txt --- old/kdepim-runtime-4.14.6/CMakeLists.txt 2015-02-27 01:16:51.000000000 +0100 +++ new/kdepim-runtime-4.14.7/CMakeLists.txt 2015-03-24 13:29:50.000000000 +0100 @@ -36,7 +36,7 @@ set(KDEPIM_RUNTIME_DEV_VERSION "") endif() -set(KDEPIM_RUNTIME_VERSION "4.14.6${KDEPIM_RUNTIME_DEV_VERSION}") +set(KDEPIM_RUNTIME_VERSION "4.14.7${KDEPIM_RUNTIME_DEV_VERSION}") configure_file(kdepim-runtime-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-runtime-version.h @ONLY) @@ -49,11 +49,11 @@ set(CMAKE_AUTOMOC ON) # Kdelibs -find_package(KDE4 4.13.0 REQUIRED) +find_package(KDE4 4.14.0 REQUIRED) include(KDE4Defaults) # KdepimLibs -find_package(KdepimLibs 4.14.6) +find_package(KdepimLibs 4.14.7) 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.14.6/resources/birthdays/birthdaysresource.cpp new/kdepim-runtime-4.14.7/resources/birthdays/birthdaysresource.cpp --- old/kdepim-runtime-4.14.6/resources/birthdays/birthdaysresource.cpp 2015-02-27 01:16:51.000000000 +0100 +++ new/kdepim-runtime-4.14.7/resources/birthdays/birthdaysresource.cpp 2015-03-24 13:29:50.000000000 +0100 @@ -38,6 +38,8 @@ #include <KLocalizedString> #include <KWindowSystem> +#include <Akonadi/TagCreateJob> + using namespace Akonadi; using namespace KABC; using namespace KCalCore; @@ -252,7 +254,7 @@ ev->setCustomProperty( "KABC", "EMAIL-1", contact.preferredEmail() ); ev->setSummary( summary ); - ev->setCategories( i18n( "Birthday" ) ); + checkForUnknownCategories(i18n( "Birthday" ), ev); return ev; } return KCalCore::Event::Ptr(); @@ -309,7 +311,7 @@ event->setCustomProperty( "KABC", "EMAIL-1", contact.fullEmail() ); event->setCustomProperty( "KABC", "ANNIVERSARY", QLatin1String("YES") ); // insert category - event->setCategories( i18n( "Anniversary" ) ); + checkForUnknownCategories(i18n( "Anniversary" ), event); return event; } return KCalCore::Event::Ptr(); @@ -346,6 +348,12 @@ return event; } +void BirthdaysResource::checkForUnknownCategories(const QString &categoryToCheck, Event::Ptr &event) +{ + Akonadi::TagCreateJob *tagCreateJob = new Akonadi::TagCreateJob(Akonadi::Tag(categoryToCheck), this); + tagCreateJob->setMergeIfExisting(true); + event->setCategories(categoryToCheck); +} AKONADI_RESOURCE_MAIN( BirthdaysResource ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.6/resources/birthdays/birthdaysresource.h new/kdepim-runtime-4.14.7/resources/birthdays/birthdaysresource.h --- old/kdepim-runtime-4.14.6/resources/birthdays/birthdaysresource.h 2015-02-27 01:16:51.000000000 +0100 +++ new/kdepim-runtime-4.14.7/resources/birthdays/birthdaysresource.h 2015-03-24 13:29:50.000000000 +0100 @@ -46,6 +46,7 @@ bool retrieveItem( const Akonadi::Item &item, const QSet<QByteArray> &parts ); private: + void checkForUnknownCategories(const QString &categoryToCheck, KCalCore::Event::Ptr &event); void addPendingEvent( const KCalCore::Event::Ptr &event, const QString &remoteId ); KCalCore::Event::Ptr createBirthday( const Akonadi::Item &contactItem ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.6/resources/dav/resource/davgroupwareprovider.desktop new/kdepim-runtime-4.14.7/resources/dav/resource/davgroupwareprovider.desktop --- old/kdepim-runtime-4.14.6/resources/dav/resource/davgroupwareprovider.desktop 2015-02-27 01:16:51.000000000 +0100 +++ new/kdepim-runtime-4.14.7/resources/dav/resource/davgroupwareprovider.desktop 2015-03-24 13:29:50.000000000 +0100 @@ -66,3 +66,7 @@ [PropertyDef::X-DavGroupware-GroupDavPath] Type=QString + +[PropertyDef::X-DavGroupware-Provider] +Type=QString + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.6/resources/dav/resource/setupwizard.cpp new/kdepim-runtime-4.14.7/resources/dav/resource/setupwizard.cpp --- old/kdepim-runtime-4.14.6/resources/dav/resource/setupwizard.cpp 2015-02-27 01:16:51.000000000 +0100 +++ new/kdepim-runtime-4.14.7/resources/dav/resource/setupwizard.cpp 2015-03-24 13:29:50.000000000 +0100 @@ -70,6 +70,7 @@ QString pathPattern; + QString pathPropertyName( QLatin1String("X-DavGroupware-") + protocol + QLatin1String("Path") ); if ( service->property( pathPropertyName ).isNull() ) return QString(); @@ -81,15 +82,24 @@ localPart.remove( QRegExp( QLatin1String("@.*$") ) ); pathPattern.replace( QLatin1String("$user$"), username ); pathPattern.replace( QLatin1String("$localpart$"), localPart ); - + QString providerName; + if (!service->property("X-DavGroupware-Provider").isNull()) { + providerName = service->property("X-DavGroupware-Provider").toString(); + } QString localPath = wizard->field( QLatin1String("installationPath") ).toString(); if ( !localPath.isEmpty() ) { - if ( !localPath.startsWith( QLatin1Char('/') ) ) - pathPattern.prepend( QLatin1Char('/') + localPath ); - else - pathPattern.prepend( localPath ); + if (providerName == QLatin1String("davical")) { + if (!localPath.endsWith(QLatin1Char('/') )) + pathPattern.append( localPath + QLatin1Char('/') ); + else + pathPattern.append( localPath ); + } else { + if ( !localPath.startsWith( QLatin1Char('/') ) ) + pathPattern.prepend( QLatin1Char('/') + localPath ); + else + pathPattern.prepend( localPath ); + } } - QUrl url; if ( !wizard->property( "usePredefinedProvider" ).isNull() ) { @@ -123,7 +133,6 @@ url.setPort( port ); } } - return url.toString(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.14.6/resources/dav/services/davical.desktop new/kdepim-runtime-4.14.7/resources/dav/services/davical.desktop --- old/kdepim-runtime-4.14.6/resources/dav/services/davical.desktop 2015-02-27 01:16:51.000000000 +0100 +++ new/kdepim-runtime-4.14.7/resources/dav/services/davical.desktop 2015-03-24 13:29:50.000000000 +0100 @@ -46,5 +46,7 @@ Type=Service X-KDE-ServiceTypes=DavGroupwareProvider +X-DavGroupware-Provider=davical X-DavGroupware-SupportedProtocols=CalDav X-DavGroupware-CalDavPath=/caldav.php +