summaryrefslogtreecommitdiff
path: root/media-gfx/digikam
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
committerV3n3RiX <venerix@koprulu.sector>2022-05-12 16:42:50 +0300
commit752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree330d16e6362a49cbed8875a777fe641a43376cd3 /media-gfx/digikam
parent0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
gentoo resync : 12.05.2022
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r--media-gfx/digikam/Manifest3
-rw-r--r--media-gfx/digikam/digikam-7.5.0.ebuild6
-rw-r--r--media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch28
3 files changed, 35 insertions, 2 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 51495925a6e8..c6153de02446 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,5 @@
AUX digikam-7.3.0-cmake.patch 4316 BLAKE2B 7da300081ad72f6a3c1f5dc4c5c04bbc67d5cc2b2a876dfe0c72dddde19274060c9f4fb8e723a9ebf023dbd1d7993ccfa96426a26ffd4bd736213a96058ad4df SHA512 a326826ff291e9facae55ad3bbc03e5d7173437c9b9734e3b48a5eb6c18ed2f3e1afcb44a3c0f3a2b77fb67f6d414da1dc03992fa9f70d7307e5864d66e2fff3
+AUX digikam-7.5.0-akonadi-22.04.0.patch 906 BLAKE2B 962e53ffd27428f41ee998b9bd6d94b4541d8f9d66e1e9005b071d8a6fc2250cd0f8cadd2685467c26d76f664dec98fcb0ce8737612d06bb57799097688be08a SHA512 44f33f77b327f384764d74aade0567560f2f8cf34f53a9391da42ade06b08d9edc858c8b48cb0f2677dce8fa195e31d866585ee287a49a765d3fd2f8d5ed3c41
DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B 26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6 SHA512 a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
-EBUILD digikam-7.5.0.ebuild 4024 BLAKE2B 9c929b011bb0eba32e13947561e9390f88f246e8281d5bb57043b6e0366315f5696501a10fe131b9472bd0fad78777af44837ec7f22d699ec4a2bfee391199b8 SHA512 35a6318c5ac3bd55e1c49d768967bd40cf5b60fe0db51426a9beba25f88e3abc3e79e37e8fc39c5743fcf9896bba225623c1ff36bdbf9b89cbad410c55764446
+EBUILD digikam-7.5.0.ebuild 4090 BLAKE2B def4db51d90f1340f1ae42ef814c96ae98b2f7e68957bb4e6b317716a5742172da9014d4101c2bf1c8fa657f74cbb659d440ab61ac4f6ce86f72ea6183674439 SHA512 03e0239f98618fe9614204e33a179431ea57e8825965cc62c786e63e88bb406599713c0b2b5bc21c72c5835d0f520641f4624c9cf7d013409c030311dfc7f37c
MISC metadata.xml 1166 BLAKE2B 022418e3ce42ac9ec248d5301d20786cd3ddedac61e85b934d9074d9e68fa9511720976620ae84dc2def3961fba307fa9c9d84e5bd90896da7b866b21dfbf7f9 SHA512 1e249e12495dcf72e0eb02f9fa7822112afba627a0b155a2188c382e69a3697cd186757484cd0f559a2985a83ace953a62cbb4e0afb4a6c9551d89053321b3c1
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 <arojas@archlinux.org>
+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 <AkonadiCore/Item>
+ #endif
+
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
++#include <Akonadi/ContactSearchJob>
++#else
+ #include <Akonadi/Contact/ContactSearchJob>
++#endif
+ #include <KContacts/Addressee>
+
+ #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
+--
+GitLab
+