[arch-commits] Commit in qtiplot/trunk (4 files)
Ronald van Haren
ronald at archlinux.org
Tue Feb 23 13:43:27 UTC 2010
Date: Tuesday, February 23, 2010 @ 08:43:26
Author: ronald
Revision: 69879
upgpkg: qtiplot 0.9.7.12-1
update to latest version; new build method using build.conf; compile fixes
Added:
qtiplot/trunk/build.conf.archlinux
qtiplot/trunk/qtiplot-0.9.7.12-system-liborigin.patch
Modified:
qtiplot/trunk/PKGBUILD
Deleted:
qtiplot/trunk/qtiplot.pro.archlinux
-----------------------------------------+
PKGBUILD | 36 ++--
build.conf.archlinux | 29 +++
qtiplot-0.9.7.12-system-liborigin.patch | 92 +++++++++++
qtiplot.pro.archlinux | 235 ------------------------------
4 files changed, 141 insertions(+), 251 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-02-23 13:38:09 UTC (rev 69878)
+++ PKGBUILD 2010-02-23 13:43:26 UTC (rev 69879)
@@ -4,14 +4,13 @@
# Contributor: Gergely Imreh <imrehg at gmail.com>
pkgname=qtiplot
-pkgver=0.9.7.10
-pkgrel=3
+pkgver=0.9.7.12
+pkgrel=1
pkgdesc="Data analysis and scientific plotting - free clone of Origin"
arch=('i686' 'x86_64')
url="http://soft.proindependent.com/qtiplot.html"
-depends=('muparser>=1.30' 'gsl' 'pyqt' 'sip>=4.9.1' \
- 'boost>=1.41.0' 'libgl' 'shared-mime-info')
-# build against liborigin provided in the package ...
+depends=('muparser>=1.32' 'gsl' 'pyqt' 'sip>=4.9.1' \
+ 'boost>=1.41.0' 'libgl' 'shared-mime-info' 'mesa' 'liborigin2>=20090406')
# build against qwtplot3d provided in the package ...
# build against qwt provided in the package ...
# as systemwide one doesn't provide all needed functions
@@ -21,20 +20,22 @@
source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
$pkgname.desktop
$pkgname.png
- qtiplot.pro.archlinux
+ build.conf.archlinux
qwtplot3d_gcc.patch
- sip.patch
- qtiplot.xml)
-md5sums=('627e5beeee598c6761de593921003335'
+ qtiplot.xml
+ qtiplot-0.9.7.12-system-liborigin.patch)
+md5sums=('2620bf8a520967d2a58d5f290da745de'
'56bd53f4f1367c285086acb969f13348'
'ad8affbd6f0d5cbdcde46c923ee2668a'
- 'b0f586e74badeedca21b1875f96507cb'
+ 'b5c16bb18f4d4034578fb3e7c31c3b65'
'ab02c436ec2c04b1838cb5517383b4eb'
- 'd02a4db813dff3b847500fbbbde233fa'
- '35683f3b32e1edcca0bb02c471d284e9')
+ '35683f3b32e1edcca0bb02c471d284e9'
+ 'd3fe35e985f6a1f04ba0abeea51ba135')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np0 -i ${srcdir}/qtiplot-0.9.7.12-system-liborigin.patch || return 1
+ install -Dm644 ${srcdir}/build.conf.archlinux build.conf || return 1
# Make qwt
sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
@@ -43,14 +44,17 @@
qmake || return 1
make || return 1
+ # Make qwtplot3d
+ cd ../qwtplot3d
+ qmake || return 1
+ make || return 1
+
# Make qtiplot
cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}
- cp ${srcdir}/qtiplot.pro.archlinux .
+ sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp
- # Change references for invalid file, due to sip changes
- patch -p1 < ${srcdir}/sip.patch || return 1
- qmake qtiplot.pro.archlinux QMAKESPEC=linux-g++ || return 1
+ qmake qtiplot.pro QMAKESPEC=linux-g++ || return 1
make QTDIR=/usr/ QMAKESPEC=linux-g++ || return 1
INSTALL_ROOT=${pkgdir} make install || return 1
Added: build.conf.archlinux
===================================================================
--- build.conf.archlinux (rev 0)
+++ build.conf.archlinux 2010-02-23 13:43:26 UTC (rev 69879)
@@ -0,0 +1,29 @@
+isEmpty( QTI_ROOT ) {
+ message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+}
+
+SYS_INCLUDEPATH = /usr/include
+SYS_LIBS = -L/usr/lib
+
+MUPARSER_LIBS = -lmuparser
+GSL_LIBS = -lgsl -lgslcblas
+BOOST_INCLUDEPATH = /usr/include/boost
+BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
+QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
+QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
+QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
+LIB_ORIGIN_LIBS = -lorigin2
+QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
+
+PYTHON = python
+LUPDATE = lupdate
+LRELEASE = lrelease
+
+SCRIPTING_LANGS += muParser
+SCRIPTING_LANGS += Python
+
+CONFIG += CustomInstall
+DEFINES += SCRIPTING_CONSOLE
+
Added: qtiplot-0.9.7.12-system-liborigin.patch
===================================================================
--- qtiplot-0.9.7.12-system-liborigin.patch (rev 0)
+++ qtiplot-0.9.7.12-system-liborigin.patch 2010-02-23 13:43:26 UTC (rev 69879)
@@ -0,0 +1,92 @@
+=== modified file 'build.conf.example'
+--- build.conf.example 2010-02-14 15:07:01 +0000
++++ build.conf.example 2010-02-14 15:16:08 +0000
+@@ -118,6 +118,14 @@
+ EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
+
+ ##########################################################
++## liborigin - keep commented if you wish to use local copy
++# http://sourceforge.net/projects/liborigin/
++##########################################################
++
++# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
++# LIB_ORIGIN_LIBS = -lorigin2
++
++##########################################################
+ ## python - only used if python is needed
+ ##########################################################
+
+
+=== modified file 'qtiplot/qtiplot.pro'
+--- qtiplot/qtiplot.pro 2010-02-14 15:07:01 +0000
++++ qtiplot/qtiplot.pro 2010-02-14 15:13:58 +0000
+@@ -9,7 +9,6 @@
+ #############################################################################
+
+ # local copy included
+-INCLUDEPATH += ../3rdparty/liborigin
+ INCLUDEPATH += ../3rdparty/zlib
+
+ # configurable
+@@ -18,6 +17,7 @@
+ INCLUDEPATH += $$QWT3D_INCLUDEPATH
+ INCLUDEPATH += $$GSL_INCLUDEPATH
+ INCLUDEPATH += $$BOOST_INCLUDEPATH
++INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH
+
+ # configurable libs
+ LIBS += $$MUPARSER_LIBS
+@@ -26,6 +26,7 @@
+ LIBS += $$QTEXENGINE_LIBS
+ LIBS += $$GSL_LIBS
+ LIBS += $$BOOST_LIBS
++LIBS += $$LIB_ORIGIN_LIBS
+
+ #############################################################################
+ ###################### BASIC PROJECT PROPERTIES #############################
+@@ -154,6 +155,10 @@
+ SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
+ }
+
++isEmpty(LIB_ORIGIN_LIBS) {
++ INCLUDEPATH += ../3rdparty/liborigin
++}
++
+ ###############################################################
+ ##################### Scripting: PYTHON + SIP + PyQT ##########
+ ###############################################################
+
+=== modified file 'qtiplot/src/origin/origin.pri'
+--- qtiplot/src/origin/origin.pri 2009-10-18 01:48:15 +0000
++++ qtiplot/src/origin/origin.pri 2010-02-14 15:11:15 +0000
+@@ -4,14 +4,17 @@
+ INCLUDEPATH += src/origin/
+
+ HEADERS += src/origin/importOPJ.h
+-HEADERS += ../3rdparty/liborigin/OriginObj.h
+-HEADERS += ../3rdparty/liborigin/OriginFile.h
+-HEADERS += ../3rdparty/liborigin/OriginParser.h
+-HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
+-HEADERS += ../3rdparty/liborigin/Origin750Parser.h
+-
+ SOURCES += src/origin/importOPJ.cpp
+-SOURCES += ../3rdparty/liborigin/OriginFile.cpp
+-SOURCES += ../3rdparty/liborigin/OriginParser.cpp
+-SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
+-SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
++
++isEmpty(LIB_ORIGIN_LIBS) {
++ HEADERS += ../3rdparty/liborigin/OriginObj.h
++ HEADERS += ../3rdparty/liborigin/OriginFile.h
++ HEADERS += ../3rdparty/liborigin/OriginParser.h
++ HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
++ HEADERS += ../3rdparty/liborigin/Origin750Parser.h
++
++ SOURCES += ../3rdparty/liborigin/OriginFile.cpp
++ SOURCES += ../3rdparty/liborigin/OriginParser.cpp
++ SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
++ SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
++}
+
+
+
Deleted: qtiplot.pro.archlinux
===================================================================
--- qtiplot.pro.archlinux 2010-02-23 13:38:09 UTC (rev 69878)
+++ qtiplot.pro.archlinux 2010-02-23 13:43:26 UTC (rev 69879)
@@ -1,235 +0,0 @@
-# building without muParser doesn't work yet
-SCRIPTING_LANGS += muParser
-SCRIPTING_LANGS += Python
-
-# a console displaying output of scripts; particularly useful on Windows
-# where running QtiPlot from a terminal is inconvenient
-DEFINES += SCRIPTING_CONSOLE
-
-# a dialog for selecting the scripting language on a per-project basis
-DEFINES += SCRIPTING_DIALOG
-
-#DEFINES += QTIPLOT_DEMO
-
-# Comment the following lines to disable donations start-up message.
-#DEFINES += QTIPLOT_SUPPORT
-
-# Comment the next line, if you don't have libpng on your system.
-CONFIG += HAVE_LIBPNG
-
-# Uncomment the next line in order to enable export of 2D plots to the EMF file format on Windows. You need EmfEngine on your system.
-CONFIG += HAVE_EMF
-
-# Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.
-CONFIG += CustomInstall
-
-#CONFIG += release
-#CONFIG += debug
-#win32: CONFIG += console
-
-##################### 3rd PARTY HEADER FILES SECTION ########################
-#!!! Warning: You must modify these paths according to your computer settings
-#############################################################################
-
-INCLUDEPATH += ../3rdparty/qwtplot3d/include
-INCLUDEPATH += ../3rdparty/qwt/src
-INCLUDEPATH += ../3rdparty/liborigin
-INCLUDEPATH += /usr/include
-INCLUDEPATH += /usr/include/gsl
-INCLUDEPATH += /usr/include/boost
-
-##################### 3rd PARTY LIBRARIES SECTION ###########################
-#!!! Warning: You must modify these paths according to your computer settings
-#############################################################################
-
-##################### 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/lib/libboost_date_time-gcc43-mt-1_38.a
-#unix:LIBS += ../3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
-
-# dynamically link against dependencies if they are installed system-wide
-unix:LIBS += -lmuparser $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread-mt
-##################### Windows ###############################################
-
-win32:LIBS += ../3rdparty/muparser/lib/libmuparser.a
-win32:LIBS += ../3rdparty/qwt/lib/libqwt.a
-win32:LIBS += ../3rdparty/gsl/lib/libgsl.a
-win32:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-win32:LIBS += ../3rdparty/zlib/libz.a
-win32:LIBS += ../3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib
-win32:LIBS += ../3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
-
-#############################################################################
-###################### BASIC PROJECT PROPERTIES #############################
-#############################################################################
-
-QMAKE_PROJECT_DEPTH = 0
-
-TARGET = qtiplot
-TEMPLATE = app
-CONFIG += qt warn_on exceptions opengl thread
-CONFIG += assistant
-
-DEFINES += QT_PLUGIN
-contains(CONFIG, CustomInstall){
- INSTALLS += target
- INSTALLS += translations
- INSTALLS += manual
- INSTALLS += documentation
- unix:INSTALLS += man
-
- unix: INSTALLBASE = /usr
- win32: INSTALLBASE = C:/QtiPlot
-
- 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: man.path = $$INSTALLBASE/share/man/man1/
-
- win32: target.path = $$INSTALLBASE
- win32: translations.path = $$INSTALLBASE/translations
- win32: manual.path = $$INSTALLBASE/manual
- win32: documentation.path = $$INSTALLBASE/doc
-
- DEFINES += TRANSLATIONS_PATH="\\\"$$replace(translations.path," ","\ ")\\\"
- DEFINES += MANUAL_PATH="\\\"$$replace(manual.path," ","\ ")\\\"
- }
-
-win32:DEFINES += QT_DLL QT_THREAD_SUPPORT
-QT += opengl qt3support network svg xml
-
-MOC_DIR = ../tmp/qtiplot
-OBJECTS_DIR = ../tmp/qtiplot
-SIP_DIR = ../tmp/qtiplot
-DESTDIR = ./
-
-#############################################################################
-###################### PROJECT FILES SECTION ################################
-#############################################################################
-
-###################### ICONS ################################################
-INCLUDEPATH += icons/
-HEADERS += icons/pixmaps.h
-HEADERS += icons/axes_icons.h
-win32:RC_FILE = icons/qtiplot.rc
-mac:RC_FILE = icons/qtiplot.icns
-
-###################### TRANSLATIONS #########################################
-
-TRANSLATIONS = translations/qtiplot_cn.ts \
- translations/qtiplot_cz.ts \
- translations/qtiplot_de.ts \
- translations/qtiplot_es.ts \
- translations/qtiplot_fr.ts \
- #translations/qtiplot_pt.ts \
- translations/qtiplot_ro.ts \
- translations/qtiplot_ru.ts \
- translations/qtiplot_ja.ts \
- translations/qtiplot_sv.ts
-
-system(lupdate -verbose qtiplot.pro)
-system(lrelease -verbose qtiplot.pro)
-
-translations.files += translations/qtiplot_de.qm \
- translations/qtiplot_es.qm \
- translations/qtiplot_fr.qm \
- #translations/qtiplot_pt.qm \
- translations/qtiplot_ru.qm \
- translations/qtiplot_ja.qm \
- translations/qtiplot_sv.qm
-
-###################### DOCUMENTATION ########################################
-
-manual.files += ../manual/html \
- ../manual/qtiplot-manual-en.pdf
-
-documentation.files += ../README.html \
- ../gpl_licence.txt
-
-unix: man.files += ../qtiplot.1
-
-###############################################################
-##################### Compression (zlib-1.2.3) ################
-###############################################################
-
-SOURCES += ../3rdparty/zlib/minigzip.c
-
-###############################################################
-################# Default Modules #############################
-###############################################################
-
-include(../3rdparty/qwtplot3d/qwtplot3d.pri)
-include(src/analysis/analysis.pri)
-include(src/core/core.pri)
-include(src/lib/libqti.pri)
-include(src/plot2D/plot2D.pri)
-include(src/plot3D/plot3D.pri)
-include(src/matrix/matrix.pri)
-include(src/origin/origin.pri)
-include(src/table/table.pri)
-include(src/scripting/scripting.pri)
-
-###############################################################
-##################### TeX export: QTeXEngine ##################
-###############################################################
-
-INCLUDEPATH += ../3rdparty/QTeXEngine/src
-HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h
-SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp
-SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
-
-###############################################################
-##################### Scripting: PYTHON + SIP + PyQT ##########
-###############################################################
-
-contains(SCRIPTING_LANGS, Python) {
-
- contains(CONFIG, CustomInstall){
- INSTALLS += pythonconfig
- pythonconfig.files += qtiplotrc.py \
- qtiUtil.py \
- qti_wordlist.txt \
-
- unix: pythonconfig.path = /usr/share/qtiplot
- win32: pythonconfig.path = $$INSTALLBASE
- DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
- }
-
- unix {
- INCLUDEPATH += $$system(python python-includepath.py)
- LIBS += $$system(python -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/scripting/qti.sip)
- }
-
- win32 {
- INCLUDEPATH += $$system(call python-includepath.py)
- LIBS += $$system(call python-libs-win.py)
- system($$system(call python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)
- }
-}
-
-###############################################################
-
-contains(CONFIG, HAVE_LIBPNG){
- DEFINES += GL2PS_HAVE_LIBPNG
-}
-
-###############################################################
-
-contains(CONFIG, HAVE_EMF){
- win32 {
- DEFINES += EMF_OUTPUT
- INCLUDEPATH += ../3rdparty/EmfEngine/src
- LIBS += ../3rdparty/EmfEngine/libEmfEngine.a -lgdiplus
- }
-}
-
-###############################################################
More information about the arch-commits
mailing list