[80967] trunk/dports/aqua/qtiplot
macsforever2000 at macports.org
macsforever2000 at macports.org
Fri Jul 22 10:33:47 PDT 2011
Revision: 80967
http://trac.macports.org/changeset/80967
Author: macsforever2000 at macports.org
Date: 2011-07-22 10:33:46 -0700 (Fri, 22 Jul 2011)
Log Message:
-----------
qtiplot: Update to version 0.9.8.7. Add python27 variant. (#30269)
Modified Paths:
--------------
trunk/dports/aqua/qtiplot/Portfile
trunk/dports/aqua/qtiplot/files/patch-ApplicationWindow.diff
Added Paths:
-----------
trunk/dports/aqua/qtiplot/files/patch-qti.sip.diff
trunk/dports/aqua/qtiplot/files/patch-scripting.pri.diff
Removed Paths:
-------------
trunk/dports/aqua/qtiplot/files/patch-importOPJ.cpp.diff
trunk/dports/aqua/qtiplot/files/patch-qtiplot-qtiplot.pro
trunk/dports/aqua/qtiplot/files/patch-qtiplot-src-scripting-scripting.pri
Modified: trunk/dports/aqua/qtiplot/Portfile
===================================================================
--- trunk/dports/aqua/qtiplot/Portfile 2011-07-22 15:30:56 UTC (rev 80966)
+++ trunk/dports/aqua/qtiplot/Portfile 2011-07-22 17:33:46 UTC (rev 80967)
@@ -5,8 +5,7 @@
PortGroup qt4 1.0
name qtiplot
-version 0.9.8.3
-revision 2
+version 0.9.8.7
categories aqua science
maintainers jonas openmaintainer
@@ -22,9 +21,7 @@
homepage http://soft.proindependent.com/qtiplot.html
master_sites http://download.berlios.de/qtiplot/
-distfiles ${distname}.zip \
- QTeXEngine-0.2-opensource.zip \
- liborigin2-13092010.zip
+distfiles ${distname}.zip
depends_lib-append path:bin/qmake-mac:qt4-mac \
port:muparser \
@@ -34,19 +31,13 @@
port:zlib
checksums qtiplot-${version}.zip \
- md5 c90e9dc08e03dc1cd0db19dfe8941f0c \
- sha1 35dec539fb20b8c7ca121cca11f7b800b4ff0c6b \
- rmd160 2b0fd5b710d2752a1a413f83cbee9daf1e88edbf \
- QTeXEngine-0.2-opensource.zip \
- md5 fc2fe7f3fdb9e06c00d1f5c3c3e68920 \
- sha1 b484a4da7a0f3103e188539bfa6c1910dc9b55ca \
- rmd160 76ff1f2f96cd6df0ea5e6965013e0db452c55f09 \
- liborigin2-13092010.zip \
- md5 e2b41c4d8a1e2d357dd2b5b331d31375 \
- sha1 3f17d5a8c484ddb864a29a91a94d677b0b3b18d7 \
- rmd160 df7f4bafc1b9815c5921c09b435f431d8a1947e6
+ md5 cd571f88cde988734b7acf5db9917afc \
+ sha1 8c4b39a2e5997b2e9a8a2ec2a41ac8395661bbe6 \
+ rmd160 2a69ae9c2ab836cc8170fc71eb581b605ba6e7b6
-patchfiles patch-ApplicationWindow.diff
+patchfiles patch-ApplicationWindow.diff \
+ patch-qti.sip.diff \
+ patch-scripting.pri.diff
use_zip yes
@@ -70,22 +61,19 @@
puts $confFD "QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src"
puts $confFD "QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a"
puts $confFD "QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include"
- puts $confFD "unix:QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a"
+ puts $confFD "QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a"
puts $confFD "LIBPNG_LIBS = -lpng"
- puts $confFD "TEX_ENGINE_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/QTeXEngine/src"
- puts $confFD "TEX_ENGINE_LIBS = \$\$QTI_ROOT/3rdparty/QTeXEngine/libQTeXEngine.a"
- if {[variant_isset origin]} {
- puts $confFD "LIBORIGIN_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/liborigin2"
- puts $confFD "LIBORIGIN_LIBS = \$\$QTI_ROOT/3rdparty/liborigin2/liborigin2.a"
+ # Forcing TamuAnova to nothing
+ puts $confFD "TAMUANOVA_LIBS = "
+ if {[variant_isset qtexengine]} {
+ puts $confFD "TEX_ENGINE_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/QTeXEngine/src"
+ puts $confFD "TEX_ENGINE_LIBS = \$\$QTI_ROOT/3rdparty/QTeXEngine/libQTeXEngine.a"
}
- # linking to deprecated library
- reinplace "s|<QAssistantClient>|\"qassistantclient.h\"|g" ${worksrcpath}/qtiplot/src/core/ApplicationWindow.cpp
-
# target specific configuration
puts $confFD "contains( TARGET, qtiplot ) \{"
puts $confFD "SCRIPTING_LANGS += muParser"; # currently you can't build without
- if {[variant_isset python25] || [variant_isset python26]} {
+ if {[variant_isset python25] || [variant_isset python26] || [variant_isset python27]} {
puts $confFD "SCRIPTING_LANGS += Python"
}
puts $confFD "DEFINES += SCRIPTING_CONSOLE"
@@ -101,23 +89,16 @@
sys.path.append(os.path.dirname(__file__))
" ${worksrcpath}/qtiplot/qtiplotrc.py
- if {[variant_isset origin]} {
- # prepare liborigin2
- copy ${workpath}/liborigin2 ${worksrcpath}/3rdparty/liborigin2
- reinplace "s|INCLUDEPATH += ../boost|INCLUDEPATH += ${prefix}/include|g" ${worksrcpath}/3rdparty/liborigin2/liborigin2.pro
- reinplace "s|lboost_thread|lboost_thread-mt|g" ${worksrcpath}/3rdparty/liborigin2/liborigin2.pro
- reinplace "s|liborigin|liborigin2|g" ${worksrcpath}/qtiplot/src/origin/origin.pri
- }
+ if {[variant_isset qtexengine]} {
+ # prepare qtexengine
+ copy ${workpath}/QTeXEngine ${worksrcpath}/3rdparty/QTeXEngine
- # prepare qtexengine
- copy ${workpath}/QTeXEngine ${worksrcpath}/3rdparty/QTeXEngine
-
- # add 3rdparty to compilation
- reinplace "s|3rdparty/qwtplot3d \|3rdparty/qwtplot3d 3rdparty/QTeXEngine \|g" \
- ${worksrcpath}/qtiplot.pro
- if {[variant_isset origin]} {
- reinplace "s|3rdparty/QTeXEngine \|3rdparty/QTeXEngine 3rdparty/liborigin2 \|g" \
+ # add 3rdparty to compilation
+ reinplace "s|3rdparty/qwtplot3d \|3rdparty/qwtplot3d 3rdparty/QTeXEngine \|g" \
${worksrcpath}/qtiplot.pro
+
+ # suppress examples which do not compile
+ reinplace "/example/d" ${worksrcpath}/3rdparty/QTeXEngine/QTeXEngine.pro
}
# use system-wide libraries
@@ -126,8 +107,6 @@
configure.pre_args "PREFIX=${prefix}"
configure.cmd "LOCALSOFT=${prefix} ${qt_qmake_cmd}"
-configure.env-append QMAKESPEC=${qt_mkspecs_dir}/macx-g++
-build.env-append QMAKESPEC=${qt_mkspecs_dir}/macx-g++
destroot.destdir INSTALL_ROOT=${destroot}
destroot {
@@ -155,19 +134,28 @@
${plugin_dir}
}
-variant origin description "add support for originlab files" {
- depends_lib-append port:treehh
- patchfiles-append patch-importOPJ.cpp.diff
+variant qtexengine description "add support for tex exportation" {
+ distfiles-append QTeXEngine-0.3-opensource.zip
+ checksums-append QTeXEngine-0.3-opensource.zip \
+ md5 d1b234623770ec6209b14d1b5137f2f1 \
+ sha1 971410ebc6b73f31a11cf473f4d9171c278271f0 \
+ rmd160 6f75f8e6355515cf5eb8a7b90b9acca8aa889129
}
-variant python25 conflicts python26 description "add support for python26 scripting" {
+variant python25 conflicts python26 python27 description "add support for python26 scripting" {
depends_lib-append port:python25 \
port:py25-sip \
port:py25-pyqt4
}
-variant python26 conflicts python25 description "add support for python26 scripting" {
+variant python26 conflicts python25 python27 description "add support for python26 scripting" {
depends_lib-append port:python26 \
port:py26-sip \
port:py26-pyqt4
}
+
+variant python27 conflicts python25 python26 description "add support for python26 scripting" {
+ depends_lib-append port:python27 \
+ port:py27-sip \
+ port:py27-pyqt4
+}
\ No newline at end of file
Modified: trunk/dports/aqua/qtiplot/files/patch-ApplicationWindow.diff
===================================================================
--- trunk/dports/aqua/qtiplot/files/patch-ApplicationWindow.diff 2011-07-22 15:30:56 UTC (rev 80966)
+++ trunk/dports/aqua/qtiplot/files/patch-ApplicationWindow.diff 2011-07-22 17:33:46 UTC (rev 80967)
@@ -1,6 +1,6 @@
---- qtiplot/src/core/ApplicationWindow.cpp.orig 2010-10-12 08:53:20.000000000 +0200
-+++ qtiplot/src/core/ApplicationWindow.cpp 2010-11-10 22:19:52.000000000 +0100
-@@ -171,7 +171,7 @@
+--- qtiplot/src/core/ApplicationWindow.cpp.orig 2011-07-14 13:24:58.000000000 +0200
++++ qtiplot/src/core/ApplicationWindow.cpp 2011-07-20 20:41:23.000000000 +0200
+@@ -173,7 +173,7 @@
#include <QVarLengthArray>
#include <QList>
#include <QUrl>
@@ -9,16 +9,16 @@
#include <QFontComboBox>
#include <QSpinBox>
#include <QMdiArea>
-@@ -352,7 +352,7 @@
+@@ -347,7 +347,7 @@
insertTranslatedStrings();
disableToolbars();
- assistant = new QAssistantClient( QString(), this );
+ //assistant = new QAssistantClient( QString(), this );
- actionNextWindow = new QAction(QIcon(":/next.png"), tr("&Next","next window"), this);
- actionNextWindow->setShortcut( tr("F5","next window shortcut") );
-@@ -11169,10 +11169,10 @@
+ connect(tablesDepend, SIGNAL(activated(int)), this, SLOT(showTable(int)));
+
+@@ -11325,10 +11325,10 @@
}
QStringList cmdLst = QStringList() << "-profile" << profilePath;
@@ -33,7 +33,7 @@
}
void ApplicationWindow::showHelp()
-@@ -11203,8 +11203,8 @@
+@@ -11359,8 +11359,8 @@
}
QStringList cmdLst = QStringList() << "-profile" << profilePath;
Deleted: trunk/dports/aqua/qtiplot/files/patch-importOPJ.cpp.diff
===================================================================
--- trunk/dports/aqua/qtiplot/files/patch-importOPJ.cpp.diff 2011-07-22 15:30:56 UTC (rev 80966)
+++ trunk/dports/aqua/qtiplot/files/patch-importOPJ.cpp.diff 2011-07-22 17:33:46 UTC (rev 80967)
@@ -1,11 +0,0 @@
---- qtiplot/src/origin/importOPJ.cpp.orig 2010-10-12 08:53:22.000000000 +0200
-+++ qtiplot/src/origin/importOPJ.cpp 2010-10-24 01:50:36.000000000 +0200
-@@ -790,7 +790,7 @@
- case Origin::GraphCurve::TextPlot:
- style = Origin::GraphCurve::TextPlot;
- break;
-- case Origin::GraphCurve::XYZContour:
-+/* case Origin::GraphCurve::XYZContour:*/
- case Origin::GraphCurve::Contour:
- style = Origin::GraphCurve::Contour;
- break;
Added: trunk/dports/aqua/qtiplot/files/patch-qti.sip.diff
===================================================================
--- trunk/dports/aqua/qtiplot/files/patch-qti.sip.diff (rev 0)
+++ trunk/dports/aqua/qtiplot/files/patch-qti.sip.diff 2011-07-22 17:33:46 UTC (rev 80967)
@@ -0,0 +1,20 @@
+--- qtiplot/src/scripting/qti.sip.orig 2011-07-06 09:25:00.000000000 +0200
++++ qtiplot/src/scripting/qti.sip 2011-07-22 17:13:52.000000000 +0200
+@@ -3433,7 +3433,7 @@
+ double pValue();
+ };
+
+-class Anova : StatisticTest
++/*class Anova : StatisticTest
+ {
+ %TypeHeaderCode
+ #include <Anova.h>
+@@ -3483,7 +3483,7 @@
+ double msb();
+ //! Mean square value for the interaction
+ double msab();
+-};
++};*/
+
+ // used for output redirection
+ class PythonScripting
Deleted: trunk/dports/aqua/qtiplot/files/patch-qtiplot-qtiplot.pro
===================================================================
--- trunk/dports/aqua/qtiplot/files/patch-qtiplot-qtiplot.pro 2011-07-22 15:30:56 UTC (rev 80966)
+++ trunk/dports/aqua/qtiplot/files/patch-qtiplot-qtiplot.pro 2011-07-22 17:33:46 UTC (rev 80967)
@@ -1,159 +0,0 @@
-This patch is already included upstream, unfortunately *after* the 0.9.7.9 release
-
---- qtiplot/qtiplot.pro.orig 2009-09-18 19:46:47.000000000 +0200
-+++ qtiplot/qtiplot.pro 2009-09-18 19:47:42.000000000 +0200
-@@ -1,72 +1,30 @@
--# building without muParser doesn't work yet
--SCRIPTING_LANGS += muParser
--SCRIPTING_LANGS += Python
--
--# a console displaying output of scripts; particularly useful on Windows
--# where running QtiPlot from a terminal is inconvenient
--DEFINES += SCRIPTING_CONSOLE
--
--# a dialog for selecting the scripting language on a per-project basis
--DEFINES += SCRIPTING_DIALOG
--
--#DEFINES += QTIPLOT_DEMO
--
--# Comment the following lines to disable donations start-up message.
--#DEFINES += QTIPLOT_SUPPORT
--
--# Comment the next line, if you don't have libpng on your system.
--CONFIG += HAVE_LIBPNG
--
--# Uncomment the next line in order to enable export of 2D plots to the EMF file format on Windows. You need EmfEngine on your system.
--CONFIG += HAVE_EMF
--
--# Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.
--#CONFIG += CustomInstall
--
--CONFIG += release
--#CONFIG += debug
--#win32: CONFIG += console
-+TARGET = qtiplot
-+QTI_ROOT = ..
-+!include( $$QTI_ROOT/build.conf ) {
-+ message( "You need a build.conf file with local settings!" )
-+}
-
- ##################### 3rd PARTY HEADER FILES SECTION ########################
--#!!! Warning: You must modify these paths according to your computer settings
-+#!!! Warning: You must set this up in $$QTIROOT/build.conf
- #############################################################################
-
--INCLUDEPATH += ../3rdparty/muparser/include
-+# local copy included
- INCLUDEPATH += ../3rdparty/qwtplot3d/include
--INCLUDEPATH += ../3rdparty/qwt/src
- INCLUDEPATH += ../3rdparty/liborigin
--INCLUDEPATH += ../3rdparty/gsl/include
- INCLUDEPATH += ../3rdparty/zlib
--INCLUDEPATH += ../3rdparty/boost
--
--##################### 3rd PARTY LIBRARIES SECTION ###########################
--#!!! Warning: You must modify these paths according to your computer settings
--#############################################################################
--
--##################### Linux (Mac OS X) ######################################
-+INCLUDEPATH += ../3rdparty/QTeXEngine/src
-
--# statically link against libraries in 3rdparty
--unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
--unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
--unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
--unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
--unix:LIBS += ../3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a
--unix:LIBS += ../3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
--
--# dynamically link against dependencies if they are installed system-wide
--#unix:LIBS += -lmuparser
--#unix:LIBS += -lqwt
--#unix:LIBS += -lgsl -lgslcblas
--
--##################### Windows ###############################################
--
--win32:LIBS += ../3rdparty/muparser/lib/libmuparser.a
--win32:LIBS += ../3rdparty/qwt/lib/libqwt.a
--win32:LIBS += ../3rdparty/gsl/lib/libgsl.a
--win32:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
--win32:LIBS += ../3rdparty/zlib/libz.a
--win32:LIBS += ../3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib
--win32:LIBS += ../3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
-+# configurable
-+INCLUDEPATH += $$MUPARSER_INCLUDEPATH
-+INCLUDEPATH += $$QWT_INCLUDEPATH
-+INCLUDEPATH += $$GSL_INCLUDEPATH
-+INCLUDEPATH += $$BOOST_INCLUDEPATH
-+
-+# configurable libs
-+LIBS += $$MUPARSER_LIBS
-+LIBS += $$QWT_LIBS
-+LIBS += $$GSL_LIBS
-+LIBS += $$BOOST_LIBS
-
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
-@@ -74,7 +32,6 @@
-
- QMAKE_PROJECT_DEPTH = 0
-
--TARGET = qtiplot
- TEMPLATE = app
- CONFIG += qt warn_on exceptions opengl thread
- CONFIG += assistant
-@@ -137,9 +94,6 @@
- translations/qtiplot_ja.ts \
- translations/qtiplot_sv.ts
-
--system(lupdate -verbose qtiplot.pro)
--system(lrelease -verbose qtiplot.pro)
--
- translations.files += translations/qtiplot_de.qm \
- translations/qtiplot_es.qm \
- translations/qtiplot_fr.qm \
-@@ -184,7 +138,7 @@
- ###############################################################
-
- INCLUDEPATH += ../3rdparty/QTeXEngine/src
--HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h
-+HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h
- SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp
- SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
-
-@@ -222,20 +176,26 @@
-
- ###############################################################
-
--contains(CONFIG, HAVE_LIBPNG){
-+# check if we have libpng
-+!isEmpty(LIBPNG_LIBS) {
- DEFINES += GL2PS_HAVE_LIBPNG
-- INCLUDEPATH += ../3rdparty/libpng/
-- LIBS += ../3rdparty/libpng/libpng.a
-+ INCLUDEPATH += $$LIBPNG_INCLUDEPATH
-+ LIBS += $$LIBPNG_LIBS
- }
-
- ###############################################################
-
--contains(CONFIG, HAVE_EMF){
-- win32 {
-- DEFINES += EMF_OUTPUT
-- INCLUDEPATH += ../3rdparty/EmfEngine/src
-- LIBS += ../3rdparty/EmfEngine/libEmfEngine.a -lgdiplus
-- }
-+# check if we have EmfEnginge
-+!isEmpty(EMF_ENGINE_LIBS) {
-+ DEFINES += EMF_OUTPUT
-+ INCLUDEPATH += $$EMF_ENGINE_INCLUDEPATH
-+ LIBS += $$EMF_ENGINE_LIBS
-+ win32:LIBS += -lgdiplus
-+ unix:LIBS += -lEMF
- }
-
- ###############################################################
-+
-+# At the very end: add global include- and lib path
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH
-+unix:LIBS += $$SYS_LIBS
Deleted: trunk/dports/aqua/qtiplot/files/patch-qtiplot-src-scripting-scripting.pri
===================================================================
--- trunk/dports/aqua/qtiplot/files/patch-qtiplot-src-scripting-scripting.pri 2011-07-22 15:30:56 UTC (rev 80966)
+++ trunk/dports/aqua/qtiplot/files/patch-qtiplot-src-scripting-scripting.pri 2011-07-22 17:33:46 UTC (rev 80967)
@@ -1,27 +0,0 @@
-This fixes an issue with SIP >= 4.9
-It's already fixed upstream in versions > 0.9.7.10
---- qtiplot/src/scripting/scripting.pri.orig 2009-11-03 22:25:47.000000000 +0100
-+++ qtiplot/src/scripting/scripting.pri 2009-11-03 22:27:16.000000000 +0100
-@@ -80,7 +80,6 @@
- $${SIP_DIR}/sipqtiPythonScript.cpp\
- $${SIP_DIR}/sipqtiPythonScripting.cpp\
- $${SIP_DIR}/sipqtiFolder.cpp\
-- $${SIP_DIR}/sipqtiQList.cpp\
- $${SIP_DIR}/sipqtiFit.cpp \
- $${SIP_DIR}/sipqtiExponentialFit.cpp \
- $${SIP_DIR}/sipqtiTwoExpFit.cpp \
-@@ -105,4 +104,14 @@
- $${SIP_DIR}/sipqtiCorrelation.cpp \
- $${SIP_DIR}/sipqtiConvolution.cpp \
- $${SIP_DIR}/sipqtiDeconvolution.cpp \
-+
-+exists(../../$${SIP_DIR}/sipqtiQList.cpp) {
-+ # SIP < 4.9
-+ SOURCES += $${SIP_DIR}/sipqtiQList.cpp
-+} else {
-+ SOURCES += \
-+ $${SIP_DIR}/sipqtiQList0101Folder.cpp\
-+ $${SIP_DIR}/sipqtiQList0101Graph.cpp\
-+ $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp\
-+}
- }
Added: trunk/dports/aqua/qtiplot/files/patch-scripting.pri.diff
===================================================================
--- trunk/dports/aqua/qtiplot/files/patch-scripting.pri.diff (rev 0)
+++ trunk/dports/aqua/qtiplot/files/patch-scripting.pri.diff 2011-07-22 17:33:46 UTC (rev 80967)
@@ -0,0 +1,12 @@
+--- qtiplot/src/scripting/scripting.pri.orig 2011-07-01 17:56:54.000000000 +0200
++++ qtiplot/src/scripting/scripting.pri 2011-07-22 17:30:27.000000000 +0200
+@@ -115,8 +115,7 @@
+ $${SIP_DIR}/sipqtiStatisticTest.cpp \
+ $${SIP_DIR}/sipqtitTest.cpp \
+ $${SIP_DIR}/sipqtiShapiroWilkTest.cpp \
+- $${SIP_DIR}/sipqtiChiSquareTest.cpp \
+- $${SIP_DIR}/sipqtiAnova.cpp \
++ $${SIP_DIR}/sipqtiChiSquareTest.cpp
+
+ exists(../../$${SIP_DIR}/sipqtiQList.cpp) {
+ # SIP < 4.9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110722/46002ea6/attachment-0001.html>
More information about the macports-changes
mailing list