diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-02-10 19:43:34 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-02-10 21:09:51 +0100 |
| commit | 972b3ec622b6c26162d4e557d1ae5d1bb8d5010d (patch) | |
| tree | 08deb8217ecb3499e0588986d9d081157c163c05 /app-office | |
| parent | kde-apps/akonadi: Fix README.gentoo with newer mariadb/akonadi (diff) | |
| download | gentoo-972b3ec622b6c26162d4e557d1ae5d1bb8d5010d.tar.gz gentoo-972b3ec622b6c26162d4e557d1ae5d1bb8d5010d.tar.bz2 gentoo-972b3ec622b6c26162d4e557d1ae5d1bb8d5010d.zip | |
app-office/kmymoney: Fix build with >=kde-apps/akonadi-21.12.0
EAPI-8 bump.
Closes: https://bugs.gentoo.org/831729
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch | 38 | ||||
| -rw-r--r-- | app-office/kmymoney/kmymoney-5.1.2.ebuild | 6 |
2 files changed, 42 insertions, 2 deletions
diff --git a/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch b/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch new file mode 100644 index 000000000000..2af212241ca6 --- /dev/null +++ b/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch @@ -0,0 +1,38 @@ +From a06d2fe154f755c3af1e7f261cd631929b9da998 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@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 + diff --git a/app-office/kmymoney/kmymoney-5.1.2.ebuild b/app-office/kmymoney/kmymoney-5.1.2.ebuild index 6ad28d6b1537..963c4c37aea9 100644 --- a/app-office/kmymoney/kmymoney-5.1.2.ebuild +++ b/app-office/kmymoney/kmymoney-5.1.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 EGIT_BRANCH="5.1" ECM_HANDBOOK="optional" @@ -81,6 +81,8 @@ DEPEND="${RDEPEND} " BDEPEND="virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${P}-akonadi-21.12.0.patch" ) + pkg_setup() { ecm_pkg_setup |