[arch-commits] Commit in qtiplot/repos (3 files)

Ronald van Haren ronald at archlinux.org
Wed Sep 16 04:46:20 UTC 2009


    Date: Wednesday, September 16, 2009 @ 00:46:20
  Author: ronald
Revision: 52091

Merged revisions 52089 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/qtiplot/trunk

........
  r52089 | ronald | 2009-09-16 06:22:25 +0200 (Wed, 16 Sep 2009) | 2 lines
  
  upgpkg: qtiplot 0.9.7.9-1
      update to latest version; minor changes to make it buildable again
........

Modified:
  qtiplot/repos/extra-i686/	(properties)
  qtiplot/repos/extra-i686/PKGBUILD
  qtiplot/repos/extra-i686/qtiplot.pro.archlinux

-----------------------+
 PKGBUILD              |   14 +++++++++-----
 qtiplot.pro.archlinux |   41 +++++++++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 21 deletions(-)


Property changes on: qtiplot/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /qtiplot/trunk:1-47730
   + /qtiplot/trunk:1-52090

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-16 04:22:52 UTC (rev 52090)
+++ extra-i686/PKGBUILD	2009-09-16 04:46:20 UTC (rev 52091)
@@ -3,14 +3,15 @@
 # Contributor: damir <damir.archlinux.org>
 
 pkgname=qtiplot
-pkgver=0.9.7.8
+pkgver=0.9.7.9
 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' 'boost>=1.39.0' 'libgl' 'qwt')
+depends=('muparser>=1.30' 'gsl' 'pyqt' 'sip' 'boost>=1.39.0' 'libgl')
 # build against liborigin provided in the package ...
 # build against qwtplot3d provided in the package ...
+# build against qwt provided in the package ...
 # as systemwide one doesn't provide all needed functions
 makedepends=('pkgconfig')
 license=('GPL2')
@@ -19,10 +20,10 @@
         $pkgname.png
         qtiplot.pro.archlinux
         qwtplot3d_gcc.patch)
-md5sums=('15a62821f6f69086e685c271fb510bd4' 
+md5sums=('08e4943cadd5ee39e28e4ce0d61d475a'
          '56bd53f4f1367c285086acb969f13348'
          'ad8affbd6f0d5cbdcde46c923ee2668a'
-         '7af559c2986f5c65616331dc36859642'
+         'b0f586e74badeedca21b1875f96507cb'
          'ab02c436ec2c04b1838cb5517383b4eb')
 
 build() {
@@ -30,6 +31,10 @@
   sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
   patch -Np1 -i ${srcdir}/qwtplot3d_gcc.patch || return 1
 
+  cd ./3rdparty/qwt
+  qmake || return 1
+  make || return 1
+
   cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}
   install -Dm644 ${srcdir}/qtiplot.pro.archlinux qtiplot.pro
 
@@ -47,4 +52,3 @@
   install -D -m644 ${srcdir}/${pkgname}.desktop \
   	${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
 }
-

Modified: extra-i686/qtiplot.pro.archlinux
===================================================================
--- extra-i686/qtiplot.pro.archlinux	2009-09-16 04:22:52 UTC (rev 52090)
+++ extra-i686/qtiplot.pro.archlinux	2009-09-16 04:46:20 UTC (rev 52091)
@@ -4,7 +4,7 @@
 
 # a console displaying output of scripts; particularly useful on Windows
 # where running QtiPlot from a terminal is inconvenient
-#DEFINES         += SCRIPTING_CONSOLE
+DEFINES         += SCRIPTING_CONSOLE
 
 # a dialog for selecting the scripting language on a per-project basis
 DEFINES         += SCRIPTING_DIALOG
@@ -18,12 +18,12 @@
 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
+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          += release
 #CONFIG          += debug
 #win32: CONFIG   += console
 
@@ -31,10 +31,10 @@
 #!!! Warning: You must modify these paths according to your computer settings
 #############################################################################
 
-INCLUDEPATH       += /usr/include
 INCLUDEPATH       += ../3rdparty/qwtplot3d/include
+INCLUDEPATH       += ../3rdparty/qwt/src
 INCLUDEPATH       += ../3rdparty/liborigin
-INCLUDEPATH       += /usr/include/qwt
+INCLUDEPATH       += /usr/include
 INCLUDEPATH       += /usr/include/gsl
 INCLUDEPATH       += /usr/include/boost
 
@@ -46,15 +46,14 @@
 
 # statically link against libraries in 3rdparty
 #unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a
-#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.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         += ../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 -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread-mt
-
+unix:LIBS          += -lmuparser $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread-mt
 ##################### Windows ###############################################
 
 win32:LIBS        += ../3rdparty/muparser/lib/libmuparser.a
@@ -62,8 +61,8 @@
 win32:LIBS        += ../3rdparty/gsl/lib/libgsl.a
 win32:LIBS        += ../3rdparty/gsl/lib/libgslcblas.a
 win32:LIBS        += ../3rdparty/zlib/libz.a
-win32:LIBS        += ../3rdparty/boost_1_36_0/lib/libboost_date_time-mgw34-mt.lib
-win32:LIBS        += ../3rdparty/boost_1_36_0/lib/libboost_thread-mgw34-mt.lib
+win32:LIBS        += ../3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib
+win32:LIBS        += ../3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
 
 #############################################################################
 ###################### BASIC PROJECT PROPERTIES #############################
@@ -123,7 +122,9 @@
 
 ###################### TRANSLATIONS #########################################
 
-TRANSLATIONS    = translations/qtiplot_de.ts \
+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 \
@@ -175,6 +176,15 @@
 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 ##########
 ###############################################################
 
@@ -217,9 +227,8 @@
 contains(CONFIG, HAVE_EMF){
 	win32 {
 		DEFINES += EMF_OUTPUT
-		INCLUDEPATH += ../3rdparty/EmfEngine/
-		HEADERS += ../3rdparty/EmfEngine/EmfEngine.h
-		SOURCES += ../3rdparty/EmfEngine/EmfEngine.cpp
+		INCLUDEPATH += ../3rdparty/EmfEngine/src
+		LIBS        += ../3rdparty/EmfEngine/libEmfEngine.a -lgdiplus
 	}
 }
 




More information about the arch-commits mailing list