[gentoo-commits] repo/gentoo:master commit in: net-wireless/inspectrum/files/, net-wireless/inspectrum/

[gentoo-commits] repo/gentoo:master commit in: net-wireless/inspectrum/files/, net-wireless/inspectrum/

[Andreas Sturmlechner]

commit:     f7eaf3bd3fc99384fe7a926326d267345f56278b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 11:52:28 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 14:13:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7eaf3bd

net-wireless/inspectrum: Fix build with Qt 5.15

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

 .../files/inspectrum-0.2.2-qt-5.15.patch           | 21 +++++++++++++++
 net-wireless/inspectrum/inspectrum-0.2.2.ebuild    | 30 ++++++++++++----------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch b/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch
new file mode 100644
index 00000000000..3e55e814ecb
--- /dev/null
+++ b/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch
@@ -0,0 +1,21 @@
+From 1f2b4587ec2c6d1a1945eee8bbf361dbdf3dc8af Mon Sep 17 00:00:00 2001
+From: Martin Hauke <mardnh@gmx.de>
+Date: Sun, 7 Jun 2020 21:56:38 +0200
+Subject: [PATCH] Fix build with Qt 5.15+
+
+---
+ traceplot.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/traceplot.cpp b/traceplot.cpp
+index 3704d24..04bdba8 100644
+--- a/traceplot.cpp
++++ b/traceplot.cpp
+@@ -20,6 +20,7 @@
+ #include <QPixmapCache>
+ #include <QTextStream>
+ #include <QtConcurrent>
++#include <QPainterPath>
+ #include "samplesource.h"
+ #include "traceplot.h"
+ 

diff --git a/net-wireless/inspectrum/inspectrum-0.2.2.ebuild b/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
index 55640eba8fb..13dd958f53d 100644
--- a/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
+++ b/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="a tool for analysing captured signals from software-defined radio receivers"
+DESCRIPTION="Tool for analysing captured signals from software-defined radio receivers"
 HOMEPAGE="https://github.com/miek/inspectrum"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
+
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
-	KEYWORDS=""
+	inherit git-r3
 else
 	SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -20,11 +20,15 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
-RDEPEND="sci-libs/fftw:3.0=
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
+RDEPEND="
 	dev-qt/qtcore:5
-	net-libs/liquid-dsp"
-DEPEND="virtual/pkgconfig
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/liquid-dsp
+	sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
-	${RDEPEND}"
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )