Compare commits

..

No commits in common. "factory" and "factory" have entirely different histories.

7 changed files with 168 additions and 160 deletions

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(-)
Index: digikam-8.4.0/core/cmake/rules/RulesKDEFramework.cmake
===================================================================
--- digikam-8.4.0.orig/core/cmake/rules/RulesKDEFramework.cmake
+++ digikam-8.4.0/core/cmake/rules/RulesKDEFramework.cmake
@@ -51,15 +51,9 @@ if(ENABLE_AKONADICONTACTSUPPORT)
find_package(KPim${QT_VERSION_MAJOR}AkonadiContactCore ${AKONADI_MIN_VERSION} QUIET)
else()
-
- find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
- OPTIONAL_COMPONENTS
- Akonadi
- AkonadiContact # For KDE Mail Contacts support.
- Contacts # API for contacts/address book data.
- )
- find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
- find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET)
+ find_package(KF${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
+ find_package(KF${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
+ find_package(KF${QT_VERSION_MAJOR}Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data.
endif()

3
digiKam-8.4.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53c8aca5a2f660173e29a860d8b13844bd0ec748ef3f618c42f7689476494481
size 58025616

16
digiKam-8.4.0.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmaRkEgACgkQSnd0e8I4
blD6dBAAp6RaMFzrZqIAhqD89/YRcNda/z3WQuUAkQOkheD7EdP6iLHZ37JJ3LYo
KLtgmM3q3LstaArDKjyXV1LqFXyqDdKvaGLHhix9dANrpyh9Z8xL3GAoxoPk04bO
d9qNqoi8vfguxHmHoloQd3CPTZXgox4ex/NCfqjAEMfBzL8dC0kR9y+azh3o3ybN
QnAzcTGD5QXF4dt802vMgvfEMFfX04uAM9spHNWe7mE/4+evfcPv++X+vsd/rTI8
/gykvqfsY3ah58jbNdVdWdvc6DJggAhCt2AnTieCSVOn/NByK3Z39ep/WqRemzj/
ijhWO+5TcAkIc73/KWFFLdNDrshOPUmErxLTdgQd3dXlcEmkJasJnMvVKRwiU8Dz
vJ//9eJPsHeQ9/33+Rcb4EE3f/RoJH2/usDNjMID1x6CkqcTxaz4u0jeDiYv9f5+
CeH1k7b3aDcAStXozrdiQa5hRwmjjScEiHvTz5SLPcvItXKUOm39a5JfJPQVQjbh
PwdL4JfskjRQfu4BV9uvyFIeK2cVOzm5BJYTIjZV/YEa8wyFuc4UHelizoIoMJl2
tjE6zxiZboLkISlp6CFyypn6lGdf3CrB1FE25/SBaBUgzovlyyHVdQqWRvSka7Zq
z0pgX9ja5ZAcYnXAanADDHsXe1rQPS1rHq1XerHQQSto4q1gfho=
=fF/7
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c4eaafbca59425a0fe8cb41e7d7a08446defbbb967528bb1148aed0e0d0e975
size 62028432

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmc3hwsACgkQSnd0e8I4
blAs0A/9Hg46M+Kt7k5dXGktOSgMMqXybXV7VNXf7TvdrkSKKQW3g415neI/XF2i
q5Yzkk4ANwjXx2+/0AL5u+Sap2zHnumKcvQYW0j9jUZU0GTbw5v0Ii9CJc3rPG/d
MKYF/FU0VSxY/iAuCBuwheFXATl3DyGCoFGh5TrbSxYDo6LQTHUL2Lo6qiRzC/50
Fa6aApyTPin0gbZ641sRjulaMRQdxY0cYl/ygZLKuc5l2A2DVY/UFMz5jERGZLad
FZqTEwTdqJt1yvYoVU81ZTkylRWk8EpnUUjlgS11ARFiHh6uTviuyy6NU/jAlrLW
36SGF0H5CfImHqorS+ekOzcK1CtCzOorcwjgc9emzQplTkRdAiuLLfoKDj7BlLKG
RZc0ZCSDPEklASCnQpRT0+DtG4kjXEpURxkJdBhPownDrBCfWgELNVrWI1GpWxy/
SzQEltbWzZ+ZTXox+KUvB9+c5Yb/yt7YFzI5koo62luWcYqSbuKp14RnXtgZRvaJ
4tVRHZOFbKHb13pL+tQkllFPfd7O7hih1sn+X3ctO2nTo1+s9Lfi11/sUMT2ialS
2mZMwpCEP45ZOjmudT5x6k1oi/3pX9bs0PAr79wkVw1sshboY5/lo+fvjfednPJi
zzXkX+D2CCKvmGSddtdm5l6R+xE2RwCpdYGTQ2FPg3Lg+/2gu9M=
=Go7E
-----END PGP SIGNATURE-----

View File

@ -1,17 +1,3 @@
-------------------------------------------------------------------
Wed Nov 20 18:06:36 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Stop using the %suse_update_desktop_file macro
-------------------------------------------------------------------
Sun Nov 17 13:04:59 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 8.5.0
https://www.digikam.org/news/2024-11-16-8.5.0_release_announcement/
- Use Qt 6 to build Digikam
- Drop patch, no longer needed:
* 0001-Look-for-each-akonadi-component-separately.patch
-------------------------------------------------------------------
Wed Jul 31 17:32:54 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -16,77 +16,80 @@
#
%define kf6_version 6.0.0
%define qt6_version 6.4.0
%define soversion 8_5_0
%define soversion 8_4_0
%bcond_without released
%bcond_with apidocs
Name: digikam
Version: 8.5.0
Version: 8.4.0
Release: 0
Summary: A KDE Photo Manager
License: GPL-2.0-or-later
URL: https://www.digikam.org/
Source0: https://download.kde.org/stable/digikam/%{version}/digiKam-%{version}.tar.xz
Source0: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/digikam/%{version}/digiKam-%{version}.tar.xz.sig
Source2: digikam.keyring
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: bison
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: hicolor-icon-theme
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: lensfun
BuildRequires: libboost_graph-devel
BuildRequires: libeigen3-devel
BuildRequires: libexiv2-devel >= 0.27.1
BuildRequires: liblqr-devel
BuildRequires: libtiff-devel
BuildRequires: opencv-devel
BuildRequires: pkgconfig
BuildRequires: qt6-gui-private-devel >= %{qt6_version}
BuildRequires: cmake(KF6CalendarCore) >= %{kf6_version}
BuildRequires: cmake(KF6Config) >= %{kf6_version}
BuildRequires: cmake(KF6Contacts) >= %{kf6_version}
BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
BuildRequires: cmake(KF6FileMetaData) >= %{kf6_version}
BuildRequires: cmake(KF6I18n) >= %{kf6_version}
BuildRequires: cmake(KF6IconThemes) >= %{kf6_version}
BuildRequires: cmake(KF6KIO) >= %{kf6_version}
BuildRequires: cmake(KF6Notifications) >= %{kf6_version}
BuildRequires: cmake(KF6NotifyConfig) >= %{kf6_version}
BuildRequires: cmake(KF6Service) >= %{kf6_version}
BuildRequires: cmake(KF6Solid) >= %{kf6_version}
BuildRequires: cmake(KF6Sonnet) >= %{kf6_version}
BuildRequires: cmake(KF6ThreadWeaver) >= %{kf6_version}
BuildRequires: cmake(KF6WindowSystem) >= %{kf6_version}
BuildRequires: cmake(KF6XmlGui) >= %{kf6_version}
BuildRequires: cmake(KPim6Akonadi)
BuildRequires: cmake(KPim6AkonadiContactCore)
BuildRequires: cmake(KSaneWidgets6)
BuildRequires: cmake(Qt6Concurrent) >= %{qt6_version}
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
BuildRequires: cmake(Qt6DBus) >= %{qt6_version}
BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
BuildRequires: cmake(Qt6Multimedia) >= %{qt6_version}
BuildRequires: cmake(Qt6MultimediaWidgets) >= %{qt6_version}
BuildRequires: cmake(Qt6Network) >= %{qt6_version}
BuildRequires: cmake(Qt6NetworkAuth) >= %{qt6_version}
BuildRequires: cmake(Qt6OpenGL) >= %{qt6_version}
BuildRequires: cmake(Qt6OpenGLWidgets) >= %{qt6_version}
BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version}
BuildRequires: cmake(Qt6Sql) >= %{qt6_version}
BuildRequires: cmake(Qt6StateMachine) >= %{qt6_version}
BuildRequires: cmake(Qt6Svg) >= %{qt6_version}
BuildRequires: cmake(Qt6SvgWidgets) >= %{qt6_version}
BuildRequires: cmake(Qt6WebEngineWidgets) >= %{qt6_version}
BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
BuildRequires: cmake(Qt6Xml) >= %{qt6_version}
BuildRequires: update-desktop-files
%if %{with apidocs}
BuildRequires: doxygen
BuildRequires: graphviz-devel
BuildRequires: cmake(KF5DocTools)
%endif
BuildRequires: cmake(KF5CalendarCore)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5Contacts)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5FileMetaData)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5NotifyConfig)
BuildRequires: cmake(KF5Sane)
BuildRequires: cmake(KF5Service)
BuildRequires: cmake(KF5Solid)
BuildRequires: cmake(KF5Sonnet)
BuildRequires: cmake(KF5ThreadWeaver)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF5XmlGui)
BuildRequires: cmake(Marble)
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Multimedia)
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5NetworkAuth)
BuildRequires: cmake(Qt5OpenGL)
BuildRequires: cmake(Qt5PrintSupport)
BuildRequires: cmake(Qt5Sql)
BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5WebEngineWidgets)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5X11Extras)
BuildRequires: cmake(Qt5Xml)
BuildRequires: cmake(Qt5XmlPatterns)
BuildRequires: cmake(libheif)
BuildRequires: pkgconfig(Magick++)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(jasper)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(lensfun)
@ -99,38 +102,30 @@ BuildRequires: pkgconfig(libgphoto2) >= 2.4.0
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libjxl)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(libswresample)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(vdpau)
%if %{with apidocs}
BuildRequires: doxygen
BuildRequires: graphviz-devel
BuildRequires: cmake(KF6DocTools) >= %{kf6_version}
%endif
Requires: digikam-plugins
Requires: qt6-sql-sqlite >= %{qt6_version}
BuildRequires: pkgconfig(zlib)
Requires: %{name}-plugins
Requires: libQt5Sql5-sqlite
Recommends: marble
Recommends: showfoto
# Got merged into libimageeditor in 5.2.0
Provides: digikam-plugin-color = %{version}
Obsoletes: digikam-plugin-color < %{version}
Provides: digikam-plugin-decorate = %{version}
Obsoletes: digikam-plugin-decorate < %{version}
Provides: digikam-plugin-enhance = %{version}
Obsoletes: digikam-plugin-enhance < %{version}
Provides: digikam-plugin-fxfilters = %{version}
Obsoletes: digikam-plugin-fxfilters < %{version}
Provides: digikam-plugin-transform = %{version}
Obsoletes: digikam-plugin-transform < %{version}
Provides: %{name}-plugin-color = %{version}
Obsoletes: %{name}-plugin-color < %{version}
Provides: %{name}-plugin-decorate = %{version}
Obsoletes: %{name}-plugin-decorate < %{version}
Provides: %{name}-plugin-enhance = %{version}
Obsoletes: %{name}-plugin-enhance < %{version}
Provides: %{name}-plugin-fxfilters = %{version}
Obsoletes: %{name}-plugin-fxfilters < %{version}
Provides: %{name}-plugin-transform = %{version}
Obsoletes: %{name}-plugin-transform < %{version}
Obsoletes: digikam-libs < %{version}
# Docs no longer included in 6.0.0
Provides: digikam-doc = %{version}
Obsoletes: digikam-doc < %{version}
# QtWebEngine is not available on ppc and zSystems
ExclusiveArch: aarch64 x86_64 %{x86_64} riscv64
Provides: %{name}-doc = %{version}
Obsoletes: %{name}-doc < %{version}
%description
digiKam is a simple digital photo management application for KDE, which
@ -157,14 +152,14 @@ Development headers and libraries for digiKam.
%package -n showfoto
Summary: DigiKam: Showfoto
Supplements: digikam
Supplements: %{name}
%description -n showfoto
Additional program to browse and view photos
%package -n libdigikamcore%{soversion}
Summary: The main digikam libraries
Recommends: digikam-plugins
Recommends: %{name}-plugins
%description -n libdigikamcore%{soversion}
The main digikam libraries that are being shared between showfoto and digikam
@ -172,33 +167,27 @@ The main digikam libraries that are being shared between showfoto and digikam
%lang_package
%prep
%autosetup -p1 -n digikam-%{version}
%autosetup -p1
%build
%cmake_kf6 \
-DBUILD_WITH_QT6:BOOL=TRUE \
-DENABLE_AKONADICONTACTSUPPORT:BOOL=TRUE \
-DENABLE_APPSTYLES:BOOL=TRUE \
-DENABLE_KFILEMETADATASUPPORT:BOOL=TRUE \
-DENABLE_MEDIAPLAYER:BOOL=TRUE \
-DSSE3_FOUND:BOOL=FALSE \
-DSSE4_1_FOUND:BOOL=FALSE \
-DSSE4_2_FOUND:BOOL=FALSE \
-DSSSE3_FOUND:BOOL=FALSE \
%ifarch x86_64 %{?x86_64}
-DSSE2_FOUND:BOOL=TRUE
%else
-DSSE2_FOUND:BOOL=FALSE
%endif
%{cmake_kf5 -d build -- \
-DENABLE_APPSTYLES=ON \
-DENABLE_MEDIAPLAYER=ON \
-DENABLE_KFILEMETADATASUPPORT=ON \
-DENABLE_AKONADICONTACTSUPPORT=OFF
}
%kf6_build
%cmake_build
%if %{with apidocs}
%kf6_build doc
%cmake_build doc
%endif
%install
%kf6_install
%kf5_makeinstall -C build
%suse_update_desktop_file -r org.kde.digikam Qt KDE Graphics Photography
%suse_update_desktop_file -r org.kde.showfoto Qt KDE Graphics Photography
%find_lang %{name} --without-kde
@ -208,51 +197,52 @@ The main digikam libraries that are being shared between showfoto and digikam
%files
%doc AUTHORS NEWS README.md
%doc %{_kf6_mandir}/man1/cleanup_digikamdb.1%{ext_man}
%doc %{_kf6_mandir}/man1/digitaglinktree.1%{ext_man}
%{_kf6_applicationsdir}/org.kde.digikam.desktop
%{_kf6_appstreamdir}/org.kde.digikam.appdata.xml
%{_kf6_bindir}/cleanup_digikamdb
%{_kf6_bindir}/digikam
%{_kf6_bindir}/digitaglinktree
%{_kf6_iconsdir}/hicolor/*/actions/
%{_kf6_iconsdir}/hicolor/*/apps/digikam.*
%{_kf6_kxmlguidir}/digikam/
%{_kf6_notificationsdir}/digikam.notifyrc
%{_kf6_sharedir}/digikam/
%dir %{_kf6_sharedir}/solid
%dir %{_kf6_sharedir}/solid/actions
%{_kf6_sharedir}/solid/actions/digikam-opencamera.desktop
%dir %{_kf5_sharedir}/solid
%dir %{_kf5_sharedir}/solid/actions
%doc %{_kf5_mandir}/man1/cleanup_digikamdb.1%{ext_man}
%doc %{_kf5_mandir}/man1/digitaglinktree.1%{ext_man}
%{_kf5_applicationsdir}/org.kde.digikam.desktop
%{_kf5_appstreamdir}/org.kde.digikam.appdata.xml
%{_kf5_bindir}/cleanup_digikamdb
%{_kf5_bindir}/digikam
%{_kf5_bindir}/digitaglinktree
%{_kf5_iconsdir}/hicolor/*/actions/
%{_kf5_iconsdir}/hicolor/*/apps/avplayer.*
%{_kf5_iconsdir}/hicolor/*/apps/digikam.*
%{_kf5_kxmlguidir}/digikam/
%{_kf5_notifydir}/digikam.notifyrc
%{_kf5_sharedir}/digikam/
%{_kf5_sharedir}/solid/actions/digikam-opencamera.desktop
%files plugins
%{_kf6_iconsdir}/hicolor/*/apps/dk-*
%{_kf6_iconsdir}/hicolor/*/apps/expoblending.*
%{_kf6_iconsdir}/hicolor/*/apps/panorama.*
%{_kf6_plugindir}/digikam/
%{_kf5_iconsdir}/hicolor/*/apps/dk-*
%{_kf5_iconsdir}/hicolor/*/apps/expoblending.*
%{_kf5_iconsdir}/hicolor/*/apps/panorama.*
%{_kf5_plugindir}/digikam/
%files devel
%{_includedir}/digikam/
%{_kf6_cmakedir}/DigikamCore/
%{_kf6_cmakedir}/DigikamDatabase/
%{_kf6_cmakedir}/DigikamGui/
%{_kf6_cmakedir}/DigikamPlugin/
%{_kf6_libdir}/libdigikamcore.so
%{_kf6_libdir}/libdigikamdatabase.so
%{_kf6_libdir}/libdigikamgui.so
%{_kf5_cmakedir}/DigikamCore/
%{_kf5_cmakedir}/DigikamDatabase/
%{_kf5_cmakedir}/DigikamGui/
%{_kf5_cmakedir}/DigikamPlugin/
%{_kf5_libdir}/libdigikamcore.so
%{_kf5_libdir}/libdigikamdatabase.so
%{_kf5_libdir}/libdigikamgui.so
%files -n showfoto
%{_kf6_applicationsdir}/org.kde.showfoto.desktop
%{_kf6_appstreamdir}/org.kde.showfoto.appdata.xml
%{_kf6_bindir}/showfoto
%{_kf6_iconsdir}/hicolor/*/apps/showfoto.*
%{_kf6_kxmlguidir}/showfoto/
%{_kf6_sharedir}/showfoto/
%{_kf5_applicationsdir}/org.kde.showfoto.desktop
%{_kf5_appstreamdir}/org.kde.showfoto.appdata.xml
%{_kf5_bindir}/showfoto
%{_kf5_iconsdir}/hicolor/*/apps/showfoto.*
%{_kf5_kxmlguidir}/showfoto/
%{_kf5_sharedir}/showfoto/
%files -n libdigikamcore%{soversion}
%license LICENSES/*
%{_kf6_libdir}/libdigikamcore.so.*
%{_kf6_libdir}/libdigikamdatabase.so.*
%{_kf6_libdir}/libdigikamgui.so.*
%{_kf5_libdir}/libdigikamcore.so.%{version}
%{_kf5_libdir}/libdigikamdatabase.so.%{version}
%{_kf5_libdir}/libdigikamgui.so.%{version}
%files lang -f %{name}.lang