Mon Jun 20 23:03:54 UTC 2011

24 files changed, 311 insertions, 146 deletions

diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index 57bc2bddd..d33875673 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110553 2011-02-19 22:20:32Z remy $
+# $Id: PKGBUILD 127783 2011-06-18 10:36:42Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
-pkgver=2.08
+pkgver=2.11
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('python2:           for the xasy GUI'
             'tix:               for the xasy GUI')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install=texlive.install
-sha1sums=(6b81336727458f7fdcc3db972f1e63b3bfc1a93b)
+sha1sums=('fde16f05bddb9e86a4dd05f25369f35c771fb84b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,6 +28,12 @@ build() {
               --with-context=/usr/share/texmf/tex/context
   make all
 }
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check-all
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install-all
diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD
index 2fb8e57f5..67502ca6c 100644
--- a/extra/cln/PKGBUILD
+++ b/extra/cln/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 108622 2011-02-02 01:45:45Z eric $
+# $Id: PKGBUILD 127750 2011-06-18 05:06:20Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=cln
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 pkgdesc="Class library for numbers"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ makedepends=('texlive-core')
 options=('!libtool')
 install=cln.install
 source=(ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ede584cb1cafa66d56f42a3cf420469d')
-sha1sums=('351506da9bd7b0b3cefd3a5424823797fb589acc')
+md5sums=('d897cce94d9c34d106575ed4ec865d71')
+sha1sums=('c30dca80e75f45e2107f233075e6d0339ea884b0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/cln/cln.install b/extra/cln/cln.install
index 7706dea0c..35df785e0 100644
--- a/extra/cln/cln.install
+++ b/extra/cln/cln.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(cln.info.gz)
 
 post_install() {
diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD
index 755dc23a1..d6cc0b4f7 100644
--- a/extra/festival/PKGBUILD
+++ b/extra/festival/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102549 2010-12-08 06:43:53Z schiv $
+# $Id: PKGBUILD 127865 2011-06-19 00:11:13Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Simo Leone <neotuli@gmail.com>
@@ -6,7 +6,7 @@
 pkgname=festival
 pkgver=2.1
 _suffix=release
-pkgrel=1
+pkgrel=2
 pkgdesc="A general multi-lingual speech synthesis system"
 arch=('i686' 'x86_64')
 url="http://www.cstr.ed.ac.uk/projects/festival/"
@@ -30,17 +30,17 @@ md5sums=('c93eb3e389ed171ab9abd46afe8897a8'
 
 build() {
 	# Build Speech Tools first
-	cd $srcdir/speech_tools
-	patch -Np1 -i $srcdir/speechconfig.patch
+	cd "$srcdir/speech_tools"
+	patch -Np1 -i "$srcdir/speechconfig.patch"
 
 	./configure --prefix=/usr --sysconfdir=/etc
 	make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
 
 	# Build Festival itself
-	cd $srcdir/festival
-	patch -Np1 -i $srcdir/festconfig.patch
+	cd "$srcdir/festival"
+	patch -Np1 -i "$srcdir/festconfig.patch"
 
-	# Aviod make failure on making scripts and docs
+	# Avoid make failure on making scripts and docs
 	sed -i "s#examples bin doc#examples#" Makefile
 
 	./configure --prefix=/usr --sysconfdir=/etc
@@ -49,62 +49,72 @@ build() {
 
 package() {
 	# Install Speech Tools first
-	cd $srcdir/speech_tools
-	install -dm755 $pkgdir/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
+	cd "$srcdir/speech_tools"
+	install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
 
 	#binaries
 	#move binaries over wrappers (FS#7864)
-	for i in `grep -l 'EST shared script' bin/*`; do
+	for i in $(grep -l 'EST shared script' bin/*); do
 		cp -f main/$(basename $i) bin;
 	done
-	install -m755 -t $pkgdir/usr/bin bin/[a-z]*
-	rm -f $pkgdir/usr/bin/{est_gdb,est_examples,est_program}
+	install -m755 -t "$pkgdir"/usr/bin bin/[a-z]*
+	rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program}
 
 	#libraries
-	install -m755 -t $pkgdir/usr/lib lib/lib*.so.*
-	ln -sf libestbase.so.${pkgver}.1 $pkgdir/usr/lib/libestbase.so
-	ln -sf libeststring.so.1.2 $pkgdir/usr/lib/libeststring.so
-	install -m644 -t $pkgdir/usr/lib lib/lib*.a
+	install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.*
+	ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so
+	ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so
+	install -m644 -t "$pkgdir"/usr/lib lib/lib*.a
 
 	#headers
 	for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
-	  install -m644 -t ${pkgdir}/usr/include/speech_tools/$dir include/$dir/*.h
+	  install -m644 -t "${pkgdir}"/usr/include/speech_tools/$dir include/$dir/*.h
 	done
 
 	# Install Festival itself
-	cd $srcdir/festival
+	cd "$srcdir"/festival
 
 	#binaries
-	install -m755 src/main/festival $pkgdir/usr/bin/
-	install -m755 src/main/festival_client $pkgdir/usr/bin/
-	install -m755 examples/text2wave $pkgdir/usr/bin
-	install -m755 examples/saytime $pkgdir/usr/bin/
+	install -m755 src/main/festival "$pkgdir"/usr/bin/
+	install -m755 src/main/festival_client "$pkgdir"/usr/bin/
+	install -m755 examples/benchmark "$pkgdir"/usr/bin/
+	install -m755 examples/dumpfeats "$pkgdir"/usr/bin/
+	install -m755 examples/durmeanstd "$pkgdir"/usr/bin/
+	install -m755 examples/latest "$pkgdir"/usr/bin/
+	install -m755 examples/make_utts "$pkgdir"/usr/bin/
+	install -m755 examples/powmeanstd "$pkgdir"/usr/bin/
+	install -m755 examples/run-festival-script "$pkgdir"/usr/bin/
+	install -m755 examples/saytime "$pkgdir"/usr/bin/
+	install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/
+	install -m755 examples/text2pos "$pkgdir"/usr/bin/
+	install -m755 examples/text2wave "$pkgdir"/usr/bin
 
 	#libraries
-	install -m644 src/lib/libFestival.a $pkgdir/usr/lib/
+	install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/
 
 	#headers
-	install -dm755 $pkgdir/usr/include/festival
-	install -m644 -t $pkgdir/usr/include/festival src/include/*.h
+	install -dm755 "$pkgdir"/usr/include/festival
+	install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h
 
-	mkdir -p $pkgdir/usr/share/festival
-	#install -m644 -t $pkgdir/usr/share/festival lib/*.scm
+	mkdir -p "$pkgdir"/usr/share/festival
+	#install -m644 -t "$pkgdir"/usr/share/festival lib/*.scm
 	#need to clean up but requires knowing which files are actually needed...
-	cp -aR lib/* $pkgdir/usr/share/festival
-	rm -f $(find $pkgdir/usr/share/festival -name Makefile)
+	cp -aR lib/* "$pkgdir"/usr/share/festival
+	rm -f $(find "$pkgdir"/usr/share/festival -name Makefile)
+	rm -f $(find "$pkgdir"/usr/bin -name Makefile)
 
 	#create voices directory
-	install -dm755 $pkgdir/usr/share/festival/voices
+	install -dm755 "$pkgdir"/usr/share/festival/voices
 
 	#licenses
-	install -D -m644 $srcdir/festival/COPYING \
-	                 $pkgdir/usr/share/licenses/$pkgname/LICENSE
-	install -D -m644 $srcdir/speech_tools/README \
-	                 $pkgdir/usr/share/licenses/$pkgname/LICENSE.other
+	install -D -m644 "$srcdir"/festival/COPYING \
+	                 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	install -D -m644 "$srcdir"/speech_tools/README \
+	                 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other
 
 	#################################################################
 	# Ok now some general cleanups
-	for i in `find $pkgdir/usr/include/ -type f`; do
+	for i in $(find "$pkgdir"/usr/include/ -type f); do
 		sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
 		-e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
 		-e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index ce6175f96..8f4b2c5c9 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119882 2011-04-16 11:21:52Z andyrtr $
+# $Id: PKGBUILD 127908 2011-06-19 16:23:50Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> 
 
 pkgname=garcon
-pkgver=0.1.7
+pkgver=0.1.8
 pkgrel=1
 pkgdesc="implementation of the freedesktop.org menu specification"
 arch=('i686' 'x86_64')
@@ -14,9 +14,9 @@ depends=('glib2') # 'perl')
 makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools>=4.7.4')
 conflicts=('garcon-git')
 replaces=('libxfce4menu')
-options=('!libtool')
+options=('!libtool' '!makeflags')
 source=(http://archive.xfce.org/src/libs/garcon/0.1/garcon-${pkgver}.tar.bz2)
-md5sums=('8990668e4f2fecffe124f613b6e1e01f')
+md5sums=('18fbf523ed2865dfaccdfb40b4b20b05')
 
 build() {
   cd ${srcdir}/garcon-${pkgver}
diff --git a/extra/gnome-utils/PKGBUILD b/extra/gnome-utils/PKGBUILD
index fdfbac8c8..cbdd24beb 100644
--- a/extra/gnome-utils/PKGBUILD
+++ b/extra/gnome-utils/PKGBUILD
@@ -1,10 +1,10 @@
-#  $Id: PKGBUILD 120619 2011-04-25 18:27:58Z ibiru $
+#  $Id: PKGBUILD 127840 2011-06-18 19:20:15Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-utils
 pkgver=3.0.1
-pkgrel=1
-pkgdesc="Common utilities for GNOME"
+pkgrel=2
+pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index afa3bd5e9..637a65faa 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125742 2011-05-29 04:00:08Z eric $
+# $Id: PKGBUILD 127860 2011-06-18 22:47:58Z foutrelis $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
 pkgver=2.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64')
 url="http://www.gnucash.org"
@@ -14,7 +14,6 @@ depends=('gtkhtml' 'slib' 'goffice' 'guile' 'libofx'
          'desktop-file-utils')
 makedepends=('intltool')
 optdepends=('evince: for print preview'
-            'gnucash-docs: (AUR) for user documentation'
             'perl-finance-quote: for stock information lookups'
             'perl-date-manip: for stock information lookups')
 options=('!libtool' '!makeflags')
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index de3a8f515..3e906aab8 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127545 2011-06-16 09:44:48Z ibiru $
+# $Id: PKGBUILD 127882 2011-06-19 07:39:12Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls'
@@ -12,13 +12,16 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch)
+        xid-collision-debug.patch
+        gdk_Make_background_changes_queue_a_repaint.patch)
 sha256sums=('d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
     patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+    patch -NRp1 -i "${srcdir}/gdk_Make_background_changes_queue_a_repaint.patch"
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
diff --git a/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch b/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch
new file mode 100644
index 000000000..40aa187e6
--- /dev/null
+++ b/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch
@@ -0,0 +1,55 @@
+From 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@redhat.com>
+Date: Thu, 09 Jun 2011 04:29:45 +0000
+Subject: gdk: Make background changes queue a repaint
+
+For client-side windows, we need to queue a repaint when the background
+changes. For native windows, the windowing system does take care of it,
+but client-side windows are our own, so we gotta do it manually.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=652102
+---
+diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
+index f058570..10d83ab 100644
+--- a/gdk/gdkwindow.c
++++ b/gdk/gdkwindow.c
+@@ -8004,11 +8004,15 @@ gdk_window_set_background (GdkWindow      *window,
+     }
+ 
+   if (!GDK_WINDOW_DESTROYED (window) &&
+-      gdk_window_has_impl (private) &&
+       !private->input_only)
+     {
+-      impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
+-      impl_iface->set_background (window, &private->bg_color);
++      if (gdk_window_has_impl (private))
++        {
++          impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
++          impl_iface->set_background (window, &private->bg_color);
++        }
++      else
++        gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
+     }
+ }
+ 
+@@ -8077,11 +8081,15 @@ gdk_window_set_back_pixmap (GdkWindow *window,
+     private->bg_pixmap = GDK_NO_BG;
+ 
+   if (!GDK_WINDOW_DESTROYED (window) &&
+-      gdk_window_has_impl (private) &&
+       !private->input_only)
+     {
+-      impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
+-      impl_iface->set_back_pixmap (window, private->bg_pixmap);
++      if (gdk_window_has_impl (private))
++        {
++          impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
++          impl_iface->set_back_pixmap (window, private->bg_pixmap);
++        }
++      else
++        gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
+     }
+ }
+ 
+--
+cgit v0.9
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 5d5fa30e4..e77f17db2 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121220 2011-04-29 15:00:49Z andyrtr $
+# $Id: PKGBUILD 127768 2011-06-18 10:02:24Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.2.3
+pkgver=4.3.0
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('autoconf')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4957f40d55e1bc6985e11244364b8938')
+md5sums=('3c6ff88f8c6e93ff90d8e3b054f3b086')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libmodplug/PKGBUILD b/extra/libmodplug/PKGBUILD
index ba117d07d..25f14d567 100644
--- a/extra/libmodplug/PKGBUILD
+++ b/extra/libmodplug/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 81170 2010-05-26 23:12:54Z ibiru $
+# $Id: PKGBUILD 127934 2011-06-20 02:16:14Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
 
 pkgname=libmodplug
-pkgver=0.8.8.1
+pkgver=0.8.8.2
 pkgrel=1
 pkgdesc="A MOD playing library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://modplug-xmms.sourceforge.net/"
 license=('custom')
 depends=('gcc-libs')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/modplug-xmms/libmodplug-${pkgver}.tar.gz)
-md5sums=('f7fa53a60c650024ff51cca88341776b')
+md5sums=('e1fceac4c3bc26ebe96f619b46d26ff7')
 
 build() {
-  cd ${srcdir}/libmodplug-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd "${srcdir}/libmodplug-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/libmodplug-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD
index 6058cb7ee..c2b414cf8 100644
--- a/extra/libofx/PKGBUILD
+++ b/extra/libofx/PKGBUILD
@@ -1,29 +1,35 @@
-# $Id: PKGBUILD,v 1.9 2009/02/06 16:41:19 abhidg Exp $
+# $Id: PKGBUILD 127929 2011-06-20 00:18:32Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgbase=libofx
 pkgname=('libofx' 'libofx-doc')
-pkgver=0.9.2
+pkgver=0.9.4
 pkgrel=1
 pkgdesc="API for the OFX banking standard"
 arch=('i686' 'x86_64')
 url="http://libofx.sourceforge.net"
 license=('GPL')
-depends=('opensp' 'curl' 'gcc-libs')
+depends=('opensp' 'curl' 'libxml++')
+checkdepends=('gnupg')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('cb72fce95e0d59bef78ba0601fbc91f3')
-sha1sums=('f11e873a50f5bd16749a7c0700acbf5d565bc859')
+md5sums=('f2419bf8d01c0cff74efe7084e0a26c5')
+sha1sums=('7370245c011ac4ea9313ba24a88c70e0eb9c317b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
+check() {
+  cd "$srcdir/$pkgbase-$pkgver"
+  make check
+}
+
 package_libofx() {
   options=('!libtool' '!docs')
 
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" install
 }
 
@@ -31,8 +37,7 @@ package_libofx-doc() {
   pkgdesc="Documention of the OFX banking standard API"
   depends=()
 
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" install-docDATA
-  cd doc
-  make DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
 }
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index 9f5a1c34a..d7636998a 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127264 2011-06-12 08:13:43Z ronald $
+# $Id: PKGBUILD 127855 2011-06-18 21:42:16Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
 pkgver=4.0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
@@ -13,7 +13,7 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
          'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
          'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
 	 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' 
-	 'gstreamer0.10-ffmpeg' 'ffmpeg')
+	 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen')
 makedepends=('pkg-config')
 install=miro.install
 source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 6b609da9d..873c8ad07 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 124985 2011-05-25 16:04:09Z ibiru $
+# $Id: PKGBUILD 127788 2011-06-18 10:58:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=mkvtoolnix
 pkgver=4.8.0
-pkgrel=2
-pkgdesc="Set of tools to create, edit and inspect Matroska files"
+pkgrel=3
+pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-depends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils')
+depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis')
 makedepends=('boost' 'ruby')
-install=mkvtoolnix.install
 source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('47a730706f3da2bcf4ba62bba3a8f260')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # Disable automagic curl dep used for online update checking
+  sed -i -e '/curl/d' configure.in
+  export CURL_CFLAGS="" CURL_LIBS=""
+
   export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
   export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
 
+  autoreconf
+
   ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  ./drake
+              --with-boost-libdir=/usr/lib \
+              --disable-gui
+  rake
 }
 
 package () {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./drake DESTDIR="${pkgdir}" install
+  rake DESTDIR="${pkgdir}" install
 }
diff --git a/extra/rox/PKGBUILD b/extra/rox/PKGBUILD
index 34b72f227..799ad8d43 100644
--- a/extra/rox/PKGBUILD
+++ b/extra/rox/PKGBUILD
@@ -1,51 +1,46 @@
-# $Id: PKGBUILD 46891 2009-07-20 23:09:07Z giovanni $
+# $Id: PKGBUILD 127760 2011-06-18 07:02:05Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=rox
-_appname=${pkgname}-filer
 pkgver=2.10
-pkgrel=1
-pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels."
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels"
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://roscidus.com/desktop/"
-depends=('libxml2' 'gtk2' 'shared-mime-info' 'bash' 'libsm' 'libglade')
+depends=('sh' 'libsm' 'libglade')
 makedepends=('librsvg' 'python')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${_appname}-${pkgver}.tar.bz2 \
-        ${pkgname}.desktop ${pkgname}.svg)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/rox-filer-${pkgver}.tar.bz2 \
+        rox.desktop rox.svg rox.sh right-click.diff)
 md5sums=('28e8494c9af783258ff86c830f8f0062'
          '80e7a90e9d58375b25494fbdc01a05bd'
-         '658c8648b51e215558e13e6afb2b5c76')
+         '658c8648b51e215558e13e6afb2b5c76'
+         '31578a90b241f0a8d09c9f8587608d00'
+         '2b2105a33070ac09a6352c29a5a17e4e')
 
 build() {
-  cd ${startdir}/src/${_appname}-${pkgver}/Choices
-  mkdir -p ${startdir}/pkg/usr/share/Choices
-  cp -rp MIME-types ${startdir}/pkg/usr/share/Choices/
- # manually copy the manpages first
-  cd ../
-  install -Dm 0644 rox.1 ${startdir}/pkg/usr/share/man/man1/rox.1
-  cd ${startdir}/pkg/usr/share/man/man1
-  ln -sf rox.1 ROX-Filer.1
- # this compiles and installs rox
- cd ${startdir}/src/${_appname}-${pkgver}/ROX-Filer
+  cd "${srcdir}/rox-filer-${pkgver}/ROX-Filer"
+  patch -p2 -i "${srcdir}/right-click.diff"
   ./AppRun --compile
-  cd ..
-  cp -rp ROX-Filer ${startdir}/pkg/usr/share/
-  rm -fr ${startdir}/pkg/usr/share/ROX-Filer/{src,build}
- # create a shellscript which is known in the PATH
-  mkdir -p ${startdir}/pkg/usr/bin
-  echo "#!/bin/sh" > "${startdir}/pkg/usr/bin/rox"
-  echo "exec /usr/share/ROX-Filer/AppRun \"\$@\"" >> "${startdir}/pkg/usr/bin/rox"
-  chmod a+x ${startdir}/pkg/usr/bin/rox
- # install some freedesktop.org compatibility
-  install -D -m644 ${startdir}/src/${pkgname}.desktop \
-    ${startdir}/pkg/usr/share/applications/${pkgname}.desktop
-  install -D -m644 ${startdir}/src/${pkgname}.svg \
-    ${startdir}/pkg/usr/share/pixmaps/${pkgname}.svg
-   # finally we render a png as fallback for not svg aware menu applications
-   # Attention: always make sure you check the dimensions of the source-svg,
-   # you can read the dimensions via inkscapes export funktion
-  rsvg -w 48 -h 38 -f png ${startdir}/src/${pkgname}.svg \
-    ${startdir}/pkg/usr/share/pixmaps/${pkgname}.png
+# finally we render a png as fallback for svg unaware menu applications
+# Attention: always make sure you check the dimensions of the source-svg,
+# you can read the dimensions via inkscape's export function
+  rsvg-convert -w 48 -h 38 -f png -o "${srcdir}/rox.png" "${srcdir}/rox.svg"
+}
+
+package() {
+  cd "${srcdir}/rox-filer-${pkgver}"
+  install -d "${pkgdir}/usr/share/Choices/MIME-types"
+  install -m755 Choices/MIME-types/* "${pkgdir}/usr/share/Choices/MIME-types/"
+  cp -rp ROX-Filer "${pkgdir}/usr/share/"
+  rm -fr "${pkgdir}"/usr/share/ROX-Filer/{src,build}
+ 
+  install -D -m755 "${srcdir}/rox.sh" "${pkgdir}/usr/bin/rox"
+  install -D -m644 rox.1 "${pkgdir}/usr/share/man/man1/rox.1"
+  ln -sf rox.1 "${pkgdir}/usr/share/man/man1/ROX-Filer.1"
+
+  install -D -m644 "${srcdir}/rox.desktop" "${pkgdir}/usr/share/applications/rox.desktop"
+  install -D -m644 "${srcdir}/rox.svg" "${pkgdir}/usr/share/pixmaps/rox.svg"
+  install -D -m644 "${srcdir}/rox.png" "${pkgdir}/usr/share/pixmaps/rox.png"
 }
diff --git a/extra/rox/right-click.diff b/extra/rox/right-click.diff
new file mode 100644
index 000000000..e8ad67907
--- /dev/null
+++ b/extra/rox/right-click.diff
@@ -0,0 +1,32 @@
+From c2232d5075342347a8ff814ced5ce8b9e1cf64b9 Mon Sep 17 00:00:00 2001
+From: Thomas Leonard <talex5@gmail.com>
+Date: Wed, 7 Apr 2010 15:44:57 +0100
+Subject: [PATCH] Bugfix: unselect item when menu is closed
+
+We used to listen for "unmap_event", but this is no longer emitted in recent
+versions of GTK. Switched to using "selection-done" instead.
+
+Closes #2925212 (reported by Barry Kauler).
+---
+ ROX-Filer/src/menu.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c
+index 611918d..bf4bae3 100644
+--- a/ROX-Filer/src/menu.c
++++ b/ROX-Filer/src/menu.c
+@@ -322,9 +322,9 @@ gboolean ensure_filer_menu(void)
+ 	GET_SSMENU_ITEM(item, "filer", "Window", "New Window");
+ 	filer_new_window = GTK_BIN(item)->child;
+ 
+-	g_signal_connect(filer_menu, "unmap_event",
++	g_signal_connect(filer_menu, "selection-done",
+ 			G_CALLBACK(menu_closed), NULL);
+-	g_signal_connect(filer_file_menu, "unmap_event",
++	g_signal_connect(filer_file_menu, "selection-done",
+ 			G_CALLBACK(menu_closed), NULL);
+ 
+ 	g_signal_connect(filer_keys, "accel_changed",
+-- 
+1.6.5.GIT
+
diff --git a/extra/rox/rox.sh b/extra/rox/rox.sh
new file mode 100644
index 000000000..f2dc449d0
--- /dev/null
+++ b/extra/rox/rox.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/share/ROX-Filer/AppRun "$@"
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 2a14af3df..765a40e98 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 125547 2011-05-26 16:47:44Z ibiru $
+# $Id: PKGBUILD 127845 2011-06-18 19:41:13Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.0.1
-pkgrel=2
-url="http://www.hadess.net/totem.php3"
+pkgrel=3
+url="http://www.gnome.org"
 arch=('i686' 'x86_64')
 license=('GPL2' 'custom')
 makedepends=('intltool' 'gnome-doc-utils' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser'
     'libpeas' 'pygobject' 'pygobject-devel' 'nautilus' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'libgdata'
     'xulrunner' 'lirc-utils' 'libepc' 'bluez' 'vala')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2
+       fix_crash.patch)
+sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a'
+            '65125a0b8a1fd7f8840b2b7528de3bc553689e224a9aa3fd2c459918ab6f1f1c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/fix_crash.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/totem \
       --localstatedir=/var --disable-static \
diff --git a/extra/totem/fix_crash.patch b/extra/totem/fix_crash.patch
new file mode 100644
index 000000000..08409696c
--- /dev/null
+++ b/extra/totem/fix_crash.patch
@@ -0,0 +1,30 @@
+From cee6399c1de27e5ccae35975aaae4fd7cfa40c2c Mon Sep 17 00:00:00 2001
+From: Marcel van den Hof <marcelvdh@gmail.com>
+Date: Sun, 29 May 2011 23:45:36 +0100
+Subject: [PATCH] Fix segfault in Bemused plugin
+
+If bluetoothd is not running sdp_connect() returns a null value which
+will cause the plugin to segfault.
+
+This patch adds a check for a possible null value from sdp_connect().
+---
+ src/plugins/bemused/totem-bemused.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/bemused/totem-bemused.c b/src/plugins/bemused/totem-bemused.c
+index 584b4d3..c51a0ee 100644
+--- a/src/plugins/bemused/totem-bemused.c
++++ b/src/plugins/bemused/totem-bemused.c
+@@ -655,7 +655,8 @@ sdp_svc_add_spp(u_int8_t port,
+ 
+ 	/* Connect to the local SDP server, register the service record */
+ 	session = sdp_connect (BDADDR_ANY, BDADDR_LOCAL, 0);
+-	sdp_record_register (session, &record, 0);
++	if (session != NULL)	
++		sdp_record_register (session, &record, 0);
+ 
+ 	/* Cleanup */
+ 	sdp_data_free (channel);
+-- 
+1.7.5.2
+
diff --git a/extra/xfce-utils/PKGBUILD b/extra/xfce-utils/PKGBUILD
index 621755ab8..abf733525 100644
--- a/extra/xfce-utils/PKGBUILD
+++ b/extra/xfce-utils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108283 2011-01-30 17:27:33Z andyrtr $
+# $Id: PKGBUILD 127773 2011-06-18 10:07:36Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce-utils
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="Utilities for Xfce"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ optdepends=('perl:	for migration scripts'
 options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e39866365a45f7a1e7284b93eb4f92f0')
+md5sums=('7f48198f4bee3edf7869064c2922c609')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD
index d35984253..3e942a3c1 100644
--- a/extra/xfce4-panel/PKGBUILD
+++ b/extra/xfce4-panel/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 118498 2011-04-07 16:18:14Z andyrtr $
+# $Id: PKGBUILD 127913 2011-06-19 20:00:47Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-panel
-pkgver=4.8.3
+pkgver=4.8.4
 pkgrel=1
 pkgdesc="Panel for the Xfce desktop environment"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
-depends=('exo>=0.6.0' 'garcon>=0.1.5' 'libxfce4ui>=4.8.0' 'libwnck' 'libsm' 'hicolor-icon-theme')
+depends=('exo>=0.6.0' 'garcon>=0.1.5' 'libxfce4ui>=4.8.0' 'libwnck' 'libsm' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('intltool' 'gtk-doc')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('31d7c15fb93f4a771fc26cf13d4dc010')
+md5sums=('44f06660226723fdd8de3ad59d648546')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/xfce4-panel/xfce4-panel.install b/extra/xfce4-panel/xfce4-panel.install
index 21b79d2d4..bce670aff 100644
--- a/extra/xfce4-panel/xfce4-panel.install
+++ b/extra/xfce4-panel/xfce4-panel.install
@@ -1,11 +1,12 @@
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 0f80af66a..027b192d2 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 126178 2011-06-02 11:13:57Z pierre $
+# $Id: PKGBUILD 127893 2011-06-19 11:12:41Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
 pkgver=4.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
 license=('custom')
 depends=('pcre' 'libcap' 'gdbm')
 install=zsh.install
-source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811')
+source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch')
+md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811'
+         'b367c1398b60242f7044a93a837227f9')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	# upstream patch to fix handling of compressed kernel modules
+	patch -p1 -i ${srcdir}/modules.patch
 	# FS#16360
 	sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
 				 Doc/zsh.texi \
diff --git a/extra/zsh/modules.patch b/extra/zsh/modules.patch
new file mode 100644
index 000000000..315d40b98
--- /dev/null
+++ b/extra/zsh/modules.patch
@@ -0,0 +1,11 @@
+--- a/Completion/Linux/Command/_modutils
++++ b/Completion/Linux/Command/_modutils
+@@ -107,7 +107,7 @@ case "$state" in
+       ! _retrieve_cache modules-$kver;
+     then 
+       # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough?
+-      modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko)(.:t:r) )
++      modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) )
+       _store_cache modules-$kver modules
+     fi
+