From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 268F715808B for ; Thu, 10 Feb 2022 20:26:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 455C6E07C7; Thu, 10 Feb 2022 20:24:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 692EDE0B4C for ; Thu, 10 Feb 2022 20:10:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9633342E64 for ; Thu, 10 Feb 2022 20:10:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5701C2D2 for ; Thu, 10 Feb 2022 20:10:12 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1644523791.972b3ec622b6c26162d4e557d1ae5d1bb8d5010d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/files/, app-office/kmymoney/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch app-office/kmymoney/kmymoney-5.1.2.ebuild X-VCS-Directories: app-office/kmymoney/ app-office/kmymoney/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 972b3ec622b6c26162d4e557d1ae5d1bb8d5010d X-VCS-Branch: master Date: Thu, 10 Feb 2022 20:10:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e137446a-f4bd-4a53-a5b8-2965ad682c7b X-Archives-Hash: 2fb88c00f95969a4951f7ec2e3471772 commit: 972b3ec622b6c26162d4e557d1ae5d1bb8d5010d Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 10 18:43:34 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 10 20:09:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972b3ec6 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 gentoo.org> .../files/kmymoney-5.1.2-akonadi-21.12.0.patch | 38 ++++++++++++++++++++++ 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?= +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 + #include ++#include ++#include ++ ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include ++#include ++#include ++#else + #include + #include + #include ++#endif ++ + #include + #include + #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