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 34A78158086 for ; Sat, 18 Dec 2021 17:42:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6261AE077A; Sat, 18 Dec 2021 17:42:12 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC5DAE077A for ; Sat, 18 Dec 2021 17:42:11 +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 97400343384 for ; Sat, 18 Dec 2021 17:42:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F7B9219 for ; Sat, 18 Dec 2021 17:42:07 +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: <1639849133.61895f0899758028e72b7f9461177b34640e1683.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/digikam/digikam-7.3.0-r1.ebuild media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch X-VCS-Directories: media-gfx/digikam/files/ media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 61895f0899758028e72b7f9461177b34640e1683 X-VCS-Branch: master Date: Sat, 18 Dec 2021 17:42:07 +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: 5f50fae4-5adb-40e7-88df-cc3d6b020341 X-Archives-Hash: 95725b8847a162f36d4565c0db805fb6 commit: 61895f0899758028e72b7f9461177b34640e1683 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 18 17:36:15 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 18 17:38:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61895f08 media-gfx/digikam: Fix build with >=kde-apps/akonadi-contacts-21.12.0 Closes: https://bugs.gentoo.org/829539 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-7.3.0-r1.ebuild | 5 +++- .../files/digikam-7.3.0-akonadi-21.12.0.patch | 31 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild b/media-gfx/digikam/digikam-7.3.0-r1.ebuild index 7f3918113e25..46f064167d80 100644 --- a/media-gfx/digikam/digikam-7.3.0-r1.ebuild +++ b/media-gfx/digikam/digikam-7.3.0-r1.ebuild @@ -108,7 +108,10 @@ RDEPEND="${COMMON_DEPEND} panorama? ( media-gfx/hugin ) " -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-akonadi-21.12.0.patch" +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch new file mode 100644 index 000000000000..6e4dd25a4028 --- /dev/null +++ b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch @@ -0,0 +1,31 @@ +From 95a8ece964681fc6823e968541da2da2da06b3dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= +Date: Sat, 2 Oct 2021 21:50:04 +0300 +Subject: [PATCH] Fix compile for newer Akonadi Build Versions + +--- + core/utilities/extrasupport/addressbook/akonadiiface.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp +index 8e43dad0da..cb38036e39 100644 +--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp ++++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp +@@ -41,7 +41,14 @@ + #endif + + #include ++#include ++ ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include ++#else + #include ++#endif ++ + #include + #include + +-- +2.34.1 +