summaryrefslogtreecommitdiff
path: root/finance
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2022-05-23 17:23:00 +0200
committerTobias C. Berner <tcberner@FreeBSD.org>2022-05-23 17:33:34 +0200
commit783e985f0d557fd04b77243d400774153450b3f0 (patch)
tree79d41b26ef38a2497359f0b73016b96430894da9 /finance
parentgraphics/ksnip: update to 1.10.0 (diff)
deskutils/semantik: update to 1.2.8
Diffstat (limited to 'finance')
-rw-r--r--finance/kraft/files/patch-git_0001_14906b37-akonadi-5.1992
-rw-r--r--finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.0469
2 files changed, 0 insertions, 161 deletions
diff --git a/finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19 b/finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19
deleted file mode 100644
index bb2d20d9d35c..000000000000
--- a/finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19
+++ /dev/null
@@ -1,92 +0,0 @@
-From 3894d1d013310d9212c1df42dbde2161dec16645 Mon Sep 17 00:00:00 2001
-From: Klaas Freitag <kraft@freisturz.de>
-Date: Sat, 9 Oct 2021 12:00:44 +0200
-Subject: [PATCH 1/2] Merge pull request #116 from
- kossebau/prepareforakonadi2112
-
-Adapt to new Akonadi includes in Akonadi 5.19
----
- src/addressprovider_akonadi.cpp | 15 ++++++++++++++-
- src/addressprovider_akonadi.h | 8 +++++++-
- src/addressselectorwidget.cpp | 6 ++++++
- 3 files changed, 27 insertions(+), 2 deletions(-)
-
-diff --git src/addressprovider_akonadi.cpp src/addressprovider_akonadi.cpp
-index edb9d0c..4a809a8 100644
---- src/addressprovider_akonadi.cpp
-+++ src/addressprovider_akonadi.cpp
-@@ -21,16 +21,29 @@
- #include <QDebug>
-
- #ifdef HAVE_AKONADI
-+#include "akonadi/contact/contactsearchjob.h"
-+#include <akonadi_version.h>
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
-+#include <Akonadi/ItemFetchJob>
-+#include <Akonadi/ItemFetchScope>
-+
-+#include <Akonadi/CollectionFetchJob>
-+
-+#include <Akonadi/ItemFetchJob>
-+#include <Akonadi/ItemFetchScope>
-+#include <Akonadi/EntityDisplayAttribute>
-+#include <Akonadi/Control>
-+#else
- #include <AkonadiCore/ItemFetchJob>
- #include <AkonadiCore/ItemFetchScope>
-
--#include "akonadi/contact/contactsearchjob.h"
- #include <AkonadiCore/CollectionFetchJob>
-
- #include <AkonadiCore/ItemFetchJob>
- #include <AkonadiCore/ItemFetchScope>
- #include <AkonadiCore/entitydisplayattribute.h>
- #include <AkonadiCore/control.h>
-+#endif
-
- using namespace Akonadi;
- #endif
-diff --git src/addressprovider_akonadi.h src/addressprovider_akonadi.h
-index fde0f44..14f6aa2 100644
---- src/addressprovider_akonadi.h
-+++ src/addressprovider_akonadi.h
-@@ -25,9 +25,15 @@
-
- #ifdef HAVE_AKONADI
- #include <kjob.h>
-+#include <akonadi/contact/contactstreemodel.h>
-+#include <akonadi_version.h>
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
-+#include <Akonadi/Session>
-+#include <Akonadi/ChangeRecorder>
-+#else
- #include <AkonadiCore/session.h>
- #include <AkonadiCore/changerecorder.h>
--#include <akonadi/contact/contactstreemodel.h>
-+#endif
- #endif
-
- class QAbstractItemModel;
-diff --git src/addressselectorwidget.cpp src/addressselectorwidget.cpp
-index ad450c9..bf0c95d 100644
---- src/addressselectorwidget.cpp
-+++ src/addressselectorwidget.cpp
-@@ -37,9 +37,15 @@
- #include <kcontacts/contactgroup.h>
-
- #ifdef HAVE_AKONADI
-+#include <akonadi_version.h>
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
-+#include <Akonadi/EntityTreeModel>
-+#include <Akonadi/EntityTreeView>
-+#else
- #include <entitytreemodel.h>
- #include <entitytreeview.h>
- #endif
-+#endif
-
- /* ==================================================================== */
- AddressSortProxyModel::AddressSortProxyModel(AddressProvider *provider, QObject *parent)
---
-2.36.0
-
diff --git a/finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04 b/finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04
deleted file mode 100644
index ec5e40bef965..000000000000
--- a/finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04
+++ /dev/null
@@ -1,69 +0,0 @@
-From e492e3d78520ff02aa4626f447ab2eea97cab2cc Mon Sep 17 00:00:00 2001
-From: "Tobias C. Berner" <tcberner@FreeBSD.org>
-Date: Sun, 24 Apr 2022 17:45:57 +0200
-Subject: [PATCH 2/2] Fix build with akonadi-contacts 22.04
-
----
- src/addressprovider_akonadi.cpp | 7 ++++++-
- src/addressprovider_akonadi.h | 5 +++++
- src/addressselectorwidget.h | 7 ++++++-
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git src/addressprovider_akonadi.cpp src/addressprovider_akonadi.cpp
-index 4a809a8..33e232a 100644
---- src/addressprovider_akonadi.cpp
-+++ src/addressprovider_akonadi.cpp
-@@ -21,7 +21,12 @@
- #include <QDebug>
-
- #ifdef HAVE_AKONADI
--#include "akonadi/contact/contactsearchjob.h"
-+#include <AkonadiContact/akonadi-contact_version.h>
-+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0)
-+#include <AkonadiContact/akonadi/contactsearchjob.h>
-+#else
-+#include <akonadi/contact/contactsearchjob.h>
-+#endif
- #include <akonadi_version.h>
- #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
- #include <Akonadi/ItemFetchJob>
-diff --git src/addressprovider_akonadi.h src/addressprovider_akonadi.h
-index 14f6aa2..4130f8a 100644
---- src/addressprovider_akonadi.h
-+++ src/addressprovider_akonadi.h
-@@ -25,7 +25,12 @@
-
- #ifdef HAVE_AKONADI
- #include <kjob.h>
-+#include <AkonadiContact/akonadi-contact_version.h>
-+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0)
-+#include <AkonadiContact/akonadi/contactstreemodel.h>
-+#else
- #include <akonadi/contact/contactstreemodel.h>
-+#endif
- #include <akonadi_version.h>
- #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
- #include <Akonadi/Session>
-diff --git src/addressselectorwidget.h src/addressselectorwidget.h
-index cb3428e..7a661c6 100644
---- src/addressselectorwidget.h
-+++ src/addressselectorwidget.h
-@@ -23,9 +23,14 @@
- #include <QSplitter>
-
- #ifdef HAVE_AKONADI
-+#include <AkonadiContact/akonadi-contact_version.h>
-+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0)
-+#include <AkonadiContact/Akonadi/ContactViewer>
-+#include <AkonadiContact/Akonadi/ContactEditorDialog>
-+#else
- #include <Akonadi/Contact/ContactViewer>
- #include <Akonadi/Contact/ContactEditorDialog>
--
-+#endif
- #endif
-
- #include <kcontacts/addressee.h>
---
-2.36.0
-