From cceb5a90b733beb0ae1e438af1049b62c2816819 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 18 Dec 2024 19:43:22 +0100 Subject: [PATCH] rebuilt with qt6 [release 8.5.0-3mamba;Mon Dec 16 2024] --- digikam.spec | 125 ++++++++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 57 deletions(-) diff --git a/digikam.spec b/digikam.spec index 44c6610..923b51f 100644 --- a/digikam.spec +++ b/digikam.spec @@ -4,7 +4,7 @@ Name: digikam Version: 8.5.0 -Release: 1mamba +Release: 3mamba Summary: An advanced digital photo management application Linux, Windows and Mac-OSX Group: Graphical Desktop/Applications/Graphics Vendor: openmamba @@ -17,27 +17,21 @@ License: GPL BuildRequires: glibc-devel BuildRequires: libICE-devel BuildRequires: libMagick-devel -BuildRequires: libQt5Concurrent -BuildRequires: libQt5Core -BuildRequires: libQt5DBus -BuildRequires: libQt5Gui -BuildRequires: libQt5Multimedia-devel -BuildRequires: libQt5Network -BuildRequires: libQt5NetworkAuth-devel -BuildRequires: libQt5OpenGL -BuildRequires: libQt5Positioning-devel -BuildRequires: libQt5PrintSupport -BuildRequires: libQt5Sql -BuildRequires: libQt5Svg-devel -BuildRequires: libQt5WebChannel-devel -BuildRequires: libQt5WebEngine-devel -BuildRequires: libQt5Widgets -BuildRequires: libQt5X11Extras-devel -BuildRequires: libQt5Xml -BuildRequires: libQt5XmlPatterns-devel +BuildRequires: libQt6Concurrent +BuildRequires: libQt6Core +BuildRequires: libQt6DBus +BuildRequires: libQt6Gui +BuildRequires: libQt6Network +BuildRequires: libQt6OpenGL +BuildRequires: libQt6PrintSupport +BuildRequires: libQt6Sql +BuildRequires: libQt6Widgets +BuildRequires: libQt6Xml BuildRequires: libSM-devel BuildRequires: libX11-devel BuildRequires: libXext-devel +BuildRequires: libakonadi-contacts-devel +BuildRequires: libakonadi-devel BuildRequires: libavcodec-devel BuildRequires: libavdevice-devel BuildRequires: libavfilter-devel @@ -51,52 +45,61 @@ BuildRequires: libglu-devel BuildRequires: libglvnd-devel BuildRequires: libgomp-devel BuildRequires: libgphoto2-devel +BuildRequires: libgrantleetheme-devel BuildRequires: libheif-devel BuildRequires: libjasper-devel BuildRequires: libjpeg-turbo BuildRequires: libjxl-devel -BuildRequires: libkauth-devel -BuildRequires: libkcalendarcore-devel -BuildRequires: libkcodecs-devel -BuildRequires: libkcompletion-devel -BuildRequires: libkconfig-devel -BuildRequires: libkconfigwidgets-devel -BuildRequires: libkcoreaddons-devel -BuildRequires: libki18n-devel -BuildRequires: libkiconthemes-devel -BuildRequires: libkio-devel -BuildRequires: libkjobwidgets-devel -BuildRequires: libknotifications-devel -BuildRequires: libknotifyconfig-devel -BuildRequires: libksane5-devel -BuildRequires: libkservice-devel -BuildRequires: libkwidgetsaddons-devel -BuildRequires: libkwindowsystem-devel -BuildRequires: libkxmlgui-devel +BuildRequires: libkf6-kcalendarcore-devel +BuildRequires: libkf6-kcolorscheme-devel +BuildRequires: libkf6-kcompletion-devel +BuildRequires: libkf6-kconfig-devel +BuildRequires: libkf6-kconfigwidgets-devel +BuildRequires: libkf6-kcontacts-devel +BuildRequires: libkf6-kcoreaddons-devel +BuildRequires: libkf6-kfilemetadata-devel +BuildRequires: libkf6-ki18n-devel +BuildRequires: libkf6-kiconthemes-devel +BuildRequires: libkf6-kio-devel +BuildRequires: libkf6-kitemmodels-devel +BuildRequires: libkf6-kjobwidgets-devel +BuildRequires: libkf6-knotifications-devel +BuildRequires: libkf6-knotifyconfig-devel +BuildRequires: libkf6-kservice-devel +BuildRequires: libkf6-ktexttemplate-devel +BuildRequires: libkf6-kwidgetsaddons-devel +BuildRequires: libkf6-kwindowsystem-devel +BuildRequires: libkf6-kxmlgui-devel +BuildRequires: libkf6-solid-devel +BuildRequires: libkf6-sonnet-devel +BuildRequires: libkf6-threadweaver-devel +BuildRequires: libksane-devel BuildRequires: liblcms2-devel BuildRequires: liblensfun-devel BuildRequires: libopencv-devel BuildRequires: libperl BuildRequires: libpng-devel -BuildRequires: libsolid-devel -BuildRequires: libsonnet-devel BuildRequires: libstdc++6-devel BuildRequires: libswresample-devel BuildRequires: libswscale-devel -BuildRequires: libthreadweaver-devel BuildRequires: libtiff-devel BuildRequires: libusb-devel -BuildRequires: libva-devel -BuildRequires: libvdpau-devel BuildRequires: libx265-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: libz-devel BuildRequires: perl-devel -BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qtmultimedia-devel +BuildRequires: qt6-qtnetworkauth-devel +BuildRequires: qt6-qtpositioning-devel +BuildRequires: qt6-qtscxml-devel +BuildRequires: qt6-qtsvg-devel +BuildRequires: qt6-qtwebchannel-devel +BuildRequires: qt6-qtwebengine-devel ## AUTOBUILDREQ-END -BuildRequires: libx265-devel >= 0:4.0-1mamba -BuildRequires: libksane-devel >= 24.02.0 +BuildRequires: libx265-devel >= 0:4.1-1mamba +BuildRequires: libksane-devel >= 24.12.0 BuildRequires: ufraw BuildRequires: mysql BuildRequires: shared-desktop-ontologies-devel @@ -107,7 +110,8 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} Requires: libqt5-sqlite Requires: dcraw Requires: marble -Requires: mysql +Requires: mariadb +Requires: perl-Image-ExifTool %description digiKam is an advanced digital photo management application for KDE, which makes importing and organizing digital photos a 'snap'. @@ -254,26 +258,29 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} #:<< _EOF %cmake_kde5 -d build \ -DCMAKE_BUILD_TYPE=Release \ - -DDIGIKAMSC_COMPILE_DOC=OFF \ + -DBUILD_WITH_QT6=ON \ + -DENABLE_KFILEMETADATASUPPORT=ON \ + -DENABLE_MEDIAPLAYER=ON \ + -DENABLE_AKONADICONTACTSUPPORT=ON \ + -DENABLE_MYSQLSUPPORT=ON \ + -DENABLE_APPSTYLES=ON \ + -DENABLE_QWEBENGINE=ON \ -DCMAKE_SKIP_RPATH=OFF \ -DBUILD_tests=OFF \ - -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \ -DCMAKE_CXX_FLAGS="%{optflags}" %make -#|| %make -j1 - %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} %makeinstall -C build -%find_lang %{name}5_qt --with-qt --with-man --all-name || touch %{name}5_qt.lang +%find_lang %{name} --with-qt --with-man --all-name || touch %{name}.lang %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%files -f %{name}5_qt.lang +%files -f %{name}.lang %defattr(-,root,root) %{_kde5_bindir}/cleanup_digikamdb %{_kde5_bindir}/digikam @@ -289,13 +296,11 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} %dir %{_datadir}/kxmlgui5/digikam/ %{_datadir}/kxmlgui5/digikam/* %{_datadir}/kxmlgui5/showfoto/showfotoui5.rc -%{_datadir}/knotifications5/digikam.notifyrc +%{_datadir}/knotifications6/digikam.notifyrc %{_datadir}/icons/hicolor/* %{_mandir}/man1/cleanup_digikamdb.* %{_mandir}/man1/digitaglinktree.* - - %files -n %{libname} %defattr(-,root,root) %{_kde5_libdir}/libdigikamcore.so.* @@ -303,8 +308,8 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} %{_kde5_libdir}/libdigikamcore.so %{_kde5_libdir}/libdigikamdatabase.so %{_kde5_libdir}/libdigikamgui.so.* -%dir %{_libdir}/qt5/plugins/digikam -%{_libdir}/qt5/plugins/digikam/* +%dir %{_qt6_plugindir}/digikam +%{_qt6_plugindir}/digikam/* %files -n %{libname}-devel %defattr(-,root,root) @@ -321,6 +326,12 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} %{_libdir}/cmake/DigikamPlugin/DigikamPluginConfig.cmake %changelog +* Mon Dec 16 2024 Silvan Calarco 8.5.0-3mamba +- rebuilt with qt6 + +* Sun Dec 08 2024 Silvan Calarco 8.5.0-2mamba +- require perl-Image-ExifTool providing exiftool + * Sat Nov 16 2024 Automatic Build System 8.5.0-1mamba - automatic version update by autodist