git: 1712e3f21205 - main - graphics/digikam: unbreak build after KDE PIM 23.04 (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 26 Apr 2023 09:08:01 UTC
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1712e3f212057b3892514e2ee9878b7863ca45cb commit 1712e3f212057b3892514e2ee9878b7863ca45cb Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2023-04-26 09:06:39 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2023-04-26 09:06:39 +0000 graphics/digikam: unbreak build after KDE PIM 23.04 (+) In KDE PIM 23.04 the KF5:: targets have been renamed to KPim5:: While the KF5:: targets are kept for backwards compatibility, they no longer recursively include other KF5:: targets. We need to search for Akonadi explicitly so that the KF5::AkonadiCore target is defined. Backport from: https://invent.kde.org/graphics/digikam/-/commit/5b4ba173f6a84a8be1131b1523dc42df95171ec7 --- graphics/digikam/files/patch-core_CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/graphics/digikam/files/patch-core_CMakeLists.txt b/graphics/digikam/files/patch-core_CMakeLists.txt index 42ed65623cb8..03bbfb53f083 100644 --- a/graphics/digikam/files/patch-core_CMakeLists.txt +++ b/graphics/digikam/files/patch-core_CMakeLists.txt @@ -1,4 +1,4 @@ ---- core/CMakeLists.txt.orig 2020-04-23 11:51:20 UTC +--- core/CMakeLists.txt.orig 2023-03-12 13:19:01 UTC +++ core/CMakeLists.txt @@ -10,6 +10,7 @@ APPLY_COMMON_POLICIES() @@ -8,7 +8,15 @@ message(STATUS "----------------------------------------------------------------------------------") message(STATUS "Check dependencies for ${PROJECT_NAME} version ${DIGIKAM_VERSION_STRING}") message(STATUS "") -@@ -341,8 +342,13 @@ endif() +@@ -132,6 +133,7 @@ if(ENABLE_AKONADICONTACTSUPPORT) + + find_package(KF5 ${AKONADI_MIN_VERSION} QUIET + OPTIONAL_COMPONENTS ++ Akonadi # We need to search for Akonadi explicitly so that the KF5::AkonadiCore target is defined after KDE PIM 23.04 + AkonadiContact # For KDE Mail Contacts support. + Contacts # API for contacts/address book data. + ) +@@ -379,8 +381,13 @@ endif() find_package(Doxygen) @@ -22,4 +30,4 @@ + link_directories(${LQR-1_LIBDIR}) endif() - # -- libgphoto2 rules ---------------------------------------------------------- + if(BUILD_WITH_CCACHE)