diff options
| author | makc <makc@FreeBSD.org> | 2013-10-25 01:27:26 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-10-25 01:27:26 +0800 |
| commit | 6a4f8b05f5d36541aae6a01ba42cfcd394abe936 (patch) | |
| tree | c94af90b9ea05a7c49e02c22a20cb62917e4c0b4 /math | |
| parent | f63f772c6825213c032e2847ea6df114b891b950 (diff) | |
| download | freebsd-ports-gnome-6a4f8b05f5d36541aae6a01ba42cfcd394abe936.tar.gz freebsd-ports-gnome-6a4f8b05f5d36541aae6a01ba42cfcd394abe936.tar.zst freebsd-ports-gnome-6a4f8b05f5d36541aae6a01ba42cfcd394abe936.zip | |
- Remove no longer needed patch
- Add patch to fix build after sip/PyQt update
Diffstat (limited to 'math')
| -rw-r--r-- | math/qtiplot/files/patch-qtiplot__src__plot2D__Log2ScaleEngine.cpp | 22 | ||||
| -rw-r--r-- | math/qtiplot/files/patch-sip-4.15 | 45 |
2 files changed, 45 insertions, 22 deletions
diff --git a/math/qtiplot/files/patch-qtiplot__src__plot2D__Log2ScaleEngine.cpp b/math/qtiplot/files/patch-qtiplot__src__plot2D__Log2ScaleEngine.cpp deleted file mode 100644 index 67a660447bfd..000000000000 --- a/math/qtiplot/files/patch-qtiplot__src__plot2D__Log2ScaleEngine.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- ./qtiplot/src/plot2D/Log2ScaleEngine.cpp.orig 2009-10-18 10:44:49.000000000 +0400 -+++ ./qtiplot/src/plot2D/Log2ScaleEngine.cpp 2009-10-18 18:54:12.000000000 +0400 -@@ -160,8 +160,8 @@ - if ( numTicks > 10000 ) - numTicks = 10000; - -- const double lxmin = ::log2(interval.minValue()); -- const double lxmax = ::log2(interval.maxValue()); -+ const double lxmin = ::log(interval.minValue())*M_LOG2E; -+ const double lxmax = ::log(interval.maxValue())*M_LOG2E; - const double lstep = (lxmax - lxmin) / double(numTicks - 1); - - QwtValueList ticks; -@@ -224,6 +224,6 @@ - QwtDoubleInterval Log2ScaleEngine::log2( - const QwtDoubleInterval &interval) const - { -- return QwtDoubleInterval(::log2(interval.minValue()), -- ::log2(interval.maxValue())); -+ return QwtDoubleInterval(::log(interval.minValue())*M_LOG2E, -+ ::log(interval.maxValue())*M_LOG2E); - } diff --git a/math/qtiplot/files/patch-sip-4.15 b/math/qtiplot/files/patch-sip-4.15 new file mode 100644 index 000000000000..c68f83fc7916 --- /dev/null +++ b/math/qtiplot/files/patch-sip-4.15 @@ -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; |