[arch-commits] Commit in linssid/trunk (PKGBUILD linssid-qwt-6.2.patch)

[Antonio Rojas]

    Date: Sunday, October 10, 2021 @ 16:41:48
  Author: arojas
Revision: 1029271

qwt 6.2 rebuild

Added:
  linssid/trunk/linssid-qwt-6.2.patch
Modified:
  linssid/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   13 +++++++++----
 linssid-qwt-6.2.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-10 16:18:34 UTC (rev 1029270)
+++ PKGBUILD	2021-10-10 16:41:48 UTC (rev 1029271)
@@ -4,7 +4,7 @@
 
 pkgname=linssid
 pkgver=3.6
-pkgrel=9
+pkgrel=10
 pkgdesc='Graphical wireless scanner for Linux'
 url='https://sourceforge.net/projects/linssid/'
 arch=('x86_64')
@@ -13,14 +13,19 @@
          'desktop-file-utils' 'gtk-update-icon-cache')
 makedepends=('boost')
 optdepends=('sudo: privilege escalation to use wireless tools')
-source=(${pkgname}-${pkgver}.tar.gz::https://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
-sha256sums=('57301ee93f708f2512316668bf4e718502f37f21a5e93b68fc604a9032e3e49c')
-sha512sums=('066c890776a23d0e5fe8518826c64edc4b7d6dcef28cd7ce58f842e52b9e2b13517358ca6df636613abd1e860b20c6b542b5df165de1aa262e1e7db8a60e00e5')
+source=(${pkgname}-${pkgver}.tar.gz::https://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
+        linssid-qwt-6.2.patch)
+sha256sums=('57301ee93f708f2512316668bf4e718502f37f21a5e93b68fc604a9032e3e49c'
+            '3b6df6cede4313a72adc473a3c1223bef0cbedc7dcc67d55e7ed33cb896bf999')
+sha512sums=('066c890776a23d0e5fe8518826c64edc4b7d6dcef28cd7ce58f842e52b9e2b13517358ca6df636613abd1e860b20c6b542b5df165de1aa262e1e7db8a60e00e5'
+            '4c450580374cb307856b8a81fc5ab42c5367cc6c6f8942d0b0b4a00ffb49b58164d4a13d2effeb865917938b89d62a15b624ec1a829501d30b763aebf2183870')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -r 's|libqwt-qt5.so|libqwt.so|g' -i linssid-app/linssid-app.pro
   sed -r 's|/usr/sbin|/usr/bin|g' -i linssid-app/linssid-app.pro
+
+  patch -p1 -i ../linssid-qwt-6.2.patch # Fix build with qwt 6.2
 }
 
 build() {

Added: linssid-qwt-6.2.patch
===================================================================
--- linssid-qwt-6.2.patch	                        (rev 0)
+++ linssid-qwt-6.2.patch	2021-10-10 16:41:48 UTC (rev 1029271)
@@ -0,0 +1,36 @@
+diff -ru linssid-3.6.orig/linssid-app/MainForm.cpp linssid-3.6/linssid-app/MainForm.cpp
+--- linssid-3.6.orig/linssid-app/MainForm.cpp	2021-10-10 18:23:38.037465662 +0200
++++ linssid-3.6/linssid-app/MainForm.cpp	2021-10-10 18:32:43.396592202 +0200
+@@ -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 @@
+                     MainForm::cellDataRay[tbi].signal ) );
+             }
+         } else {
+-            MainForm::cellDataRay[tbi].pBandCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pBandCurve->setSamples((double*)0, (double*)0, 0);
+         }
+         // now the signal history plot
+         int ixStart;
+@@ -1055,7 +1056,7 @@
+                     &(MainForm::cellDataRay[tbi].pHistory->signal[ixStart]), ixLength);
+         } else {
+ 
+-            MainForm::cellDataRay[tbi].pTimeCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pTimeCurve->setSamples((double*)0, (double*)0, 0);
+         }
+     }
+     MainForm::mainFormWidget.chan24Plot->replot();
+@@ -1424,4 +1425,4 @@
+ //    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 hay ningún carácter de nueva línea al final del fichero
++//}