Wed Jan 25 23:14:53 UTC 2012

5 files changed, 52 insertions, 15 deletions

diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 97712e104..773c4e06e 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144041 2011-12-02 20:54:07Z ibiru $
+# $Id: PKGBUILD 147227 2012-01-24 20:32:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://pim.kde.org/akonadi'
@@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('07e2aa2e6953ac518f9306911747e264')
+md5sums=('804309dca70ede35b4a654ab764e9079')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index dcde4e180..bcd412b82 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 140254 2011-10-11 00:44:55Z stephane $
+# $Id: PKGBUILD 147244 2012-01-25 02:07:03Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=python-egenix-mx-base
 _origname=egenix-mx-base
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="A collection of Python tools"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.egenix.com/products/python/mxBase/"
 depends=('python2')
-makedepends=('python2-distribute')
 replaces=('egenix-mx-base')
 provides=('egenix-mx-base')
 source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('a82f7f155ea92f26f40a6a3bf9160bfac7c52a00')
+sha1sums=('9faaf608a29b80d9a8daf16b8b3578e896b6395b')
 
 build() {
   cd "${srcdir}/${_origname}-${pkgver}"
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index 8bd7c546b..b72402f4a 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 131790 2011-07-15 09:16:14Z ronald $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 147208 2012-01-24 18:38:05Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=qwtplot3d
 pkgver=0.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
 arch=("i686" "x86_64")
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
 depends=('qt' 'qwt' 'mesa')
 source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
-        qwtplot3d-gcc44.patch)
-sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215')
+        qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
+sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
+          '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
+          '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
 
 build() {
     cd ${srcdir}/${pkgname}
     patch -p1 < ../qwtplot3d-gcc44.patch
+    patch -p1 < ../qwtplot3d-qt-4.8.0.patch
 
     # build qwt:
     qmake qwtplot3d.pro
diff --git a/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch
new file mode 100644
index 000000000..ae10f48f0
--- /dev/null
+++ b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch
@@ -0,0 +1,34 @@
+diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h
+--- qwtplot3d/include/qwt3d_io_gl2ps.h	2005-07-10 16:54:52.000000000 +0300
++++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h	2012-01-21 22:15:20.000000000 +0200
+@@ -2,12 +2,7 @@
+ #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code

+ 

+ #include <time.h>

+-

+-#if QT_VERSION < 0x040000

+-#include <qgl.h>

+-#else

+-#include <QtOpenGL/qgl.h>

+-#endif

++#include <QtOpenGL>

+ 

+ #include "qwt3d_types.h"

+ #include "qwt3d_io.h"

+diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h
+--- qwtplot3d/include/qwt3d_openglhelper.h	2005-07-19 17:40:28.000000000 +0300
++++ qwtplot3d.patched/include/qwt3d_openglhelper.h	2012-01-21 22:29:56.000000000 +0200
+@@ -2,11 +2,8 @@
+ #define __openglhelper_2003_06_06_15_49__

+ 

+ #include "qglobal.h"

+-#if QT_VERSION < 0x040000

+-#include <qgl.h>

+-#else

+-#include <QtOpenGL/qgl.h>

+-#endif

++#include <QtOpenGL>

++#include <GL/glu.h>

+ 

+ namespace Qwt3D

+ {

diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD
index 8b1a81e6e..3bd8b4197 100644
--- a/extra/time/PKGBUILD
+++ b/extra/time/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 131069 2011-07-10 01:00:33Z stephane $
+# $Id: PKGBUILD 147242 2012-01-25 01:42:55Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=time
 pkgver=1.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Utility for monitoring a program's use of system resources"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/directory/time.html"