commit: 34ddb2a63471bacfc07cfb8e0c5f3aff7260fc9c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 07:59:25 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 07:59:25 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=34ddb2a6
media-gfx/digikam: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/digikam-7.0.0_beta2.ebuild | 2 +
.../files/digikam-7.0.0_beta2-qt-5.15.patch | 51 ++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
index 49e89080ca..d6909e113c 100644
--- a/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
+++ b/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
@@ -109,6 +109,8 @@ RDEPEND="${COMMON_DEPEND}
panorama? ( media-gfx/hugin )
"
+PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
+
RESTRICT+=" test"
# bug 366505
diff --git a/media-gfx/digikam/files/digikam-7.0.0_beta2-qt-5.15.patch
b/media-gfx/digikam/files/digikam-7.0.0_beta2-qt-5.15.patch
new file mode 100644
index 0000000000..fe865eb73a
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.0.0_beta2-qt-5.15.patch
@@ -0,0 +1,51 @@
+From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <[email protected]>
+Date: Sun, 19 Apr 2020 09:55:03 +0200
+Subject: [PATCH] Fix build with Qt 5.15.0
+
+Signed-off-by: Andreas Sturmlechner <[email protected]>
+---
+ .../dplugins/generic/view/presentation/opengl/presentationgl.cpp | 1 +
+ core/libs/dimg/filters/curves/curveswidget.cpp | 1 +
+ core/libs/dimg/filters/levels/histogrampainter.cpp | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+index b37699436e..6a4f173ab0 100644
+--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
++++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+@@ -44,6 +44,7 @@
+ #include <QMatrix>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QTimer>
+ #include <QWheelEvent>
+diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp
b/core/libs/dimg/filters/curves/curveswidget.cpp
+index cccccbd156..d0beef9bf2 100644
+--- a/core/libs/dimg/filters/curves/curveswidget.cpp
++++ b/core/libs/dimg/filters/curves/curveswidget.cpp
+@@ -40,6 +40,7 @@
+ #include <QColor>
+ #include <QFont>
+ #include <QFontMetrics>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QMouseEvent>
+
+diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp
b/core/libs/dimg/filters/levels/histogrampainter.cpp
+index 241d5fc4c8..f11ad4b560 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
+
+--
+2.26.1
+
