Date: Friday, April 22, 2022 @ 17:16:43 Author: arojas Revision: 443765
Rebuild with akonadi 22.04 Added: digikam/trunk/akonadi-22.04.patch Modified: digikam/trunk/PKGBUILD ---------------------+ PKGBUILD | 11 +++++++---- akonadi-22.04.patch | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-22 16:59:17 UTC (rev 443764) +++ PKGBUILD 2022-04-22 17:16:43 UTC (rev 443765) @@ -7,7 +7,7 @@ pkgname=digikam _pkgver=7.6.0 pkgver=${_pkgver//-/_} # for beta versions -pkgrel=1 +pkgrel=2 pkgdesc='An advanced digital photo management application' arch=(x86_64) license=(GPL) @@ -19,15 +19,18 @@ 'rawtherapee: RAW import' 'darktable: RAW import' 'perl: for digitaglinktree') source=(https://download.kde.org/stable/$pkgname/$pkgver/digiKam-$_pkgver.tar.xz{,.sig} - ffmpeg5.patch) + ffmpeg5.patch + akonadi-22.04.patch) sha256sums=('d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641' 'SKIP' - 'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee') + 'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee' + '595f7e971c4f9784046ab7bcba0983305b990bdc21e6257d9ec81b013aab1dc3') validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdevelo...@gmail.com> options=(debug) prepare() { - patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch + patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5 + patch -d $pkgname-$_pkgver -p1 < akonadi-22.04.patch # Fix build with akonadi 22.04 } build() { Added: akonadi-22.04.patch =================================================================== --- akonadi-22.04.patch (rev 0) +++ akonadi-22.04.patch 2022-04-22 17:16:43 UTC (rev 443765) @@ -0,0 +1,16 @@ +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)