Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2016-09-14 23:00:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2016-08-29 14:30:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new/akonadi-server.changes 2016-09-14 23:00:25.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 9 08:02:36 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.1 + * KDE Applications 16.08.1 + * https://www.kde.org/announcements/announce-applications-16.08.1.php + + +------------------------------------------------------------------- Old: ---- akonadi-16.08.0.tar.xz New: ---- akonadi-16.08.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.9v6FmN/_old 2016-09-14 23:00:25.000000000 +0200 +++ /var/tmp/diff_new_pack.9v6FmN/_new 2016-09-14 23:00:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: akonadi-server -Version: 16.08.0 +Version: 16.08.1 Release: 0 %define rname akonadi Summary: PIM Storage Service ++++++ akonadi-16.08.0.tar.xz -> akonadi-16.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.08.0/CMakeLists.txt new/akonadi-16.08.1/CMakeLists.txt --- old/akonadi-16.08.0/CMakeLists.txt 2016-08-11 13:49:22.000000000 +0200 +++ new/akonadi-16.08.1/CMakeLists.txt 2016-08-26 15:36:51.000000000 +0200 @@ -20,7 +20,7 @@ include(AkonadiMacros) -set(PIM_VERSION "5.3.0") +set(PIM_VERSION "5.3.1") set(QT_REQUIRED_VERSION "5.4.0") set(AKONADI_VERSION ${PIM_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.08.0/KF5AkonadiConfig.cmake.in new/akonadi-16.08.1/KF5AkonadiConfig.cmake.in --- old/akonadi-16.08.0/KF5AkonadiConfig.cmake.in 2016-08-11 13:49:22.000000000 +0200 +++ new/akonadi-16.08.1/KF5AkonadiConfig.cmake.in 2016-08-26 15:36:51.000000000 +0200 @@ -6,12 +6,8 @@ endif(NOT AKONADI_INSTALL_DIR) find_dependency(KF5Completion "@KF5_VERSION@") -find_dependency(KF5JobWidgets "@KF5_VERSION@") -find_dependency(KF5Service "@KF5_VERSION@") -find_dependency(KF5Solid "@KF5_VERSION@") find_dependency(KF5XmlGui "@KF5_VERSION@") find_dependency(KF5ItemModels "@KF5_VERSION@") -find_dependency(KF5KDELibs4Support "@KF5_VERSION@") find_dependency(Qt5Network "@QT_REQUIRED_VERSION@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.08.0/KF5AkonadiMacros.cmake new/akonadi-16.08.1/KF5AkonadiMacros.cmake --- old/akonadi-16.08.0/KF5AkonadiMacros.cmake 2016-08-11 13:49:22.000000000 +0200 +++ new/akonadi-16.08.1/KF5AkonadiMacros.cmake 2016-08-26 15:36:51.000000000 +0200 @@ -27,12 +27,19 @@ Qt5::Test Qt5::Gui Qt5::Widgets KF5::KIOCore KF5::AkonadiCore KF5::DBusAddons ${_linklibraries}) - # Set the akonaditest path when the macro is used in Akonadi - find_program(_testrunner - NAMES akonaditest akonaditest.exe - PATHS ${CMAKE_CURRENT_BINARY_DIR} ${_akonaditest_DIR} ENV PATH) - if (_testrunner-NOTFOUND) - message(WARNING "Could not locate akonaditest executable, isolated Akonadi tests will fail!") + if (NOT DEFINED _testrunner) + if (${PROJECT_NAME} STREQUAL Akonadi AND TARGET akonaditest) + # If this macro is used in Akonadi itself, just use the target name; + # CMake will replace it with the path to the executable in the build + # directory. This will ensure it works even on a clean build, + # where the executable doesn't exist yet at cmake time. + set(_testrunner akonaditest) + else() + find_program(_testrunner NAMES akonaditest akonaditest.exe) + if (NOT _testrunner) + message(WARNING "Could not locate akonaditest executable, isolated Akonadi tests will fail!") + endif() + endif() endif() # based on kde4_add_unit_test @@ -61,9 +68,9 @@ if ( KDEPIMLIBS_RUN_MYSQL_ISOLATED_TESTS OR AKONADI_RUN_MYSQL_ISOLATED_TESTS ) find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin ) if ( MYSQLD_EXECUTABLE ) - add_test( akonadi-mysql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-db.xml ${_executable} + add_test( NAME akonadi-mysql-db-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-db.xml ${_executable} ${MYSQL_EXTRA_OPTIONS_DB} ) - add_test( akonadi-mysql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-fs.xml ${_executable} + add_test( NAME akonadi-mysql-fs-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-fs.xml ${_executable} ${MYSQL_EXTRA_OPTIONS_FS} ) endif() endif() @@ -71,15 +78,15 @@ if ( KDEPIMLIBS_RUN_PGSQL_ISOLATED_TESTS OR AKONADI_RUN_PGSQL_ISOLATED_TESTS ) find_program( POSTGRES_EXECUTABLE postgres ) if ( POSTGRES_EXECUTABLE ) - add_test( akonadi-postgresql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-db.xml ${_executable} + add_test( NAME akonadi-postgresql-db-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-db.xml ${_executable} ${POSTGRESL_EXTRA_OPTIONS_DB} ) - add_test( akonadi-postgresql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-fs.xml ${_executable} + add_test( NAME akonadi-postgresql-fs-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-fs.xml ${_executable} ${POSTGRESL_EXTRA_OPTIONS_FS} ) endif() endif() # Always have SQLITE tests - add_test( akonadi-sqlite-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-sqlite-db.xml ${_executable} + add_test( NAME akonadi-sqlite-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-sqlite-db.xml ${_executable} ${SQLITE_EXTRA_OPTIONS} ) endmacro() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.08.0/autotests/akonadicontrol/agenttypetest.cpp new/akonadi-16.08.1/autotests/akonadicontrol/agenttypetest.cpp --- old/akonadi-16.08.0/autotests/akonadicontrol/agenttypetest.cpp 2016-08-11 13:49:22.000000000 +0200 +++ new/akonadi-16.08.1/autotests/akonadicontrol/agenttypetest.cpp 2016-08-26 15:36:51.000000000 +0200 @@ -43,7 +43,8 @@ googleContactsResource.instanceCounter = 0; googleContactsResource.identifier = QStringLiteral("akonadi_googlecontacts_resource"); googleContactsResource.custom = QVariantMap { - {QStringLiteral("KAccounts"), QStringList {QStringLiteral("google-contacts"), QStringLiteral("google-calendar")}} + { QStringLiteral("KAccounts"), QStringList { QStringLiteral("google-contacts"), QStringLiteral("google-calendar") } }, + { QStringLiteral("HasLocalStorage"), true } }; googleContactsResource.launchMethod = AgentType::Process; // We test an UTF-8 name within quotes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.08.0/autotests/akonadicontrol/data/akonaditestresource.desktop new/akonadi-16.08.1/autotests/akonadicontrol/data/akonaditestresource.desktop --- old/akonadi-16.08.0/autotests/akonadicontrol/data/akonaditestresource.desktop 2016-08-11 13:49:22.000000000 +0200 +++ new/akonadi-16.08.1/autotests/akonadicontrol/data/akonaditestresource.desktop 2016-08-26 15:36:51.000000000 +0200 @@ -90,5 +90,6 @@ X-Akonadi-Capabilities=Resource X-Akonadi-Identifier=akonadi_googlecontacts_resource X-Akonadi-Custom-KAccounts=google-contacts,google-calendar +X-Akonadi-Custom-HasLocalStorage=true Icon=im-google diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.08.0/src/akonadicontrol/agenttype.cpp new/akonadi-16.08.1/src/akonadicontrol/agenttype.cpp --- old/akonadi-16.08.0/src/akonadicontrol/agenttype.cpp 2016-08-11 13:49:22.000000000 +0200 +++ new/akonadi-16.08.1/src/akonadicontrol/agenttype.cpp 2016-08-26 15:36:51.000000000 +0200 @@ -55,7 +55,12 @@ Q_FOREACH (const QString &key, group.keyList()) { if (key.startsWith(QLatin1String("X-Akonadi-Custom-"))) { QString customKey = key.mid(17, key.length()); - custom[customKey] = group.readEntry(key, QStringList()); + QStringList val = group.readEntry(key, QStringList()); + if (val.size() == 1) { + custom[customKey] = QVariant(val[0]); + } else { + custom[customKey] = val; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.08.0/src/widgets/tagwidget.cpp new/akonadi-16.08.1/src/widgets/tagwidget.cpp --- old/akonadi-16.08.0/src/widgets/tagwidget.cpp 2016-08-11 13:49:22.000000000 +0200 +++ new/akonadi-16.08.1/src/widgets/tagwidget.cpp 2016-08-26 15:36:51.000000000 +0200 @@ -70,6 +70,7 @@ Monitor *monitor = new Monitor(this); monitor->setTypeMonitored(Monitor::Tags); d->mModel = new Akonadi::TagModel(monitor, this); + connect(monitor, &Monitor::tagAdded, this, &TagWidget::updateView); QHBoxLayout *layout = new QHBoxLayout(this); layout->setMargin(0);
