1 |
commit: e21afcf5a4083064234f4d4d1906164986a85bdc |
2 |
Author: Pavel Kalugin <paul.kalug <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri May 29 08:41:32 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 30 22:22:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e21afcf5 |
7 |
|
8 |
media-gfx/flameshot: Fix build with Qt 5.15 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/725930 |
11 |
Signed-off-by: Pavel Kalugin <paul.kalug <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/16001 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../flameshot-0.6.0-missing-include-fix.patch | 22 ++++++++++++++++++++++ |
16 |
media-gfx/flameshot/flameshot-0.6.0.ebuild | 5 ++++- |
17 |
2 files changed, 26 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch b/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..f6b2ea457cb |
22 |
--- /dev/null |
23 |
+++ b/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch |
24 |
@@ -0,0 +1,22 @@ |
25 |
+diff -ru a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp |
26 |
+--- a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 22:47:56.183333313 +0300 |
27 |
++++ b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 22:52:19.147998709 +0300 |
28 |
+@@ -24,6 +24,7 @@ |
29 |
+ #include <cmath> |
30 |
+ #include <QMouseEvent> |
31 |
+ #include <QPainter> |
32 |
++#include <QPainterPath> |
33 |
+ #include <QLineF> |
34 |
+ #include <QDragEnterEvent> |
35 |
+ #include <QMimeData> |
36 |
+diff -ru a/src/tools/arrow/arrowtool.h b/src/tools/arrow/arrowtool.h |
37 |
+--- a/src/tools/arrow/arrowtool.h 2020-05-29 22:47:56.184333329 +0300 |
38 |
++++ b/src/tools/arrow/arrowtool.h 2020-05-29 22:48:25.688787364 +0300 |
39 |
+@@ -19,6 +19,7 @@ |
40 |
+ |
41 |
+ #include "src/tools/abstracttwopointtool.h" |
42 |
+ #include <QPainter> |
43 |
++#include <QPainterPath> |
44 |
+ |
45 |
+ class ArrowTool : public AbstractTwoPointTool { |
46 |
+ Q_OBJECT |
47 |
|
48 |
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild |
49 |
index e3d9daac1c7..08fa91211c6 100644 |
50 |
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild |
51 |
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild |
52 |
@@ -25,7 +25,10 @@ DEPEND=" |
53 |
sys-apps/dbus |
54 |
" |
55 |
RDEPEND="${DEPEND}" |
56 |
-PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" ) |
57 |
+PATCHES=( |
58 |
+ "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" |
59 |
+ "${FILESDIR}/${P}-missing-include-fix.patch" |
60 |
+) |
61 |
|
62 |
src_prepare() { |
63 |
rm -r src/third-party/singleapplication || die |