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

[Antonio Rojas]

    Date: Sunday, October 10, 2021 @ 17:59:13
  Author: arojas
Revision: 1029278

qwt 6.2 rebuild

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

----------------------+
 PKGBUILD             |   12 +++++++--
 srsgui-qwt-6.2.patch |   61 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-10 17:48:34 UTC (rev 1029277)
+++ PKGBUILD	2021-10-10 17:59:13 UTC (rev 1029278)
@@ -4,7 +4,7 @@
 _pkgname=srsGUI
 pkgver=2.0
 _tag=release_${pkgver/./_}_qt5
-pkgrel=1
+pkgrel=2
 pkgdesc='A graphics library for software radio'
 arch=('x86_64')
 url='https://github.com/srsLTE/srsGUI'
@@ -11,9 +11,15 @@
 license=('AGPL3')
 depends=('boost-libs' 'qt5-base' 'qwt')
 makedepends=('cmake' 'boost')
-source=("$_pkgname-$pkgver.tar.gz::$url/archive/$_tag.tar.gz")
-sha512sums=('9d766a80fc81b015f5c8dbed3fa97d417496a0e4db11bd23a66bae4c3a2d7e0206f2569af8884d01b40702416dab6add52cc0ef04f29b176aba99de00466a88d')
+source=("$_pkgname-$pkgver.tar.gz::$url/archive/$_tag.tar.gz"
+         srsgui-qwt-6.2.patch)
+sha512sums=('9d766a80fc81b015f5c8dbed3fa97d417496a0e4db11bd23a66bae4c3a2d7e0206f2569af8884d01b40702416dab6add52cc0ef04f29b176aba99de00466a88d'
+            '1097681e57d0548db36db9ab1331e6e96554b44618b21ee08631e188e092796d57ec49c0456055b633026246eb652f75cd7470c60bb530ebf246d92cd9f28b5e')
 
+prepare() {
+  patch -d $_pkgname-$_tag -p1 < srsgui-qwt-6.2.patch # Fix build with qwt 6.2
+}
+
 build() {
   mkdir $_pkgname-$_tag/build
   cd $_pkgname-$_tag/build

Added: srsgui-qwt-6.2.patch
===================================================================
--- srsgui-qwt-6.2.patch	                        (rev 0)
+++ srsgui-qwt-6.2.patch	2021-10-10 17:59:13 UTC (rev 1029278)
@@ -0,0 +1,61 @@
+diff --git a/include/srsgui/common/WaterfallData.h b/include/srsgui/common/WaterfallData.h
+index a289c6d..5cde564 100755
+--- a/include/srsgui/common/WaterfallData.h
++++ b/include/srsgui/common/WaterfallData.h
+@@ -2,6 +2,7 @@
+ #define WATERFALLDATA_H
+ 
+ #include <qwt_raster_data.h>
++#include <qwt_interval.h>
+ #ifndef Q_MOC_RUN
+ #include <boost/circular_buffer.hpp>
+ #include <boost/shared_ptr.hpp>
+@@ -65,6 +66,16 @@ public:
+     return *(std::min_element(minVec.begin(),minVec.end()));
+   }
+ 
++  QwtInterval interval( Qt::Axis axis) const
++  {
++    return d_intervals[axis];
++  }
++
++  void setInterval( Qt::Axis axis, const QwtInterval &interval )
++  {
++    d_intervals[axis] = interval;
++  }
++
+   double value(double x, double y) const
+   {
+     double bottom = interval(Qt::YAxis).minValue();
+@@ -88,6 +99,7 @@ private:
+   VecPtrBuf data_;
+   int nData_;
+   int nRows_;
++  QwtInterval d_intervals[3];
+ };
+ 
+ #endif // WATERFALLDATA_H
+diff --git a/src/common/Spectrogramplot.cpp b/src/common/Spectrogramplot.cpp
+index ca9fad9..92a25d5 100755
+--- a/src/common/Spectrogramplot.cpp
++++ b/src/common/Spectrogramplot.cpp
+@@ -8,6 +8,8 @@
+ #include <qwt_plot_canvas.h>
+ #include "srsgui/common/Spectrogramplot.h"
+ 
++#include <QPen>
++
+ class MyZoomer: public QwtPlotZoomer
+ {
+ public:
+@@ -101,8 +103,8 @@ Spectrogramplot::Spectrogramplot(int numDataPoints, int numRows, QWidget *parent
+   sd->setMinimumExtent( fm.width("100.00") );
+ 
+   const QColor c(Qt::darkBlue);
+-  zoomer_->setRubberBandPen(c);
+-  zoomer_->setTrackerPen(c);
++  zoomer_->setRubberBandPen(QPen(c));
++  zoomer_->setTrackerPen(QPen(c));
+ }
+ 
+ void Spectrogramplot::appendData(double* data, int n)