Fri Aug 12 23:14:35 UTC 2011

8 files changed, 41 insertions, 31 deletions

diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD
index 33e3805b1..b78606f9c 100644
--- a/extra/hydrogen/PKGBUILD
+++ b/extra/hydrogen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 115128 2011-03-17 06:06:23Z schiv $
+# $Id: PKGBUILD 135233 2011-08-11 10:28:18Z schiv $
 # Maintainer: tobias <tobias@archlinux.org>
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: K. Piche <kpiche@rogers.com>
@@ -14,13 +14,16 @@ url="http://www.hydrogen-music.org/"
 depends=('libarchive' 'liblrdf' 'qt' 'jack')
 makedepends=('scons')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e96f291d60e58f5d62fe616cee577dc0')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        lrdf_raptor2.patch)
+md5sums=('e96f291d60e58f5d62fe616cee577dc0'
+         '2124851e890f46158189b5fa90006d40')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export QTDIR=/usr
+  patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
   scons prefix=/usr libarchive=1
 }
 
diff --git a/extra/hydrogen/lrdf_raptor2.patch b/extra/hydrogen/lrdf_raptor2.patch
new file mode 100644
index 000000000..ec176b716
--- /dev/null
+++ b/extra/hydrogen/lrdf_raptor2.patch
@@ -0,0 +1,11 @@
+diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
+--- hydrogen-0.9.5.old/Sconstruct	2011-08-11 18:00:07.889112348 +0800
++++ hydrogen-0.9.5/Sconstruct	2011-08-11 18:00:34.945632437 +0800
+@@ -83,6 +83,7 @@
+ 	includes.append( './' )
+ 	includes.append( 'gui/src/' )
+ 	includes.append( '3rdparty/install/include' )
++	includes.append( '/usr/include/raptor2' )
+ 
+ 	if sys.platform == "darwin":
+ 		ldflags.append( '-L/opt/local/lib' )
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 3fa56c015..239a2ca67 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132576 2011-07-25 00:12:30Z andrea $
+# $Id: PKGBUILD 135257 2011-08-11 16:57:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-python
 pkgver=4.7.0
-pkgrel=1
-pkgdesc="KDE bindings for python"
+pkgrel=2
+pkgdesc="KDE bindings for Python"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index d42d1ede8..9d62d6835 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 97682 2010-11-01 09:15:00Z jgc $
+# $Id: PKGBUILD 135207 2011-08-11 07:14:39Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxfont
-pkgver=1.4.3
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="X11 font rasterisation library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha1sums=('191b40c566f80737cf6838747d86ebaee7b0c7d7')
+sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041')
 
 build() {
   cd "${srcdir}/libXfont-${pkgver}"
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index cedae286a..d3e0493b0 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 122181 2011-05-02 17:31:08Z andrea $
+# $Id: PKGBUILD 135252 2011-08-11 16:55:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.8.4
+pkgver=4.8.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
@@ -13,7 +13,7 @@ license=('GPL')
 makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
              'python-opengl' 'qt-assistant-compat')
 source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('97c5dc1042feb5b3fe20baabad055af1')
+md5sums=('0e4264bb912edfbda319bb236ac84407')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index e3227ab9d..967e6d1ea 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124858 2011-05-24 19:56:15Z schiv $
+# $Id: PKGBUILD 135263 2011-08-11 18:35:34Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -13,22 +13,23 @@ url="http://www.rosegardenmusic.com/"
 license=('GPL')
 depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
          'perl' 'qt' 'shared-mime-info')
-makedepends=('pkgconfig' 'imake')
+makedepends=('imake')
 optdepends=('lilypond: notation display'
             'cups: printing support'
             'okular: print preview, or any other PDF viewer'
             'timidity++: MIDI playback, or any other softsynth'
             'flac'
             'wavpack')
-[ "$CARCH" = "i686" ] && optdepends=("${optdepends[@]}"
-                                     'dssi-vst: win32 VST support')
+[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
 md5sums=('77ab43d06de53ace338843ff82e26288')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # lrdf + raptor2 compatibility
+  export lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
   ./configure --prefix=/usr
   make
 }
@@ -36,7 +37,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
index 061962a8e..1ed7ff194 100644
--- a/extra/scummvm/PKGBUILD
+++ b/extra/scummvm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106447 2011-01-17 06:22:16Z angvp $
+# $Id: PKGBUILD 135227 2011-08-11 09:16:00Z juergen $
 # Maintainer: juergen <juergen@hoetzel.info>
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=1.2.1
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 url="http://www.scummvm.org/"
 depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'flac>=1.1.4' 'sdl' 'fluidsynth')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b1d224d7640bc7fdccaca958164b31df')
+md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 5d73e1d73..b326c385e 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,25 +1,20 @@
-# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $
+# $Id: PKGBUILD 135247 2011-08-11 16:54:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python2-sip')
-pkgver=4.12.3
-pkgrel=2
+pkgver=4.12.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz"
-        'fix-regression.patch')
-md5sums=('d0f1fa60494db04b4d115d4c2d92f79e'
-         '598ffc65ebaf1c0e8855a352b02c43e7')
+source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
+md5sums=('6cbd56abb7d35aad833789c98ae61652')
 
 build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-regression.patch
-
   cd "${srcdir}"
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}