summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Kalugin <paul.kalug@gmail.com>2020-05-29 11:41:32 +0300
committerAndreas Sturmlechner <asturm@gentoo.org>2020-05-31 00:22:48 +0200
commite21afcf5a4083064234f4d4d1906164986a85bdc (patch)
treed4b3051b59bc7dc32df5109aa60cd443a50b405d
parentsys-boot/palo: Version 2.14 (diff)
downloadgentoo-e21afcf5a4083064234f4d4d1906164986a85bdc.tar.gz
gentoo-e21afcf5a4083064234f4d4d1906164986a85bdc.tar.bz2
gentoo-e21afcf5a4083064234f4d4d1906164986a85bdc.zip
media-gfx/flameshot: Fix build with Qt 5.15
Closes: https://bugs.gentoo.org/725930 Signed-off-by: Pavel Kalugin <paul.kalug@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16001 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch22
-rw-r--r--media-gfx/flameshot/flameshot-0.6.0.ebuild5
2 files changed, 26 insertions, 1 deletions
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
new file mode 100644
index 000000000000..f6b2ea457cbf
--- /dev/null
+++ b/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch
@@ -0,0 +1,22 @@
+diff -ru a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp
+--- a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 22:47:56.183333313 +0300
++++ b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 22:52:19.147998709 +0300
+@@ -24,6 +24,7 @@
+ #include <cmath>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLineF>
+ #include <QDragEnterEvent>
+ #include <QMimeData>
+diff -ru a/src/tools/arrow/arrowtool.h b/src/tools/arrow/arrowtool.h
+--- a/src/tools/arrow/arrowtool.h 2020-05-29 22:47:56.184333329 +0300
++++ b/src/tools/arrow/arrowtool.h 2020-05-29 22:48:25.688787364 +0300
+@@ -19,6 +19,7 @@
+
+ #include "src/tools/abstracttwopointtool.h"
+ #include <QPainter>
++#include <QPainterPath>
+
+ class ArrowTool : public AbstractTwoPointTool {
+ Q_OBJECT
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index e3d9daac1c78..08fa91211c6b 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -25,7 +25,10 @@ DEPEND="
sys-apps/dbus
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+ "${FILESDIR}/${P}-missing-include-fix.patch"
+)
src_prepare() {
rm -r src/third-party/singleapplication || die