Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2018-11-01 14:45:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam" Thu Nov 1 14:45:33 2018 rev:175 rq:645877 version:5.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2018-10-31 13:22:15.847011302 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2018-11-01 14:45:38.802869858 +0100 @@ -1,0 +2,10 @@ +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 + +------------------------------------------------------------------- New: ---- Add-QtWebEngine-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.vlNPvd/_old 2018-11-01 14:45:41.250869608 +0100 +++ /var/tmp/diff_new_pack.vlNPvd/_new 2018-11-01 14:45:41.254869609 +0100 @@ -32,9 +32,14 @@ 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: 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: 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 @@ %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 @@ 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 ++++++ Add-QtWebEngine-support.patch ++++++ ++++ 1727 lines (skipped)