mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

- Remove no longer needed patch

Browse Source 
- Add patch to fix build after sip/PyQt update
This commit is contained in:
Max Brazhnikov 2013-10-24 17:27:26 +00:00
parent c31830b23e
commit 173beecc16
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=331502
2 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
math/qtiplot/files/patch-qtiplot__src__plot2D__Log2ScaleEngine.cpp
View File

@ -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);
}

45
math/qtiplot/files/patch-sip-4.15 Normal file
View File

@ -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;