Fri Jan 6 23:14:57 UTC 2012

14 files changed, 244 insertions, 111 deletions

diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 6665c8603..2f9399b4c 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 142485 2011-11-10 18:57:46Z ronald $
-# Maintainer: Andrea Scarpino <ronald@archlinux.org>
+# $Id: PKGBUILD 146190 2012-01-05 20:00:07Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.5.0
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,11 +14,19 @@ url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
              'cmake' 'automoc4' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('15b8b16d7cce6ac50fb958d30166214f2f2b83ee')
-
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+	"boost148.patch" "libkipi140.patch")
+sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383'
+          '93853084905b21309c46ce7d585021e76283d429'
+          '8a8f624fd0ca768a9dcd706405eb6e4944892d87')
 build() {
   cd "${srcdir}"
+
+  pushd ${pkgname}-${pkgver}/core
+  patch -Np0 -i ${srcdir}/boost148.patch
+  patch -Np1 -i ${srcdir}/libkipi140.patch
+  popd
+
   mkdir build
   cd build
   # Use internal lensfun (FS#21816)
diff --git a/extra/digikam/boost148.patch b/extra/digikam/boost148.patch
new file mode 100644
index 000000000..6d3ff585b
--- /dev/null
+++ b/extra/digikam/boost148.patch
@@ -0,0 +1,65 @@
+diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
+--- libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 08:32:19.837388059 -0500
++++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 09:17:27.798341897 -0500
+@@ -1198,7 +1198,7 @@
+             {
+                 boost::dag_shortest_paths(graph, v,
+                                           // we provide a constant weight of 1
+-                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
++                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
+                                           // Store distance and predecessors in QMaps, wrapped to serve as property maps
+                                           distance_map(VertexIntMapAdaptor(distances)).
+                                           predecessor_map(VertexVertexMapAdaptor(predecessors))
+@@ -1218,7 +1218,7 @@
+             {
+                 boost::dag_shortest_paths(graph, v,
+                                           // we provide a constant weight of 1
+-                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
++                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
+                                           // Invert the default compare method: With greater, we get the longest path
+                                           distance_compare(std::greater<int>()).
+                                           // will be returned if a node is unreachable
+@@ -1384,14 +1384,15 @@
+         template <class GraphType, typename VertexLessThan>
+         class lessThanMapEdgeToTarget
+         {
++            typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
+         public:
+             lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
+                 : g(g), vertexLessThan(vertexLessThan) {}
+             const GraphType& g;
+             VertexLessThan vertexLessThan;
+-            bool operator()(const Edge& a, const Edge& b)
++            bool operator()(const edge_descriptor& a, const edge_descriptor& b)
+             {
+-                return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
++                return vertexLessThan(boost::target(a, g), boost::target(b, g));
+             }
+         };
+ 
+@@ -1402,20 +1403,21 @@
+         {
+             typedef std::pair<Vertex, QList<Edge> > VertexInfo;
+ 
+-            QList<Edge>             outEdges;
++            typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
++            QList<edge_descriptor> outEdges;
+             std::vector<VertexInfo> stack;
+ 
+             boost::put(color, u, boost::gray_color);
+             vis.discover_vertex(u, g);
+ 
+-            outEdges = toEdgeList(boost::out_edges(u, g));
++            outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
+             // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
+             // maps the given edges to their targets, and calls our vertex lessThan.
+             qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
+ 
+-            foreach(const Edge& e, outEdges)
++            foreach(const edge_descriptor& e, outEdges)
+             {
+-                Vertex v = boost::target(e.toEdge(), g);
++                Vertex v = boost::target(e, g);
+                 vis.examine_edge(e, g);
+                 boost::default_color_type v_color = boost::get(color, v);
+                 if (v_color == boost::white_color)
diff --git a/extra/digikam/libkipi140.patch b/extra/digikam/libkipi140.patch
new file mode 100644
index 000000000..a221b5847
--- /dev/null
+++ b/extra/digikam/libkipi140.patch
@@ -0,0 +1,63 @@
+diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
+index 0f4030a..b8efb35 100644
+--- a/utilities/setup/setupplugins.cpp
++++ b/utilities/setup/setupplugins.cpp
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
+ 
+     panel->setLayout(mainLayout);
+ 
++#if KIPI_VERSION < 0x010400
++    d->checkAllBtn->setVisible(false);
++    d->clearBtn->setVisible(false);
++#endif
++
+     initPlugins();
+ 
+     // --------------------------------------------------------
+@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
+ void SetupPlugins::slotCheckAll()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotCheckAll();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+ void SetupPlugins::slotClear()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotClear();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
+index 271a569..114e0fa 100644
+--- a/utilities/setup/setupplugins.h
++++ b/utilities/setup/setupplugins.h
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+
+  
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 9ea40af59..b47ca87b9 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 137977 2011-09-13 15:26:07Z juergen $
+# $Id: PKGBUILD 146181 2012-01-05 13:48:00Z juergen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
+
 pkgname=emacs
 _majorver=23.3
-_minorver=a
+_minorver=b
 # We want something like "23.3.a" so pacman version comparison works, but
 # upstream uses "23.3a", which is a bit silly and interpreted as alpha.
 pkgver=$_majorver.$_minorver
 _realver=$_majorver$_minorver
-pkgrel=3
+pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop)
-md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
-         '8af038d2ba4561271e935bb444ceb4e3')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz)
+md5sums=('f2bfd8eab7e3b34a0f7f09acc0667e71')
 
 build() {
   cd "$srcdir"/$pkgname-$_majorver
@@ -42,9 +42,4 @@ package() {
   chmod 775 "$pkgdir"/var/games/emacs
   chmod 664 "$pkgdir"/var/games/emacs/*
   chown -R root:games "$pkgdir"/var/games
-
-  # fix  FS#9253
-  mkdir -p "$pkgdir"/usr/share/pixmaps "$pkgdir"/usr/share/applications
-  install -D -m644 "$srcdir"/$pkgname.desktop   "$pkgdir"/usr/share/applications
-  ln -s  ../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png
 }
diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD
index bfc8d10b0..f5d664ee7 100644
--- a/extra/foobillard++/PKGBUILD
+++ b/extra/foobillard++/PKGBUILD
@@ -1,36 +1,38 @@
-# $Id: PKGBUILD 141931 2011-11-03 08:55:49Z eric $
+# $Id: PKGBUILD 146196 2012-01-05 21:53:59Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=foobillard++
-pkgver=3.41beta
-pkgrel=1
+pkgver=3.42beta
+pkgrel=2
 pkgdesc="An OpenGL billiard game"
 arch=('i686' 'x86_64')
 url="http://foobillardplus.sourceforge.net/"
 license=('GPL2')
-depends=('bzip2' 'freetype2' 'libpng' 'mesa' 'sdl_net')
+depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
 replaces=('foobillard')
 source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz)
-sha1sums=('41d6db473557386ffeacd98b9a2ee26198e42c6a')
+sha1sums=('51507efab0f595cfff26149003faf669c0a42f32')
 
 build() {
   cd "${srcdir}/foobillardplus-${pkgver}"
-  sed -i 's|$prefix/foobillardplus|$prefix|' configure
-  sed -i 's|$prefix/data|$prefix/share/foobillardplus|' configure
-  sed -i 's|"/data"|"/share/foobillardplus"|' src/language.c
   sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
   sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
-  ./configure --prefix=/usr
+  aclocal --force
+  autoconf -f
+  autoheader -f
+  automake -a -c -f 
+  ./configure --prefix=/usr/share
   make
 }
 
 package() {
   cd "${srcdir}/foobillardplus-${pkgver}"
-  install -Dm755 src/foobillardplus "${pkgdir}/usr/bin/foobillardplus"
-  install -d "${pkgdir}/usr/share/foobillardplus"
-  cp -R data/* "${pkgdir}/usr/share/foobillardplus"
-  install -Dm644 foobillardplus.desktop "${pkgdir}/usr/share/applications/foobillardplus.desktop"
-  install -Dm644 foobillardplus.png "${pkgdir}/usr/share/pixmaps/foobillardplus.png"
-  install -Dm644 foobillardplus.xbm "${pkgdir}/usr/share/pixmaps/foobillardplus.xbm"
-  find "${pkgdir}" -depth  -type d -name .svn -exec rm -rf  {} \;
+  make DESTDIR="${pkgdir}" datadir="${pkgdir}/usr/share/foobillardplus/data" \
+    prefix="${pkgdir}/usr/share" install
+
+  install -d "${pkgdir}"/usr/{bin,share/{applications,pixmaps}}
+  mv "${pkgdir}"/usr/share/{AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO} "${pkgdir}/usr/share/foobillardplus" 
+  mv "${pkgdir}"/usr/share/foobillardplus.desktop "${pkgdir}"/usr/share/applications
+  mv "${pkgdir}"/usr/share/foobillardplus.{png,xbm} "${pkgdir}"/usr/share/pixmaps
+  ln -s /usr/share/foobillardplus/bin/foobillardplus "${pkgdir}"/usr/bin/foobillardplus
 }
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index d24dddfcc..896faa265 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -1,27 +1,20 @@
-# $Id: PKGBUILD 143741 2011-11-28 19:17:54Z giovanni $
+# $Id: PKGBUILD 146192 2012-01-05 20:11:27Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fping
-pkgver=2.4b2
-pkgrel=5
+pkgver=3.0
+pkgrel=1
 pkgdesc="A utility to ping multiple hosts at once"
 arch=('i686' 'x86_64')
-url="http://packages.qa.debian.org/"
+url="http://www.fping.org/"
 license=('custom') 
 depends=('glibc')
-source=("http://ftp.de.debian.org/debian/pool/main/f/fping/fping_2.4b2-to-ipv6.orig.tar.gz"
-        'fping_2.4b2-to-ipv6-16.1.diff'
-        'fping-2.4b2_p161-min-time.patch')
-md5sums=('3ad516765514249a40d3c5b6caab812a'
-         '4881e981971379a0948b31719e4505f5'
-         '36753d9556eba1a6159c20c8db3e2232')
+source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz")
+md5sums=('e937c9a2b1d65b6f5294fec57891645b')
 
 build() {
-  cd $srcdir/$pkgname-2.4b2_to-ipv6
-
-  patch -Np1 -i ${srcdir}/fping_2.4b2-to-ipv6-16.1.diff
-  patch -Np1 -i ${srcdir}/fping-2.4b2_p161-min-time.patch
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
               --mandir=/usr/share/man
@@ -29,7 +22,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-2.4b2_to-ipv6
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index a8b506baa..19e5f58c1 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145025 2011-12-15 06:57:18Z andyrtr $
+# $Id: PKGBUILD 146077 2012-01-05 09:04:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.9
+pkgver=3.0.10
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
 makedepends=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('7e5d749f28eda1c781c89a2e520913c8')
+md5sums=('6d92a1e154833a70a21e771f41e5c512')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,7 +21,7 @@ build() {
 	--with-zlib \
 	--disable-static \
 	--disable-guile \
-	--disable-valgrind-tests # breaks make check. errors have been reported upstream
+	--disable-valgrind-tests # x86_64 test are all passed. some fail in i686 chroot
   make
 }
 
diff --git a/extra/ltrace/PKGBUILD b/extra/ltrace/PKGBUILD
index 9861acb93..6101195a7 100644
--- a/extra/ltrace/PKGBUILD
+++ b/extra/ltrace/PKGBUILD
@@ -1,28 +1,39 @@
-# $Id: PKGBUILD 87253 2010-08-11 14:16:17Z allan $
-# Maintainer:
+# $Id: PKGBUILD 146208 2012-01-06 03:36:04Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ltrace
-pkgver=0.5.3
-pkgrel=2
-pkgdesc="A debugging program which runs a specified command until it exits"
+pkgver=0.6.0
+pkgrel=1
+pkgdesc="Tracks runtime library calls in dynamically linked programs"
 arch=('i686' 'x86_64')
-url="http://packages.debian.org/sid/ltrace"
+url="http://ltrace.alioth.debian.org/"
 license=('GPL')
-depends=('glibc' 'elfutils')
+depends=('elfutils')
 backup=('etc/ltrace.conf')
-source=(http://ftp.debian.org/debian/pool/main/l/ltrace/${pkgname}_${pkgver}.orig.tar.gz)
-md5sums=('3fa7fe715ab879db08bd06d1d59fd90f')
+source=(http://dev.archlinux.org/~foutrelis/sources/ltrace/$pkgname-$pkgver.tar.xz
+        fix-crash-on-int3-after-symcall.patch)
+sha256sums=('13e4a66aa1f2ad23fd4ddd7faa79c52a68f210155eeb6490ce421f2a07fa0706'
+            'ef2c33c94b5cbfc552e5e734ac5627918ace918f48db5d3f29f1c0dcb1732d04')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's|/usr/bin/install|/bin/install|' configure
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Fix FS#27250: SIGSEGV due to int3 right after a call instruction
+  patch -Np1 -i "$srcdir/fix-crash-on-int3-after-symcall.patch"
+
+  ./autogen.sh
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc
   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/ltrace/fix-crash-on-int3-after-symcall.patch b/extra/ltrace/fix-crash-on-int3-after-symcall.patch
new file mode 100644
index 000000000..5e0a7911c
--- /dev/null
+++ b/extra/ltrace/fix-crash-on-int3-after-symcall.patch
@@ -0,0 +1,14 @@
+diff -upr ltrace-0.6.0.orig/handle_event.c ltrace-0.6.0/handle_event.c
+--- ltrace-0.6.0.orig/handle_event.c	2011-01-07 21:29:30.000000000 +0200
++++ ltrace-0.6.0/handle_event.c	2012-01-06 05:14:04.000000000 +0200
+@@ -617,6 +617,10 @@ handle_breakpoint(Event *event) {
+ 	}
+ 
+ 	if ((sbp = address2bpstruct(event->proc, event->e_un.brk_addr))) {
++		if (sbp->libsym == NULL) {
++			continue_after_breakpoint(event->proc, sbp);
++			return;
++		}
+ 		if (strcmp(sbp->libsym->name, "") == 0) {
+ 			debug(2, "Hit _dl_debug_state breakpoint!\n");
+ 			arch_check_dbg(event->proc);
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
index 414f8dba1..2b45eb118 100644
--- a/extra/scummvm/PKGBUILD
+++ b/extra/scummvm/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 135987 2011-08-21 05:01:03Z eric $
-# Maintainer: juergen <juergen@hoetzel.info>
+# $Id: PKGBUILD 146120 2012-01-05 12:48:56Z juergen $
+# Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=1.3.1
+pkgver=1.4.0
 pkgrel=2
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.scummvm.org/"
 depends=('libmad' 'sdl' 'fluidsynth')
-makedepends=('libmpeg2')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2')
+md5sums=('361000b78ebf0d0f449e98238d677be1')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   ./configure --backend=sdl --disable-debug \
-    --enable-mpeg2 --with-mpeg2-prefix=/usr \
     --with-flac-prefix=/usr \
     --with-fluidsynth-prefix=/usr \
     --prefix=/usr
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 97156ffae..ec6525529 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141613 2011-10-31 19:59:13Z andrea $
+# $Id: PKGBUILD 146186 2012-01-05 14:57:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
-pkgver=2.7.3
+pkgver=2.7.4
 pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL')
 depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
 makedepends=('cmake' 'openjdk6' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2674ab79c3ec17e4d1b7ecfc76651cd0')
+md5sums=('783fb07f9679f45e987aff7a17bef649')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/thunar-media-tags-plugin/PKGBUILD b/extra/thunar-media-tags-plugin/PKGBUILD
index 142378be6..1c26c84b0 100644
--- a/extra/thunar-media-tags-plugin/PKGBUILD
+++ b/extra/thunar-media-tags-plugin/PKGBUILD
@@ -1,36 +1,23 @@
-# $Id: PKGBUILD 108077 2011-01-29 12:18:52Z andyrtr $
+# $Id: PKGBUILD 146210 2012-01-06 03:43:06Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar-media-tags-plugin
-pkgver=0.1.2.99.git20110129
+pkgver=0.2.0
 pkgrel=1
-pkgdesc="adds special features for media files to the Thunar File Manager"
+pkgdesc="Adds special features for media files to the Thunar File Manager"
 arch=('i686' 'x86_64')
-license=('GPL2')
+license=('GPL')
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
 groups=('xfce4-goodies')
 depends=('taglib' 'thunar')
-makedepends=('intltool' 'xfce4-dev-tools')
+makedepends=('intltool')
 options=('!libtool')
-source=(#http://archive.xfce.org/src/thunar-plugins/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2
-	# broken master http://git.xfce.org/thunar-plugins/thunar-media-tags-plugin/snapshot/thunar-media-tags-plugin-8d29c1f4672f41baabc84ec02630c79793ead159.tar.bz2
-	# thunarx-2 branch 
-	#http://git.xfce.org/thunar-plugins/thunar-media-tags-plugin/snapshot/thunar-media-tags-plugin-270924abcab81275dede68d882936c14b238b3ec.tar.bz2
-	ftp://ftp.archlinux.org/other/$pkgname/thunar-media-tags-plugin-270924abcab81275dede68d882936c14b238b3ec.tar.bz2
-	0001-Switch-to-the-new-tooltip-api-in-gtk-depend-on-gtk-2.patch
-	04_fix-implicit-dso-linking.patch)
-md5sums=('faf79a2568ae7b76477ddd0d9ffe9380'
-         '199e0f657333ed1d09947b7d4fdeb493'
-         'b310ccc46752f672a1030c4e17093b77')
+source=(http://archive.xfce.org/src/thunar-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('1111b4dae10156ab91adb4eadb26586593b1b023')
 
 build() {
-#  cd ${srcdir}/${pkgname}-${pkgver}
-  cd ${srcdir}/${pkgname}*
-  # fixes for new thunar taken from http://bugzilla.xfce.org/show_bug.cgi?id=6295
-  patch -Np1 -i ${srcdir}/0001-Switch-to-the-new-tooltip-api-in-gtk-depend-on-gtk-2.patch
-  patch -Np1 -i ${srcdir}/04_fix-implicit-dso-linking.patch
-  xdt-autogen
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/xfce4 \
@@ -41,7 +28,6 @@ build() {
 }
 
 package() {
-#  cd ${srcdir}/${pkgname}-${pkgver}
-  cd ${srcdir}/${pkgname}*
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/vsftpd/PKGBUILD b/extra/vsftpd/PKGBUILD
index c35fe02de..465974f25 100644
--- a/extra/vsftpd/PKGBUILD
+++ b/extra/vsftpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131827 2011-07-15 23:59:43Z dreisner $
+# $Id: PKGBUILD 146202 2012-01-06 00:42:46Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=vsftpd
-pkgver=2.3.4
-pkgrel=2
+pkgver=2.3.5
+pkgrel=1
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
 url="https://security.appspot.com/vsftpd.html"
@@ -12,12 +12,10 @@ license=('GPL2')
 depends=('openssl')
 backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
-source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz"
+source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
         'vsftpd.xinetd' 'vsftpd.d')
-md5sums=('2ea5d19978710527bb7444d93b67767a'
-         'b07fd4609c70063c1d6b20142910c1a6'
-         '60060a6c7db3b3b7baa1561a302e6923')
-sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea'
+sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755'
+          '2ddf92782f19dafc72439a2917acb1d7e124d149'
           'c87b4ce56dac15223694a6e86c01ea813b877596'
           '24f268956c24e78be0c234c6d31f41487922eafe')
 
diff --git a/extra/xfce4-genmon-plugin/PKGBUILD b/extra/xfce4-genmon-plugin/PKGBUILD
index 8e631a255..074f82688 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 116662 2011-03-24 17:55:38Z andyrtr $
+# $Id: PKGBUILD 146212 2012-01-06 03:56:23Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-genmon-plugin
-pkgver=3.3.0
+pkgver=3.3.1
 pkgrel=1
 pkgdesc="plugin that monitors customizable programs stdout for the Xfce4 panel"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=('xfce4-panel' 'libxfcegui4')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/3.3/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7c95234dc99efc21bbf9d2b056dd21f9')
+md5sums=('e0022e15d4211a87c17d9f252b68e1d3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}