summaryrefslogtreecommitdiffstats
path: root/academic/QtiPlot/sip-4.15.patch
diff options
context:
space:
mode:
author David Spencer <baildon.research@googlemail.com>2015-10-28 19:31:10 +0000
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit9434f258ee05b0951f5690cb20726c55a2e73e40 (patch)
treeb21b21d2bb4b47988b9edcda093af97d379deda1 /academic/QtiPlot/sip-4.15.patch
parent7f020478b9da0abb624b1d887ed4be81ee28c014 (diff)
downloadslackbuilds-9434f258ee05b0951f5690cb20726c55a2e73e40.tar.gz
slackbuilds-9434f258ee05b0951f5690cb20726c55a2e73e40.tar.xz
academic/QtiPlot: Patched for building with sip-4.16.
Also fixed library plugin location. Signed-off-by: David Spencer <baildon.research@googlemail.com>
Diffstat (limited to 'academic/QtiPlot/sip-4.15.patch')
-rw-r--r--academic/QtiPlot/sip-4.15.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/academic/QtiPlot/sip-4.15.patch b/academic/QtiPlot/sip-4.15.patch
new file mode 100644
index 0000000000..504223190a
--- /dev/null
+++ b/academic/QtiPlot/sip-4.15.patch
@@ -0,0 +1,32 @@
+--- ./qtiplot/src/analysis/FFT.cpp.orig 2011-07-06 11:51:08.000000000 +0000
++++ ./qtiplot/src/analysis/FFT.cpp 2013-10-23 23:07:45.674925476 +0000
+@@ -353,7 +353,7 @@
+ ml->arrangeLayers(false, false);
+ }
+
+-bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to)
++bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to, bool unused)
+ {
+ d_init_err = true;
+
+--- ./qtiplot/src/analysis/FFT.h.orig 2011-07-05 22:05:03.000000000 +0000
++++ ./qtiplot/src/analysis/FFT.h 2013-10-23 23:11:34.277924367 +0000
+@@ -52,6 +52,8 @@
+ Matrix *realOutputMatrix(){return d_re_out_matrix;}
+ Matrix *imaginaryOutputMatrix(){return d_im_out_matrix;}
+
++ bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1, bool unused = false);
++
+ private:
+ void init();
+ void output();
+@@ -60,8 +62,6 @@
+ void fftTable();
+ void fftMatrix();
+
+- bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1);
+-
+ double d_sampling;
+ //! Flag telling if an inverse FFT must be performed.
+ bool d_inverse;
+