Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0bbbb142c10df0336f06774127fc9e332f9dadf2

commit 0bbbb142c10df0336f06774127fc9e332f9dadf2
Author: Elentir <[email protected]>
Date:   Wed Oct 13 18:42:23 2010 +0200

qtiplot-0.9.8.3-1-i686

* version bump

diff --git a/source/xapps-extra/qtiplot/FrugalBuild 
b/source/xapps-extra/qtiplot/FrugalBuild
index a18a28a..148ec58 100644
--- a/source/xapps-extra/qtiplot/FrugalBuild
+++ b/source/xapps-extra/qtiplot/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir <[email protected]>

pkgname=qtiplot
-pkgver=0.9.8.2
+pkgver=0.9.8.3
pkgrel=1
pkgdesc="QtiPlot is a professional scientific data analysis and visualisation 
solution"
depends=('libboost-mt>=1.39.0' 'pyqt4' 'muparser' 'gsl' 'libglu' 
'libqtassistantclient' 'libglu' 'libqt3support' 'libqtopengl')
@@ -16,14 +16,17 @@ _F_desktop_icon="qtiplot.png"
_F_desktop_name="Qtiplot"
_F_desktop_categories="Qt;Education;Science;"
_F_desktop_mimetypes="application/x-qtiplot-project;application/x-qtiplot-project-compressed;application/x-qtiplot-project-backup"
-source=($source build.conf qtiplot.xml)
+source=($source build.conf qtiplot.xml \
+       http://download.berlios.de/qtiplot/QTeXEngine-0.2-opensource.zip)
up2date="Flasttar http://soft.proindependent.com/download.html";
-sha1sums=('dd8d1003cee8767d4ba9e616e5263da1302c290d' \
-          '145f86a395e9e69783896e813fa351bb9dee9d19' \
-          '285f57d865956d93250ec548288c5bface096b6b')
+sha1sums=('e5ffdd25f1f69611f3f39a0b22e8c23959ab51e1' \
+          'c4b7d496212ac5b14d24fb436d80ca2aa477e22c' \
+          '285f57d865956d93250ec548288c5bface096b6b' \
+          'b484a4da7a0f3103e188539bfa6c1910dc9b55ca')

build() {
Fcd
+       cp -a ../QTeXEngine ./3rdparty/ || Fdie
cp ../build.conf ./ || Fdie

cd ./3rdparty/qwt || Fdie
@@ -33,7 +36,11 @@ build() {
cd ../qwtplot3d || Fdie
qmake || Fdie
make || Fdie
-
+
+       cd ../QTeXEngine || Fdie
+       qmake || Fdie
+       make || Fdie
+
cd ../../qtiplot || Fdie
## fix some path
Fsed "pythonconfig.path = /usr/local/qtiplot" "pythonconfig.path = 
/usr/share/qtiplot" qtiplot.pro
@@ -50,7 +57,7 @@ build() {
Fdesktop2

## fix doc
-       Frm usr/share/doc/qtiplot-0.9.8.2manual
+       Frm usr/share/doc/qtiplot-${pkgver}manual
Frm usr/share/doc/qtiplot
Fdoc $_F_cd_path/gpl_licence.txt
}
diff --git a/source/xapps-extra/qtiplot/build.conf 
b/source/xapps-extra/qtiplot/build.conf
index f05f58e..cad0658 100755
--- a/source/xapps-extra/qtiplot/build.conf
+++ b/source/xapps-extra/qtiplot/build.conf
@@ -12,6 +12,13 @@ SYS_INCLUDEPATH = /usr/include
SYS_LIBS = -L/usr/lib

##########################################################
+## zlib (http://www.zlib.net/)
+##########################################################
+
+# include path. leave it blank to use SYS_INCLUDE
+#ZLIB_INCLUDEPATH = $$QTI_ROOT/3rdparty/zlib/
+
+##########################################################
## muParser (http://muparser.sourceforge.net/)
##########################################################

@@ -35,20 +42,6 @@ MUPARSER_LIBS = -lmuparser
GSL_LIBS = -lgsl -lgslcblas

##########################################################
-## Boost libraries (http://www.boost.org/)
-##########################################################
-
-# include path. leave it blank to use SYS_INCLUDE
-BOOST_INCLUDEPATH = /usr/include/boost
-# link statically against a copy in 3rdparty/
-#unix: BOOST_LIBS = 
$$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \
-#                                 
$$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
-#win32:BOOST_LIBS = 
$$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
-#                                 
$$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
-# or dynamically against a system-wide installation
-BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
-
-##########################################################
## QWT - use local copy till upstream catches up
# http://qwt.sourceforge.net/index.html
##########################################################
@@ -70,14 +63,40 @@ QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
unix:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a

##########################################################
-## ExcelFormat - optional. you don't have to set these variables
-##(http://www.codeproject.com/KB/office/ExcelFormat.aspx)
+## Boost libraries (http://www.boost.org/) - optional
##########################################################

+# include path. leave it blank to use SYS_INCLUDE
+#BOOST_INCLUDEPATH = $$QTI_ROOT/3rdparty/boost
+# link statically against a copy in 3rdparty/
+#unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time.a \
+#                                 
$$QTI_ROOT/3rdparty/boost/lib/libboost_thread.a
+#win32:BOOST_LIBS = 
$$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
+#                                 
$$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
+# or dynamically against a system-wide installation
+BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
+
+##########################################################
+## liborigin2 - optional. you don't have to set these variables
+# http://soft.proindependent.com/liborigin2/
+##########################################################
+
+# include path. leave it blank to use SYS_INCLUDE
+#LIBORIGIN_INCLUDEPATH = $$QTI_ROOT/3rdparty/liborigin2
+# link statically against a copy in 3rdparty/
+#LIBORIGIN_LIBS = $$QTI_ROOT/3rdparty/liborigin2/liborigin2.a
+
+###########################################################
+## libxls - optional. you don't have to set these variables
+# http://libxls.sourceforge.net/
+###########################################################
+
# include path.
-# XLS_INCLUDEPATH = $$QTI_ROOT/3rdparty/ExcelFormat/
+#XLS_INCLUDEPATH = $$QTI_ROOT/3rdparty/libxls/include/
+#XLS_INCLUDEPATH = $$QTI_ROOT/3rdparty/ExcelFormat/
# link locally against a copy in 3rdparty/
-# XLS_LIBS = $$QTI_ROOT/3rdparty/ExcelFormat/lib/libExcelFormat.a
+#XLS_LIBS = $$QTI_ROOT/3rdparty/libxls/lib/libxlsreader.a
+#XLS_LIBS = $$QTI_ROOT/3rdparty/ExcelFormat/lib/libExcelFormat.a

###########################################################
## QuaZIP - optional. you don't have to set these variables
@@ -111,6 +130,26 @@ LIBPNG_LIBS = -lpng
#EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a

##########################################################
+## QTeXEngine - optional. you don't have to set these variables
+# http://soft.proindependent.com/qtexengine/
+##########################################################
+
+# include path.
+TEX_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/QTeXEngine/src
+# link locally against a copy in 3rdparty/
+TEX_ENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine/libQTeXEngine.a
+
+##########################################################
+## ALGLIB (2.6) - optional. you don't have to set these variables
+# http://www.alglib.net/
+##########################################################
+
+# include path.
+#ALGLIB_INCLUDEPATH = $$QTI_ROOT/3rdparty/alglib/
+# link locally against a copy in 3rdparty/
+#ALGLIB_LIBS = $$QTI_ROOT/3rdparty/alglib/libalglib.a
+
+##########################################################
## python - only used if python is needed
##########################################################

@@ -140,15 +179,12 @@ contains( TARGET, qtiplot ) {

#DEFINES         += QTIPLOT_DEMO

-  # Comment the following lines to disable donations start-up message.
-  #DEFINES         += QTIPLOT_SUPPORT
-
# Uncomment the following line if you want to perform a custom installation 
using the *.path variables defined in ./qtiplot.pro.
CONFIG          += CustomInstall

# Uncomment the following line if you want to build QtiPlot as a browser plugin 
(not working on Internet Explorer).
#CONFIG          += BrowserPlugin
-
+
CONFIG          += release
#CONFIG          += debug
#win32: CONFIG   += console
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to