Index: head/math/qtiplot/Makefile =================================================================== --- head/math/qtiplot/Makefile (revision 466564) +++ head/math/qtiplot/Makefile (revision 466565) @@ -1,92 +1,87 @@ # Created by: Jie Gao # $FreeBSD$ PORTNAME= qtiplot DISTVERSION= 0.9.8.9 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= math science MASTER_SITES= BERLIOS http://soft.proindependent.com/src/ -MAINTAINER= ports@FreeBSD.org +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_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 - -post-patch-PYTHON-on: - ${REINPLACE_CMD} -e \ - '/^sys.path.append/s|"\."|"${DATADIR}"|' \ - ${WRKSRC}/${PORTNAME}/qtiplotrc.py 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/patch-qtiplot_qtiplotrc.py =================================================================== --- head/math/qtiplot/files/patch-qtiplot_qtiplotrc.py (nonexistent) +++ head/math/qtiplot/files/patch-qtiplot_qtiplotrc.py (revision 466565) @@ -0,0 +1,14 @@ +--- qtiplot/qtiplotrc.py.orig 2011-07-06 06:37:50 UTC ++++ qtiplot/qtiplotrc.py +@@ -37,7 +37,10 @@ def import_to_global(modname, attrs=None + """ + import sys + import os +- sys.path.append(os.path.dirname(__file__)) ++ try: ++ sys.path.append(os.path.dirname(__file__)) ++ except: ++ pass + mod = __import__(modname) + for submod in modname.split(".")[1:]: + mod = getattr(mod, submod) Property changes on: head/math/qtiplot/files/patch-qtiplot_qtiplotrc.py ___________________________________________________________________ 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_table_Table.cpp =================================================================== --- head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp (nonexistent) +++ head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp (revision 466565) @@ -0,0 +1,18 @@ +Description: if you don't initialize the "i" variable, or initialize it to 0.0 + qtiplot won't let you set the column values using muparser. +Author: Scott Howard +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707736 + +Index: qtiplot/qtiplot/src/table/Table.cpp +=================================================================== +--- qtiplot/src/table/Table.cpp.orig 2011-09-13 11:20:29 UTC ++++ qtiplot/src/table/Table.cpp +@@ -564,7 +564,7 @@ bool Table::muParserCalculate(int col, i + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + + muParserScript *mup = new muParserScript(scriptEnv, cmd, this, QString("<%1>").arg(colName(col))); +- double *r = mup->defineVariable("i"); ++ double *r = mup->defineVariable("i",startRow + 1.0); + mup->defineVariable("j", (double)col); + mup->defineVariable("sr", startRow + 1.0); + mup->defineVariable("er", endRow + 1.0); Property changes on: head/math/qtiplot/files/patch-qtiplot_src_table_Table.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-sip-4.19.6 =================================================================== --- head/math/qtiplot/files/patch-sip-4.19.6 (revision 466564) +++ head/math/qtiplot/files/patch-sip-4.19.6 (revision 466565) @@ -1,48 +1,17 @@ -The patch name is an approximation; something changed between SIP 4.19.2 and -SIP 4.19.6 that causes the build to fail and sipAPI.qti.h is no longer -generated. - -Obtained from: https://anonscm.debian.org/git/debian-science/packages/qtiplot.git/tree/debian/patches/20_fix_FTBFS_sip4.19.patch Obtained from: https://bugs.gentoo.org/641514#c2 ---- qtiplot/src/scripting/PythonScripting.cpp.orig 2018-01-02 11:37:07 UTC -+++ qtiplot/src/scripting/PythonScripting.cpp -@@ -58,7 +58,7 @@ typedef struct _traceback { - #include - - // includes sip.h, which undefines Qt's "slots" macro since SIP 4.6 --#include "sipAPIqti.h" -+#include "sip.h" - extern "C" void initqti(); - - const char* PythonScripting::langName = "Python"; -@@ -359,10 +359,11 @@ bool PythonScripting::setQObject(QObject *val, const c - if(!val) return false; - PyObject *pyobj=NULL; - -- PyGILState_STATE state = PyGILState_Ensure(); -+ sipAPIDef sip_API; - -- sipWrapperType * klass = sipFindClass(val->className()); -- if (klass) pyobj = sipConvertFromInstance(val, klass, NULL); -+ PyGILState_STATE state = PyGILState_Ensure(); -+ const auto klass = sip_API.api_find_class(val->className()); -+ if (klass) pyobj = sip_API.api_convert_from_type(val, klass->wt_td, NULL); - - if (pyobj) { - if (dict) --- qtiplot/src/scripting/qti.sip.orig 2018-01-02 11:37:07 UTC +++ qtiplot/src/scripting/qti.sip @@ -3243,11 +3243,11 @@ class FFT : Filter (public) %MethodCode SIPQTI_APP(new sipFFT(app, a0, *a1, a2, a3)) %End - FFT(QwtPlotCurve *&) /NoDerived/; + FFT(QwtPlotCurve *) /NoDerived/; %MethodCode SIPQTI_APP(new sipFFT(app, a0)) %End - FFT(QwtPlotCurve *&, double, double) /NoDerived/; + FFT(QwtPlotCurve *, double, double) /NoDerived/; %MethodCode SIPQTI_APP(new sipFFT(app, a0, a1, a2)) %End