public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/
Date: Sat, 30 May 2020 22:24:17 +0000 (UTC)	[thread overview]
Message-ID: <1590877368.e21afcf5a4083064234f4d4d1906164986a85bdc.asturm@gentoo> (raw)

commit:     e21afcf5a4083064234f4d4d1906164986a85bdc
Author:     Pavel Kalugin <paul.kalug <AT> gmail <DOT> com>
AuthorDate: Fri May 29 08:41:32 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 30 22:22:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e21afcf5

media-gfx/flameshot: Fix build with Qt 5.15

Closes: https://bugs.gentoo.org/725930
Signed-off-by: Pavel Kalugin <paul.kalug <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16001
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../flameshot-0.6.0-missing-include-fix.patch      | 22 ++++++++++++++++++++++
 media-gfx/flameshot/flameshot-0.6.0.ebuild         |  5 ++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

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 00000000000..f6b2ea457cb
--- /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 e3d9daac1c7..08fa91211c6 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


             reply	other threads:[~2020-05-30 22:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-30 22:24 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-30  7:19 [gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/ Joonas Niilola
2020-05-28 18:37 Maxim Koltsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1590877368.e21afcf5a4083064234f4d4d1906164986a85bdc.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox