diff --git a/akonadi-18.12.3.tar.xz b/akonadi-18.12.3.tar.xz deleted file mode 100644 index 8115ebf..0000000 --- a/akonadi-18.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f930deaade1cac1488b8af05cc28f4a78a441c34dbe875b673af3423f8a14658 -size 1555044 diff --git a/akonadi-19.03.80.tar.xz b/akonadi-19.03.80.tar.xz new file mode 100644 index 0000000..b854a55 --- /dev/null +++ b/akonadi-19.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c01ec78627a504962e230a1c39a7a25ef344f419364acf21441678dbb5c01a97 +size 1574364 diff --git a/akonadi-server.changes b/akonadi-server.changes index 665a480..c95710d 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,9 +1,12 @@ ------------------------------------------------------------------- -Wed Apr 3 12:01:56 UTC 2019 - Luca Beltrame +Wed Mar 27 06:40:54 UTC 2019 - lbeltrame@kde.org -- Add upstream patches to fix regressions when checking mail: - * fix-regression-when-updating-attributes.patch - * fix-collection-detaching.patch +- Update to 19.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/announce-applications-19.04-beta.php +- Changes since 18.12.3: + * Too many changes to list here ------------------------------------------------------------------- Sat Mar 09 08:03:10 UTC 2019 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index 74bd0f8..eeed8c1 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -22,17 +22,13 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 18.12.3 +Version: 19.03.80 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later Group: System/GUI/KDE URL: http://akonadi-project.org Source: %{rname}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch0: fix-regression-when-updating-attributes.patch -# PATCH-FIX-UPSTREAM -Patch1: fix-collection-detaching.patch Source99: akonadi-server-rpmlintrc BuildRequires: cmake >= 3.0.0 BuildRequires: extra-cmake-modules >= %{kf5_version} @@ -92,7 +88,9 @@ BuildRequires: gcc6-c++ BuildRequires: gcc7-c++ %endif %endif +%if %{with lang} Recommends: %{name}-lang +%endif %description This package contains the data files of Akonadi, the KDE PIM storage @@ -176,11 +174,12 @@ Requires: boost-devel This package contains development files of Akonadi, the KDE PIM storage service. +%if %{with lang} %lang_package +%endif %prep %setup -q -n %{rname}-%{version} -%autopatch -p1 %build %if 0%{?suse_version} < 1330 diff --git a/fix-collection-detaching.patch b/fix-collection-detaching.patch deleted file mode 100644 index 98cc5e6..0000000 --- a/fix-collection-detaching.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 53ad3b6d73d92ea289cf0183c10e2b8a35c8127a Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Thu, 21 Mar 2019 23:37:36 +0100 -Subject: Fix collection detaching at the wrong time in attribute() - -Summary: -Found in FatCRM where changes to collection attributes were not stored -anymore. - -Test Plan: -New unittest to ensure that we get the attribute from the -detached collection, not from the original one. - -Reviewers: dvratil - -Reviewed By: dvratil - -Subscribers: kde-pim - -Tags: #kde_pim - -Differential Revision: https://phabricator.kde.org/D19741 ---- - autotests/libs/collectionattributetest.cpp | 15 +++++++++++++++ - autotests/libs/collectionattributetest.h | 1 + - src/core/collection.h | 8 ++------ - 3 files changed, 18 insertions(+), 6 deletions(-) - -diff --git a/autotests/libs/collectionattributetest.cpp b/autotests/libs/collectionattributetest.cpp -index e264a37..9c46561 100644 ---- a/autotests/libs/collectionattributetest.cpp -+++ b/autotests/libs/collectionattributetest.cpp -@@ -240,3 +240,18 @@ void CollectionAttributeTest::testCollectionIdentificationAttribute() - QCOMPARE(parsed.identifier(), id); - QCOMPARE(parsed.collectionNamespace(), ns); - } -+ -+void CollectionAttributeTest::testDetach() -+{ -+ // GIVEN a collection with an attribute -+ Collection col; -+ col.attribute(Akonadi::Collection::AddIfMissing); -+ Collection col2 = col; // and a copy, so that non-const access detaches -+ -+ // WHEN -+ TestAttribute *attr = col2.attribute(Akonadi::Collection::AddIfMissing); -+ TestAttribute *attr2 = col2.attribute(); -+ -+ // THEN -+ QCOMPARE(attr, attr2); -+} -diff --git a/autotests/libs/collectionattributetest.h b/autotests/libs/collectionattributetest.h -index 420df78..2afa9eb 100644 ---- a/autotests/libs/collectionattributetest.h -+++ b/autotests/libs/collectionattributetest.h -@@ -32,6 +32,7 @@ private Q_SLOTS: - void testDefaultAttributes(); - void testCollectionRightsAttribute(); - void testCollectionIdentificationAttribute(); -+ void testDetach(); - }; - - #endif -diff --git a/src/core/collection.h b/src/core/collection.h -index b5a496c..9c19cc9 100644 ---- a/src/core/collection.h -+++ b/src/core/collection.h -@@ -565,10 +565,10 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option) - Q_UNUSED(option); - - const T dummy; -+ markAttributesChanged(); - if (hasAttribute(dummy.type())) { - T *attr = dynamic_cast(attribute(dummy.type())); - if (attr) { -- markAttributesChanged(); - return attr; - } - //Reuse 5250 -@@ -585,14 +585,10 @@ template - inline T *Akonadi::Collection::attribute() const - { - const QByteArray type = T().type(); -+ const_cast(this)->markAttributesChanged(); - if (hasAttribute(type)) { - T *attr = dynamic_cast(attribute(type)); - if (attr) { -- // FIXME: This method returns a non-const pointer, so callers may still modify the -- // attribute. Unfortunately, just making this function return a const pointer and -- // creating a non-const overload does not work, as many users of this function abuse the -- // non-const pointer and modify the attribute even on a const object. -- const_cast(this)->markAttributesChanged(); - return attr; - } - //reuse 5250 --- -cgit v1.1 - diff --git a/fix-regression-when-updating-attributes.patch b/fix-regression-when-updating-attributes.patch deleted file mode 100644 index aac26b5..0000000 --- a/fix-regression-when-updating-attributes.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1d8851495bcfa6ff5d3fa35882b68fdf68b21a7f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -Date: Thu, 21 Mar 2019 13:22:58 +0100 -Subject: Fix a regression when updating attributes - -This fixes a regression introduced in 3a062e6a and 6054e42d where some -attributes were not sent to the Akonadi server in update job even though -they were modified. This was due to a bad API design which returns a -non-const pointer to an attribute from a const method, so callers sometimes -modify the returned attribute on a const object. Since the method itself -is const though, it did not mark the attribute as modified. - -Proper fix is to introduce a purely const and non-const overloads for -the attribute accessors, unfortunatelly this requires fixing a lot of our code -in many places first to not abuse the non-constness of the returned -attribute. - -Note that since the code is in an inlined method, all clients should be -recompiled. - -CCMAIL: faure@kde.org ---- - src/core/collection.h | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/core/collection.h b/src/core/collection.h -index 50c0926..b5a496c 100644 ---- a/src/core/collection.h -+++ b/src/core/collection.h -@@ -584,14 +584,19 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option) - template - inline T *Akonadi::Collection::attribute() const - { -- const T dummy; -- if (hasAttribute(dummy.type())) { -- T *attr = dynamic_cast(attribute(dummy.type())); -+ const QByteArray type = T().type(); -+ if (hasAttribute(type)) { -+ T *attr = dynamic_cast(attribute(type)); - if (attr) { -+ // FIXME: This method returns a non-const pointer, so callers may still modify the -+ // attribute. Unfortunately, just making this function return a const pointer and -+ // creating a non-const overload does not work, as many users of this function abuse the -+ // non-const pointer and modify the attribute even on a const object. -+ const_cast(this)->markAttributesChanged(); - return attr; - } - //reuse 5250 -- qWarning() << "Found attribute of unknown type" << dummy.type() -+ qWarning() << "Found attribute of unknown type" << type - << ". Did you forget to call AttributeFactory::registerAttribute()?"; - } - --- -cgit v1.1 -