Changeset 80967

Timestamp:

07/22/11 10:33:46 (4 years ago)

Author:

macsforever2000@…

Message:

qtiplot: Update to version 0.9.8.7. Add python27 variant. (#30269)

Location:

trunk/dports/aqua/qtiplot

Files:

• Portfile (modified) (8 diffs)
• files/patch-ApplicationWindow.diff (modified) (4 diffs)
• files/patch-importOPJ.cpp.diff (deleted)
• files/patch-qti.sip.diff (added)
• files/patch-qtiplot-qtiplot.pro (deleted)
• files/patch-qtiplot-src-scripting-scripting.pri (deleted)
• files/patch-scripting.pri.diff (added)

trunk/dports/aqua/qtiplot/Portfile

@@ -6 +6 @@
 
 name                qtiplot
-version             0.9.8.3
-revision            2
+version             0.9.8.7
 categories          aqua science
 maintainers         jonas openmaintainer
@@ -23 +22 @@
 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 \
@@ -35 +32 @@
 
 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
@@ -71 +62 @@
     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"
     }
@@ -102 +90 @@
     " ${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
 
-    # 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" \
-      ${worksrcpath}/qtiplot.pro
+      # suppress examples which do not compile
+      reinplace "/example/d" ${worksrcpath}/3rdparty/QTeXEngine/QTeXEngine.pro
     }
 
@@ -127 +108 @@
 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}
 
@@ -156 +135 @@
 }
 
-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 \
@@ -167 +149 @@
 }
 
-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
+}

trunk/dports/aqua/qtiplot/files/patch-ApplicationWindow.diff

@@ -1 @@
---- 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>
@@ -10 +10 @@
  #include <QSpinBox>
  #include <QMdiArea>
-@@ -352,7 +352,7 @@
+@@ -347,7 +347,7 @@
         insertTranslatedStrings();
         disableToolbars();
@@ -17 +17 @@
 +       //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 @@
         }
  
@@ -34 +34 @@
  
  void ApplicationWindow::showHelp()
-@@ -11203,8 +11203,8 @@
+@@ -11359,8 +11359,8 @@
         }