pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1106031 from KDE:Extra

Browse Source 
- Adapt once again to the build system changes in akonadi*
  packages
- Add patch:
  * 0001-Look-for-each-akonadi-component-separately.patch

- Add the optional libpulse dependency (boo#1210750)

OBS-URL: https://build.opensuse.org/request/show/1106031
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=216
This commit is contained in:
Ana Guerrero 2023-08-28 15:14:15 +00:00 committed by Git OBS Bridge
commit 144c86cbd7
3 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-Look-for-each-akonadi-component-separately.patch Normal file
View File

@ -0,0 +1,32 @@
From 969e9b89dce08fc1e5a1b8991f17d57b1abf5450 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe@krop.fr>
Date: Sat, 26 Aug 2023 12:14:25 +0200
Subject: [PATCH] Look for each akonadi component separately
---
core/cmake/rules/RulesKDEFramework.cmake | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
index 6100334..8a18288 100644
--- a/core/cmake/rules/RulesKDEFramework.cmake
+++ b/core/cmake/rules/RulesKDEFramework.cmake
@@ -37,12 +37,9 @@ endif()
if(ENABLE_AKONADICONTACTSUPPORT)
- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
- OPTIONAL_COMPONENTS
- Akonadi
- AkonadiContact # For KDE Mail Contacts support.
- Contacts # API for contacts/address book data.
- )
+ find_package(KF5Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
+ find_package(KF5AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
+ find_package(KF5Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data.
endif()
--
2.41.0

13
digikam.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sat Aug 26 10:01:13 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Adapt once again to the build system changes in akonadi*
packages
- Add patch:
* 0001-Look-for-each-akonadi-component-separately.patch
-------------------------------------------------------------------
Wed Aug 9 10:19:20 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Add the optional libpulse dependency (boo#1210750)
-------------------------------------------------------------------
Fri Jul 28 05:34:21 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>

14
digikam.spec
View File

@ -30,9 +30,14 @@ Source0: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{ver
Source1: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz.sig
Source2: %{name}.keyring
%endif
# PATCH-FIX-OPENSUSE
Patch0: 0001-Look-for-each-akonadi-component-separately.patch
# QtWebEngine is not available on ppc and zSystems
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{riscv}
BuildRequires: QtAV-devel >= 1.12
# Don't use the CMake target names for these two dependencies
BuildRequires: akonadi-contact-devel
BuildRequires: akonadi-server-devel
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
@ -51,7 +56,6 @@ BuildRequires: doxygen
BuildRequires: graphviz-devel
BuildRequires: cmake(KF5DocTools)
%endif
BuildRequires: cmake(KF5AkonadiContact)
BuildRequires: cmake(KF5CalendarCore)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5Contacts)
@ -97,6 +101,8 @@ BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libgphoto2) >= 2.4.0
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libswresample)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
@ -163,10 +169,14 @@ The main digikam libraries that are being shared between showfoto and digikam
%prep
%autosetup -p1
%if %{pkg_vcmp cmake(KF5AkonadiContact) >= 23.03.80}
%if %{pkg_vcmp akonadi-contact-devel >= 23.03.80}
# Digikam doesn't look explicitly for akonadi-server but relies on AkonadiContact dependencies
sed -i 's#KF5::AkonadiCore#KPim5::AkonadiCore#' core/utilities/extrasupport/addressbook/CMakeLists.txt
%endif
# Compatibility CMake files were removed in PIM packages after 23.08.0
%if %{pkg_vcmp akonadi-contact-devel >= 23.08.0}
sed -i 's#KF5\([:]*Akonadi\)#KPim5\1#' core/{CMakeLists.txt,utilities/extrasupport/{addressbook/,}CMakeLists.txt,app/DigikamCoreTarget.cmake,cmake/rules/RulesKDEFramework.cmake}
%endif
%build
%{cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON -DENABLE_KFILEMETADATASUPPORT=ON -DENABLE_AKONADICONTACTSUPPORT=ON \