From ac1b8244d626d799930e520ae41ea8c7697e6e0a5890ccd780d1d0fd1b79661c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 27 Feb 2024 21:47:58 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 220 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=c766bdc06ad232941e19d99960c17929 --- digikam.changes | 5 +++++ digikam.spec | 14 +------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/digikam.changes b/digikam.changes index 3640aa2..5b6815c 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 26 22:17:07 UTC 2024 - Christophe Marin + +- Drop the KDE PIM build dependencies until digikam starts using Qt6 + ------------------------------------------------------------------- Mon Jan 15 14:52:32 UTC 2024 - Wolfgang Bauer diff --git a/digikam.spec b/digikam.spec index f61706e..7a601a1 100644 --- a/digikam.spec +++ b/digikam.spec @@ -35,9 +35,6 @@ 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: extra-cmake-modules BuildRequires: fdupes @@ -171,17 +168,8 @@ The main digikam libraries that are being shared between showfoto and digikam %prep %autosetup -p1 -%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#KF${QT_VERSION_MAJOR}::AkonadiCore#KPim${QT_VERSION_MAJOR}::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#KF${QT_VERSION_MAJOR}\([:]*Akonadi\)#KPim${QT_VERSION_MAJOR}\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 \ +%{cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON -DENABLE_KFILEMETADATASUPPORT=ON -DENABLE_AKONADICONTACTSUPPORT=OFF \ -DSSE3_FOUND=OFF -DSSSE3_FOUND=OFF -DSSE4_1_FOUND=OFF -DSSE4_2_FOUND=OFF \ %ifarch x86_64 %{?x86_64} -DSSE2_FOUND=ON