Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26579
Modified Files:
qtiplot-qt4-x11.info qtiplot-qt4-x11.patch
Log Message:
Update from -submissions
https://sourceforge.net/tracker/index.php?func=detail&aid=2716760&group_id=17203&atid=414256
Index: qtiplot-qt4-x11.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-x11.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- qtiplot-qt4-x11.patch 14 Apr 2008 20:44:12 -0000 1.4
+++ qtiplot-qt4-x11.patch 28 Mar 2009 20:52:50 -0000 1.5
@@ -1,242 +1,245 @@
-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
-...@prefix@/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
-...@prefix@/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
-...@prefix@/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 += -...@prefix@/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 += -...@prefix@/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
+--- qtiplot-0.9.7.5orig/manual/Makefile 2009-03-05 13:57:29.000000000
+0100
++++ qtiplot-0.9.7.5/manual/Makefile 2009-03-26 12:50:12.000000000 +0100
+@@ -1,3 +1,9 @@
+ html-pdf:
+- docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid
+- dblatex -o qtiplot-manual-en.pdf -c dblatex.conf -p dblatex-param.xsl
docbook-en/index.docbook
++# docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid
++# dblatex -o qtiplot-manual-en.pdf -c dblatex.conf -p dblatex-param.xsl
docbook-en/index.docbook
++
++install:
++
++clean:
++
++distclean:
+--- qtiplot-0.9.7.5orig/qtiplot/qtiplot.pro 2009-03-09 00:28:18.000000000
+0100
++++ qtiplot-0.9.7.5/qtiplot/qtiplot.pro 2009-03-26 12:49:45.000000000
+0100
+@@ -1,6 +1,6 @@
+ # building without muParser doesn't work yet
+ SCRIPTING_LANGS += muParser
+-SCRIPTING_LANGS += Python
++#SCRIPTING_LANGS += Python
- unix: target.path = $$INSTALLBASE/bin
-@@ -45,12 +46,11 @@
+ # a console displaying output of scripts; particularly useful on Windows
+ # where running QtiPlot from a terminal is inconvenient
+@@ -28,13 +28,13 @@
#!!! 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 += @PREFIX@/include
+ INCLUDEPATH += ../3rdparty/qwtplot3d/include
+ INCLUDEPATH += ../3rdparty/qwt/src
+ INCLUDEPATH += ../3rdparty/liborigin
-INCLUDEPATH += ../3rdparty/gsl/include
--INCLUDEPATH += ../3rdparty/zlib123/include
-+unix:INCLUDEPATH += ../3rdparty/liborigin
-+unix:INCLUDEPATH += @PREFIX@/include
-+unix:INCLUDEPATH += @PREFIX@/lib/qt4-x11/include/qwtplot3d
-+unix:INCLUDEPATH += @PREFIX@/lib/qt4-x11/include/qwt
-+#unix:INCLUDEPATH += /usr/include
++INCLUDEPATH += @PREFIX@/include/gsl
+ INCLUDEPATH += ../3rdparty/zlib
+-INCLUDEPATH += ../3rdparty/boost_1_36_0
++INCLUDEPATH += @PREFIX@/include/boost
##################### 3rd PARTY LIBRARIES SECTION ###########################
#!!! Warning: You must modify these paths according to your computer settings
-@@ -59,17 +59,17 @@
+@@ -43,18 +43,18 @@
##################### 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/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 += -L../3rdparty/liborigin
-+unix:LIBS += -...@prefix@/lib/qt4-x11/lib #libqwtplot3d.a
-+unix:LIBS += -...@prefix@/lib #libmuparser.a
-+unix:LIBS += -...@prefix@/lib/python2.5/config
+-unix:LIBS +=
../3rdparty/boost_1_36_0/lib/libboost_date_time-gcc43-mt-1_36.a
+-unix:LIBS +=
../3rdparty/boost_1_36_0/lib/libboost_thread-gcc43-mt-1_36.a
++#unix:LIBS += @PREFIX@/lib/libgsl.a
++#unix:LIBS += @PREFIX@/lib/libgslcblas.a
++#unix:LIBS += @PREFIX@/lib/libboost_date_time-mt.a
++#unix:LIBS += @PREFIX@/lib/libboost_thread-mt.a
# 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 += -lqwt
+-#unix:LIBS += -lgsl -lgslcblas
+-
+unix:LIBS += -lgsl -lgslcblas
-+unix:LIBS += -lorigin.0.0.1
-
++unix:LIBS += -lboost_date_time-mt -lboost_thread-mt
##################### 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
+ win32:LIBS += ../3rdparty/muparser/lib/libmuparser.a
+@@ -84,7 +84,7 @@
+ INSTALLS += documentation
+ unix:INSTALLS += man
- 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)
- }
+- unix: INSTALLBASE = /usr
++ unix: INSTALLBASE = @PREFIX@
+ win32: INSTALLBASE = C:/QtiPlot
- 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 @@
+ unix: target.path = $$INSTALLBASE/bin
+@@ -210,8 +210,9 @@
- SUBDIRS = fitPlugins/fitRational0\
- fitPlugins/fitRational1\
-- manual\
-+# manual\
- qtiplot
-Binary files qtiplot-0.9.3.orig/fitPlugins/fitRational0/.DS_Store and
qtiplot-0.9.3/fitPlugins/fitRational0/.DS_Store differ
-diff -urN qtiplot-0.9.3.orig/fitPlugins/fitRational0/fitRational0.pro
qtiplot-0.9.3/fitPlugins/fitRational0/fitRational0.pro
---- qtiplot-0.9.3.orig/fitPlugins/fitRational0/fitRational0.pro
2008-03-29 11:20:57.000000000 +0000
-+++ qtiplot-0.9.3/fitPlugins/fitRational0/fitRational0.pro 2008-03-30
13:59:26.000000000 +0100
-@@ -10,7 +10,9 @@
- CONFIG += dll
+ contains(CONFIG, HAVE_LIBPNG){
+ DEFINES += GL2PS_HAVE_LIBPNG
+- INCLUDEPATH += ../3rdparty/libpng/
+- LIBS += ../3rdparty/libpng/libpng.a
++ INCLUDEPATH += @PREFIX@/include
++# LIBS += @PREFIX@/lib/libpng.a
++ LIBS += -lpng
+ }
+ ###############################################################
+--- qtiplot-0.9.7.5orig/fitPlugins/exp_saturation/exp_saturation.pro
2009-03-05 13:56:56.000000000 +0100
++++ qtiplot-0.9.7.5/fitPlugins/exp_saturation/exp_saturation.pro
2009-03-27 10:03:07.000000000 +0100
+@@ -12,14 +12,14 @@
DESTDIR = ../
--
-+
-+QMAKE_LFLAGS_SONAME =
-install_name$${literal_whitespa...@prefix@/lib/qt4-x11/qtiplot/
-+
+
# statically link against GSL in 3rdparty
- unix:INCLUDEPATH += @PREFIX@/include
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
++INCLUDEPATH += @PREFIX@/include/
++#LIBS += @PREFIX@/lib/libgsl.a
++#LIBS += @PREFIX@/lib/libgslcblas.a
-Binary files qtiplot-0.9.3.orig/fitPlugins/fitRational1/.DS_Store and
qtiplot-0.9.3/fitPlugins/fitRational1/.DS_Store differ
-diff -urN qtiplot-0.9.3.orig/fitPlugins/fitRational1/fitRational1.pro
qtiplot-0.9.3/fitPlugins/fitRational1/fitRational1.pro
---- qtiplot-0.9.3.orig/fitPlugins/fitRational1/fitRational1.pro
2008-03-29 11:20:57.000000000 +0000
-+++ qtiplot-0.9.3/fitPlugins/fitRational1/fitRational1.pro 2008-03-30
13:59:51.000000000 +0100
-@@ -10,7 +10,9 @@
- CONFIG += dll
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += -...@prefix@/lib -lgsl -lgslcblas
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
+-INSTALLS += target
++#target.pa...@prefix@/lib$${libsuff}/qtiplot/plugins
++#INSTALLS += target
+
+ SOURCES += exp_saturation.c
+--- qtiplot-0.9.7.5orig/fitPlugins/explin/explin.pro 2009-03-05
13:56:56.000000000 +0100
++++ qtiplot-0.9.7.5/fitPlugins/explin/explin.pro 2009-03-27
10:03:17.000000000 +0100
+@@ -12,14 +12,14 @@
DESTDIR = ../
--
-+
-+QMAKE_LFLAGS_SONAME =
-install_name$${literal_whitespa...@prefix@/lib/qt4-x11/qtiplot/
-+
+
# statically link against GSL in 3rdparty
- unix:INCLUDEPATH += @PREFIX@/include
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
++INCLUDEPATH += @PREFIX@/include/
++#LIBS += @PREFIX@/lib/libgsl.a
++#LIBS += @PREFIX@/lib/libgslcblas.a
-Binary files qtiplot-0.9.3.orig/qtiplot/.DS_Store and
qtiplot-0.9.3/qtiplot/.DS_Store differ
-diff -urN qtiplot-0.9.3.orig/qtiplot/qtiplot.pro
qtiplot-0.9.3/qtiplot/qtiplot.pro
---- qtiplot-0.9.3.orig/qtiplot/qtiplot.pro 2008-03-29 11:20:57.000000000
+0000
-+++ qtiplot-0.9.3/qtiplot/qtiplot.pro 2008-03-30 14:13:13.000000000 +0100
-@@ -4,7 +4,7 @@
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += -...@prefix@/lib -lgsl -lgslcblas
- # building without muParser doesn't work yet
- SCRIPTING_LANGS += muParser
--#SCRIPTING_LANGS += Python
-+SCRIPTING_LANGS += Python
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
+-INSTALLS += target
++#target.pa...@prefix@/lib$${libsuff}/qtiplot/plugins
++#INSTALLS += target
- # a console displaying output of scripts; particularly useful on Windows
- # where running QtiPlot from a terminal is inconvenient
-@@ -16,8 +16,8 @@
- # comment the following lines if you haven't subscribed for a QtiPlot
binaries maintenance contract
- #RESTRICTED_MODULES += EMF
+ SOURCES += explin.c
+--- qtiplot-0.9.7.5orig/fitPlugins/fitRational0/fitRational0.pro
2009-03-05 13:56:56.000000000 +0100
++++ qtiplot-0.9.7.5/fitPlugins/fitRational0/fitRational0.pro 2009-03-27
10:03:23.000000000 +0100
+@@ -1,25 +1,25 @@
+-QMAKE_PROJECT_DEPTH = 0
+-linux-g++-64: libsuff=64
+-
+-TARGET = fitRational0
+-TEMPLATE = lib
+-
+-CONFIG += thread
+-CONFIG += warn_on
+-CONFIG += release
+-CONFIG += dll
+-
+-DESTDIR = ../
+-
+-# statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
+-
+-#dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
+-
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
+-INSTALLS += target
+-
++QMAKE_PROJECT_DEPTH = 0
++linux-g++-64: libsuff=64
++
++TARGET = fitRational0
++TEMPLATE = lib
++
++CONFIG += thread
++CONFIG += warn_on
++CONFIG += release
++CONFIG += dll
++
++DESTDIR = ../
++
++# statically link against GSL in 3rdparty
++INCLUDEPATH += @PREFIX@/include/
++#LIBS += @PREFIX@/lib/libgsl.a
++#LIBS += @PREFIX@/lib/libgslcblas.a
++
++#dynamically link against GSL installed system-wide
++unix:LIBS += -...@prefix@/lib -lgsl -lgslcblas
++
++#target.pa...@prefix@/lib$${libsuff}/qtiplot/plugins
++#INSTALLS += target
++
+ SOURCES += fitRational0.cpp
+--- qtiplot-0.9.7.5orig/fitPlugins/fitRational1/fitRational1.pro
2009-03-05 13:56:56.000000000 +0100
++++ qtiplot-0.9.7.5/fitPlugins/fitRational1/fitRational1.pro 2009-03-27
10:03:29.000000000 +0100
+@@ -12,14 +12,14 @@
+ DESTDIR = ../
+
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
++INCLUDEPATH += @PREFIX@/include/
++#LIBS += @PREFIX@/lib/libgsl.a
++#LIBS += @PREFIX@/lib/libgslcblas.a
--#CONFIG += release
--CONFIG += debug
-+CONFIG += release
-+#CONFIG += debug
- #win32: CONFIG += console
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += -...@prefix@/lib -lgsl -lgslcblas
- # what to install and where
-@@ -32,9 +32,9 @@
- win32: INSTALLBASE = c:/QtiPlot
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
+-INSTALLS += target
++#target.pa...@prefix@/lib$${libsuff}/qtiplot/plugins
++#INSTALLS += target
- unix: target.path = $$INSTALLBASE/bin
--unix: translations.path = $$INSTALLBASE/share/qtiplot/translations
--unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual
--unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
-+unix: translations.path = $$INSTALLBASE/share/qtiplot-qt4-x11/translations
-+unix: manual.path = $$INSTALLBASE/share/doc/qtiplot-qt4-x11/manual
-+unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot-qt4-x11
- unix: man.path = $$INSTALLBASE/share/man/man1/
+ SOURCES += fitRational1.cpp
+
+--- qtiplot-0.9.7.5orig/3rdparty/qwt/qwt.prf 2009-03-10 12:43:17.000000000
+0100
++++ qtiplot-0.9.7.5/3rdparty/qwt/qwt.prf 2009-03-27 08:35:04.000000000
+0100
+@@ -11,7 +11,7 @@
+ QwtVersion = 5.2.0
+
+ unix {
+- QwtBase = /usr/local/qwt-$${QwtVersion}-svn
++ QwtBase = @PREFIX@/share/qwt-$${QwtVersion}-svn
+ LIBS += -L$${QwtBase}/lib -lqwt
+ }
+ win32 {
+--- qtiplot-0.9.7.5orig/3rdparty/qwt/qwtconfig.pri 2009-03-10
12:43:54.000000000 +0100
++++ qtiplot-0.9.7.5/3rdparty/qwt/qwtconfig.pri 2009-03-27 11:39:32.000000000
+0100
+@@ -8,15 +8,15 @@
+ VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
- win32: target.path = $$INSTALLBASE
-@@ -451,7 +451,7 @@
- pythonconfig.files += qtiplotrc.py \
- qtiUtil.py
+ unix {
+- INSTALLBASE = /usr/local/qwt-$$VERSION-svn
++# INSTALLBASE = @PREFIX@/share/qwt-$$VERSION-svn
+ }
-- unix: pythonconfig.path = /etc
-+ unix: pythonconfig.path =
@PREFIX@/lib/python2.5/site-packages/qtiplot-qt4-x11
- win32: pythonconfig.path = $$INSTALLBASE
+ win32 {
+ INSTALLBASE = C:/Qwt-$$VERSION-svn
+ }
- DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
-
-
+-target.path = $$INSTALLBASE/lib
+-headers.path = $$INSTALLBASE/include
+-doc.path = $$INSTALLBASE/doc
++#target.path = $$INSTALLBASE/lib
++#headers.path = $$INSTALLBASE/include
++#doc.path = $$INSTALLBASE/doc
+
+ ######################################################################
+ # qmake internal options
\ No newline at end of file
Index: qtiplot-qt4-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-x11.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- qtiplot-qt4-x11.info 31 Jan 2009 23:58:16 -0000 1.6
+++ qtiplot-qt4-x11.info 28 Mar 2009 20:52:50 -0000 1.7
@@ -1,11 +1,11 @@
Package: qtiplot-qt4-x11
-Version: 0.9.3
-Revision: 3
+Version: 0.9.7.5
+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, scipy-core-py25
-BuildDepends: x11-dev, qt4-x11, gsl, qwtplot3d-qt4-x11, qwt-qt4-x11, muparser,
sip-py25, sip-py25-bin, fink (>= 0.28), libgettext3-dev, glib2-dev, fink (>=
0.24.12)
+Depends: x11, qt4-x11-core-shlibs, qt4-x11-gui-shlibs, gsl-shlibs,
muparser-shlibs, boost1.35.nopython-shlibs, libpng3-shlibs
+BuildDepends: x11-dev, qt4-x11, gsl, muparser, boost1.35.nopython, fink (>=
0.28), libgettext3-dev, glib2-dev
BuildConflicts: labplot, labplot-shlibs, liborigin, liborigin-shlibs
Conflicts: qtiplot
@@ -15,12 +15,12 @@
Source: http://soft.proindependent.com/src/qtiplot-%v.tar.bz2
SourceDirectory: qtiplot-%v
-Source-MD5: 6216c76dc191552be6602af40c53ff6e
+Source-MD5: 8ca64ee66d1a843828b7cfda3d1a7b00
GCC: 4.0
PatchFile: %n.patch
-PatchFile-MD5: 1c0fdfc2314e430f498f94ce2f0c51d5
+PatchFile-MD5: 6f6b9dae069568fa4bddebb6448f8d04
PatchScript: sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
CompileScript: <<
@@ -28,28 +28,23 @@
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: <<
INSTALL_ROOT=%d make install
-cp -R 3rdparty/liborigin/*.dylib %i/lib/qt4-x11/qtiplot/
-echo qti > %i/lib/python2.5/site-packages/qtiplot-qt4-x11.pth
-cd %i/lib/python2.5/site-packages; %p/bin/python2.5 -O
%p/lib/python2.5/compileall.py qtiplot-qt4-x11
+mkdir %i/bin
+cp %b/qtiplot/qtiplot %i/bin/qtiplot
<<
-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
-<<
+#Shlibs: <<
+#!%p/lib/qtiplot/plugins/libexp_saturation.1.dylib 1.0.0
+#!%p/lib/qtiplot/plugins/libexplin.1.dylib 1.0.0
+#!%p/lib/qtiplot/plugins/libfitRational0.1.dylib 1.0.0
+#!%p/lib/qtiplot/plugins/libfitRational1.1.dylib 1.0.0
+#<<
+
#DocFiles: gpl_licence.txt README.html qtiplot.css qtiplot_logo.png
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
