Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2018-11-12 09:22:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Mon Nov 12 09:22:28 2018 rev:50 rq:647954 version:18.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2018-10-15 09:19:30.264704877 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new/akonadi-server.changes 2018-11-12 09:24:53.230485013 +0100 @@ -1,0 +2,11 @@ +Thu Nov 08 20:43:25 UTC 2018 - lbeltr...@kde.org + +- Update to 18.08.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.08.3.php +- Changes since 18.08.2: + * Fix StorageJanitor SQL error in duplicate detection + * Fix KOrg category color customization crash (kde#398459) + +------------------------------------------------------------------- Old: ---- akonadi-18.08.2.tar.xz New: ---- akonadi-18.08.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.K0RCj5/_old 2018-11-12 09:24:56.218481280 +0100 +++ /var/tmp/diff_new_pack.K0RCj5/_new 2018-11-12 09:24:56.222481276 +0100 @@ -20,7 +20,7 @@ %define rname akonadi Name: akonadi-server -Version: 18.08.2 +Version: 18.08.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ akonadi-18.08.2.tar.xz -> akonadi-18.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-18.08.2/CMakeLists.txt new/akonadi-18.08.3/CMakeLists.txt --- old/akonadi-18.08.2/CMakeLists.txt 2018-10-09 02:29:40.000000000 +0200 +++ new/akonadi-18.08.3/CMakeLists.txt 2018-11-06 01:19:21.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.9.2") +set(PIM_VERSION "5.9.3") project(Akonadi VERSION ${PIM_VERSION}) set(CMAKE_CXX_STANDARD 14) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-18.08.2/po/zh_CN/akonadi_knut_resource.po new/akonadi-18.08.3/po/zh_CN/akonadi_knut_resource.po --- old/akonadi-18.08.2/po/zh_CN/akonadi_knut_resource.po 2018-10-09 02:29:40.000000000 +0200 +++ new/akonadi-18.08.3/po/zh_CN/akonadi_knut_resource.po 2018-11-06 01:19:21.000000000 +0100 @@ -8,8 +8,8 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-09-18 03:28+0200\n" -"PO-Revision-Date: 2018-09-28 19:52\n" -"Last-Translator: guoyunhe <yunhe....@protonmail.com>\n" +"PO-Revision-Date: 2018-11-01 23:17\n" +"Last-Translator: guoyunhe <i...@guoyunhe.me>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-18.08.2/po/zh_CN/libakonadi5.po new/akonadi-18.08.3/po/zh_CN/libakonadi5.po --- old/akonadi-18.08.2/po/zh_CN/libakonadi5.po 2018-10-09 02:29:40.000000000 +0200 +++ new/akonadi-18.08.3/po/zh_CN/libakonadi5.po 2018-11-06 01:19:21.000000000 +0100 @@ -8,8 +8,8 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-08-26 06:24+0200\n" -"PO-Revision-Date: 2018-09-28 19:52\n" -"Last-Translator: guoyunhe <yunhe....@protonmail.com>\n" +"PO-Revision-Date: 2018-11-01 23:17\n" +"Last-Translator: guoyunhe <i...@guoyunhe.me>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-18.08.2/src/server/storage/akonadidb.xml new/akonadi-18.08.3/src/server/storage/akonadidb.xml --- old/akonadi-18.08.2/src/server/storage/akonadidb.xml 2018-10-05 07:52:03.000000000 +0200 +++ new/akonadi-18.08.3/src/server/storage/akonadidb.xml 2018-10-22 13:00:50.000000000 +0200 @@ -67,7 +67,7 @@ <comment>Contains the schema version of the database.</comment> <column name="version" type="int" default="0" allowNull="false"/> <column name="generation" type="int" default="0" allowNull="false" /> - <data columns="version" values="35"/> + <data columns="version" values="36"/> </table> <table name="Resource"> @@ -199,7 +199,7 @@ <table name="Tag"> <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/> <column name="gid" type="QString" allowNull="false"/> - <column name="parentId" type="qint64" refTable="Tag" refColumn="id" allowNull="true" methodName="parent"/> + <column name="parentId" type="qint64" refTable="Tag" refColumn="id" allowNull="true" methodName="parent" default="-1"/> <column name="typeId" type="qint64" refTable="TagType" refColumn="id" onDelete="Restrict" default="1"/> </table> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-18.08.2/src/server/storage/entities.xsl new/akonadi-18.08.3/src/server/storage/entities.xsl --- old/akonadi-18.08.2/src/server/storage/entities.xsl 2018-10-05 07:52:03.000000000 +0200 +++ new/akonadi-18.08.3/src/server/storage/entities.xsl 2018-10-22 13:00:50.000000000 +0200 @@ -224,7 +224,7 @@ </xsl:when> <xsl:otherwise> (qb.query().isNull(valueIndex)) ? - <xsl:call-template name="data-type"/>() : + <xsl:call-template name="data-type"/>(<xsl:value-of select="@default"/>) : <xsl:choose> <xsl:when test="starts-with(@type,'QString')"> Utils::variantToString( qb.query().value( valueIndex ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-18.08.2/src/server/storagejanitor.cpp new/akonadi-18.08.3/src/server/storagejanitor.cpp --- old/akonadi-18.08.2/src/server/storagejanitor.cpp 2018-10-05 07:52:03.000000000 +0200 +++ new/akonadi-18.08.3/src/server/storagejanitor.cpp 2018-10-22 13:00:50.000000000 +0200 @@ -543,7 +543,6 @@ } while (duplicates.query().next()) { const QString rid = duplicates.query().value(0).toString(); - inform(QStringLiteral("Found duplicates ") + rid); Query::Condition condition(Query::And); condition.addValueCondition(PimItem::remoteIdColumn(), Query::Equals, rid); @@ -561,6 +560,13 @@ while (items.query().next()) { itemsIds.push_back(items.query().value(0)); } + if (itemsIds.isEmpty()) { + // the mimetype filter may have dropped some entries from the + // duplicates query + continue; + } + + inform(QStringLiteral("Found duplicates ") + rid); SelectQueryBuilder<Part> parts; parts.addValueCondition(Part::pimItemIdFullColumnName(), Query::In, QVariant::fromValue(itemsIds));
