1 |
commit: 54c96702dba9bb8dc9fccd90ee19439ecc6a237e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 30 21:20:54 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 30 21:44:04 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c96702 |
7 |
|
8 |
media-gfx/digikam: Fix 6.4.0-r1 build w/ Qt-5.15 |
9 |
|
10 |
Thanks-to: Thomas Posch <bugs.gentoo.org <AT> online.posch.name> |
11 |
Closes: https://bugs.gentoo.org/729446 |
12 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
media-gfx/digikam/digikam-6.4.0-r1.ebuild | 5 ++- |
16 |
.../digikam/files/digikam-6.4.0-qt-5.15.patch | 38 ++++++++++++++++++++++ |
17 |
2 files changed, 42 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/media-gfx/digikam/digikam-6.4.0-r1.ebuild b/media-gfx/digikam/digikam-6.4.0-r1.ebuild |
20 |
index f89120250bc..870d93f3a99 100644 |
21 |
--- a/media-gfx/digikam/digikam-6.4.0-r1.ebuild |
22 |
+++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild |
23 |
@@ -109,7 +109,10 @@ RDEPEND="${COMMON_DEPEND} |
24 |
RESTRICT+=" test" |
25 |
# bug 366505 |
26 |
|
27 |
-PATCHES=( "${FILESDIR}/${PN}-6.3.0-cmake.patch" ) |
28 |
+PATCHES=( |
29 |
+ "${FILESDIR}/${PN}-6.3.0-cmake.patch" |
30 |
+ "${FILESDIR}/${P}-qt-5.15.patch" # bug 730298 |
31 |
+) |
32 |
|
33 |
pkg_pretend() { |
34 |
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
35 |
|
36 |
diff --git a/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch |
37 |
new file mode 100644 |
38 |
index 00000000000..c2d5154b549 |
39 |
--- /dev/null |
40 |
+++ b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch |
41 |
@@ -0,0 +1,38 @@ |
42 |
+Fix build with Qt 5.15 |
43 |
+ |
44 |
+Authored-by: Thomas Posch <bugs.gentoo.org@××××××××××××.name> |
45 |
+ |
46 |
+diff -Naur a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp |
47 |
+--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp 2020-06-30 22:48:50.477149053 +0200 |
48 |
++++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp 2020-06-30 22:49:52.217439213 +0200 |
49 |
+@@ -44,6 +44,8 @@ |
50 |
+ #include <QMatrix> |
51 |
+ #include <QMouseEvent> |
52 |
+ #include <QPainter> |
53 |
++#include <QPainterPath> |
54 |
++#include <QPainterPathStroker> |
55 |
+ #include <QPixmap> |
56 |
+ #include <QTimer> |
57 |
+ #include <QWheelEvent> |
58 |
+diff -Naur a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp |
59 |
+--- a/core/libs/dimg/filters/curves/curveswidget.cpp 2020-06-30 22:48:50.374150231 +0200 |
60 |
++++ b/core/libs/dimg/filters/curves/curveswidget.cpp 2020-06-30 22:49:17.219842551 +0200 |
61 |
+@@ -41,6 +41,7 @@ |
62 |
+ #include <QFont> |
63 |
+ #include <QFontMetrics> |
64 |
+ #include <QPaintEvent> |
65 |
++#include <QPainterPath> |
66 |
+ #include <QMouseEvent> |
67 |
+ |
68 |
+ // KDE includes |
69 |
+diff -Naur a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp |
70 |
+--- a/core/libs/dimg/filters/levels/histogrampainter.cpp 2020-06-30 22:48:50.374150231 +0200 |
71 |
++++ b/core/libs/dimg/filters/levels/histogrampainter.cpp 2020-06-30 22:49:17.219842551 +0200 |
72 |
+@@ -30,6 +30,7 @@ |
73 |
+ // Qt includes |
74 |
+ |
75 |
+ #include <QPainter> |
76 |
++#include <QPainterPath> |
77 |
+ |
78 |
+ // KDE includes |
79 |
+ |