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 C1390158090 for ; Mon, 9 May 2022 00:13:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09200E08A2; Mon, 9 May 2022 00:13:55 +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 DCD3DE08A2 for ; Mon, 9 May 2022 00:13:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A373F3413DD for ; Mon, 9 May 2022 00:13:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 287E1389 for ; Mon, 9 May 2022 00:13:52 +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: <1652055221.f9d833272ef7ee42b6f9514fcac499b2dc691e3c.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.5.0.ebuild media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch X-VCS-Directories: media-gfx/digikam/ media-gfx/digikam/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f9d833272ef7ee42b6f9514fcac499b2dc691e3c X-VCS-Branch: master Date: Mon, 9 May 2022 00:13:52 +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: 845980b8-f8b3-46c5-85e1-eb3f21fedab5 X-Archives-Hash: e1611683ab57dea13ebeed206f3020b0 commit: f9d833272ef7ee42b6f9514fcac499b2dc691e3c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 9 00:07:28 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 9 00:13:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d83327 media-gfx/digikam: Fix build with kde-apps/akonadi-22.04.0 Closes: https://bugs.gentoo.org/841695 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-7.5.0.ebuild | 6 ++++- .../files/digikam-7.5.0-akonadi-22.04.0.patch | 28 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild b/media-gfx/digikam/digikam-7.5.0.ebuild index 1c774239c811..63edd26cbf88 100644 --- a/media-gfx/digikam/digikam-7.5.0.ebuild +++ b/media-gfx/digikam/digikam-7.5.0.ebuild @@ -106,7 +106,11 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-7.3.0-cmake.patch" + # upstream git master + "${FILESDIR}/${P}-akonadi-22.04.0.patch" +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch new file mode 100644 index 000000000000..a2933bc71d3f --- /dev/null +++ b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch @@ -0,0 +1,28 @@ +From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Fri, 22 Apr 2022 19:13:28 +0200 +Subject: [PATCH] Fix build with akonadi-contacts 22.04 + +--- + core/utilities/extrasupport/addressbook/akonadiiface.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp +index 6a78863cf6..8e65a405da 100644 +--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp ++++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp +@@ -49,7 +49,11 @@ + #include + #endif + ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80) ++#include ++#else + #include ++#endif + #include + + #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG) +-- +GitLab +