Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26135
Added Files:
qtiplot-qt4-mac.info qtiplot-qt4-mac.patch
Log Message:
New from -submissions
https://sourceforge.net/tracker/?func=detail&aid=2770824&group_id=17203&atid=414256
--- NEW FILE: qtiplot-qt4-mac.patch ---
diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/exp_saturation/exp_saturation.pro
qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
>qtiplot-qt4-x11.patch
--- qtiplot-0.9.7.6.orig/fitPlugins/exp_saturation/exp_saturation.pro
2009-04-01 16:16:14.000000000 +0200
+++ qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
2009-03-27 10:03:07.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
#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
diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/explin/explin.pro
qtiplot-0.9.7.6/fitPlugins/explin/explin.pro >> qtiplot-qt4-x11.patch
--- qtiplot-0.9.7.6.orig/fitPlugins/explin/explin.pro 2009-04-01
16:16:14.000000000 +0200
+++ qtiplot-0.9.7.6/fitPlugins/explin/explin.pro 2009-03-27
10:03:17.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
#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 += explin.c
diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/fitRational0/fitRational0.pro
qtiplot-0.9.7.6/fitPlugins/fitRational0/fitRational0.pro >>
qtiplot-qt4-x11.patch
--- qtiplot-0.9.7.6.orig/fitPlugins/fitRational0/fitRational0.pro
2009-04-01 16:16:14.000000000 +0200
+++ qtiplot-0.9.7.6/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
diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/fitRational1/fitRational1.pro
qtiplot-0.9.7.6/fitPlugins/fitRational1/fitRational1.pro >>
qtiplot-qt4-x11.patch
--- qtiplot-0.9.7.6.orig/fitPlugins/fitRational1/fitRational1.pro
2009-04-01 16:16:14.000000000 +0200
+++ qtiplot-0.9.7.6/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
#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 += fitRational1.cpp
diff -Naur qtiplot-0.9.7.6.orig/manual/Makefile qtiplot-0.9.7.6/manual/Makefile
>> qtiplot-qt4-x11.patch
--- qtiplot-0.9.7.6.orig/manual/Makefile 2009-04-01 16:16:49.000000000
+0200
+++ qtiplot-0.9.7.6/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:
diff -Naur qtiplot-0.9.7.6.orig/qtiplot/qtiplot.pro
qtiplot-0.9.7.6/qtiplot/qtiplot.pro >> qtiplot-qt4-x11.patch
--- qtiplot-0.9.7.6.orig/qtiplot/qtiplot.pro 2009-04-02 02:53:44.000000000
+0200
+++ qtiplot-0.9.7.6/qtiplot/qtiplot.pro 2009-04-08 09:47:16.000000000 +0200
@@ -1,6 +1,6 @@
# building without muParser doesn't work yet
SCRIPTING_LANGS += muParser
-SCRIPTING_LANGS += Python
+#SCRIPTING_LANGS += Python
# a console displaying output of scripts; particularly useful on Windows
# where running QtiPlot from a terminal is inconvenient
@@ -28,13 +28,14 @@
#!!! Warning: You must modify these paths according to your computer settings
#############################################################################
-INCLUDEPATH += ../3rdparty/muparser/include
+INCLUDEPATH += @PREFIX@/include
+INCLUDEPATH += @PREFIX@/include/gsl
+INCLUDEPATH += @PREFIX@/include/boost
+INCLUDEPATH += @PREFIX@/lib/qt4-mac/include/qwt
INCLUDEPATH += ../3rdparty/qwtplot3d/include
-INCLUDEPATH += ../3rdparty/qwt/src
INCLUDEPATH += ../3rdparty/liborigin
-INCLUDEPATH += ../3rdparty/gsl/include
INCLUDEPATH += ../3rdparty/zlib
-INCLUDEPATH += ../3rdparty/boost_1_36_0
+
##################### 3rd PARTY LIBRARIES SECTION ###########################
#!!! Warning: You must modify these paths according to your computer settings
@@ -43,17 +44,14 @@
##################### Linux (Mac OS X) ######################################
# 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_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/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 += -lqwt
-#unix:LIBS += -lgsl -lgslcblas
+unix:LIBS += -lmuparser
+unix:LIBS += -lqwt
+unix:LIBS += -lgsl -lgslcblas
+unix:LIBS += -lboost_date_time-mt -lboost_thread-mt
##################### Windows ###############################################
@@ -84,7 +82,7 @@
INSTALLS += documentation
unix:INSTALLS += man
- unix: INSTALLBASE = /usr
+ unix: INSTALLBASE = @PREFIX@
win32: INSTALLBASE = C:/QtiPlot
unix: target.path = $$INSTALLBASE/bin
@@ -186,7 +184,7 @@
qtiUtil.py \
qti_wordlist.txt \
- unix: pythonconfig.path = /usr/local/qtiplot
+ unix: pythonconfig.path = @PREFIX@/share/qtiplot
win32: pythonconfig.path = $$INSTALLBASE
DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\
")\\\"
}
@@ -210,8 +208,8 @@
contains(CONFIG, HAVE_LIBPNG){
DEFINES += GL2PS_HAVE_LIBPNG
- INCLUDEPATH += ../3rdparty/libpng/
- LIBS += ../3rdparty/libpng/libpng.a
+ INCLUDEPATH += @PREFIX@/include
+ LIBS += -lpng
}
###############################################################
--- NEW FILE: qtiplot-qt4-mac.info ---
Package: qtiplot-qt4-mac
Version: 0.9.7.6
Revision: 1
Maintainer: Alexandre Vial <av...@altern.org>
Depends: qt4-mac-core-shlibs (>=4.5.1-1), qt4-mac-gui-shlibs(>=4.5.1-1),
gsl-shlibs, muparser-shlibs, boost1.35.nopython-shlibs, qwt-qt4-mac-shlibs
(>=5.2.0), libpng3-shlibs
BuildDepends: qt4-mac, gsl, muparser, libpng3, boost1.35.nopython, qwt-qt4-mac
(>=5.2.0), fink (>= 0.28), libgettext3-dev, glib2-dev
BuildConflicts: labplot, labplot-shlibs, liborigin, liborigin-shlibs
Conflicts: qtiplot
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: a9b9b2fbd3044022a7afa3a89ec5c47d
GCC: 4.0
PatchFile: %n.patch
PatchFile-MD5: 3d4f7fbef64803f53db5d0906c9cef05
PatchScript: sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
CompileScript: <<
#!/bin/sh -ev
unset QMAKESPEC
export QTDIR=%p/lib/qt4-mac
export PATH="$QTDIR/bin:%p/lib/freetype219/bin:$PATH"
%p/lib/qt4-mac/bin/qmake qtiplot.pro
make
<<
AppBundles: %b/qtiplot/qtiplot.app
#DocFiles: gpl_licence.txt README.html qtiplot.css qtiplot_logo.png
DescDetail: <<
Data analysis and scientific plotting program
<<
DescPackaging: <<
Requires qt4-mac in Depends, while it should only be BuildDepends, but fails
otherwise
<<
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensign option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
