From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E86521382C5 for ; Sat, 30 May 2020 22:24:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2DCCE08D0; Sat, 30 May 2020 22:24:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83B05E08D0 for ; Sat, 30 May 2020 22:24:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC81234EF93 for ; Sat, 30 May 2020 22:24:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 601191DA for ; Sat, 30 May 2020 22:24:17 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1590877368.e21afcf5a4083064234f4d4d1906164986a85bdc.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch media-gfx/flameshot/flameshot-0.6.0.ebuild X-VCS-Directories: media-gfx/flameshot/files/ media-gfx/flameshot/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e21afcf5a4083064234f4d4d1906164986a85bdc X-VCS-Branch: master Date: Sat, 30 May 2020 22:24:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b49db1b9-136d-4b19-a19e-c1fe6ca61f8b X-Archives-Hash: 8cf581069cf3704491f3ee523e6d0870 commit: e21afcf5a4083064234f4d4d1906164986a85bdc Author: Pavel Kalugin gmail com> AuthorDate: Fri May 29 08:41:32 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16001 Signed-off-by: Andreas Sturmlechner 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 + #include + #include ++#include + #include + #include + #include +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 ++#include + + 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