- up to 7.1.0

diff --git a/digikam.spec b/digikam.spec
index 562dd6901566d7890c74c2f37b34ad5f7eb8c6ed..d6726cc44389651f52b057a09db27e5463b3ec0c 100644 (file)
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,18 +1,22 @@
 #
+# TODO: fix plugins location, can't find where it i defined in the code
+#
 %define                qtver   4.8.3
 %define                kdever  4.10.0
 
 Summary:       A KDE frontend for gphoto2
 Summary(pl.UTF-8):     Interfejs KDE do gphoto2
 Name:          digikam
-Version:       6.0.0
+Version:       7.1.0
 Release:       1
 License:       GPL
 Group:         X11/Applications/Graphics
-Source0:       http://download.kde.org/stable/digikam/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 7aa9a41b0ed101230b9db7efdf5b1db1
-URL:           http://www.digikam.org/
+Source0:       https://download.kde.org/stable/digikam/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 165347a16396f3ef1d96315f683dccf8
+Patch0:                qt-5.15.patch
+URL:           https://www.digikam.org/
 BuildRequires: ImageMagick-devel
+BuildRequires: Qt5WebEngine-devel
 BuildRequires: clapack-devel
 BuildRequires: cmake >= 2.8.0
 BuildRequires: eigen3
@@ -79,6 +83,7 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
@@ -125,6 +130,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libdigikamdatabase.so.*.*.*
 %attr(755,root,root) %{_libdir}/libdigikamgui.so.*.*
 %attr(755,root,root) %{_libdir}/libdigikamcore.so.*.*.*
+%dir %{_libdir}/plugins
+%dir %{_libdir}/plugins/digikam
+%dir %{_libdir}/plugins/digikam/bqm
+%attr(755,root,root) %{_libdir}/plugins/digikam/bqm/*.so
+%dir %{_libdir}/plugins/digikam/dimg
+%attr(755,root,root) %{_libdir}/plugins/digikam/dimg/*.so
+%dir %{_libdir}/plugins/digikam/editor
+%attr(755,root,root) %{_libdir}/plugins/digikam/editor/*.so
+%dir %{_libdir}/plugins/digikam/generic
+%attr(755,root,root) %{_libdir}/plugins/digikam/generic/*.so
+%dir %{_libdir}/plugins/digikam/rawimport
+%attr(755,root,root) %{_libdir}/plugins/digikam/rawimport/*.so
 %{_datadir}/%{name}
 %{_datadir}/knotifications5/digikam.notifyrc
 %{_datadir}/kxmlgui5/digikam

diff --git a/qt-5.15.patch b/qt-5.15.patch
new file mode 100644 (file)
index 0000000..d2fa61e
--- /dev/null
+++ b/qt-5.15.patch
@@ -0,0 +1,10 @@
+--- digikam-7.1.0/core/tests/video/qtavcodecs.cpp~     2020-09-03 06:45:12.000000000 +0200
++++ digikam-7.1.0/core/tests/video/qtavcodecs.cpp      2021-03-07 17:49:11.853030674 +0100
+@@ -22,6 +22,7 @@
+  * ============================================================ */
+ 
+ #include <QDebug>
++#include <QPainterPath>
+ 
+ // QtAv includes
+