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: x11-misc/fraqtive/files/, x11-misc/fraqtive/
Date: Sun, 21 Jun 2020 11:38:00 +0000 (UTC)	[thread overview]
Message-ID: <1592739461.8d19c19cbf1f71e74c7fc6ea7489c6dc6fa6fbd2.asturm@gentoo> (raw)

commit:     8d19c19cbf1f71e74c7fc6ea7489c6dc6fa6fbd2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 11:29:45 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 11:37:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d19c19c

x11-misc/fraqtive: Fix build with Qt 5.15

Closes: https://bugs.gentoo.org/726776
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../fraqtive/files/fraqtive-0.4.8-qt-5.15.patch    | 39 ++++++++++++++++++++++
 x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild         |  6 +++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
new file mode 100644
index 00000000000..63c28175709
--- /dev/null
+++ b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
@@ -0,0 +1,39 @@
+From 34963f986f64d98b6ef82757ca07159a6a059763 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 21 Jun 2020 13:21:15 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/datafunctions.cpp | 2 ++
+ src/shadewidget.cpp   | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/datafunctions.cpp b/src/datafunctions.cpp
+index 3ec1af9..9369299 100644
+--- a/src/datafunctions.cpp
++++ b/src/datafunctions.cpp
+@@ -19,6 +19,8 @@
+ #include "datafunctions.h"
+ #include "fractaldata.h"
+ 
++#include <QPainterPath>
++
+ namespace DataFunctions
+ {
+ 
+diff --git a/src/shadewidget.cpp b/src/shadewidget.cpp
+index 1494b37..3da5c05 100644
+--- a/src/shadewidget.cpp
++++ b/src/shadewidget.cpp
+@@ -19,6 +19,7 @@
+ #include "shadewidget.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QToolTip>
+ 
+-- 
+2.27.0
+

diff --git a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
index 7c98c206900..0b5059a75c4 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals"
@@ -25,7 +26,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-qt-includes.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt-includes.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch"
+)
 
 src_configure() {
 	tc-export PKG_CONFIG


                 reply	other threads:[~2020-06-21 11:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1592739461.8d19c19cbf1f71e74c7fc6ea7489c6dc6fa6fbd2.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