Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmymoney for openSUSE:Factory checked in at 2021-12-01 20:47:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmymoney (Old) and /work/SRC/openSUSE:Factory/.kmymoney.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmymoney" Wed Dec 1 20:47:08 2021 rev:76 rq:934835 version:5.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kmymoney/kmymoney.changes 2021-10-04 18:42:38.410318262 +0200 +++ /work/SRC/openSUSE:Factory/.kmymoney.new.31177/kmymoney.changes 2021-12-02 02:15:39.410589011 +0100 @@ -1,0 +2,6 @@ +Tue Nov 30 16:34:37 UTC 2021 - Wolfgang Bauer <wba...@tmo.at> + +- Add Fix-compile-for-Newer-Akonadi-Builds.patch to fix build with + Akonadi 21.12 + +------------------------------------------------------------------- New: ---- Fix-compile-for-Newer-Akonadi-Builds.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmymoney.spec ++++++ --- /var/tmp/diff_new_pack.RqBd1q/_old 2021-12-02 02:15:40.002587205 +0100 +++ /var/tmp/diff_new_pack.RqBd1q/_new 2021-12-02 02:15:40.002587205 +0100 @@ -34,6 +34,8 @@ # PATCH-FIX-UPSTREAM Patch0: 0001-Remove-unused-variable-definition.patch Patch1: 0002-Fix-build-with-newer-Gwenhywfar-versions.patch +# PATCH-FIX-UPSTREAM +Patch2: Fix-compile-for-Newer-Akonadi-Builds.patch BuildRequires: doxygen BuildRequires: extra-cmake-modules BuildRequires: fdupes ++++++ Fix-compile-for-Newer-Akonadi-Builds.patch ++++++ >From a06d2fe154f755c3af1e7f261cd631929b9da998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omeru...@gmail.com> Date: Sat, 2 Oct 2021 22:16:06 +0300 Subject: [PATCH] Fix Compile for Newer Akonadi Builds --- kmymoney/mymoney/mymoneycontact.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kmymoney/mymoney/mymoneycontact.cpp b/kmymoney/mymoney/mymoneycontact.cpp index acc3575ef..a32357290 100644 --- a/kmymoney/mymoney/mymoneycontact.cpp +++ b/kmymoney/mymoney/mymoneycontact.cpp @@ -8,11 +8,20 @@ #include "mymoneycontact.h" #ifdef ENABLE_ADDRESSBOOK -#include <KIdentityManagement/IdentityManager> #include <KIdentityManagement/Identity> +#include <KIdentityManagement/IdentityManager> +#include <akonadi_version.h> + +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/Collection> +#include <Akonadi/ItemFetchScope> +#include <Akonadi/RecursiveItemFetchJob> +#else #include <AkonadiCore/RecursiveItemFetchJob> #include <AkonadiCore/ItemFetchScope> #include <AkonadiCore/Collection> +#endif + #include <KContacts/Addressee> #include <QRegularExpression> #endif -- GitLab
