gentoo resync : 20.03.2022

3 files changed, 55 insertions, 5 deletions

diff --git a/net-wireless/linssid/Manifest b/net-wireless/linssid/Manifest
index 3d380dc3d565..d89c42685539 100644
--- a/net-wireless/linssid/Manifest
+++ b/net-wireless/linssid/Manifest
@@ -1,3 +1,4 @@
+AUX linssid-3.6-qwt620.patch 1709 BLAKE2B 6750a7a981a3e781202c3c7c0e052abd84f53066a6a99b1649a9881ba832f09666efae8470be5626dfa52ab3b8fc029c8adc1bb65081655d4ff3b88c7db24bdf SHA512 d048eedf2f86798ec7af70d7be385093fd918ea294c904d2fbd9b41983039cdb52f2bf8d8938248ce5939b99ac37009a49368a4df4f0c5bca53a69fdb1858fa2
 DIST linssid_3.6.orig.tar.gz 397541 BLAKE2B 35d56cc9439a3a117200c59a03dad3a53bbecbe522a5592ba4cd6a5d37332c4b8c6ec065b7357643bda6b7b54462d720e3ee0b3efcb5a80e14c809330d84fc2b SHA512 066c890776a23d0e5fe8518826c64edc4b7d6dcef28cd7ce58f842e52b9e2b13517358ca6df636613abd1e860b20c6b542b5df165de1aa262e1e7db8a60e00e5
-EBUILD linssid-3.6-r1.ebuild 1088 BLAKE2B 23cb66317aa3688f69d9151961de15f34b65dd90389d6a7c0a9288c3276e4ceb521c95605c31f435e240ce5f547aa1d10dc9b943d6a87cb600b26f126f6168ab SHA512 8c083191d5505aae46e083681d86f5f367a253bb45d01d7a0810fc9673e8e50a1e3ac8153291dc93082fdffafb3d37473039609e2ef7e6d46c7e730480604089
+EBUILD linssid-3.6-r2.ebuild 1137 BLAKE2B bc9eb656eb98a6a9819eeb19fb98fa5b4fda2492035fc5f19160e3a5667b7516dc626f9295cc2e4d56c3ba4a502389156a58732f67d8d9ad21607a5e8869ee72 SHA512 0403e844284c35459f8f0d8f19d55f8fd1bc4964f697859271d0283f4f28131f498805e10e0bcfeafa4098bee68a7d2dbe752ef5e2fddda9169fc08ced979019
 MISC metadata.xml 752 BLAKE2B 7f66690bd113f212d3fe452c592921d2fba708252519be636ed6cc8b7771af05771db7822f74503ba7516e383743c1cb4add12d1dc6ed85c55070456543ea0ca SHA512 2cfe5d8ee8c862fc39354db52d4f8e34cf9bb7dd5ba07af090b56cf82fc2fba6a47e284c94206bef2bcc75f4c6f1ed2c58abde8e70b1efc2da4b239df3448186
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@gmx.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-r1.ebuild b/net-wireless/linssid/linssid-3.6-r2.ebuild
index f12ac63ff47b..8e67948519cc 100644
--- a/net-wireless/linssid/linssid-3.6-r1.ebuild
+++ b/net-wireless/linssid/linssid-3.6-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+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"
@@ -29,10 +30,10 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 "
 
-S="${WORKDIR}/${P}/${PN}-app"
-
 DOCS=( README_${PV} )
 
+PATCHES=( "${FILESDIR}/${PN}-3.6-qwt620.patch" )
+
 src_prepare() {
 	default