commit digikam for openSUSE:Factory
Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2017-08-26 11:52:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam" Sat Aug 26 11:52:51 2017 rev:160 rq:518877 version:5.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2017-08-24 18:31:18.103713803 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2017-08-26 11:52:53.658870347 +0200 @@ -1,0 +2,6 @@ +Sat Aug 26 09:16:31 UTC 2017 - fabian@ritter-vogt.de + +- Add patch to fix build with cmake 3.9: + * fix-build-cmake39.patch + +------------------------------------------------------------------- New: ---- fix-build-cmake39.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.PGkrxr/_old 2017-08-26 11:52:59.054110987 +0200 +++ /var/tmp/diff_new_pack.PGkrxr/_new 2017-08-26 11:52:59.086106483 +0200 @@ -26,6 +26,8 @@ Source0: http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE find_libastro-qt5.patch -- fix build of geolocation support in Leap 42.1 Patch0: find_libastro-qt5.patch +# PATCH-FIX-UPSTREAM +Patch1: fix-build-cmake39.patch #This pulls in QWebEngine, which is not available on ppc64 %ifarch %ix86 x86_64 %arm aarch64 mips mips64 BuildRequires: akonadi-contact-devel @@ -76,8 +78,8 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel BuildRequires: cmake(KF5CalendarCore) -BuildRequires: pkgconfig(Qt5Core) >= 5.6.0 BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) >= 5.6.0 BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Svg) @@ -169,6 +171,9 @@ # we renamed libastro to libastro-qt5 in Leap 42.1, make FindMARBLE.cmake find it %patch0 -p1 %endif +pushd core +%patch1 -p1 +popd # 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') ++++++ fix-build-cmake39.patch ++++++ ++++ 13337 lines (skipped)
participants (1)
-
root@hilbert.suse.de