- updated to 8.3.0, added qt6 bcond (untested)

diff --git a/digikam.spec b/digikam.spec
index 8ab128d05bc13c237a74e2c98fbfcfd96c616ae0..3c9a3892b12d5cb6aa4cd47ff215cbd7650ef736 100644 (file)
--- a/digikam.spec
+++ b/digikam.spec
@@ -2,12 +2,13 @@
 # TODO: fix plugins location, can't find where it i defined in the code
 #
 # Conditional build:
+%bcond_with    qt6             # Qt6/KF6 instead of Qt5/KF5
 %bcond_with    qtwebkit        # use Qt5WebKit instead of Qt5WebEngine
 
 %define                akonadi_ver     5.19.0
-# or 6.2.3
-%define                qt_ver          5.14.0
-%define                kf_ver          5.89.0
+%define                qt5_ver         5.14.0
+%define                qt6_ver         6.4.0
+%define                kf_ver          5.95.0
 
 %ifarch x32
 # Qt5WebEngine not available
@@ -16,32 +17,18 @@
 Summary:       A KDE frontend for gphoto2
 Summary(pl.UTF-8):     Interfejs KDE do gphoto2
 Name:          digikam
-Version:       8.1.0
-Release:       2
+Version:       8.3.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
-Source0:       https://download.kde.org/stable/digikam/%{version}/digiKam-%{version}.tar.xz
-# Source0-md5: ee08257df9285252cb4ad0e3720fb908
+Source0:       https://download.kde.org/stable/digikam/%{version}/digiKam-%{version}-1.tar.xz
+# Source0-md5: 587650b53ae995402183454458ab3774
 URL:           https://www.digikam.org/
 BuildRequires: ImageMagick-devel >= 6.7.0
 BuildRequires: ImageMagick-c++-devel >= 6.7.0
 BuildRequires: OpenGL-devel
 BuildRequires: OpenGL-GLU-devel
-BuildRequires: Qt5Concurrent-devel >= %{qt_ver}
-BuildRequires: Qt5Core-devel >= %{qt_ver}
-BuildRequires: Qt5DBus-devel >= %{qt_ver}
-BuildRequires: Qt5Gui-devel >= %{qt_ver}
-BuildRequires: Qt5Network-devel >= %{qt_ver}
-BuildRequires: Qt5NetworkAuth-devel >= %{qt_ver}
-BuildRequires: Qt5OpenGL-devel >= %{qt_ver}
-BuildRequires: Qt5PrintSupport-devel >= %{qt_ver}
-BuildRequires: Qt5Sql-devel >= %{qt_ver}
-%{!?with_qtwebkit:BuildRequires:       Qt5WebEngine-devel >= %{qt_ver}}
-%{?with_qtwebkit:BuildRequires:        Qt5WebKit-devel >= %{qt_ver}}
-BuildRequires: Qt5Widgets-devel >= %{qt_ver}
-BuildRequires: Qt5X11Extras-devel >= %{qt_ver}
-BuildRequires: Qt5Xml-devel >= %{qt_ver}
-BuildRequires: Qt5XmlPatterns-devel >= %{qt_ver}
+BuildRequires: OpenGL-GLX-devel
 BuildRequires: bison >= 2.5.0
 BuildRequires: boost-devel >= 1.43.0
 BuildRequires: cmake >= 3.16
@@ -53,29 +40,6 @@ BuildRequires:       ffmpeg-devel
 BuildRequires: flex >= 2.5.0
 BuildRequires: gettext-tools
 BuildRequires: jasper-devel >= 1.7.0
-BuildRequires: ka5-akonadi-devel >= %{akonadi_ver}
-BuildRequires: ka5-akonadi-contacts-devel >= %{akonadi_ver}
-BuildRequires: ka5-libksane-devel >= 21.12.0
-BuildRequires: ka5-marble-devel >= 0.22.0
-BuildRequires: kf5-extra-cmake-modules >= 5.55.0
-BuildRequires: kf5-kcalendarcore-devel >= 5.89.0
-BuildRequires: kf5-kconfig-devel >= %{kf_ver}
-BuildRequires: kf5-kcontacts-devel >= %{akonadi_ver}
-BuildRequires: kf5-kcoreaddons-devel >= %{kf_ver}
-BuildRequires: kf5-kdoctools >= 5.38.0
-BuildRequires: kf5-kdoctools-devel >= %{kf_ver}
-BuildRequires: kf5-kfilemetadata-devel >= %{kf_ver}
-BuildRequires: kf5-ki18n-devel >= %{kf_ver}
-BuildRequires: kf5-kiconthemes-devel >= %{kf_ver}
-BuildRequires: kf5-kio-devel >= %{kf_ver}
-BuildRequires: kf5-knotifications-devel >= %{kf_ver}
-BuildRequires: kf5-knotifyconfig-devel >= %{kf_ver}
-BuildRequires: kf5-kservice-devel >= %{kf_ver}
-BuildRequires: kf5-kwindowsystem-devel >= %{kf_ver}
-BuildRequires: kf5-kxmlgui-devel >= %{kf_ver}
-BuildRequires: kf5-solid-devel >= %{kf_ver}
-BuildRequires: kf5-sonnet-devel >= %{kf_ver}
-BuildRequires: kf5-threadweaver-devel >= %{kf_ver}
 BuildRequires: lcms2-devel >= 2.0
 BuildRequires: lensfun-devel >= 0.2.6
 BuildRequires: libgphoto2-devel >= 2.5.0
@@ -97,28 +61,164 @@ BuildRequires:     rpmbuild(macros) >= 1.606
 BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: zlib-devel
-Requires:      Qt5Concurrent >= %{qt_ver}
-Requires:      Qt5Core >= %{qt_ver}
-Requires:      Qt5DBus >= %{qt_ver}
-Requires:      Qt5Gui >= %{qt_ver}
-Requires:      Qt5Network >= %{qt_ver}
-Requires:      Qt5OpenGL >= %{qt_ver}
-Requires:      Qt5PrintSupport >= %{qt_ver}
-Requires:      Qt5Sql >= %{qt_ver}
-Requires:      Qt5Sql-sqldriver-mysql >= %{qt_ver}
-Requires:      Qt5Sql-sqldriver-sqlite3 >= %{qt_ver}
-%{!?with_qtwebkit:Requires:    Qt5WebEngine >= %{qt_ver}}
-%{?with_qtwebkit:Requires:     Qt5WebKit >= %{qt_ver}}
-Requires:      Qt5Widgets >= %{qt_ver}
-Requires:      Qt5X11Extras >= %{qt_ver}
-Requires:      Qt5Xml >= %{qt_ver}
-Requires:      Qt5XmlPatterns >= %{qt_ver}
 Requires:      exiv2 >= 0.27.0
 Requires:      jasper-libs >= 1.7.0
+Requires:      lcms2 >= 2.0
+Requires:      lensfun >= 0.2.6
+Requires:      libgphoto2 >= 2.5.0
+Requires:      libheif >= 1.6.0
+Requires:      liblqr >= 0.4.1
+Requires:      libpng >= 2:1.2.7
+Requires:      libtiff >= 3.8.2
+Requires:      libx265 >= 2.2
+Requires:      libxml2 >= 1:2.7.0
+Requires:      libxslt >= 1.1.0
+Requires:      opencv >= 3.3.0
+%if %{with qt6}
+BuildRequires: Qt6Concurrent-devel >= %{qt6_ver}
+BuildRequires: Qt6Core-devel >= %{qt6_ver}
+BuildRequires: Qt6DBus-devel >= %{qt6_ver}
+BuildRequires: Qt6Gui-devel >= %{qt6_ver}
+BuildRequires: Qt6Multimedia-devel >= 6.5.0
+BuildRequires: Qt6MultimediaWidgets-devel >= 6.5.0
+BuildRequires: Qt6Network-devel >= %{qt6_ver}
+BuildRequires: Qt6NetworkAuth-devel >= %{qt6_ver}
+BuildRequires: Qt6OpenGL-devel >= %{qt6_ver}
+BuildRequires: Qt6PrintSupport-devel >= %{qt6_ver}
+BuildRequires: Qt6Qml-devel >= %{qt6_ver}
+BuildRequires: Qt6Sql-devel >= %{qt6_ver}
+BuildRequires: Qt6Svg-devel >= %{qt6_ver}
+BuildRequires: Qt6WebEngine-devel >= %{qt6_ver}
+BuildRequires: Qt6Widgets-devel >= %{qt6_ver}
+BuildRequires: Qt6X11Extras-devel >= %{qt6_ver}
+BuildRequires: Qt6Xml-devel >= %{qt6_ver}
+BuildRequires: ka6-akonadi-devel >= %{akonadi_ver}
+BuildRequires: ka6-akonadi-contacts-devel >= %{akonadi_ver}
+BuildRequires: ka6-libksane-devel >= 21.12.0
+BuildRequires: ka6-marble-devel >= 0.22.0
+BuildRequires: kf6-extra-cmake-modules >= 5.240.0
+BuildRequires: kf6-kcalendarcore-devel >= %{kf_ver}
+BuildRequires: kf6-kconfig-devel >= %{kf_ver}
+BuildRequires: kf6-kcontacts-devel >= %{akonadi_ver}
+BuildRequires: kf6-kcoreaddons-devel >= %{kf_ver}
+BuildRequires: kf6-kdoctools >= 5.38.0
+BuildRequires: kf6-kdoctools-devel >= %{kf_ver}
+BuildRequires: kf6-kfilemetadata-devel >= %{kf_ver}
+BuildRequires: kf6-ki18n-devel >= %{kf_ver}
+BuildRequires: kf6-kiconthemes-devel >= %{kf_ver}
+BuildRequires: kf6-kio-devel >= %{kf_ver}
+BuildRequires: kf6-knotifications-devel >= %{kf_ver}
+BuildRequires: kf6-knotifyconfig-devel >= %{kf_ver}
+BuildRequires: kf6-kservice-devel >= %{kf_ver}
+BuildRequires: kf6-kwindowsystem-devel >= %{kf_ver}
+BuildRequires: kf6-kxmlgui-devel >= %{kf_ver}
+BuildRequires: kf6-solid-devel >= %{kf_ver}
+BuildRequires: kf6-sonnet-devel >= %{kf_ver}
+BuildRequires: kf6-threadweaver-devel >= %{kf_ver}
+Requires:      Qt6Concurrent >= %{qt6_ver}
+Requires:      Qt6Core >= %{qt6_ver}
+Requires:      Qt6DBus >= %{qt6_ver}
+Requires:      Qt6Gui >= %{qt6_ver}
+Requires:      Qt6Multimedia >= 6.5.0
+Requires:      Qt6MultimediaWidgets >= 6.5.0
+Requires:      Qt6Network >= %{qt6_ver}
+Requires:      Qt6OpenGL >= %{qt6_ver}
+Requires:      Qt6PrintSupport >= %{qt6_ver}
+Requires:      Qt6Qml >= %{qt6_ver}
+Requires:      Qt6Sql >= %{qt6_ver}
+Requires:      Qt6Sql-sqldriver-mysql >= %{qt6_ver}
+Requires:      Qt6Sql-sqldriver-sqlite3 >= %{qt6_ver}
+Requires:      Qt6Svg >= %{qt6_ver}
+Requires:      Qt6WebEngine >= %{qt6_ver}
+Requires:      Qt6Widgets >= %{qt6_ver}
+Requires:      Qt6X11Extras >= %{qt6_ver}
+Requires:      Qt6Xml >= %{qt6_ver}
+Requires:      ka6-akonadi-contacts >= %{akonadi_ver}
+Requires:      ka6-libksane >= 21.12.0
+Requires:      ka6-marble >= 0.22.0
+Requires:      kf6-kcalendarcore >= %{kf_ver}
+Requires:      kf6-kconfig >= %{kf_ver}
+Requires:      kf6-kcontacts >= %{akonadi_ver}
+Requires:      kf6-kcoreaddons >= %{kf_ver}
+Requires:      kf6-kfilemetadata >= %{kf_ver}
+Requires:      kf6-ki18n >= %{kf_ver}
+Requires:      kf6-kiconthemes >= %{kf_ver}
+Requires:      kf6-kio >= %{kf_ver}
+Requires:      kf6-knotifications >= %{kf_ver}
+Requires:      kf6-knotifyconfig >= %{kf_ver}
+Requires:      kf6-kservice >= %{kf_ver}
+Requires:      kf6-kwindowsystem >= %{kf_ver}
+Requires:      kf6-kxmlgui >= %{kf_ver}
+Requires:      kf6-solid >= %{kf_ver}
+Requires:      kf6-threadweaver >= %{kf_ver}
+%else
+BuildRequires: Qt5Concurrent-devel >= %{qt5_ver}
+BuildRequires: Qt5Core-devel >= %{qt5_ver}
+BuildRequires: Qt5DBus-devel >= %{qt5_ver}
+BuildRequires: Qt5Gui-devel >= %{qt5_ver}
+BuildRequires: Qt5Multimedia-devel >= %{qt5_ver}
+BuildRequires: Qt5MultimediaWidgets-devel >= %{qt5_ver}
+BuildRequires: Qt5Network-devel >= %{qt5_ver}
+BuildRequires: Qt5NetworkAuth-devel >= %{qt5_ver}
+BuildRequires: Qt5OpenGL-devel >= %{qt5_ver}
+BuildRequires: Qt5PrintSupport-devel >= %{qt5_ver}
+BuildRequires: Qt5Sql-devel >= %{qt5_ver}
+BuildRequires: Qt5Svg-devel >= %{qt5_ver}
+%{!?with_qtwebkit:BuildRequires:       Qt5WebEngine-devel >= %{qt5_ver}}
+%{?with_qtwebkit:BuildRequires:        Qt5WebKit-devel >= %{qt5_ver}}
+BuildRequires: Qt5Widgets-devel >= %{qt5_ver}
+BuildRequires: Qt5X11Extras-devel >= %{qt5_ver}
+BuildRequires: Qt5Xml-devel >= %{qt5_ver}
+BuildRequires: Qt5XmlPatterns-devel >= %{qt5_ver}
+BuildRequires: libva-devel
+BuildRequires: libva-x11-devel
+BuildRequires: libvdpau-devel
+BuildRequires: ka5-akonadi-devel >= %{akonadi_ver}
+BuildRequires: ka5-akonadi-contacts-devel >= %{akonadi_ver}
+BuildRequires: ka5-libksane-devel >= 21.12.0
+BuildRequires: ka5-marble-devel >= 0.22.0
+BuildRequires: kf5-extra-cmake-modules >= 5.55.0
+BuildRequires: kf5-kcalendarcore-devel >= %{kf_ver}
+BuildRequires: kf5-kconfig-devel >= %{kf_ver}
+BuildRequires: kf5-kcontacts-devel >= %{akonadi_ver}
+BuildRequires: kf5-kcoreaddons-devel >= %{kf_ver}
+BuildRequires: kf5-kdoctools >= 5.38.0
+BuildRequires: kf5-kdoctools-devel >= %{kf_ver}
+BuildRequires: kf5-kfilemetadata-devel >= %{kf_ver}
+BuildRequires: kf5-ki18n-devel >= %{kf_ver}
+BuildRequires: kf5-kiconthemes-devel >= %{kf_ver}
+BuildRequires: kf5-kio-devel >= %{kf_ver}
+BuildRequires: kf5-knotifications-devel >= %{kf_ver}
+BuildRequires: kf5-knotifyconfig-devel >= %{kf_ver}
+BuildRequires: kf5-kservice-devel >= %{kf_ver}
+BuildRequires: kf5-kwindowsystem-devel >= %{kf_ver}
+BuildRequires: kf5-kxmlgui-devel >= %{kf_ver}
+BuildRequires: kf5-solid-devel >= %{kf_ver}
+BuildRequires: kf5-sonnet-devel >= %{kf_ver}
+BuildRequires: kf5-threadweaver-devel >= %{kf_ver}
+Requires:      Qt5Concurrent >= %{qt5_ver}
+Requires:      Qt5Core >= %{qt5_ver}
+Requires:      Qt5DBus >= %{qt5_ver}
+Requires:      Qt5Gui >= %{qt5_ver}
+Requires:      Qt5Multimedia >= %{qt5_ver}
+Requires:      Qt5MultimediaWidgets >= %{qt5_ver}
+Requires:      Qt5Network >= %{qt5_ver}
+Requires:      Qt5OpenGL >= %{qt5_ver}
+Requires:      Qt5PrintSupport >= %{qt5_ver}
+Requires:      Qt5Sql >= %{qt5_ver}
+Requires:      Qt5Sql-sqldriver-mysql >= %{qt5_ver}
+Requires:      Qt5Sql-sqldriver-sqlite3 >= %{qt5_ver}
+Requires:      Qt5Svg >= %{qt5_ver}
+%{!?with_qtwebkit:Requires:    Qt5WebEngine >= %{qt5_ver}}
+%{?with_qtwebkit:Requires:     Qt5WebKit >= %{qt5_ver}}
+Requires:      Qt5Widgets >= %{qt5_ver}
+Requires:      Qt5X11Extras >= %{qt5_ver}
+Requires:      Qt5Xml >= %{qt5_ver}
+Requires:      Qt5XmlPatterns >= %{qt5_ver}
 Requires:      ka5-akonadi-contacts >= %{akonadi_ver}
 Requires:      ka5-libksane >= 21.12.0
 Requires:      ka5-marble >= 0.22.0
-Requires:      kf5-kcalendarcore >= 5.89.0
+Requires:      kf5-kcalendarcore >= %{kf_ver}
 Requires:      kf5-kconfig >= %{kf_ver}
 Requires:      kf5-kcontacts >= %{akonadi_ver}
 Requires:      kf5-kcoreaddons >= %{kf_ver}
@@ -133,17 +233,7 @@ Requires:  kf5-kwindowsystem >= %{kf_ver}
 Requires:      kf5-kxmlgui >= %{kf_ver}
 Requires:      kf5-solid >= %{kf_ver}
 Requires:      kf5-threadweaver >= %{kf_ver}
-Requires:      lcms2 >= 2.0
-Requires:      lensfun >= 0.2.6
-Requires:      libgphoto2 >= 2.5.0
-Requires:      libheif >= 1.6.0
-Requires:      liblqr >= 0.4.1
-Requires:      libpng >= 2:1.2.7
-Requires:      libtiff >= 3.8.2
-Requires:      libx265 >= 2.2
-Requires:      libxml2 >= 1:2.7.0
-Requires:      libxslt >= 1.1.0
-Requires:      opencv >= 3.3.0
+%endif
 Obsoletes:     digikamimageplugins < 0.9.2
 Obsoletes:     kipi-plugins < 1.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -161,10 +251,17 @@ Summary:  A KDE frontend for gphoto2 - header files
 Summary(pl.UTF-8):     Interfejs KDE do gphoto2 - pliki nagłówkowe
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      Qt5Core-devel >= %{qt_ver}
-Requires:      Qt5Gui-devel >= %{qt_ver}
-Requires:      Qt5Sql-devel >= %{qt_ver}
-Requires:      Qt5Widgets-devel >= %{qt_ver}
+%if %{with qt6}
+Requires:      Qt6Core-devel >= %{qt6_ver}
+Requires:      Qt6Gui-devel >= %{qt6_ver}
+Requires:      Qt6Sql-devel >= %{qt6_ver}
+Requires:      Qt6Widgets-devel >= %{qt6_ver}
+%else
+Requires:      Qt5Core-devel >= %{qt5_ver}
+Requires:      Qt5Gui-devel >= %{qt5_ver}
+Requires:      Qt5Sql-devel >= %{qt5_ver}
+Requires:      Qt5Widgets-devel >= %{qt5_ver}
+%endif
 Requires:      libstdc++-devel >= 6:7
 
 %description devel
@@ -187,6 +284,7 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
        -DENABLE_INTERNALMYSQL:BOOL=ON \
        -DENABLE_OPENCV3:BOOL=ON \
        -DBUILD_TESTING:BOOL=OFF \
+       %{?with_qt6:-DBUILD_WITH_QT6:BOOL=ON} \
        %{?with_qtwebkit:-DENABLE_QWEBENGINE:BOOL=OFF}
 
 %{__make} -C build
@@ -225,6 +323,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/plugins/digikam/editor/Editor_*_Plugin.so
 %dir %{_libdir}/plugins/digikam/generic
 %attr(755,root,root) %{_libdir}/plugins/digikam/generic/Generic_*_Plugin.so
+%dir %{_libdir}/plugins/digikam/marble
+%attr(755,root,root) %{_libdir}/plugins/digikam/marble/*FloatItem.so
+%attr(755,root,root) %{_libdir}/plugins/digikam/marble/*Plugin.so
+%attr(755,root,root) %{_libdir}/plugins/digikam/marble/MeasureTool.so
+%attr(755,root,root) %{_libdir}/plugins/digikam/marble/OverviewMap.so
 %dir %{_libdir}/plugins/digikam/rawimport
 %attr(755,root,root) %{_libdir}/plugins/digikam/rawimport/RawImport_*_Plugin.so
 %{_datadir}/%{name}