Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package akonadi-calendar for
openSUSE:Factory checked in at 2021-07-09 23:57:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/akonadi-calendar (Old)
and /work/SRC/openSUSE:Factory/.akonadi-calendar.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-calendar"
Fri Jul 9 23:57:27 2021 rev:73 rq:904843 version:21.04.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/akonadi-calendar/akonadi-calendar.changes
2021-06-12 20:05:48.408694289 +0200
+++
/work/SRC/openSUSE:Factory/.akonadi-calendar.new.2625/akonadi-calendar.changes
2021-07-09 23:58:04.085117648 +0200
@@ -1,0 +2,10 @@
+Wed Jul 7 08:56:33 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 21.04.3
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/gear/21.04.3
+- Changes since 21.04.2:
+ * Revert "calendarbase.cpp - handleUidChange(): reload memory calendar"
+
+-------------------------------------------------------------------
Old:
----
akonadi-calendar-21.04.2.tar.xz
akonadi-calendar-21.04.2.tar.xz.sig
New:
----
akonadi-calendar-21.04.3.tar.xz
akonadi-calendar-21.04.3.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ akonadi-calendar.spec ++++++
--- /var/tmp/diff_new_pack.GYrAaP/_old 2021-07-09 23:58:04.725112672 +0200
+++ /var/tmp/diff_new_pack.GYrAaP/_new 2021-07-09 23:58:04.729112641 +0200
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: akonadi-calendar
-Version: 21.04.2
+Version: 21.04.3
Release: 0
Summary: Akonadi calendar integration
License: LGPL-2.1-or-later
++++++ akonadi-calendar-21.04.2.tar.xz -> akonadi-calendar-21.04.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-calendar-21.04.2/CMakeLists.txt
new/akonadi-calendar-21.04.3/CMakeLists.txt
--- old/akonadi-calendar-21.04.2/CMakeLists.txt 2021-05-15 15:27:38.000000000
+0200
+++ new/akonadi-calendar-21.04.3/CMakeLists.txt 2021-07-05 17:00:09.000000000
+0200
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-set(PIM_VERSION "5.17.2")
+set(PIM_VERSION "5.17.3")
project(Akonadi-Calendar VERSION ${PIM_VERSION})
# ECM setup
@@ -25,12 +25,12 @@
set(AKONADICALENDAR_LIB_VERSION ${PIM_VERSION})
-set(AKONADICONTACT_LIB_VERSION "5.17.2")
-set(AKONADI_LIB_VERSION "5.17.2")
-set(MAILTRANSPORT_LIB_VERSION "5.17.2")
-set(CALENDARUTILS_LIB_VERSION "5.17.2")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.17.2")
-set(GRANTLEETHEME_LIB_VERSION "5.17.2")
+set(AKONADICONTACT_LIB_VERSION "5.17.3")
+set(AKONADI_LIB_VERSION "5.17.3")
+set(MAILTRANSPORT_LIB_VERSION "5.17.3")
+set(CALENDARUTILS_LIB_VERSION "5.17.3")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.17.3")
+set(GRANTLEETHEME_LIB_VERSION "5.17.3")
ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADICALENDAR
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/akonadi-calendar_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-calendar-21.04.2/po/zh_CN/libakonadi-calendar5-serializer.po
new/akonadi-calendar-21.04.3/po/zh_CN/libakonadi-calendar5-serializer.po
--- old/akonadi-calendar-21.04.2/po/zh_CN/libakonadi-calendar5-serializer.po
2021-06-08 08:16:38.000000000 +0200
+++ new/akonadi-calendar-21.04.3/po/zh_CN/libakonadi-calendar5-serializer.po
2021-07-06 07:27:02.000000000 +0200
@@ -9,7 +9,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-01-27 03:05+0100\n"
-"PO-Revision-Date: 2021-06-03 16:07\n"
+"PO-Revision-Date: 2021-06-20 07:37\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-calendar-21.04.2/po/zh_CN/libakonadi-calendar5.po
new/akonadi-calendar-21.04.3/po/zh_CN/libakonadi-calendar5.po
--- old/akonadi-calendar-21.04.2/po/zh_CN/libakonadi-calendar5.po
2021-06-08 08:16:38.000000000 +0200
+++ new/akonadi-calendar-21.04.3/po/zh_CN/libakonadi-calendar5.po
2021-07-06 07:27:02.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-02-02 02:45+0100\n"
-"PO-Revision-Date: 2021-06-03 16:07\n"
+"PO-Revision-Date: 2021-06-20 07:37\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-calendar-21.04.2/src/calendarbase.cpp
new/akonadi-calendar-21.04.3/src/calendarbase.cpp
--- old/akonadi-calendar-21.04.2/src/calendarbase.cpp 2021-05-15
15:27:38.000000000 +0200
+++ new/akonadi-calendar-21.04.3/src/calendarbase.cpp 2021-07-05
17:00:09.000000000 +0200
@@ -279,6 +279,22 @@
const QString newUid = newIncidence->uid();
if (mItemIdByUid.contains(newIdentifier)) {
+ Incidence::Ptr oldIncidence = CalendarUtils::incidence(oldItem);
+#if 0
+ qCWarning(AKONADICALENDAR_LOG) << "New uid shouldn't be known: " <<
newIdentifier << "; id="
+ << newItem.id() << "; oldItem.id=" <<
mItemIdByUid[newIdentifier]
+ << "; new summary= " <<
newIncidence->summary()
+ << "; new recurrenceId=" <<
newIncidence->recurrenceId()
+ << "; oldIncidence" << oldIncidence;
+#endif
+ if (oldIncidence) {
+#if 0
+ qCWarning(AKONADICALENDAR_LOG) << "; oldIncidence uid=" <<
oldIncidence->uid()
+ << "; oldIncidence recurrenceId = "
<< oldIncidence->recurrenceId()
+ << "; oldIncidence summary = " <<
oldIncidence->summary();
+#endif
+ }
+ Q_ASSERT(false);
return;
}
@@ -288,17 +304,22 @@
oldIncidence = q->MemoryCalendar::incidence(oldIncidence->uid());
if (!oldIncidence) {
- q->MemoryCalendar::reload();
- oldIncidence = q->MemoryCalendar::incidence(oldIncidence->uid());
- if (!oldIncidence) {
- // How can this happen ?
- qCWarning(AKONADICALENDAR_LOG) << "Couldn't find old incidence";
- Q_ASSERT(false);
- return;
- }
+ // How can this happen ?
+ qCWarning(AKONADICALENDAR_LOG) << "Couldn't find old incidence";
+ Q_ASSERT(false);
+ return;
}
if (newIncidence->instanceIdentifier() ==
oldIncidence->instanceIdentifier()) {
+#if 0
+ qCWarning(AKONADICALENDAR_LOG) << "New uid=" << newIncidence->uid() <<
"; old uid=" << oldIncidence->uid()
+ << "; new recurrenceId="
+ << newIncidence->recurrenceId()
+ << "; old recurrenceId=" <<
oldIncidence->recurrenceId()
+ << "; new summary = " <<
newIncidence->summary()
+ << "; old summary = " <<
oldIncidence->summary()
+ << "; id = " << newItem.id();
+#endif
Q_ASSERT(false); // The reason we're here in the first place
return;
}
