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

[Conrad Kostecki]

commit:     7ab80fb494e436599d75eace5144cd41b77b6b0f
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  9 13:13:02 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 13:14:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab80fb4

net-wireless/linssid: update EAPI 7 -> 8

Also fixed compilation with >=qwt-6.2.0.

Closes: https://bugs.gentoo.org/829153
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../linssid/files/linssid-3.6-qwt620.patch         | 48 +++++++++++++++++
 net-wireless/linssid/linssid-3.6-r2.ebuild         | 62 ++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/net-wireless/linssid/files/linssid-3.6-qwt620.patch b/net-wireless/linssid/files/linssid-3.6-qwt620.patch
new file mode 100644
index 000000000000..bea00e1f432d
--- /dev/null
+++ b/net-wireless/linssid/files/linssid-3.6-qwt620.patch
@@ -0,0 +1,48 @@
+From: Luigi Baldoni <aloisio@×××.com>
+Date: 2021-08-04 22:14:02 +0200
+Subject: Fix compatibility with Qwt 6.2.0
+References: https://sourceforge.net/p/linssid/discussion/bugs/thread/3080bf8f4d/
+Upstream: submitted
+
+Disambiguate function calls after new overloads added in qwt 6.2.
+(courtesy of Jari Kuittinen)
+
+---
+
+Index: MainForm.cpp
+===================================================================
+--- a/MainForm.cpp
++++ b/MainForm.cpp
+@@ -28,6 +28,7 @@
+ #include <qwt_plot_curve.h>
+ #include <qwt_plot_grid.h>
+ #include <qwt_symbol.h>
++#include <qwt_text.h>
+ #include <qwt_plot_marker.h>
+ #include <QPointF>
+ #include <qwt_scale_draw.h>
+@@ -1036,7 +1037,7 @@ void MainForm::fillPlots() {
+                     MainForm::cellDataRay[tbi].signal ) );
+             }
+         } else {
+-            MainForm::cellDataRay[tbi].pBandCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pBandCurve->setSamples((double *)nullptr, (double *)nullptr, 0);
+         }
+         // now the signal history plot
+         int ixStart;
+@@ -1055,7 +1056,7 @@ void MainForm::fillPlots() {
+                     &(MainForm::cellDataRay[tbi].pHistory->signal[ixStart]), ixLength);
+         } else {
+ 
+-            MainForm::cellDataRay[tbi].pTimeCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pTimeCurve->setSamples((double *)nullptr, (double *)nullptr, 0);
+         }
+     }
+     MainForm::mainFormWidget.chan24Plot->replot();
+@@ -1424,4 +1425,4 @@ int MainForm::MinIntStr(const string &s)
+ //    const std::string whiteSpaces( " \f\n\r\t\v" );
+ //    std::string::size_type pos = str.find_first_not_of( whiteSpaces );
+ //    str.erase( pos + 1 );    
+-//}
+\ No newline at end of file
++//}

diff --git a/net-wireless/linssid/linssid-3.6-r2.ebuild b/net-wireless/linssid/linssid-3.6-r2.ebuild
new file mode 100644
index 000000000000..8e67948519cc
--- /dev/null
+++ b/net-wireless/linssid/linssid-3.6-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Graphical wireless scanning for Linux"
+HOMEPAGE="https://sourceforge.net/projects/linssid/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
+S="${WORKDIR}/${P}/${PN}-app"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	x11-libs/qwt:6[opengl,qt5(+),svg]
+"
+
+RDEPEND="
+	${DEPEND}
+	net-wireless/iw
+	sys-auth/polkit
+	x11-libs/libxkbcommon[X]
+"
+
+DOCS=( README_${PV} )
+
+PATCHES=( "${FILESDIR}/${PN}-3.6-qwt620.patch" )
+
+src_prepare() {
+	default
+
+	# Fix lib path for x11-libs/qwt and use system qwt for compiling
+	sed -e '/libqwt-qt5.so.6/c\LIBS += -lqwt6-qt5' -e 's/CONFIG += release/& qwt/' -i linssid-app.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}