Hello community,
here is the log from the commit of package digikam for openSUSE:Factory checked
in at 2020-06-06 23:39:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/digikam (Old)
and /work/SRC/openSUSE:Factory/.digikam.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam"
Sat Jun 6 23:39:28 2020 rev:187 rq:811909 version:6.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2020-01-12
23:26:08.382855085 +0100
+++ /work/SRC/openSUSE:Factory/.digikam.new.3606/digikam.changes
2020-06-06 23:39:53.197006653 +0200
@@ -1,0 +2,6 @@
+Fri Jun 5 11:55:04 UTC 2020 - Wolfgang Bauer <wba...@tmo.at>
+
+- Add Fix-build-with-Qt-5.15.patch to fix build with Qt 5.15
+ (kde#421817)
+
+-------------------------------------------------------------------
New:
----
Fix-build-with-Qt-5.15.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.DHGgJp/_old 2020-06-06 23:39:55.857015001 +0200
+++ /var/tmp/diff_new_pack.DHGgJp/_new 2020-06-06 23:39:55.857015001 +0200
@@ -33,6 +33,8 @@
# PATCH-FIX-UPSTREAM
Patch2: fix-build-with-opencv-4.2.patch
Patch3: dlib-update-to-work-with-latest-version-of-OpenCV.patch
+# PATCH-FIX-UPSTREAM
+Patch4: Fix-build-with-Qt-5.15.patch
BuildRequires: QtAV-devel >= 1.12
BuildRequires: bison
BuildRequires: boost-devel
@@ -184,6 +186,7 @@
%endif
%patch2 -p1
%patch3 -p1
+%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')
++++++ Fix-build-with-Qt-5.15.patch ++++++
>From 9ef1670e7ea0852cdfb694dd4d839977305bd4a2 Mon Sep 17 00:00:00 2001
From: Gilles Caulier <caulier.gil...@gmail.com>
Date: Wed, 20 May 2020 13:05:55 +0200
Subject: fix broken compilation with Qt 5.15 CCBUGS: 421817
diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp
b/core/libs/dimg/filters/levels/histogrampainter.cpp
index 241d5fc..f11ad4b 100644
--- a/core/libs/dimg/filters/levels/histogrampainter.cpp
+++ b/core/libs/dimg/filters/levels/histogrampainter.cpp
@@ -30,6 +30,7 @@
// Qt includes
#include <QPainter>
+#include <QPainterPath>
// KDE includes
diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp
b/core/libs/dimg/filters/curves/curveswidget.cpp
index cccccbd..e8b2e1b 100644
--- a/core/libs/dimg/filters/curves/curveswidget.cpp
+++ b/core/libs/dimg/filters/curves/curveswidget.cpp
@@ -42,6 +42,7 @@
#include <QFontMetrics>
#include <QPaintEvent>
#include <QMouseEvent>
+#include <QPainterPath>
// KDE includes
diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
index b376994..4d4dbfb 100644
--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
@@ -44,6 +44,8 @@
#include <QMatrix>
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
+#include <QPainterPathStroker>
#include <QPixmap>
#include <QTimer>
#include <QWheelEvent>
