Thu Nov 10 23:14:50 UTC 2011

18 files changed, 187 insertions, 120 deletions

diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index e173c7e6c..b645f13e3 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126155 2011-06-01 20:36:52Z andyrtr $
+# $Id: PKGBUILD 142442 2011-11-09 21:20:39Z guillaume $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=brltty
-pkgver=4.2
-pkgrel=4
+pkgver=4.3
+pkgrel=1
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('i686' 'x86_64')
 url="http://mielke.cc/brltty"
@@ -16,13 +16,13 @@ optdepends=('bluez: bluetooth support')
 backup=(etc/brltty.conf etc/conf.d/brltty.conf)
 options=('!makeflags' '!emptydirs')
 source=(http://mielke.cc/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz
-        'brltty-4.2-S_ISCHR.patch'
         'brltty'
         'brltty.conf')
-md5sums=('192af5e634210616928496645e392097'
-         '5954b289efaf2ff17676d06de9a88854'
+#        'brltty-4.2-S_ISCHR.patch'
+md5sums=('5ada573f88df32b6150db3b9a620e20b'
          '831ebaf0c56091702929c68805d20c4f'
          'a8ab8b3dd059e96e1734bc9cdcf844fc')
+#         '5954b289efaf2ff17676d06de9a88854'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -36,7 +36,7 @@ build() {
     --disable-caml-bindings \
     PYTHON=/usr/bin/python2
 
-  patch -Np1 -i ${srcdir}/brltty-4.2-S_ISCHR.patch
+#  patch -Np1 -i ${srcdir}/brltty-4.2-S_ISCHR.patch
   make
 }
 
diff --git a/extra/cscope/PKGBUILD b/extra/cscope/PKGBUILD
index b480a8166..4cbfccd32 100644
--- a/extra/cscope/PKGBUILD
+++ b/extra/cscope/PKGBUILD
@@ -1,32 +1,34 @@
-# $Id: PKGBUILD 67119 2010-02-03 17:32:32Z andrea $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Jason Chu <jason@archlinux.org>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=cscope
 pkgver=15.7a
-pkgrel=2
+pkgrel=3
 pkgdesc="A developers tool for browsing program code"
 arch=('i686' 'x86_64')
-url="http://cscope.sourceforge.net/index.html"
+url="http://cscope.sourceforge.net/"
 license=('BSD')
 depends=('ncurses' 'sh')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('da43987622ace8c36bbf14c15a350ec1')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|/usr/local/lib/cs|/usr/lib/cs|' contrib/ocs || return 1
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed -i 's|/usr/local/lib/cs|/usr/lib/cs|' contrib/ocs
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  
-  install -d "${pkgdir}/usr/lib/cs"
+	./configure --prefix=/usr
+	make
+}
 
-  cd contrib/xcscope
-  install -Dm644 xcscope.el ${pkgdir}/usr/share/emacs/site-lisp/xcscope.el || return 1
-  install -m755 cscope-indexer $pkgdir/usr/bin || return 1
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+  
+	install -d ${pkgdir}/usr/lib/cs
+	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	cd contrib/xcscope
+	install -Dm644 xcscope.el "${pkgdir}"/usr/share/emacs/site-lisp/xcscope.el
+	install -m755 cscope-indexer "${pkgdir}"/usr/bin
 }
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 659bc103c..df8b95706 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 140887 2011-10-20 05:42:34Z ibiru $
+# $Id: PKGBUILD 142419 2011-11-09 07:46:48Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088')
+sha256sums=('e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index c64de8104..c34dc67ff 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140969 2011-10-20 06:58:10Z heftig $
+# $Id: PKGBUILD 142417 2011-11-09 07:29:52Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
-pkgver=3.2.1
-pkgrel=2
+pkgver=3.2.2
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,17 +15,12 @@ url="http://www.gnome.org"
 groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        upower.patch)
-sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d'
-            'f7a66e9ff7f415be34873fd6d03843a20732158bd65b382b114d100aaddeb223')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d91cac869e23f36942720485f04c3029fd5286fafb6ad12b07377e527b1f6884')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix suspend via key
-  patch -Np1 -i "$srcdir/upower.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \
       --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index 5aa4b468f..d5424ed9e 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.1.3
+pkgver=1.1.4
 #_date=20110925
 #pkgrel=0.${_date}.1
 pkgrel=1
@@ -12,11 +12,11 @@ url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
 source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz
-	http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
+	http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz
 	#http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
-md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
-sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
-
+	icedtea-web-1.1.4-npapi-fix.patch)
+md5sums=('1ed24b7e58da26471187dfae80b020b6'
+         '81ac36e05ea1b55f1580bdb28c24f4db')
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
@@ -32,12 +32,13 @@ mksource() {
 build() {
   cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
 
-  #. /etc/profile.d/jre.sh
-  . /etc/profile.d/jre7-openjdk.sh
-  #. /etc/profile.d/jdk.sh
-  . /etc/profile.d/jdk7-openjdk.sh
+  . /etc/profile.d/jre.sh
+  . /etc/profile.d/jdk.sh
+  
+  #autoreconf --force --install
   
-  autoreconf --force --install
+  # fix build with Xulrunner 8
+  patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch
   
   ./configure --prefix=${_jvmdir} \
       --datarootdir=/usr/share \
diff --git a/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch b/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch
new file mode 100644
index 000000000..79ca0a6c0
--- /dev/null
+++ b/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch
@@ -0,0 +1,12 @@
+diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc
+--- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav	2011-11-08 17:27:29.046520865 -0500
++++ ./plugin/icedteanp/IcedTeaNPPlugin.cc	2011-11-08 17:27:40.469611421 -0500
+@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
+ 
+ // Returns a string describing the MIME type that this plugin
+ // handles.
+-char*
++const char*
+ NP_GetMIMEDescription ()
+ {
+   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index e1777c791..f2e20860c 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 139127 2011-09-30 05:42:46Z andyrtr $
+# $Id: PKGBUILD 142413 2011-11-09 05:54:47Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.1.3
+pkgver=1.1.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
 makedepends=('openjdk6' 'zip' 'xulrunner')
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
-sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
-
+source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz
+	icedtea-web-1.1.4-npapi-fix.patch)
+md5sums=('1ed24b7e58da26471187dfae80b020b6'
+         '81ac36e05ea1b55f1580bdb28c24f4db')
 
 build() {
   _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   cd "$srcdir/$pkgname-$pkgver"
+  
+  # fix build with Xulrunner 8
+  patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch
+  
   ./configure --prefix=/usr/lib/jvm/java-6-openjdk \
       --datarootdir=/usr/share
   make
diff --git a/extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch b/extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch
new file mode 100644
index 000000000..79ca0a6c0
--- /dev/null
+++ b/extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch
@@ -0,0 +1,12 @@
+diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc
+--- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav	2011-11-08 17:27:29.046520865 -0500
++++ ./plugin/icedteanp/IcedTeaNPPlugin.cc	2011-11-08 17:27:40.469611421 -0500
+@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
+ 
+ // Returns a string describing the MIME type that this plugin
+ // handles.
+-char*
++const char*
+ NP_GetMIMEDescription ()
+ {
+   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 20b9a1b11..8dc909b3d 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 138009 2011-09-14 09:17:28Z ibiru $
+# $Id: PKGBUILD 142433 2011-11-09 18:26:23Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.6.2.1
+pkgver=0.6.3
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
@@ -12,16 +12,16 @@ arch=('i686' 'x86_64')
 depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('478f7daebe8369ad72bf83431d953db772af6865ff3aa21bf75bf6730f561389')
+source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/$pkgname-$pkgver.tar.xz)
+sha256sums=('6b1ef59e26dd10feed279fdd7cc49c3391e124d31c46ac56c410ba0ce3bd1716')
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "$srcdir/$pkgname-$pkgver"
     ./configure --prefix=/usr --disable-static
     make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libmsn/PKGBUILD b/extra/libmsn/PKGBUILD
index c62c80a19..e9473d02e 100644
--- a/extra/libmsn/PKGBUILD
+++ b/extra/libmsn/PKGBUILD
@@ -1,33 +1,31 @@
-# $Id: $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 142434 2011-11-09 18:49:42Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Charly Ghislain <charlyghislain@gmail.com>
 
 pkgname=libmsn
-pkgver=4.1
-pkgrel=2
+pkgver=4.2
+pkgrel=1
 pkgdesc="A reusable, open-source, fully documented library for connecting to Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/"
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-	'openssl1.patch')
-md5sums=('769d3cf0e5625263fbc23321c1ddfcb0'
-	'c8d7e2113d967a1d38a531e9fe8e7861')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('8887196051d2960a9279a5e00c8416a4')
 
 build() {
-  cd ${srcdir}
-  patch -Np0 -i ${srcdir}/openssl1.patch || return 1
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release || return 1
-  make || return 1
+    -DCMAKE_BUILD_TYPE=Release
+  make
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make "DESTDIR=${pkgdir}" install
 }
diff --git a/extra/memcached/ChangeLog b/extra/memcached/ChangeLog
index ad9780fc4..d1f1e44d0 100644
--- a/extra/memcached/ChangeLog
+++ b/extra/memcached/ChangeLog
@@ -1,5 +1,5 @@
 2011-02-07 Ionut Biru <ibiru@archlinux.org>
-	* Rebuild 1.4.5 against libeven 2.0.10
+	* Rebuild 1.4.5 against libevent 2.0.10
 
 2011-01-31 Dan McGee <dan@archlinux.org>
 	* Rebuild 1.4.5 with gcc 4.5.X patch accepted upstream
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index 3087b7bde..6f04d328a 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135720 2011-08-18 03:34:00Z dan $
+# $Id: PKGBUILD 142440 2011-11-09 20:39:02Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Michael Irwin <6d6469@gmail.com>
 
 pkgname=memcached
-pkgver=1.4.7
+pkgver=1.4.9
 pkgrel=1
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
         memcached.conf
 		memcached.sh)
 changelog=ChangeLog
-sha256sums=('925837a4cf440e3cb451e338413ed9ad1429fd0d80ba4d903955f5fed8da7be6'
+sha256sums=('854a5fa6dfde478d1bb440498e378bd073f303d51bb82c611001eecdec9b4a79'
             '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
             '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
 
@@ -29,7 +29,10 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  install -D -m 755 scripts/memcached-tool $pkgdir/usr/bin/memcached-tool
-  install -D -m 644 "$srcdir/memcached.conf" $pkgdir/etc/conf.d/memcached
-  install -D -m 755 "$srcdir/memcached.sh" $pkgdir/etc/rc.d/memcached
+  install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
+  # This POS is entirely RedHat specific, so not including it now
+  #install -D -m 755 scripts/memcached.service "$pkgdir"/lib/systemd/system/memcached.service
+  #sed -i -e 's#^EnvironmentFile.*#EnvironmentFile=/etc/conf.d/memcached#' "$pkgdir"/lib/systemd/system/memcached.service
+  install -D -m 644 "$srcdir/memcached.conf" "$pkgdir"/etc/conf.d/memcached
+  install -D -m 755 "$srcdir/memcached.sh" "$pkgdir"/etc/rc.d/memcached
 }
diff --git a/extra/paprefs/PKGBUILD b/extra/paprefs/PKGBUILD
index c6b773a0e..6be68601b 100644
--- a/extra/paprefs/PKGBUILD
+++ b/extra/paprefs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139412 2011-10-01 19:00:47Z ibiru $
+# $Id: PKGBUILD 142425 2011-11-09 11:00:22Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,20 +6,22 @@
 
 pkgname=paprefs
 pkgver=0.9.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple GTK-based configuration dialog for PulseAudio"
 arch=(i686 x86_64)
 url="http://0pointer.de/lennart/projects/paprefs"
 license=(GPL)
 depends=(gconfmm gnome-icon-theme libglademm libsigc++ pulseaudio)
 makedepends=(intltool)
-source=(http://0pointer.de/lennart/projects/paprefs/$pkgname-$pkgver.tar.gz
-        paprefs.desktop)
-md5sums=('15bc6caea388e4de17e8746293cfb529'
-         '20dc978f0bd4a0bf925a4eaf80a2b8f8')
+source=(http://freedesktop.org/software/pulseaudio/$pkgname/$pkgname-$pkgver.tar.xz
+        paprefs.desktop do-not-require-recompile.patch)
+sha256sums=('261c5a67543f2d0c019894fb933949f6ee7c5e181808e1e9565f0784961eabb0'
+            '5cdd6cffb08d611451f01b34b08b316fb14cbd14b283bf5d180b8dcde11fa46b'
+            '00fd4b14e81d90ac6d74e6eb689fa4e20e1a2fbc2eefbb440a11b1373e115a9d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/do-not-require-recompile.patch"
   ./configure --prefix=/usr --disable-lynx
   make
 }
diff --git a/extra/paprefs/do-not-require-recompile.patch b/extra/paprefs/do-not-require-recompile.patch
new file mode 100644
index 000000000..66d110b3e
--- /dev/null
+++ b/extra/paprefs/do-not-require-recompile.patch
@@ -0,0 +1,33 @@
+From 4fcee37cb92c689b43a0d8fc1d8e6b2764834cbf Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <colin@mageia.org>
+Date: Sun, 6 Nov 2011 14:31:27 +0000
+Subject: [PATCH] Do not require a recompile for each new PA version in order to detect the modules.
+
+---
+ src/paprefs.cc |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/paprefs.cc b/src/paprefs.cc
+index 21fdc95..919b15c 100644
+--- a/src/paprefs.cc
++++ b/src/paprefs.cc
+@@ -637,9 +637,14 @@ void MainWindow::readFromGConf() {
+ }
+ 
+ gchar * MainWindow::modulePath(const gchar *name) {
+-  gchar *path, *pulsedir, *c;
++  gchar *path, *pulsedir, *c, **versions;
+ 
+-  pulsedir = g_strdup_printf ("pulse-%d.%d", PA_MAJOR, PA_MINOR);
++  versions = g_strsplit(pa_get_library_version(), ".", 3);
++  if (versions[0] && versions[1])
++    pulsedir = g_strdup_printf ("pulse-%s.%s", versions[0], versions[1]);
++  else
++    pulsedir = g_strdup_printf ("pulse-%d.%d", PA_MAJOR, PA_MINOR);
++  g_strfreev(versions);
+ 
+   path = g_build_filename (MODLIBDIR, pulsedir, "modules", name, NULL);
+   g_free (pulsedir);
+-- 
+1.6.3.3
+
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index f02a11779..28754057a 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130771 2011-07-07 22:43:35Z andyrtr $
+# $Id: PKGBUILD 142423 2011-11-09 10:25:24Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=pixman
-pkgver=0.22.2
+pkgver=0.24.0
 pkgrel=1
 pkgdesc="Pixman library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ license=('custom')
 depends=('glibc')
 options=('!libtool')
 source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3')
+sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 9df06d613..6d79cde5f 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,28 +1,23 @@
-# $Id: PKGBUILD 138426 2011-09-22 19:46:09Z andrea $
+# $Id: PKGBUILD 142435 2011-11-09 18:50:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=virtuoso
-pkgver=6.1.3
-pkgrel=2
+pkgver=6.1.4
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
-depends=('openssl')
+depends=('libldap')
 makedepends=('bison' 'flex')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz"
-        'fix-unicode.patch')
-md5sums=('7d4b0497411ff1c34d7ca247618cdd17'
-         '550dcc877dcbda707aa7ba53800e5d5b')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz")
+md5sums=('7110a0b4b171b84850d346f4fe648172')
 
 build() {
   cd ${srcdir}/${pkgname}-opensource-${pkgver}
 
-  # Already fixed upstream
-  patch -p0 -i "${srcdir}"/fix-unicode.patch
-
   ./configure --prefix=/usr \
     --localstatedir=/var \
     --sysconfdir=/etc \
diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD
index fb57ce0f3..b5ac7d8f1 100644
--- a/extra/xfce4-weather-plugin/PKGBUILD
+++ b/extra/xfce4-weather-plugin/PKGBUILD
@@ -1,34 +1,44 @@
-# $Id: PKGBUILD 108785 2011-02-03 12:45:05Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 142430 2011-11-09 18:10:30Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Suzy Williams <suzanne.williams3@verizon.net>
 
 pkgname=xfce4-weather-plugin
 pkgver=0.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A weather plugin for the Xfce4 panel"
-arch=(i686 x86_64)
-license=('GPL2')
+arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
+license=('GPL2')
 groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.8.0' 'libxfcegui4' 'libxml2' 'hicolor-icon-theme')
+depends=('xfce4-panel' 'libxfcegui4' 'libxml2' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('03c972d13eba5cd226432ff66e3ff282')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.7/$pkgname-$pkgver.tar.bz2)
+sha256sums=('3f76207b8a845d15bfec6825bd5300aedd086c455259c4dd8670a89a3c8ab382')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Switch to a working license key
+  # https://bugs.archlinux.org/task/26815
+  sed -i \
+    -e 's/^#define PARTNER_ID.*/#define PARTNER_ID "1003666583"/' \
+    -e 's/^#define LICENSE_KEY.*/#define LICENSE_KEY "4128909340a9b2fc"/' \
+    panel-plugin/weather.h
+
   ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-weather-plugin/xfce4-weather-plugin.install b/extra/xfce4-weather-plugin/xfce4-weather-plugin.install
index b0b7f29d1..e4f8fd06c 100644
--- a/extra/xfce4-weather-plugin/xfce4-weather-plugin.install
+++ b/extra/xfce4-weather-plugin/xfce4-weather-plugin.install
@@ -1,13 +1,13 @@
-#!/bin/sh
-
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et: