Fix build

3 files changed, 97 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ef37dd02615..af4d84ad46a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = dream
 	pkgdesc = A software radio for AM and Digital Radio Mondiale (DRM)
 	pkgver = 2.1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://sourceforge.net/projects/drm
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = gcc
+	makedepends = patch
 	depends = fftw
 	depends = opus
 	depends = libsndfile
@@ -18,7 +19,8 @@ pkgbase = dream
 	depends = qt5-svg
 	depends = qt5-base
 	source = https://sourceforge.net/projects/drm/files/dream/2.1.1/dream-2.1.1-svn808.tar.gz
-	md5sums = 4745a4f03216bc3afda077398d0e5d3b
+	source = fix_qwttext.patch
+	sha256sums = 417734a197ed596a08e75363c304be9b4595f2f21581bc64fec47c49f733bb05
+	sha256sums = a5c521644f9a95f73adc4eefa8bb690642caefa59b028ddd9b34aea231af96f2
 
 pkgname = dream
-
diff --git a/PKGBUILD b/PKGBUILD
index d7df83007a82..968969fce88c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,23 @@
 
 pkgname=dream
 pkgver=2.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A software radio for AM and Digital Radio Mondiale (DRM)"
 arch=('i686' 'x86_64')
 url="https://sourceforge.net/projects/drm"
 license=(GPL2)
 depends=(fftw opus libsndfile speexdsp hamlib libpulse qwt qt5-webkit qt5-svg qt5-base)
-makedepends=(gcc)
-source=("https://sourceforge.net/projects/drm/files/dream/${pkgver}/${pkgname}-${pkgver}-svn808.tar.gz")
-md5sums=('4745a4f03216bc3afda077398d0e5d3b')
+makedepends=(gcc patch)
+source=("https://sourceforge.net/projects/drm/files/dream/${pkgver}/${pkgname}-${pkgver}-svn808.tar.gz"
+        "fix_qwttext.patch")
+sha256sums=('417734a197ed596a08e75363c304be9b4595f2f21581bc64fec47c49f733bb05'
+            'a5c521644f9a95f73adc4eefa8bb690642caefa59b028ddd9b34aea231af96f2')
 
 build() {
     cd "${srcdir}/${pkgname}"
 
+    patch -Np0 -i "${srcdir}/fix_qwttext.patch"
+
     qmake-qt5 dream.pro
     make
 }
diff --git a/fix_qwttext.patch b/fix_qwttext.patch
new file mode 100644
index 000000000000..6f1b69523133
--- /dev/null
+++ b/fix_qwttext.patch
@@ -0,0 +1,84 @@
+--- src/GUI-QT/DRMPlot.h	2013-11-11 20:33:44.000000000 +0400
++++ src/GUI-QT/DRMPlot.h	2021-12-19 21:59:25.590485997 +0300
+@@ -58,10 +58,11 @@
+ #include <qwt_plot_layout.h>
+ #include <qwt_plot_marker.h>
+ #include <qwt_plot_picker.h>
+ #include <qwt_scale_draw.h>
+ #include <qwt_symbol.h>
++#include <qwt_text.h>
+ #if QWT_VERSION >= 0x060000
+ # include <qwt_picker_machine.h>
+ #endif
+ 
+ /* Other includes */
+--- src/GUI-QT/DRMPlot.cpp	2013-11-11 20:33:43.000000000 +0400
++++ src/GUI-QT/DRMPlot.cpp	2021-12-19 22:09:50.774375671 +0300
+@@ -567,11 +567,11 @@
+ 			im[i] = veccData[i].imag();
+ 		}
+ 		curve.SETDATA(&r[0], &im[0], size);
+ 	}
+ 	else
+-		curve.SETDATA(NULL, NULL, 0);
++		curve.SETDATA((float *)NULL, (float *)NULL, 0);
+ }
+ 
+ void CDRMPlot::SetData(CVector<_COMPLEX>& veccData)
+ {
+ 	SetData(curve1, veccData);
+@@ -598,19 +598,19 @@
+ 	curve5.detach();
+ 	hcurvegrid.detach();
+ 	vcurvegrid.detach();
+ 	main1curve.detach();
+ 	main2curve.detach();
+-	curve1.SETDATA(NULL, NULL, 0);
+-	curve2.SETDATA(NULL, NULL, 0);
+-	curve3.SETDATA(NULL, NULL, 0);
+-	curve4.SETDATA(NULL, NULL, 0);
+-	curve5.SETDATA(NULL, NULL, 0);
+-	hcurvegrid.SETDATA(NULL, NULL, 0);
+-	vcurvegrid.SETDATA(NULL, NULL, 0);
+-	main1curve.SETDATA(NULL, NULL, 0);
+-	main2curve.SETDATA(NULL, NULL, 0);
++	curve1.SETDATA((float *)NULL, (float *)NULL, 0);
++	curve2.SETDATA((float *)NULL, (float *)NULL, 0);
++	curve3.SETDATA((float *)NULL, (float *)NULL, 0);
++	curve4.SETDATA((float *)NULL, (float *)NULL, 0);
++	curve5.SETDATA((float *)NULL, (float *)NULL, 0);
++	hcurvegrid.SETDATA((float *)NULL, (float *)NULL, 0);
++	vcurvegrid.SETDATA((float *)NULL, (float *)NULL, 0);
++	main1curve.SETDATA((float *)NULL, (float *)NULL, 0);
++	main2curve.SETDATA((float *)NULL, (float *)NULL, 0);
+ #if QWT_VERSION < 0x060000
+ 	curve1.setSymbol(QwtSymbol());
+     curve2.setSymbol(QwtSymbol());
+ 	curve3.setSymbol(QwtSymbol());
+ #else
+@@ -796,11 +796,11 @@
+ 	if (bAudioDecoder)
+ 		plot->setTitle(tr("Audio Spectrum"));
+ 	else
+ 	{
+ 		plot->setTitle(tr("No audio decoding possible"));
+-		main1curve.SETDATA(NULL, NULL, 0);
++		main1curve.SETDATA((float *)NULL, (float *)NULL, 0);
+ 	}
+ 	plot->enableAxis(QwtPlot::yRight, FALSE);
+ 	plot->setAxisTitle(QwtPlot::xBottom, tr("Frequency [kHz]"));
+ 	plot->enableAxis(QwtPlot::yLeft, TRUE);
+ 	plot->setAxisTitle(QwtPlot::yLeft, "AS [dB]");
+@@ -1182,11 +1182,11 @@
+ 		dY[1] = MAX_VAL_INP_SPEC_Y_AXIS_DB;//MIN_VAL_INP_SPEC_Y_AXIS_DB;
+ 
+ 		curve2.SETDATA(dX, dY, 2);
+ 	}
+ 	else
+-		curve2.SETDATA(NULL, NULL, 0);
++		curve2.SETDATA((float *)NULL, (float *)NULL, 0);
+ }
+ 
+ void CDRMPlot::SetupInpSpecWaterf()
+ {
+ 	/* Init chart for waterfall input spectrum */