[qtiplot] 01/02: Fix FTBFS from new sip version (Closes: #728642, LP: #1243269)

[Scott Sheridan Howard]

This is an automated email from the git hooks/post-receive script.

showard pushed a commit to branch master
in repository qtiplot.

commit 174cc6dae55b60416d96007f2441193405ed26f5
Author: Scott Howard <showard314 at gmail.com>
Date:   Wed Nov 20 14:11:14 2013 -0500

    Fix FTBFS from new sip version (Closes: #728642, LP: #1243269)
---
 debian/changelog              |    6 +++++
 debian/patches/series         |    1 +
 debian/patches/sipFTBFS.patch |   56 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6c3bcbb..7194433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtiplot (0.9.8.9-7) unstable; urgency=low
+
+  * Fix FTBFS from new sip version (Closes: #728642, LP: #1243269)
+
+ -- Scott Howard <showard at debian.org>  Sun, 17 Nov 2013 11:03:08 -0500
+
 qtiplot (0.9.8.9-6) unstable; urgency=low
 
   * Fix bug were table columns could not be set (Closes: #707736)
diff --git a/debian/patches/series b/debian/patches/series
index 4f992ce..c618f1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ glu_include.patch
 minizip.patch
 adopt_to_alglib3.patch
 set_col_values.patch
+sipFTBFS.patch
diff --git a/debian/patches/sipFTBFS.patch b/debian/patches/sipFTBFS.patch
new file mode 100644
index 0000000..9eb8dd1
--- /dev/null
+++ b/debian/patches/sipFTBFS.patch
@@ -0,0 +1,56 @@
+Description: Fixed a FTBFS from a new version of SIP
+Author: makc at freebsd.org
+Bug-Debian: bugs.debian.org/cgi-bin/bugreport.cgi?bug=728642
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qtiplot/+bug/1243269
+Bug-Upstream: http://developer.berlios.de/bugs/?func=detailbug&bug_id=19204&group_id=6626
+Index: qtiplot/qtiplot/src/plot2D/ImageWidget.h
+===================================================================
+--- qtiplot.orig/qtiplot/src/plot2D/ImageWidget.h	2013-11-17 11:02:11.642725892 -0500
++++ qtiplot/qtiplot/src/plot2D/ImageWidget.h	2013-11-17 11:02:11.598725891 -0500
+@@ -67,10 +67,10 @@
+ 	void setWindowName(const QString& name){d_window_name = name;};
+ 
+ 	static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size);
++	void paintEvent(QPaintEvent *e);
+ 
+ private:
+ 	void draw(QPainter *painter, const QRect& r);
+-	void paintEvent(QPaintEvent *e);
+ 	QPixmap d_pix;
+ 	//! The file from which the image was loaded.
+ 	QString d_file_name;
+Index: qtiplot/qtiplot/src/analysis/FFT.cpp
+===================================================================
+--- qtiplot.orig/qtiplot/src/analysis/FFT.cpp	2013-11-17 11:02:11.642725892 -0500
++++ qtiplot/qtiplot/src/analysis/FFT.cpp	2013-11-17 11:02:11.622725891 -0500
+@@ -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;
+ 
+Index: qtiplot/qtiplot/src/analysis/FFT.h
+===================================================================
+--- qtiplot.orig/qtiplot/src/analysis/FFT.h	2013-11-17 11:02:11.642725892 -0500
++++ qtiplot/qtiplot/src/analysis/FFT.h	2013-11-17 11:02:11.634725892 -0500
+@@ -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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qtiplot.git