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 A2BEC1581C1 for ; Sat, 13 Jul 2024 21:57:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C092E2B77; Sat, 13 Jul 2024 21:57:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 73EA7E2A5D for ; Sat, 13 Jul 2024 21:57:49 +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 A6913343019 for ; Sat, 13 Jul 2024 21:57:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC85E1E0C for ; Sat, 13 Jul 2024 21:57:46 +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: <1720907688.2f564f978d22353c1fc71e8f9ca786ae6d1da99a.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/digikam/digikam-9999.ebuild media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch X-VCS-Directories: media-gfx/digikam/ media-gfx/digikam/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2f564f978d22353c1fc71e8f9ca786ae6d1da99a X-VCS-Branch: master Date: Sat, 13 Jul 2024 21:57:46 +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: f2afd92a-7c91-493d-9a59-15c911e8c6b1 X-Archives-Hash: 67d0b46c5e9239b510188d9d28b51a31 commit: 2f564f978d22353c1fc71e8f9ca786ae6d1da99a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 13 21:43:10 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 13 21:54:48 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2f564f97 media-gfx/digikam: Fix IUSE addressbook, still(!) broken upstream Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-9999.ebuild | 5 ++++- .../files/digikam-8.3.0-cmake-addressbook.patch | 26 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index 0f546c872d..0a06c8d6d0 100644 --- a/media-gfx/digikam/digikam-9999.ebuild +++ b/media-gfx/digikam/digikam-9999.ebuild @@ -102,7 +102,10 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-8.4.0-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-8.4.0-cmake.patch" + "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch b/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch new file mode 100644 index 0000000000..537a369904 --- /dev/null +++ b/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch @@ -0,0 +1,26 @@ +From 82ce7f02d65c43605c28b9ca69f8cbd7e12a5bee Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 26 Mar 2024 13:23:51 +0100 +Subject: [PATCH] addressbook: Fix upstream's AkonadiCore prefix confusion + +Signed-off-by: Andreas Sturmlechner +--- + core/utilities/extrasupport/addressbook/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/utilities/extrasupport/addressbook/CMakeLists.txt b/core/utilities/extrasupport/addressbook/CMakeLists.txt +index 5923f1fc34..23f31d01d8 100644 +--- a/core/utilities/extrasupport/addressbook/CMakeLists.txt ++++ b/core/utilities/extrasupport/addressbook/CMakeLists.txt +@@ -16,7 +16,7 @@ include_directories($ ++ $ + $ + + $ +-- +2.44.0 +