[arch-commits] Commit in qtiplot/trunk (PKGBUILD build.conf.archlinux)

[Eric Bélanger]

    Date: Thursday, March 3, 2011 @ 18:21:56
  Author: eric
Revision: 112107

upgpkg: qtiplot 0.9.8.2-5
Rebuild against boost 1.46

Modified:
  qtiplot/trunk/PKGBUILD
  qtiplot/trunk/build.conf.archlinux

----------------------+
 PKGBUILD             |   48 ++++++++++++++++++++++++------------------------
 build.conf.archlinux |    2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-03 23:05:51 UTC (rev 112106)
+++ PKGBUILD	2011-03-03 23:21:56 UTC (rev 112107)
@@ -5,7 +5,7 @@
 
 pkgname=qtiplot
 pkgver=0.9.8.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Data analysis and scientific plotting - free clone of Origin"
 arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/qtiplot.html"
@@ -13,7 +13,7 @@
 # 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' 'boost')
+makedepends=('pkg-config' 'boost')
 license=('GPL2')
 install=${pkgname}.install
 source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
@@ -24,24 +24,24 @@
         qtiplot.xml
 	qtiplot-0.9.7.14-system-liborigin.patch
 	gentoo-fix-origin-build-failure.patch)
-md5sums=('e8335a8760e8c2ac044607d5a4bb80ca'
-         '56bd53f4f1367c285086acb969f13348'
-         'ad8affbd6f0d5cbdcde46c923ee2668a'
-         '95e52ef9c417c8a8dbc1901fe4c0c801'
-         'ab02c436ec2c04b1838cb5517383b4eb'
-         '35683f3b32e1edcca0bb02c471d284e9'
-         'fa7cfc5ba60d28f264ad53869d31fcc8'
-         '642cb38c6579b51b86834c8640130b6f')
+md5sums=('e8335a8760e8c2ac044607d5a4bb80ca' '56bd53f4f1367c285086acb969f13348'\
+         'ad8affbd6f0d5cbdcde46c923ee2668a' '4fc37151dc30d5ca36fd7d891a8bc41b'\
+         'ab02c436ec2c04b1838cb5517383b4eb' '35683f3b32e1edcca0bb02c471d284e9'\
+         'fa7cfc5ba60d28f264ad53869d31fcc8' '642cb38c6579b51b86834c8640130b6f')
+sha1sums=('dd8d1003cee8767d4ba9e616e5263da1302c290d' '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'\
+         '4301cb2a36024a10108b689990d28c4fe5c7416e' '7afcdd4eca157f55e3ec4276712c466b3dc05106'\
+         '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' '285f57d865956d93250ec548288c5bface096b6b'\
+         '86899322f259be8594399642170f3f642d7f5f75' '9d6373fd9c0d1061796d1b920981124b6e9a49cf')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/qtiplot-0.9.7.14-system-liborigin.patch
-  patch -Np0 -i ${srcdir}/gentoo-fix-origin-build-failure.patch 
-  install -Dm644 ${srcdir}/build.conf.archlinux build.conf
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/qtiplot-0.9.7.14-system-liborigin.patch"
+  patch -Np0 -i "${srcdir}/gentoo-fix-origin-build-failure.patch"
+  install -Dm644 "${srcdir}/build.conf.archlinux" build.conf
 
   # Make qwt
   sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
-  patch -Np1 -i ${srcdir}/qwtplot3d_gcc.patch
+  patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch"
   cd ./3rdparty/qwt
   qmake
   make
@@ -52,7 +52,7 @@
   make
 
   # Make qtiplot
-  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}
+  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
 
   # fix stuff
   sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
@@ -64,15 +64,15 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}
+  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
 
-  INSTALL_ROOT=${pkgdir} make install
+  INSTALL_ROOT="${pkgdir}" make install
 
   # make it nice:
-  install -D -m644 ${srcdir}/${pkgname}.png \
-  	${pkgdir}/usr/share/pixmaps/${pkgname}.png
-  install -D -m644 ${srcdir}/${pkgname}.desktop \
-  	${pkgdir}/usr/share/applications/${pkgname}.desktop
-  install -D -m644 ${srcdir}/${pkgname}.xml \
-        ${pkgdir}/usr/share/mime/packages/${pkgname}.xml
+  install -D -m644 "${srcdir}/${pkgname}.png" \
+  	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -D -m644 "${srcdir}/${pkgname}.desktop" \
+  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -D -m644 "${srcdir}/${pkgname}.xml" \
+        "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
 }

Modified: build.conf.archlinux
===================================================================
--- build.conf.archlinux	2011-03-03 23:05:51 UTC (rev 112106)
+++ build.conf.archlinux	2011-03-03 23:21:56 UTC (rev 112107)
@@ -8,7 +8,7 @@
 MUPARSER_LIBS = -lmuparser 
 GSL_LIBS = -lgsl -lgslcblas
 BOOST_INCLUDEPATH = /usr/include/boost
-BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
+BOOST_LIBS = -lboost_date_time -lboost_thread
 QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
 QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
 QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include