Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2016-02-22 10:14:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-26 17:26:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new/akonadi-server.changes 2016-02-22 10:14:09.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Feb 13 07:59:56 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: ---- akonadi-15.12.1.tar.xz New: ---- akonadi-15.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.mW6eqK/_old 2016-02-22 10:14:10.000000000 +0100 +++ /var/tmp/diff_new_pack.mW6eqK/_new 2016-02-22 10:14:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package akonadi-server # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,7 +17,7 @@ Name: akonadi-server -Version: 15.12.1 +Version: 15.12.2 Release: 0 %define rname akonadi Summary: PIM Storage Service @@ -28,14 +28,14 @@ Source99: akonadi-server-rpmlintrc BuildRequires: boost-devel BuildRequires: cmake >= 2.8.9 +BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libxml2 BuildRequires: libxslt BuildRequires: mariadb +BuildRequires: postgresql-devel BuildRequires: shared-mime-info BuildRequires: sqlite3-devel -BuildRequires: postgresql-devel -BuildRequires: extra-cmake-modules BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) @@ -64,8 +64,8 @@ %package -n libKF5AkonadiPrivate-devel Summary: PIM Storage Service: Build Environment Group: Development/Libraries/X11 -Requires: libKF5AkonadiPrivate5 = %{version} Requires: %{name} = %{version} +Requires: libKF5AkonadiPrivate5 = %{version} %if 0%{?suse_version} > 1320 Obsoletes: libakonadiprotocolinternals-devel < %{version} %else ++++++ akonadi-15.12.1.tar.xz -> akonadi-15.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-15.12.1/src/akonadicontrol/agenttype.cpp new/akonadi-15.12.2/src/akonadicontrol/agenttype.cpp --- old/akonadi-15.12.1/src/akonadicontrol/agenttype.cpp 2015-12-17 23:42:16.000000000 +0100 +++ new/akonadi-15.12.2/src/akonadicontrol/agenttype.cpp 2016-01-28 13:00:07.000000000 +0100 @@ -47,20 +47,14 @@ if (value.isNull()) { return QString(); } else if (value.canConvert<QString>()) { - return QString::fromUtf8(value.toByteArray()); + return value.toString(); } else if (value.canConvert<QStringList>()) { // This is a workaround for QSettings interpreting value with a comma as // a QStringList, which is not compatible with KConfig. KConfig reads everything // as a QByteArray and splits it to a list when requested. See BKO#330010 // TODO KF5: If we end up in Tier 2 or above, depend on KConfig for parsing // .desktop files - const QStringList parts = value.toStringList(); - QStringList utf8Parts; - utf8Parts.reserve(parts.size()); - Q_FOREACH (const QString &part, parts) { - utf8Parts << QString::fromUtf8(part.toLatin1()); - } - return utf8Parts.join(QStringLiteral(", ")); + return value.toStringList().join(QStringLiteral(", ")); } else { akError() << "Agent desktop file" << file.fileName() << "contains invalid value for key" << key; return QString(); @@ -72,6 +66,7 @@ Q_UNUSED(manager); QSettings file(fileName, QSettings::IniFormat); + file.setIniCodec("UTF-8"); file.beginGroup(QStringLiteral("Desktop Entry")); Q_FOREACH (const QString &key, file.allKeys()) {
