Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kjots for openSUSE:Factory checked in at 2022-04-01 21:36:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjots (Old) and /work/SRC/openSUSE:Factory/.kjots.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjots" Fri Apr 1 21:36:13 2022 rev:12 rq:966393 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2022-01-08 23:24:35.286279097 +0100 +++ /work/SRC/openSUSE:Factory/.kjots.new.1900/kjots.changes 2022-04-01 21:37:32.268554815 +0200 @@ -1,0 +2,8 @@ +Fri Apr 1 10:30:50 UTC 2022 - Wolfgang Bauer <[email protected]> + +- Add upstream patches to fix build with Akonadi 22.04: + * Fix-akonadi-includes.patch + * Fix-build-with-Akonadi-21.12.patch +- Drop redundant recommendation of the -lang package + +------------------------------------------------------------------- New: ---- Fix-akonadi-includes.patch Fix-build-with-Akonadi-21.12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjots.spec ++++++ --- /var/tmp/diff_new_pack.DTTUmF/_old 2022-04-01 21:37:32.668550428 +0200 +++ /var/tmp/diff_new_pack.DTTUmF/_new 2022-04-01 21:37:32.676550340 +0200 @@ -1,7 +1,7 @@ # # spec file for package kjots # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,9 @@ # PATCH-FIX-UPSTREAM Patch0: noteshared-add-missing-library-to-link-list.patch Patch1: Adapt-to-new-Akonadi-libraries.patch +# PATCH-FIX-UPSTREAM +Patch2: Fix-akonadi-includes.patch +Patch3: Fix-build-with-Akonadi-21.12.patch BuildRequires: extra-cmake-modules BuildRequires: update-desktop-files BuildRequires: cmake(Grantlee5) @@ -46,7 +49,6 @@ BuildRequires: cmake(KF5XmlGui) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5PrintSupport) -Recommends: %{name}-lang = %{version} %description This package contains KJOTS, a note taking application using Akonadi. ++++++ Fix-akonadi-includes.patch ++++++ >From b9d91006eb3ca1c6e495d0f3d1cc32775a26538c Mon Sep 17 00:00:00 2001 From: Nicolas Fella <[email protected]> Date: Tue, 1 Mar 2022 23:33:19 +0100 Subject: [PATCH] Fix akonadi includes --- src/kjotsmodel.cpp | 2 +- src/kjotswidget.cpp | 2 +- src/noteshared/notecreatorandselector.cpp | 2 +- src/noteshared/standardnoteactionmanager.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp index 99ee14f..48997a4 100644 --- a/src/kjotsmodel.cpp +++ b/src/kjotsmodel.cpp @@ -21,7 +21,7 @@ #include <AkonadiCore/ChangeRecorder> #include <AkonadiCore/EntityDisplayAttribute> #endif -#include <Akonadi/Notes/NoteUtils> +#include <Akonadi/NoteUtils> #include <KMime/Message> #include <KPIMTextEdit/TextUtils> diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp index 834fc33..bb4d018 100644 --- a/src/kjotswidget.cpp +++ b/src/kjotswidget.cpp @@ -34,7 +34,7 @@ #include <QDebug> // Akonadi -#include <Akonadi/Notes/NoteUtils> +#include <Akonadi/NoteUtils> #include <akonadi_version.h> #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) #include <Akonadi/AttributeFactory> diff --git a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp index 6d58c83..7518deb 100644 --- a/src/noteshared/notecreatorandselector.cpp +++ b/src/noteshared/notecreatorandselector.cpp @@ -24,7 +24,7 @@ #include <AkonadiCore/EntityTreeModel> #include <AkonadiCore/ItemCreateJob> #endif -#include <Akonadi/Notes/NoteUtils> +#include <Akonadi/NoteUtils> #include "noteshared_debug.h" diff --git a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp index 2a2f4ce..692b8a2 100644 --- a/src/noteshared/standardnoteactionmanager.cpp +++ b/src/noteshared/standardnoteactionmanager.cpp @@ -25,7 +25,7 @@ #include <AkonadiCore/CollectionModifyJob> #include <AkonadiCore/ItemModifyJob> #endif -#include <Akonadi/Notes/NoteUtils> +#include <Akonadi/NoteUtils> #include <KXmlGui/KActionCollection> #include <KLocalizedString> -- GitLab ++++++ Fix-build-with-Akonadi-21.12.patch ++++++ >From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Fri, 1 Apr 2022 08:00:34 +0000 Subject: [PATCH] Fix build with Akonadi 21.12 --- src/kjotsmodel.cpp | 4 ++++ src/kjotswidget.cpp | 6 +++++- src/noteshared/notecreatorandselector.cpp | 4 ++++ src/noteshared/standardnoteactionmanager.cpp | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp index 48997a4..66f791a 100644 --- a/src/kjotsmodel.cpp +++ b/src/kjotsmodel.cpp @@ -21,7 +21,11 @@ #include <AkonadiCore/ChangeRecorder> #include <AkonadiCore/EntityDisplayAttribute> #endif +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) #include <Akonadi/NoteUtils> +#else +#include <Akonadi/Notes/NoteUtils> +#endif #include <KMime/Message> #include <KPIMTextEdit/TextUtils> diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp index bb4d018..0332766 100644 --- a/src/kjotswidget.cpp +++ b/src/kjotswidget.cpp @@ -34,8 +34,12 @@ #include <QDebug> // Akonadi -#include <Akonadi/NoteUtils> #include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) +#include <Akonadi/NoteUtils> +#else +#include <Akonadi/Notes/NoteUtils> +#endif #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) #include <Akonadi/AttributeFactory> #include <Akonadi/CollectionCreateJob> diff --git a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp index 7518deb..bbc85ee 100644 --- a/src/noteshared/notecreatorandselector.cpp +++ b/src/noteshared/notecreatorandselector.cpp @@ -24,7 +24,11 @@ #include <AkonadiCore/EntityTreeModel> #include <AkonadiCore/ItemCreateJob> #endif +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) #include <Akonadi/NoteUtils> +#else +#include <Akonadi/Notes/NoteUtils> +#endif #include "noteshared_debug.h" diff --git a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp index 692b8a2..2807bae 100644 --- a/src/noteshared/standardnoteactionmanager.cpp +++ b/src/noteshared/standardnoteactionmanager.cpp @@ -25,7 +25,11 @@ #include <AkonadiCore/CollectionModifyJob> #include <AkonadiCore/ItemModifyJob> #endif +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) #include <Akonadi/NoteUtils> +#else +#include <Akonadi/Notes/NoteUtils> +#endif #include <KXmlGui/KActionCollection> #include <KLocalizedString> -- GitLab
