diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /app-office/kmymoney | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'app-office/kmymoney')
| -rw-r--r-- | app-office/kmymoney/Manifest | 3 | ||||
| -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-r1.ebuild (renamed from app-office/kmymoney/kmymoney-5.1.2.ebuild) | 8 |
3 files changed, 45 insertions, 4 deletions
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest index 55542a0bfa4a..584c6b53e464 100644 --- a/app-office/kmymoney/Manifest +++ b/app-office/kmymoney/Manifest @@ -1,3 +1,4 @@ +AUX kmymoney-5.1.2-akonadi-21.12.0.patch 1170 BLAKE2B e23115c09e36d1c57f9bd315ce305d27756165eae8f0293387b47c3b167ba05dd420301bd644bd4e90550ccf1a94198763296eaf2ad008ef8c6572d4e1295e69 SHA512 440d55bad9ccd4fe5b9346d755feec403d0ab067b6aa86195b07c4923a332e546b7dc7336301604fb82bb21abe987c63fc26be7d8da4d6df87fc0958afc8a2a6 DIST kmymoney-5.1.2.tar.xz 12640912 BLAKE2B 72abd190914eef258e6745ca9835de14bdb2060b0d025f8bdb1bc0e12b773fc891b143fe36adb8b7afcc86498601f6e1a7f9485f9a11c875f4c75bfe01d93738 SHA512 38c60998be4e3ffb49091eb2085b293c2d5265f6582e980d2dc60a66a00862b6afd3e2152c752a9fb14a7bf8b6255a0c39b69b65e2f5c976f23d965e3a1cdf46 -EBUILD kmymoney-5.1.2.ebuild 3865 BLAKE2B e9bd3badb3fae742a3f599fcf5408fd6c7c0edc1a60d4df444523e5f901b26bdd3e26a8ebdc255e48e84d267d72e83cadfa996f2a5bee14ba8d18ee47ae8b6a1 SHA512 635023f3c1abf7ff3373d9f35d662e7842bde44c58ac4e77dce1822262ba58f8a9f215e373e8b1a5b77fefe7942c12f9b7865ad267968a677d8fecaf0da8e345 +EBUILD kmymoney-5.1.2-r1.ebuild 3921 BLAKE2B ac3177a99ccee4a7bdc4dbcfaf526436110062e2f14c4f135b133c051e91b1131978a87066cb19e76d4aef9a0d55891e3250a68eae03e27847fbcc4a51884ef4 SHA512 1bfdad853d3ad1d7c58eb1e4e72ceaae04574bdf6a4b412214ddeab187540d61ea7fd341254211a692ce80a315bf1bdc7bf82a8dc86dfb761d61f8bbfe3f923c MISC metadata.xml 681 BLAKE2B 453cabf72a1e3623123e61e00fdbc589b9b46052fb2ac5b8baaea0bccd8b0fec522eb685ca6846cc273935532ff938c94b7204b4c5c5c828ef48bb07f54d9bef SHA512 4027bcb02e1b2736c8de15aac851c7b44374020ee06794c7a8460f0a580a2cf0fd3b7af5407f915589a2245f3cedd2bc942a838fff8a6622f132893bfcd0e492 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-r1.ebuild index 6ad28d6b1537..44c995198e83 100644 --- a/app-office/kmymoney/kmymoney-5.1.2.ebuild +++ b/app-office/kmymoney/kmymoney-5.1.2-r1.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" @@ -26,7 +26,7 @@ IUSE="activities addressbook calendar hbci holidays" [[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental" RDEPEND=" - >=app-crypt/gpgme-1.7.1-r1[cxx] + >=app-crypt/gpgme-1.7.1-r1:=[cxx] >=app-office/libalkimia-7.0.0:= dev-db/sqlcipher dev-libs/gmp:0=[cxx(+)] @@ -81,6 +81,8 @@ DEPEND="${RDEPEND} " BDEPEND="virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${P}-akonadi-21.12.0.patch" ) + pkg_setup() { ecm_pkg_setup |