Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30499/sci
Added Files:
muparser.info qtiplot-qt4-x11.info qtiplot-qt4-x11.patch
Log Message:
qt4 versions of qtiplot and dependencies from tracker 1880544
--- NEW FILE: muparser.info ---
Package: muparser
Version: 1.28
Revision: 1
Source: mirror:sourceforge:%n/%n_v128.tar.gz
Source-MD5: 451a322db29d7fed159f4287e8b8e00d
SourceDirectory: %n
Depends: %N-shlibs ( = %v-%r )
ConfigureParams: --enable-shared=yes
CompileScript: <<
./configure %c
make
<<
InstallScript: <<
make install prefix=%i
<<
DocFiles: Changes.txt Credits.txt Install.txt License.txt docs/*
Description: Fast math parser library
DescPackaging: Fast math parser library
License: OSI-Approved
Maintainer: Murali Vadivelu <[EMAIL PROTECTED]>
Homepage: http://muparser.sourceforge.net/
Splitoff: <<
Package: %N-shlibs
Depends: pkgconfig
Files: lib/libmuparser.0*.dylib
Shlibs: %p/lib/libmuparser.0.dylib 1.0.0 %n (>= 128-1)
Description: Fast math parser shared library
DocFiles: Changes.txt Credits.txt Install.txt License.txt
<<
--- NEW FILE: qtiplot-qt4-x11.patch ---
diff -urN qtiplot-0.9.orig/qtiplot/python-includepath.py
qtiplot-0.9/qtiplot/python-includepath.py
--- qtiplot-0.9.orig/qtiplot/python-includepath.py 2007-05-10
10:42:48.000000000 -0400
+++ qtiplot-0.9/qtiplot/python-includepath.py 2007-09-29 20:06:43.000000000
-0400
@@ -1,3 +1,3 @@
-#!/usr/bin/python
[EMAIL PROTECTED]@/bin/python2.5
from distutils import sysconfig
print sysconfig.get_python_inc()
diff -urN qtiplot-0.9.orig/qtiplot/python-libs-win.py
qtiplot-0.9/qtiplot/python-libs-win.py
--- qtiplot-0.9.orig/qtiplot/python-libs-win.py 2007-05-10 10:42:48.000000000
-0400
+++ qtiplot-0.9/qtiplot/python-libs-win.py 2007-09-29 20:06:53.000000000
-0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
[EMAIL PROTECTED]@/bin/python2.5
import sys
pyver = sys.version_info
#print 'c:\windows\system32\python' + str(pyver[0]) + str(pyver[1]) + '.dll'
diff -urN qtiplot-0.9.orig/qtiplot/python-sipcmd.py
qtiplot-0.9/qtiplot/python-sipcmd.py
--- qtiplot-0.9.orig/qtiplot/python-sipcmd.py 2007-05-10 10:42:48.000000000
-0400
+++ qtiplot-0.9/qtiplot/python-sipcmd.py 2007-09-29 20:06:08.000000000
-0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
[EMAIL PROTECTED]@/bin/python2.5
from PyQt4 import pyqtconfig
import os.path
config = pyqtconfig.Configuration()
diff -urN qtiplot-0.9.3-rc2.orig/fitPlugins/fitRational0/fitRational0.pro
qtiplot-0.9.3-rc2/fitPlugins/fitRational0/fitRational0.pro
--- qtiplot-0.9.3-rc2.orig/fitPlugins/fitRational0/fitRational0.pro
2008-01-27 01:19:06.000000000 +0000
+++ qtiplot-0.9.3-rc2/fitPlugins/fitRational0/fitRational0.pro 2008-01-27
01:23:35.000000000 +0000
@@ -12,14 +12,12 @@
DESTDIR = ../
# statically link against GSL in 3rdparty
-INCLUDEPATH += ../../3rdparty/gsl/include/
-LIBS += ../../3rdparty/gsl/lib/libgsl.a
-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
+unix:INCLUDEPATH += @PREFIX@/include
#dynamically link against GSL installed system-wide
-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += [EMAIL PROTECTED]@/lib -lgsl -lgslcblas
-target.path=/usr/lib$${libsuff}/qtiplot/plugins
+target.path= @PREFIX@/lib/qt4-x11/qtiplot
INSTALLS += target
SOURCES += fitRational0.cpp
diff -urN qtiplot-0.9.3-rc2.orig/fitPlugins/fitRational1/fitRational1.pro
qtiplot-0.9.3-rc2/fitPlugins/fitRational1/fitRational1.pro
--- qtiplot-0.9.3-rc2.orig/fitPlugins/fitRational1/fitRational1.pro
2007-10-26 23:15:18.000000000 +0100
+++ qtiplot-0.9.3-rc2/fitPlugins/fitRational1/fitRational1.pro 2008-01-27
01:24:11.000000000 +0000
@@ -12,14 +12,12 @@
DESTDIR = ../
# statically link against GSL in 3rdparty
-INCLUDEPATH += ../../3rdparty/gsl/include/
-LIBS += ../../3rdparty/gsl/lib/libgsl.a
-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
+unix:INCLUDEPATH += @PREFIX@/include
#dynamically link against GSL installed system-wide
-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += [EMAIL PROTECTED]@/lib -lgsl -lgslcblas
-target.path=/usr/lib$${libsuff}/qtiplot/plugins
+target.path= @PREFIX@/lib/qt4-x11/qtiplot
INSTALLS += target
SOURCES += fitRational1.cpp
Binary files qtiplot-0.9.3-rc3.orig/qtiplot/.DS_Store and
qtiplot-0.9.3-rc3/qtiplot/.DS_Store differ
diff -urN qtiplot-0.9.3-rc3.orig/qtiplot/qtiplot.pro
qtiplot-0.9.3-rc3/qtiplot/qtiplot.pro
--- qtiplot-0.9.3-rc3.orig/qtiplot/qtiplot.pro 2008-02-18 13:40:20.000000000
+0000
+++ qtiplot-0.9.3-rc3/qtiplot/qtiplot.pro 2008-02-26 00:46:45.000000000
+0000
@@ -27,7 +27,8 @@
INSTALLS += documentation
unix:INSTALLS += man
-unix: INSTALLBASE = /usr
+#unix: INSTALLBASE = /usr
+unix: INSTALLBASE = @PREFIX@
win32: INSTALLBASE = c:/QtiPlot
unix: target.path = $$INSTALLBASE/bin
@@ -45,12 +46,11 @@
#!!! Warning: You must modify these paths according to your computer settings
#############################################################################
-INCLUDEPATH += ../3rdparty/muparser/include
-INCLUDEPATH += ../3rdparty/qwtplot3d/include
-INCLUDEPATH += ../3rdparty/qwt/src
-INCLUDEPATH += ../3rdparty/liborigin
-INCLUDEPATH += ../3rdparty/gsl/include
-INCLUDEPATH += ../3rdparty/zlib123/include
+unix:INCLUDEPATH += @PREFIX@/include
+unix:INCLUDEPATH += @PREFIX@/lib/qt4-x11/include/qwtplot3d
+unix:INCLUDEPATH += @PREFIX@/lib/qt4-x11/include/qwt
+unix:INCLUDEPATH += /usr/include
+unix:INCLUDEPATH += ../3rdparty/liborigin
##################### 3rd PARTY LIBRARIES SECTION ###########################
#!!! Warning: You must modify these paths according to your computer settings
@@ -59,17 +59,17 @@
##################### Linux (Mac OS X) ######################################
# statically link against libraries in 3rdparty
-unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
+unix:LIBS += [EMAIL PROTECTED]@/lib #libmuparser.a
+unix:LIBS += [EMAIL PROTECTED]@/lib/qt4-x11/lib #libqwtplot3d.a
+unix:LIBS += -L../3rdparty/liborigin
+unix:LIBS += [EMAIL PROTECTED]@/lib/python2.5/config
# dynamically link against dependencies if they are installed system-wide
-#unix:LIBS += -lmuparser
-#unix:LIBS += -lqwtplot3d
-#unix:LIBS += -lqwt
-#unix:LIBS += -lgsl -lgslcblas
+unix:LIBS += -lmuparser
+unix:LIBS += -lqwtplot3d
+unix:LIBS += -lqwt
+unix:LIBS += -lgsl -lgslcblas
+unix:LIBS += -lorigin.0.0.1
##################### Windows ###############################################
@@ -393,8 +393,8 @@
################# Origin Import (liborigin) ###################
###############################################################
-HEADERS += ../3rdparty/liborigin/OPJFile.h
-SOURCES += ../3rdparty/liborigin/OPJFile.cpp
+#HEADERS += ../3rdparty/liborigin/OPJFile.h
+#SOURCES += ../3rdparty/liborigin/OPJFile.cpp
###############################################################
################# Module: Plot 2D #############################
@@ -458,11 +458,11 @@
SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
unix {
- INCLUDEPATH += $$system(python python-includepath.py)
- LIBS += $$system(python -c "\"from distutils import sysconfig;
print '-lpython'+sysconfig.get_config_var('VERSION')\"")
+ INCLUDEPATH += $$system(python2.5 python-includepath.py)
+ LIBS += $$system(python2.5 -c "\"from distutils import sysconfig;
print '-lpython'+sysconfig.get_config_var('VERSION')\"")
LIBS += -lm
system(mkdir -p $${SIP_DIR})
- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
+ system($$system(python2.5 python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
}
win32 {
diff -urN qtiplot-0.9.3-rc3.orig/qtiplot.pro qtiplot-0.9.3-rc3/qtiplot.pro
--- qtiplot-0.9.3-rc3.orig/qtiplot.pro 2008-02-13 07:55:14.000000000 +0000
+++ qtiplot-0.9.3-rc3/qtiplot.pro 2008-02-29 10:30:22.000000000 +0000
@@ -2,5 +2,5 @@
SUBDIRS = fitPlugins/fitRational0\
fitPlugins/fitRational1\
- manual\
+# manual\
qtiplot
--- NEW FILE: qtiplot-qt4-x11.info ---
Package: qtiplot-qt4-x11
Version: 0.9.3
Revision: 1
Maintainer: Murali Vadivelu <[EMAIL PROTECTED]>
Depends: x11, qt4-x11-core-shlibs, gsl-shlibs, qwtplot3d-qt4-x11-shlibs,
qwt-qt4-x11-shlibs, muparser-shlibs, python25, python25-shlibs, pyqt4-py25,
pyqt4-py25-bin
BuildDepends: x11-dev, qt4-x11, gsl, qwtplot3d-qt4-x11, qwt-qt4-x11, muparser,
sip-py25, sip-py25-bin, fink (>= 0.28)
BuildConflicts: labplot, labplot-shlibs
Description: Data analysis and scientific plotting
Homepage: http://soft.proindependent.com/qtiplot.html
License: GPL
Source: http://soft.proindependent.com/src/qtiplot-%v.tar.bz2
SourceDirectory: qtiplot-%v
Source-MD5: 6216c76dc191552be6602af40c53ff6e
GCC: 4.0
PatchScript: sed 's,@PREFIX@,%p,g' < %a/%n.patch | patch -p1
CompileScript: <<
#!/bin/sh -ev
unset QMAKESPEC
export QTDIR=%p/lib/qt4-x11
export PATH="$QTDIR/bin:%p/lib/freetype219/bin:$PATH"
cd 3rdparty/liborigin
g++ -dynamiclib -single_module -Wl,-x -dead_strip -fno-rtti -fno-exceptions
-current_version 0.0.1 -compatibility_version 0.0.1 -install_name
%p/lib/qt4-x11/qtiplot/liborigin.0.dylib -fPIC OPJFile.cpp -Os -s -o
liborigin.0.0.1.dylib
ln -sf liborigin.0.0.1.dylib liborigin.0.0.dylib
ln -sf liborigin.0.0.1.dylib liborigin.0.dylib
ln -sf liborigin.0.0.1.dylib liborigin.dylib
cd ../../
%p/lib/qt4-x11/bin/qmake qtiplot.pro
make
<<
InstallScript: <<
mkdir -p %i/bin
cp qtiplot/qtiplot %i/bin/
mkdir -p %i/lib/qt4-x11/qtiplot
cp -R fitPlugins/*.dylib %i/lib/qt4-x11/qtiplot/
cp -R 3rdparty/liborigin/*.dylib %i/lib/qt4-x11/qtiplot/
mkdir -p %i/share/doc/qtiplot
#cp -R manual/* %i/share/doc/qtiplot/
install_name_tool -id %p/lib/qt4-x11/qtiplot/libfitRational0.1.dylib
%i/lib/qt4-x11/qtiplot/libfitRational0.1.0.0.dylib
install_name_tool -id %p/lib/qt4-x11/qtiplot/libfitRational1.1.dylib
%i/lib/qt4-x11/qtiplot/libfitRational1.1.0.0.dylib
<<
Shlibs: <<
!%p/lib/qt4-x11/qtiplot/libfitRational0.1.dylib
!%p/lib/qt4-x11/qtiplot/libfitRational1.1.dylib
!%p/lib/qt4-x11/qtiplot/liborigin.0.dylib
<<
DocFiles: gpl_licence.txt README.html qtiplot.css qtiplot_logo.png
DescDetail: <<
Data analysis and scientific plotting
<<
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
