Accepting request 645877 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/645877
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=175

digikam.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Oct 31 16:48:54 UTC 2018 - wbauer@tmo.at
+
+- Add Add-QtWebEngine-support.patch to allow building with
+  QtWebEngine instead of QtWebKit
+- Use QtWebEngine on platforms where it is available
+- Add some necessary build requirements to avoid relying on other
+  packages pulling them in
+- Remove unused libqca-qt5-devel BuildRequires
+
 -------------------------------------------------------------------
 Tue Oct 30 13:17:52 UTC 2018 - wbauer@tmo.at
 

digikam.spec

@@ -32,9 +32,14 @@ Patch1:         0001-Revert-replace-obsolete-qSort-function.patch
 Patch2:         0002-Revert-replace-obsolete-qSort-function.patch
 # PATCH-FIX-OPENSUSE
 Patch3:         Lower-minimum-exiv2-version.patch
+# PATCH-FEATURE-UPSTREAM
+Patch4:         Add-QtWebEngine-support.patch
 #This pulls in QWebEngine, which is not available on ppc64
 %ifarch %ix86 x86_64 %arm aarch64 mips mips64
 BuildRequires:  akonadi-contact-devel
+BuildRequires:  pkgconfig(Qt5WebEngineWidgets)
+%else
+BuildRequires:  pkgconfig(Qt5WebKitWidgets)
 %endif
 BuildRequires:  QtAV-devel >= 1.12
 BuildRequires:  bison
@@ -44,9 +49,19 @@ BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  graphviz-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  karchive-devel
+BuildRequires:  kconfig-devel
+BuildRequires:  kcoreaddons-devel
+BuildRequires:  kdoctools-devel
 BuildRequires:  kfilemetadata5-devel
 BuildRequires:  ki18n-devel
+BuildRequires:  kiconthemes-devel
+BuildRequires:  kio-devel
+BuildRequires:  knotifications-devel
 BuildRequires:  knotifyconfig-devel
+BuildRequires:  kservice-devel
+BuildRequires:  kwindowsystem-devel
+BuildRequires:  kxmlgui-devel
 BuildRequires:  lensfun
 BuildRequires:  lensfun-devel
 BuildRequires:  libeigen3-devel
@@ -63,23 +78,26 @@ BuildRequires:  libmediawiki-devel
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  libmysqld-devel
 BuildRequires:  libpgf-devel
-BuildRequires:  libqca-qt5-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libusb-devel
 BuildRequires:  marble-devel
 BuildRequires:  mysql
 BuildRequires:  opencv-devel
+BuildRequires:  solid-devel
 BuildRequires:  threadweaver-devel >= 5.1.0
 BuildRequires:  update-desktop-files
 BuildRequires:  cmake(KF5CalendarCore)
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5Core) >= 5.6.0
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5OpenGL)
+BuildRequires:  pkgconfig(Qt5PrintSupport)
 BuildRequires:  pkgconfig(Qt5Sql)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5WebKitWidgets)
 BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(Qt5XmlPatterns)
 BuildRequires:  pkgconfig(libgphoto2) >= 2.4.0
 Requires:       kipi-plugins >= %{version}
@@ -170,6 +188,7 @@ The main digikam libraries that are being shared between showfoto and digikam
 %patch2 -p1
 %patch3 -p1
 %endif
+%patch4 -p1
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -183,7 +202,11 @@ sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" core/libs/dimg/filters/greycstoration/
 rm -f po/*/kipiplugin_vkontakte.po
 
 %build
+%ifarch %ix86 x86_64 %arm aarch64 mips mips64
+%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON -DENABLE_QWEBENGINE=ON
+%else
 %cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON
+%endif
 %make_jobs VERBOSE=1
 
 %install