Date: Thu, 24 Oct 2013 17:27:26 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331502 - head/math/qtiplot/files Message-ID: <201310241727.r9OHRQ05061432@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Thu Oct 24 17:27:26 2013 New Revision: 331502 URL: http://svnweb.freebsd.org/changeset/ports/331502 Log: - Remove no longer needed patch - Add patch to fix build after sip/PyQt update Added: head/math/qtiplot/files/patch-sip-4.15 (contents, props changed) Deleted: head/math/qtiplot/files/patch-qtiplot__src__plot2D__Log2ScaleEngine.cpp Added: head/math/qtiplot/files/patch-sip-4.15 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/qtiplot/files/patch-sip-4.15 Thu Oct 24 17:27:26 2013 (r331502) @@ -0,0 +1,45 @@ +--- ./qtiplot/src/plot2D/ImageWidget.h.orig 2010-10-17 07:04:05.000000000 +0000 ++++ ./qtiplot/src/plot2D/ImageWidget.h 2013-10-23 18:00:01.810504452 +0000 +@@ -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; +--- ./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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310241727.r9OHRQ05061432>