public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
Date: Sat, 13 Jul 2024 21:57:46 +0000 (UTC)	[thread overview]
Message-ID: <1720907688.2f564f978d22353c1fc71e8f9ca786ae6d1da99a.asturm@gentoo> (raw)

commit:     2f564f978d22353c1fc71e8f9ca786ae6d1da99a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 21:43:10 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 <asturm@gentoo.org>
+Date: Tue, 26 Mar 2024 13:23:51 +0100
+Subject: [PATCH] addressbook: Fix upstream's AkonadiCore prefix confusion
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ 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($<TARGET_PROPERTY:Qt${QT_VERSION_MAJOR}::Widgets,INTERFACE_I
+ 
+ if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND)
+     include_directories(
+-        $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES>
++        $<TARGET_PROPERTY:KPim${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES>
+         $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::Contacts,INTERFACE_INCLUDE_DIRECTORIES>
+ 
+         $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::CoreAddons,INTERFACE_INCLUDE_DIRECTORIES>
+-- 
+2.44.0
+


             reply	other threads:[~2024-07-13 21:57 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-13 21:57 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-25 14:43 [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ Andreas Sturmlechner
2023-12-25 21:53 Andreas Sturmlechner
2023-07-08 14:54 Andreas Sturmlechner
2022-01-18 16:01 Andreas Sturmlechner
2020-05-26 15:12 Andreas Sturmlechner
2020-04-19  7:59 Andreas Sturmlechner
2012-11-10 23:33 Andreas Hüttel
2012-09-19 19:13 Andreas Hüttel
2012-09-19 19:07 Andreas Hüttel
2012-08-11 15:08 Andreas Hüttel
2012-08-10 18:27 Chris Reffett
2011-07-27 20:52 Andreas Hüttel
2011-07-05 12:03 Andreas Hüttel
2011-07-05  7:11 Andreas Hüttel
2011-07-03  9:27 Andreas Hüttel
2011-06-03 21:18 Andreas Hüttel
2011-05-20 22:55 Andreas K. Huettel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1720907688.2f564f978d22353c1fc71e8f9ca786ae6d1da99a.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox