Index: head/math/qtiplot/Makefile =================================================================== --- head/math/qtiplot/Makefile (revision 469976) +++ head/math/qtiplot/Makefile (revision 469977) @@ -1,87 +1,91 @@ # Created by: Jie Gao # $FreeBSD$ PORTNAME= qtiplot DISTVERSION= 0.9.8.9 PORTREVISION= 14 CATEGORIES= math science MASTER_SITES= BERLIOS http://soft.proindependent.com/src/ MAINTAINER= makc@FreeBSD.org COMMENT= Data analysis and scientific plotting LIB_DEPENDS= libgsl.so:math/gsl \ libmuparser.so:math/muparser \ libpng.so:graphics/png # use bundled modified libraries # qwt.5:x11-toolkits/qwt5 \ # qwtplot3d-qt4:math/qwtplot3d-qt4 USES= dos2unix gmake qmake tar:bzip2 USE_QT4= gui opengl svg qt3support network assistantclient \ moc_build rcc_build USE_GL= glu QMAKE_ARGS+= LOCALBASE=${LOCALBASE} PYTHON_CMD=${PYTHON_CMD} DOS2UNIX_GLOB= *.pro DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \ "${PREFIX}/share/pixmaps/qtiplot.png" \ "qtiplot" "" true -OPTIONS_DEFINE= DOCS PYTHON NLS DEBUG +OPTIONS_DEFINE= DOCS PYTHON NLS OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes DOCS_DESC= Install the QtiPlot Handbook DOCS_RUN_DEPENDS= qtiplot-doc>=0:math/qtiplot-doc DOCS_USE= QT4=assistant-adp_run PYTHON_DESC= Python scripting support PYTHON_USES= pyqt:4 python:2.7 PYTHON_USE= pyqt=gui PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \ PYTHON_VERSION=${PYTHON_VERSION} NLS_USE= QT4=linguisttools_build post-extract: ${CP} ${FILESDIR}/build.conf ${WRKSRC} post-patch: ${REINPLACE_CMD} -e \ 's|/usr/local/qtiplot/fitPlugins|${DATADIR}/fitPlugins|' \ ${WRKSRC}/qtiplot/src/core/ApplicationWindow.cpp ${REINPLACE_CMD} -e \ 's|target.path=.*|target.path=${DATADIR}/fitPlugins|g' \ ${WRKSRC}/fitPlugins/*/*.pro ${REINPLACE_CMD} -e '/^system($$$$LUPDATE/d; /^system($$$$LRELEASE/d' \ ${WRKSRC}/${PORTNAME}/qtiplot.pro +# fix build with clang6 + ${REINPLACE_CMD} \ + -e '/new[[:space:]]*QComboBox/s,false,,g' \ + -e '/new[[:space:]]*PatternBox/s,false,,g' \ + ${WRKSRC}/qtiplot/src/matrix/MatrixValuesDialog.cpp \ + ${WRKSRC}/qtiplot/src/plot2D/dialogs/LayerDialog.cpp \ + ${WRKSRC}/qtiplot/src/plot2D/dialogs/PlotDialog.cpp \ + ${WRKSRC}/qtiplot/src/table/SetColValuesDialog.cpp \ + ${WRKSRC}/qtiplot/src/table/TableDialog.cpp post-patch-PYTHON-off: ${REINPLACE_CMD} -e \ "s/SCRIPTING_LANGS.*Python//" \ - ${WRKSRC}/build.conf - -post-patch-DEBUG-on: - ${REINPLACE_CMD} -e \ - "/^CONFIG.*release/s|release|debug|" \ ${WRKSRC}/build.conf post-patch-NLS-off: ${REINPLACE_CMD} -e \ "/INSTALLS.*translations/d" \ ${WRKSRC}/${PORTNAME}/qtiplot.pro pre-configure-NLS-on: cd ${WRKSRC}/qtiplot && ${LRELEASE} -compress qtiplot.pro post-install: ${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtiplot.png post-install-PYTHON-on: .for s in qtiplotrc.py qtiUtil.py cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')" ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s}c ${STAGEDIR}${DATADIR}/${s}c .endfor .include Index: head/math/qtiplot/files/build.conf =================================================================== --- head/math/qtiplot/files/build.conf (revision 469976) +++ head/math/qtiplot/files/build.conf (revision 469977) @@ -1,30 +1,28 @@ isEmpty( QTI_ROOT ) { message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) } SYS_INCLUDEPATH = $$LOCALBASE/include SYS_LIBS = -L$$LOCALBASE/lib MUPARSER_INCLUDEPATH = MUPARSER_LIBS = -lmuparser GSL_INCLUDEPATH = GSL_LIBS = -lgsl -lgslcblas QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a -lGLU LIBPNG_INCLUDEPATH = LIBPNG_LIBS = -lpng contains( TARGET, qtiplot ) { SCRIPTING_LANGS += muParser SCRIPTING_LANGS += Python DEFINES += SCRIPTING_CONSOLE CONFIG += CustomInstall - - CONFIG += release } Index: head/math/qtiplot/files/patch-3rdparty_qwtplot3d_src_qwt3d__lighting.cpp =================================================================== --- head/math/qtiplot/files/patch-3rdparty_qwtplot3d_src_qwt3d__lighting.cpp (nonexistent) +++ head/math/qtiplot/files/patch-3rdparty_qwtplot3d_src_qwt3d__lighting.cpp (revision 469977) @@ -0,0 +1,11 @@ +--- 3rdparty/qwtplot3d/src/qwt3d_lighting.cpp.orig 2011-08-24 10:25:10 UTC ++++ 3rdparty/qwtplot3d/src/qwt3d_lighting.cpp +@@ -175,7 +175,7 @@ void ExtGLWidget::applyLight(unsigned li + glRotatef( lights_[light].rot.x-90, 1.0, 0.0, 0.0 ); + glRotatef( lights_[light].rot.y , 0.0, 1.0, 0.0 ); + glRotatef( lights_[light].rot.z , 0.0, 0.0, 1.0 ); +- GLfloat lightPos[4] = { lights_[light].shift.x, lights_[light].shift.y, lights_[light].shift.z, 1.0}; ++ GLfloat lightPos[4] = { static_cast(lights_[light].shift.x), static_cast(lights_[light].shift.y), static_cast(lights_[light].shift.z), 1.0}; + GLenum le = lightEnum(light); + glLightfv(le, GL_POSITION, lightPos); + } Property changes on: head/math/qtiplot/files/patch-3rdparty_qwtplot3d_src_qwt3d__lighting.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp =================================================================== --- head/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp (revision 469976) +++ head/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp (revision 469977) @@ -1,11 +1,44 @@ ---- ./qtiplot/src/analysis/dialogs/FitDialog.cpp.orig 2009-10-18 10:44:45.000000000 +0400 -+++ ./qtiplot/src/analysis/dialogs/FitDialog.cpp 2009-10-18 18:54:12.000000000 +0400 -@@ -119,7 +119,7 @@ +--- qtiplot/src/analysis/dialogs/FitDialog.cpp.orig 2011-10-17 10:38:07 UTC ++++ qtiplot/src/analysis/dialogs/FitDialog.cpp +@@ -101,7 +101,7 @@ FitDialog::FitDialog(Graph *g, QWidget* ApplicationWindow *app = (ApplicationWindow *)parent; QString pluginsPath = app->fitPluginsPath; QFileInfo fi(pluginsPath); - if (pluginsPath.isEmpty() || !fi.isDir() || !fi.isWritable()) + if (pluginsPath.isEmpty() || !fi.isDir()) choosePluginsFolder(); else loadPlugins(); +@@ -1019,11 +1019,7 @@ void FitDialog::showFitPage() + int prec = boxPrecision->value(); + for (int i = 0; isetFlags(it->flags() & (~Qt::ItemIsEditable)); +-#else +- it->setFlags(!Qt::ItemIsEditable); +-#endif + it->setBackground(QBrush(Qt::lightGray)); + it->setForeground(Qt::black); + QFont font = it->font(); +@@ -1049,7 +1045,7 @@ void FitDialog::showFitPage() + boxParams->setCellWidget(i, 2, sb); + + it = new QTableWidgetItem(); +- it->setFlags(!Qt::ItemIsEditable); ++ it->setFlags(it->flags() & (~Qt::ItemIsEditable)); + it->setText("--"); + boxParams->setItem(i, 5, it); + } +@@ -1061,11 +1057,7 @@ void FitDialog::showFitPage() + boxParams->showColumn(4); + for (int i = 0; irowCount(); i++ ){ + QTableWidgetItem *it = new QTableWidgetItem(); +-#ifdef Q_CC_MSVC + it->setFlags(it->flags() & (~Qt::ItemIsEditable)); +-#else +- it->setFlags(!Qt::ItemIsEditable); +-#endif + it->setBackground(QBrush(Qt::lightGray)); + boxParams->setItem(i, 4, it); + Index: head/math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip =================================================================== --- head/math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip (revision 469976) +++ head/math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip (revision 469977) @@ -1,60 +1,69 @@ ---- ./qtiplot/src/scripting/qti.sip.orig 2011-02-08 15:33:02.000000000 +0300 -+++ ./qtiplot/src/scripting/qti.sip 2011-03-19 00:06:07.578146696 +0300 -@@ -3390,57 +3390,6 @@ +--- qtiplot/src/scripting/qti.sip.orig 2018-05-11 22:48:48 UTC ++++ qtiplot/src/scripting/qti.sip +@@ -370,7 +370,7 @@ public: + if (sipCpp->text(row, col) != "") + sipRes = sipCpp->cell(row, col); + else { +- sipRes = NULL; ++ sipRes = 0; + PyErr_SetString(PyExc_ValueError, "Empty table cell"); + } + } +@@ -3433,57 +3433,6 @@ public: double pValue(); }; -class Anova : StatisticTest -{ -%TypeHeaderCode -#include -%End -public: - Anova(ApplicationWindow * /TransferThis/, bool twoWay = false, double level = 0.05); - Anova(bool twoWay = false, double level = 0.05) /NoDerived/; -%MethodCode - SIPQTI_APP(new sipAnova(app, a0, a1)) -%End - - bool run(); - bool addSample(const QString& colName, int aLevel = 1, int bLevel = 1); - void setAnovaTwoWayModel(int); - - virtual QString logInfo(); - double fStat(); - double statistic(); - double pValue(); - //! Sum of squares - double ssm(); - double sse(); - double sst(); - //! Mean square value - double mse(); - //! F statistic for factor A - double fStatA(); - //! F statistic for factor B - double fStatB(); - //! F statistic for the interaction - double fStatAB(); - //! P value for factor A - double pValueA(); - //! P value for factor B - double pValueB(); - //! P value for the interaction - double pValueAB(); - //! Sum of squares for factor A - double ssa(); - //! Sum of squares for factor B - double ssb(); - //! Sum of squares for the interaction - double ssab(); - //! Mean square value for factor A - double msa(); - //! Mean square value for factor B - double msb(); - //! Mean square value for the interaction - double msab(); -}; // used for output redirection class PythonScripting Index: head/math/qtiplot/files/patch-qtiplot_src_core_ConfigDialog.cpp =================================================================== --- head/math/qtiplot/files/patch-qtiplot_src_core_ConfigDialog.cpp (nonexistent) +++ head/math/qtiplot/files/patch-qtiplot_src_core_ConfigDialog.cpp (revision 469977) @@ -0,0 +1,11 @@ +--- qtiplot/src/core/ConfigDialog.cpp.orig 2011-10-25 09:50:22 UTC ++++ qtiplot/src/core/ConfigDialog.cpp +@@ -1390,7 +1390,7 @@ void ConfigDialog::setColorsList(const Q + colorsList->setRowCount(colors); + for (int i = 0; i < colors; i++){ + QTableWidgetItem *it = new QTableWidgetItem(); +- it->setFlags(!Qt::ItemIsEditable); ++ it->setFlags(it->flags() & (~Qt::ItemIsEditable)); + it->setBackground(QBrush(colList[i])); + colorsList->setItem(i, 0, it); + Property changes on: head/math/qtiplot/files/patch-qtiplot_src_core_ConfigDialog.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/qtiplot/files/patch-qtiplot_src_lib_src_ColorMapEditor.cpp =================================================================== --- head/math/qtiplot/files/patch-qtiplot_src_lib_src_ColorMapEditor.cpp (nonexistent) +++ head/math/qtiplot/files/patch-qtiplot_src_lib_src_ColorMapEditor.cpp (revision 469977) @@ -0,0 +1,26 @@ +--- qtiplot/src/lib/src/ColorMapEditor.cpp.orig 2011-07-02 07:23:52 UTC ++++ qtiplot/src/lib/src/ColorMapEditor.cpp +@@ -155,11 +155,7 @@ void ColorMapEditor::setColorMap(const L + QColor c = color_map.color(i); + + QTableWidgetItem *it = new QTableWidgetItem(c.name()); +- #ifdef Q_CC_MSVC + it->setFlags(it->flags() & (~Qt::ItemIsEditable)); +- #else +- it->setFlags(!Qt::ItemIsEditable); +- #endif + it->setBackground(QBrush(c)); + it->setForeground(QBrush(c)); + table->setItem(i, 1, it); +@@ -246,11 +242,7 @@ void ColorMapEditor::insertLevel() + table->setCellWidget(row, 0, sb); + + QTableWidgetItem *it = new QTableWidgetItem(c.name()); +-#ifdef Q_CC_MSVC + it->setFlags(it->flags() & (~Qt::ItemIsEditable)); +-#else +- it->setFlags(!Qt::ItemIsEditable); +-#endif + it->setBackground(QBrush(c)); + it->setForeground(QBrush(c)); + table->setItem(row, 1, it); Property changes on: head/math/qtiplot/files/patch-qtiplot_src_lib_src_ColorMapEditor.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property