From b9097e90ead26fa7fd3db9b4ab41c425aa0fa6c4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 10 Apr 2022 17:35:00 -0400 Subject: [PATCH] linssid: rebuild for qwt --- srcpkgs/linssid/patches/project.patch | 6 ++++-- srcpkgs/linssid/patches/qwt-6.2.patch | 28 +++++++++++++++++++++++++++ srcpkgs/linssid/template | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/linssid/patches/qwt-6.2.patch diff --git a/srcpkgs/linssid/patches/project.patch b/srcpkgs/linssid/patches/project.patch index dd03c910c7b..8adc2028ec4 100644 --- a/srcpkgs/linssid/patches/project.patch +++ b/srcpkgs/linssid/patches/project.patch @@ -1,8 +1,10 @@ --- a/linssid-app/linssid-app.pro +++ b/linssid-app/linssid-app.pro -@@ -5,7 +5,7 @@ +@@ -3,9 +3,9 @@ + TARGET = linssid + VERSION = 3.6 CONFIG -= debug_and_release app_bundle lib_bundle --CONFIG += release +-CONFIG += release +CONFIG += release qwt PKGCONFIG += -QT = core gui widgets svg diff --git a/srcpkgs/linssid/patches/qwt-6.2.patch b/srcpkgs/linssid/patches/qwt-6.2.patch new file mode 100644 index 00000000000..c05221ea6e1 --- /dev/null +++ b/srcpkgs/linssid/patches/qwt-6.2.patch @@ -0,0 +1,28 @@ +--- a/linssid-app/MainForm.cpp ++++ b/linssid-app/MainForm.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -1036,7 +1037,7 @@ + MainForm::cellDataRay[tbi].signal ) ); + } + } else { +- MainForm::cellDataRay[tbi].pBandCurve->setSamples(0, 0, 0); ++ MainForm::cellDataRay[tbi].pBandCurve->setSamples(static_cast(NULL), static_cast(NULL), 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(static_cast(NULL), static_cast(NULL), 0); + } + } + MainForm::mainFormWidget.chan24Plot->replot(); diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template index 3347f193c3e..937c8a0745e 100644 --- a/srcpkgs/linssid/template +++ b/srcpkgs/linssid/template @@ -1,7 +1,7 @@ # Template file for 'linssid' pkgname=linssid version=3.6 -revision=3 +revision=4 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="boost-devel qwt-devel"