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-01-08 23:23:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjots (Old) and /work/SRC/openSUSE:Factory/.kjots.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjots" Sat Jan 8 23:23:53 2022 rev:11 rq:944836 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2021-06-29 22:43:54.030924382 +0200 +++ /work/SRC/openSUSE:Factory/.kjots.new.1892/kjots.changes 2022-01-08 23:24:35.286279097 +0100 @@ -1,0 +2,7 @@ +Tue Nov 30 14:53:36 UTC 2021 - Wolfgang Bauer <wba...@tmo.at> + +- Add upstream patches to fix build with Akonadi 21.12: + * noteshared-add-missing-library-to-link-list.patch + * Adapt-to-new-Akonadi-libraries.patch + +------------------------------------------------------------------- New: ---- Adapt-to-new-Akonadi-libraries.patch noteshared-add-missing-library-to-link-list.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjots.spec ++++++ --- /var/tmp/diff_new_pack.fZ8APL/_old 2022-01-08 23:24:35.798279516 +0100 +++ /var/tmp/diff_new_pack.fZ8APL/_new 2022-01-08 23:24:35.802279519 +0100 @@ -24,6 +24,9 @@ Group: System/GUI/KDE URL: https://userbase.kde.org/KJots/ Source0: https://download.kde.org/stable/kjots/%{version}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: noteshared-add-missing-library-to-link-list.patch +Patch1: Adapt-to-new-Akonadi-libraries.patch BuildRequires: extra-cmake-modules BuildRequires: update-desktop-files BuildRequires: cmake(Grantlee5) @@ -51,7 +54,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build ++++++ Adapt-to-new-Akonadi-libraries.patch ++++++ >From 581548a1de9449efc0c77e9ac85c23066bac983e Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" <kosse...@kde.org> Date: Wed, 8 Sep 2021 00:58:25 +0200 Subject: [PATCH] Adapt to new Akonadi libraries includes using the C++ namespace as prefix GIT_SILENT --- src/kjotsedit.cpp | 5 +++++ src/kjotsmodel.cpp | 6 ++++++ src/kjotsmodel.h | 6 ++++++ src/kjotswidget.cpp | 20 +++++++++++++++++++- src/kjotswidget.h | 5 +++++ src/noteshared/notecreatorandselector.cpp | 7 +++++++ src/noteshared/notecreatorandselector.h | 6 ++++++ src/noteshared/notelockattribute.h | 6 ++++++ src/noteshared/notepinattribute.h | 6 ++++++ src/noteshared/standardnoteactionmanager.cpp | 8 ++++++++ src/noteshared/standardnoteactionmanager.h | 9 +++++++-- src/notesortproxymodel.cpp | 5 +++++ 12 files changed, 86 insertions(+), 3 deletions(-) diff --git a/src/kjotsedit.cpp b/src/kjotsedit.cpp index f1d61bd..c20bc42 100644 --- a/src/kjotsedit.cpp +++ b/src/kjotsedit.cpp @@ -33,7 +33,12 @@ #include <KPIMTextEdit/RichTextComposerActions> #include <KPIMTextEdit/RichTextComposerImages> +#include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/Item> +#else #include <AkonadiCore/Item> +#endif #include "kjotslinkdialog.h" #include "kjotsmodel.h" diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp index e35c94f..99ee14f 100644 --- a/src/kjotsmodel.cpp +++ b/src/kjotsmodel.cpp @@ -13,8 +13,14 @@ #include <QTextDocument> #include <QIcon> +#include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/ChangeRecorder> +#include <Akonadi/EntityDisplayAttribute> +#else #include <AkonadiCore/ChangeRecorder> #include <AkonadiCore/EntityDisplayAttribute> +#endif #include <Akonadi/Notes/NoteUtils> #include <KMime/Message> diff --git a/src/kjotsmodel.h b/src/kjotsmodel.h index 71e0ca6..ec564a7 100644 --- a/src/kjotsmodel.h +++ b/src/kjotsmodel.h @@ -10,7 +10,13 @@ #ifndef KJOTSMODEL_H #define KJOTSMODEL_H +#include <akonadi_version.h> +#include <QtGlobal> // for QT_VERSION_CHECK +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/EntityTreeModel> +#else #include <AkonadiCore/EntityTreeModel> +#endif class QTextDocument; diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp index 3a3abd0..834fc33 100644 --- a/src/kjotswidget.cpp +++ b/src/kjotswidget.cpp @@ -35,6 +35,24 @@ // Akonadi #include <Akonadi/Notes/NoteUtils> +#include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/AttributeFactory> +#include <Akonadi/CollectionCreateJob> +#include <Akonadi/CollectionDeleteJob> +#include <Akonadi/ChangeRecorder> +#include <Akonadi/EntityDisplayAttribute> +#include <Akonadi/EntityMimeTypeFilterModel> +#include <Akonadi/Item> +#include <Akonadi/ItemCreateJob> +#include <Akonadi/ItemModifyJob> +#include <Akonadi/ItemDeleteJob> +#include <Akonadi/ItemFetchScope> +#include <Akonadi/EntityOrderProxyModel> +#include <Akonadi/EntityTreeView> +#include <Akonadi/ETMViewStateSaver> +#include <Akonadi/ControlGui> +#else #include <AkonadiCore/AttributeFactory> #include <AkonadiCore/CollectionCreateJob> #include <AkonadiCore/CollectionDeleteJob> @@ -50,7 +68,7 @@ #include <AkonadiWidgets/EntityTreeView> #include <AkonadiWidgets/ETMViewStateSaver> #include <AkonadiWidgets/ControlGui> - +#endif // Grantlee #include <grantlee/template.h> #include <grantlee/engine.h> diff --git a/src/kjotswidget.h b/src/kjotswidget.h index 7fe91ed..00a41b5 100644 --- a/src/kjotswidget.h +++ b/src/kjotswidget.h @@ -18,7 +18,12 @@ #include <QAbstractItemDelegate> #include <QPrinter> +#include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/Collection> +#else #include <AkonadiCore/Collection> +#endif #include <grantlee/templateloader.h> diff --git a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp index 2172cbf..6d58c83 100644 --- a/src/noteshared/notecreatorandselector.cpp +++ b/src/noteshared/notecreatorandselector.cpp @@ -14,9 +14,16 @@ #include <KMime/Message> +#include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/EntityDisplayAttribute> +#include <Akonadi/EntityTreeModel> +#include <Akonadi/ItemCreateJob> +#else #include <AkonadiCore/EntityDisplayAttribute> #include <AkonadiCore/EntityTreeModel> #include <AkonadiCore/ItemCreateJob> +#endif #include <Akonadi/Notes/NoteUtils> #include "noteshared_debug.h" diff --git a/src/noteshared/notecreatorandselector.h b/src/noteshared/notecreatorandselector.h index 90055cf..986d042 100644 --- a/src/noteshared/notecreatorandselector.h +++ b/src/noteshared/notecreatorandselector.h @@ -14,8 +14,14 @@ #include <QItemSelectionModel> #include <QTimer> +#include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/Collection> +#include <Akonadi/Item> +#else #include <AkonadiCore/Collection> #include <AkonadiCore/Item> +#endif class KJob; diff --git a/src/noteshared/notelockattribute.h b/src/noteshared/notelockattribute.h index 9bdd8a2..b0ee819 100644 --- a/src/noteshared/notelockattribute.h +++ b/src/noteshared/notelockattribute.h @@ -11,7 +11,13 @@ #ifndef KJOTS_LOCK_ATTRIBUTE_H #define KJOTS_LOCK_ATTRIBUTE_H +#include <akonadi_version.h> +#include <QtGlobal> // for QT_VERSION_CHECK +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/Attribute> +#else #include <AkonadiCore/Attribute> +#endif namespace NoteShared { diff --git a/src/noteshared/notepinattribute.h b/src/noteshared/notepinattribute.h index 3026dea..5f3903c 100644 --- a/src/noteshared/notepinattribute.h +++ b/src/noteshared/notepinattribute.h @@ -9,7 +9,13 @@ #ifndef NOTE_PIN_ATTRIBUTE_H #define NOTE_PIN_ATTRIBUTE_H +#include <akonadi_version.h> +#include <QtGlobal> // for QT_VERSION_CHECK +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/Attribute> +#else #include <AkonadiCore/Attribute> +#endif namespace NoteShared { diff --git a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp index a3f4b8b..2a2f4ce 100644 --- a/src/noteshared/standardnoteactionmanager.cpp +++ b/src/noteshared/standardnoteactionmanager.cpp @@ -13,10 +13,18 @@ #include <QColorDialog> #include <QItemSelectionModel> +#include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/EntityDisplayAttribute> +#include <Akonadi/EntityTreeModel> +#include <Akonadi/CollectionModifyJob> +#include <Akonadi/ItemModifyJob> +#else #include <AkonadiCore/EntityDisplayAttribute> #include <AkonadiCore/EntityTreeModel> #include <AkonadiCore/CollectionModifyJob> #include <AkonadiCore/ItemModifyJob> +#endif #include <Akonadi/Notes/NoteUtils> #include <KXmlGui/KActionCollection> diff --git a/src/noteshared/standardnoteactionmanager.h b/src/noteshared/standardnoteactionmanager.h index fe80dae..6605820 100644 --- a/src/noteshared/standardnoteactionmanager.h +++ b/src/noteshared/standardnoteactionmanager.h @@ -10,10 +10,15 @@ #ifndef AKONADI_STANDARDNOTESACTIONMANAGER_H #define AKONADI_STANDARDNOTESACTIONMANAGER_H -#include <AkonadiWidgets/StandardActionManager> - #include <QObject> +#include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/StandardActionManager> +#else +#include <AkonadiWidgets/StandardActionManager> +#endif + class QAction; class KActionCollection; class QItemSelectionModel; diff --git a/src/notesortproxymodel.cpp b/src/notesortproxymodel.cpp index 89def1c..dbe582f 100644 --- a/src/notesortproxymodel.cpp +++ b/src/notesortproxymodel.cpp @@ -8,7 +8,12 @@ #include "notesortproxymodel.h" +#include <akonadi_version.h> +#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) +#include <Akonadi/EntityTreeModel> +#else #include <AkonadiCore/EntityTreeModel> +#endif #include "noteshared/notepinattribute.h" -- GitLab ++++++ noteshared-add-missing-library-to-link-list.patch ++++++ >From 3d3cee8caeec813802a1af54c14805203fb1ddf6 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" <kosse...@kde.org> Date: Tue, 7 Sep 2021 23:21:34 +0200 Subject: [PATCH] noteshared: add missing library to link list GIT_SILENT --- src/noteshared/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/noteshared/CMakeLists.txt b/src/noteshared/CMakeLists.txt index 5de60ab..6aa0b0a 100644 --- a/src/noteshared/CMakeLists.txt +++ b/src/noteshared/CMakeLists.txt @@ -16,6 +16,7 @@ target_link_libraries(noteshared Qt5::Core Qt5::Widgets KF5::I18n + KF5::AkonadiWidgets KF5::AkonadiCore KF5::AkonadiNotes KF5::XmlGui -- GitLab
