Sun Nov 4 01:48:41 PDT 2012

28 files changed, 438 insertions, 98 deletions

diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD
index a0f060ca0..9a9786fa9 100644
--- a/extra/aisleriot/PKGBUILD
+++ b/extra/aisleriot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142864 2011-11-17 18:34:18Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 170150 2012-11-03 17:53:42Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=aisleriot
-pkgver=3.2.2
+pkgver=3.2.3.2
 pkgrel=1
 pkgdesc="GNOME Solitaire card games"
 arch=(i686 x86_64)
@@ -10,14 +10,14 @@ license=(GPL)
 url="http://www.gnome.org"
 groups=('gnome-extra')
 depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf)
-makedepends=(gnome-doc-utils intltool itstool)
+makedepends=(intltool itstool docbook-xsl)
 options=('!emptydirs' '!libtool')
 install=aisleriot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('818e16767f30238a98332fe07e8b905376a71de05feb3de19815652a48fdfcca')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('06eeeef49e7a0f8a98142085a64bc7830d0dd02e480fbfa1309545fccc977a36')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -27,7 +27,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD
index 31c4f34df..fef7ab7a2 100644
--- a/extra/caribou/PKGBUILD
+++ b/extra/caribou/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166581 2012-09-12 17:27:00Z jgc $
+# $Id: PKGBUILD 170129 2012-11-03 12:27:12Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Adam Hani Schakaki <krzd@krzd.net>
 
 pkgname=caribou
 pkgver=0.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Caribou"
@@ -13,11 +13,14 @@ depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxkla
 makedepends=('intltool' 'docbook-xsl')
 install=caribou.install
 options=(!libtool !emptydirs)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('823c53afec88d43f06ddce63e0d1aac79d783f498502a0617d8be0cffc6a7de2')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz
+        fix-crash.patch)
+sha256sums=('823c53afec88d43f06ddce63e0d1aac79d783f498502a0617d8be0cffc6a7de2'
+            '813229104fcb15ae5d3c197362fa7474a4963eb31d241d4f5354f7000d03f9e1')
 
 build() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../fix-crash.patch
   sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py
   export PYTHON=/usr/bin/python2
   ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/extra/caribou/fix-crash.patch b/extra/caribou/fix-crash.patch
new file mode 100644
index 000000000..98e5baab9
--- /dev/null
+++ b/extra/caribou/fix-crash.patch
@@ -0,0 +1,25 @@
+From a8fb1d8fba1e9557a3370edd62501f0a866c6774 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@unixuser.org>
+Date: Fri, 02 Nov 2012 06:19:47 +0000
+Subject: Fix border-image slice values in antler's gtk CSS
+
+According to CSS spec, border-image slice values are not denoted
+with length units.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687409
+---
+diff --git a/data/antler/style.css b/data/antler/style.css
+index 0e830dc..7553cf6 100644
+--- a/data/antler/style.css
++++ b/data/antler/style.css
+@@ -12,7 +12,7 @@
+ .antler-keyboard-button {
+   border-width: 0px;
+   border-radius: 2px;
+-  border-image: url("dark-key-border.svg") 2px 2px 2px 2px repeat stretch;
++  border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch;
+   font: Sans 14px;
+   background-image: -gtk-gradient (linear,
+ 				     left top,
+--
+cgit v0.9.0.2
diff --git a/extra/celt/PKGBUILD b/extra/celt/PKGBUILD
new file mode 100644
index 000000000..e1f07e228
--- /dev/null
+++ b/extra/celt/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Lauri Niskanen <ape@ape3000.com>
+# Contributor: Ray Rashif <schivmeister@gmail.com>
+
+pkgname=celt
+pkgver=0.11.1
+pkgrel=4
+pkgdesc='Low-latency audio communication codec'
+arch=('i686' 'x86_64')
+url='http://www.celt-codec.org'
+license=('BSD')
+depends=('libogg')
+options=('!libtool')
+source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('94fe4acd241da8702c295bcd13a555e6')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure \
+    --prefix=/usr \
+    --enable-custom-modes
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+
+  install -D -m644 COPYING \
+    ${pkgdir}/usr/share/licenses/${pkgname}/BSD
+}
diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD
new file mode 100644
index 000000000..439292d9b
--- /dev/null
+++ b/extra/chromaprint/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 170160 2012-11-03 19:43:21Z heftig $
+# Contributor: Wieland Hoffmann <the_mineo@web.de>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=chromaprint
+pkgver=0.7
+pkgrel=1
+pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
+url='http://acoustid.org/chromaprint/'
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('ffmpeg')
+makedepends=('cmake')
+source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON .
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index fca51e846..43e127dfb 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 168635 2012-10-13 17:04:17Z thomas $
+# $Id: PKGBUILD 170145 2012-11-03 17:35:36Z heftig $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.4.1
-_pkgver=4.2.4-P1
+pkgver=4.2.4.2
+_pkgver=4.2.4-P2
 
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
@@ -17,8 +17,8 @@ source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz
         dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
         dhcp-4.1.1-missing-ipv6-not-fatal.patch
         dhclient-script-pathFixes.patch)
-md5sums=('0ca7181024651f6323951d5498c8020b'
-         '0dfe000dd88555ea06b282ae5e574d5f'
+md5sums=('fe36056f2d274fa4b82a5422f192e65f'
+         '1f20126efd33c34d52a4148db780921f'
          'c49b1497837ba56c54e401a66e1bab9b'
          '12c2f3ae47ed23eb698eb7f1bfd80f20'
          '8f357e46e1efcbb746f38737a3f977a2'
@@ -37,10 +37,10 @@ build() {
   patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-      --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
-      --with-cli-lease-file=/var/state/dhclient/dhclient.leases \
-      --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases
+      --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+      --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+      --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
+      --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
 
   make
 
@@ -59,12 +59,10 @@ package_dhcp(){
   install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4"
   install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6"
   install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}"
-  install -d "${pkgdir}/var/state/dhcp"
+  install -d "${pkgdir}/var/lib/dhcp"
 
   install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
   install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service"
-  ln -s dhcpd4.service "${pkgdir}/usr/lib/systemd/system/dhcp4.service"
-  ln -s dhcpd6.service "${pkgdir}/usr/lib/systemd/system/dhcp6.service"
 
   # Remove dhclient
   make -C client DESTDIR="${pkgdir}" uninstall
@@ -83,7 +81,7 @@ package_dhclient(){
   # move dhclient.conf to dhclient.conf.example
   mv "${pkgdir}"/etc/dhclient.conf{,.example}
   
-  install -d "${pkgdir}/var/state/dhclient"
+  install -d "${pkgdir}/var/lib/dhclient"
 
   # install dhclient linux script
   install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script"
diff --git a/extra/dhcp/dhcp.install b/extra/dhcp/dhcp.install
index 5302be4b5..2bcd9ea82 100644
--- a/extra/dhcp/dhcp.install
+++ b/extra/dhcp/dhcp.install
@@ -1,18 +1,14 @@
-# arg 1:  the new package version
 post_install() {
-  [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases
-  [ -f var/state/dhcp/dhcpd6.leases ] || : >var/state/dhcp/dhcpd6.leases
-  #echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded."
-
-  echo
-  echo "==> The dhcp server has now two rc.d scripts."
-  echo "==> Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or"
-  echo "==> '/etc/rc.d/dhcp4' to use IPv4 dhcp server."
-  echo "==> Make sure that you change your DAEMONS array in '/etc/rc.conf'!"
+  [[ -f var/lib/dhcp/dhcpd.leases ]] || : >var/lib/dhcp/dhcpd.leases
+  [[ -f var/lib/dhcp/dhcpd6.leases ]] || : >var/lib/dhcp/dhcpd6.leases
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  if (( $(vercmp $2 4.2.4.2) < 0 )); then
+    echo ">>> Lease directory moved from /var/state/dhcp"
+    echo "    to /var/lib/dhcp. Move your old lease files"
+    echo "    if you want to keep using them."
+  fi
+
+  post_install
 }
diff --git a/extra/eventlog/ChangeLog b/extra/eventlog/ChangeLog
new file mode 100644
index 000000000..1c139bdf5
--- /dev/null
+++ b/extra/eventlog/ChangeLog
@@ -0,0 +1,19 @@
+2011-11-02  Andrea Scarpino  <andrea@archlinux.org>
+
+	* Sign package
+
+2011-04-05  Stéphane Gaudreault  <stephane@archlinux.org>
+
+    * Rebuild of old package
+    * Tidy up PKGBUILD
+
+2010-07-10  Dan McGee  <dan@archlinux.org>
+
+	* Updated PKGBUILD to be in line with standard style
+	* Upstream update
+
+2009-01-03  Eric Belanger  <eric@archlinux.org>
+
+	* eventlog 0.2.9-1
+	* Upstream update
+	* Added ChangeLog
diff --git a/extra/eventlog/PKGBUILD b/extra/eventlog/PKGBUILD
new file mode 100644
index 000000000..f32a2e4a8
--- /dev/null
+++ b/extra/eventlog/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 170165 2012-11-04 01:36:23Z dreisner $
+# Maintainer:
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=eventlog
+pkgver=0.2.12
+pkgrel=3
+pkgdesc="API to format and send structured log messages"
+arch=('i686' 'x86_64')
+url="http://www.balabit.com/support/community/products/"
+license=('BSD')
+depends=('glibc')
+options=('!libtool')
+changelog=ChangeLog
+source=("http://www.balabit.com/downloads/files/${pkgname}/${pkgver%.*}/${pkgname}_${pkgver}.tar.gz")
+sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 1659d7e82..75feca3b0 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169878 2012-10-30 22:25:45Z heftig $
+# $Id: PKGBUILD 170142 2012-11-03 17:25:25Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdm
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Display Manager"
 arch=(i686 x86_64)
 license=(GPL)
@@ -14,8 +14,8 @@ backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-e
 groups=(gnome)
 options=('!libtool')
 depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd
-         xorg-xrdb nss polkit-gnome)
-makedepends=(itstool intltool gnome-doc-utils xorg-server gobject-introspection)
+         xorg-xrdb nss polkit-gnome xorg-server)
+makedepends=(itstool intltool gnome-doc-utils gobject-introspection)
 optdepends=('gnome-shell: new login interface'
             'fprintd: fingerprint authentication')
 install=gdm.install
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index a99009358..5771bf4c6 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159121 2012-05-16 06:34:12Z eric $
+# $Id: PKGBUILD 170173 2012-11-04 03:56:58Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=2.0
-_fmver=2.0
+pkgver=2.1.0
+_fmver=2.1.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
@@ -15,7 +15,7 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}
         http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
         http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
         glsof-filemonitor glsof-queries)
-sha1sums=('4bb1ca87aa8aedcf793cd704d4ea5dfec5c53bb1'
+sha1sums=('cb5c31639f0aafb5ef45b9f3895fa05dceda9b7d'
           'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
           'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
           '197b58f40880995d6442fd42a58fa1f4594fd19d'
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index fdb11c92e..6af819a3f 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169305 2012-10-19 02:10:54Z heftig $
+# $Id: PKGBUILD 170151 2012-11-03 17:55:00Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.6.11
+pkgver=2.6.12
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib')
 makedepends=('gtk-sharp-2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ec227549062120af006ed0842baab921e133aa520353ca0fff004390c68af9ab')
+sha256sums=('85ccdf29bc8c4801123e28c27d1afadf0b2c5618aae17e6ec78d40d03ef431a8')
 
 build() {
   # get rid of that .wapi errors in fakeroot
diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD
index 489b1729c..4cb695f0b 100644
--- a/extra/gnome-applets/PKGBUILD
+++ b/extra/gnome-applets/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165330 2012-08-15 21:16:25Z heftig $
+# $Id: PKGBUILD 170135 2012-11-03 12:57:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-applets
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.5.92
+pkgrel=1
 pkgdesc="GNOME Applets"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,7 +13,7 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 install=gnome-applets.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e')
+sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-applets/gnome-applets.install b/extra/gnome-applets/gnome-applets.install
index dd9c34269..e3441e722 100644
--- a/extra/gnome-applets/gnome-applets.install
+++ b/extra/gnome-applets/gnome-applets.install
@@ -1,7 +1,8 @@
 pkgname=gnome-applets
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  gconfpkg --install ${pkgname}
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -14,9 +15,10 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 506592963..63769423e 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 170067 2012-10-31 13:36:50Z ibiru $
+# $Id: PKGBUILD 170143 2012-11-03 17:26:58Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
 pkgver=3.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip')
-makedepends=('intltool' 'gnome-doc-utils')
+license=(GPL2)
+depends=(caribou folks gcr gjs gnome-bluetooth gnome-desktop gnome-menus libcroco libpulse mutter
+         nautilus networkmanager telepathy-logger telepathy-mission-control unzip gdm)
+makedepends=(intltool gnome-doc-utils)
 optdepends=('network-manager-applet: shell integration for networkmanager')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD
new file mode 100644
index 000000000..94526a7a5
--- /dev/null
+++ b/extra/gsasl/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 170167 2012-11-04 02:30:50Z eric $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Orivej Desh <smpuj@bk.ru>
+# Maintainer: Orivej Desh <smpuj@bk.ru>
+
+pkgname=gsasl
+pkgver=1.8.0
+pkgrel=2
+pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
+arch=("i686" "x86_64")
+url="http://josefsson.org/gsasl/"
+license=("GPL")
+depends=('gnutls' 'libidn' 'krb5' 'libgcrypt')
+source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz")
+md5sums=('982fe54a20016aa46a871c084c990c36')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --with-gssapi-impl=mit
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la"
+}
diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD
index caee54895..717c6c763 100644
--- a/extra/gtkpod/PKGBUILD
+++ b/extra/gtkpod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164515 2012-08-01 13:53:49Z jgc $
+# $Id: PKGBUILD 170131 2012-11-03 12:34:41Z ibiru $
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=gtkpod
 pkgver=2.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
 arch=('i686' 'x86_64')
 url="http://gtkpod.sourceforge.net"
@@ -18,11 +18,14 @@ optdepends=('libmp4v2: MP4/h264 support'
             'faad2: m4a conversion support')
 install=gtkpod.install
 options=('!libtool')
-source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz")
-md5sums=('88fef3f947cbb7ae6b714080733a3b6b')
+source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz"
+        "gtkpod-2.1.2-anjuta.patch")
+md5sums=('88fef3f947cbb7ae6b714080733a3b6b'
+         '0a5f4ce0c9ef3d4d8db57290df43db27')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/gtkpod-2.1.2-anjuta.patch"
   sed -i 's#python#python2#' scripts/sync-palm-jppy.py
   ./configure --prefix=/usr
   make
diff --git a/extra/gtkpod/gtkpod-2.1.2-anjuta.patch b/extra/gtkpod/gtkpod-2.1.2-anjuta.patch
new file mode 100644
index 000000000..08c64f71b
--- /dev/null
+++ b/extra/gtkpod/gtkpod-2.1.2-anjuta.patch
@@ -0,0 +1,11 @@
+--- src/anjuta-app.c~	2012-06-01 03:14:23.000000000 -0500
++++ src/anjuta-app.c	2012-07-25 08:15:37.289630966 -0500
+@@ -501,7 +501,7 @@
+     g_list_free(plugins_dirs);
+ 
+     /* Preferences */
+-    app->preferences = anjuta_preferences_new(app->plugin_manager);
++    app->preferences = anjuta_preferences_new(app->plugin_manager, PREF_SCHEMA);
+     g_object_add_weak_pointer(G_OBJECT (app->preferences), (gpointer) &app->preferences);
+ 
+     g_signal_connect(app->settings, "changed::" GDL_STYLE, G_CALLBACK(on_gdl_style_changed), app);
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index 97ea02440..b1e0e90e4 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157080 2012-04-23 13:11:44Z heftig $
+# $Id: PKGBUILD 170152 2012-11-03 17:56:09Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 
 pkgname=gupnp-av
-pkgver=0.10.2
+pkgver=0.10.3
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('gupnp')
 makedepends=('gobject-introspection' 'gtk-doc')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4863c9bcbfa2e9fcb215d43c8d1e4090fbd078f8ae65e45a3314e7f6d59a8cbf')
+sha256sums=('d0dbb727d87bc9f2dc834455d14a30700b16b41a57e9dcde2e822b378ca8f1e2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index 1ec9f5695..22011547e 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsecret
-pkgver=0.10
+pkgver=0.11
 pkgrel=1
 pkgdesc='library for storing and retrieving passwords and other secrets.'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('glib2' 'libgcrypt')
 makedepends=('intltool' 'docbook-xsl')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('4015ac83042fa408bf66ca8526709662d194fe566181db6ab3d86a6ea4ab8880')
+sha256sums=('e5399dfb61376a7500d20cb22715152780aa3a2c8a64281ec6bc8f0ebeb8b689')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index 563ec2d2c..a1570a2b0 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159694 2012-05-26 04:30:08Z foutrelis $
+# $Id: PKGBUILD 170122 2012-11-03 06:32:33Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
 pkgver=1.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://thunar.xfce.org"
@@ -23,13 +23,19 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2
+        thunar-1.4.0-dont-add-duplicates-of-devices.patch
         thunar-1.4.0-show-loop-devices-hack.patch)
 sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba'
+            'c25f86a4c298c24327b0681702167aea9f9d712a738c8f3883f5d66da7f08f19'
             '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e')
 
 build() {
   cd "$srcdir/Thunar-$pkgver"
 
+  # https://bugzilla.xfce.org/show_bug.cgi?id=9440
+  # Backport of http://git.xfce.org/xfce/thunar/commit/?id=70a4301
+  patch -Np1 -i "$srcdir/thunar-1.4.0-dont-add-duplicates-of-devices.patch"
+
   # Fix: Loop devices not appearing in Thunar side pane
   # https://bugs.archlinux.org/task/29894
   # https://bugzilla.xfce.org/show_bug.cgi?id=8947
diff --git a/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch b/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch
new file mode 100644
index 000000000..ee8636392
--- /dev/null
+++ b/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch
@@ -0,0 +1,59 @@
+diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c Thunar-1.4.0/thunar/thunar-shortcuts-model.c
+--- Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c	2012-11-03 07:42:39.000000000 +0200
++++ Thunar-1.4.0/thunar/thunar-shortcuts-model.c	2012-11-03 08:13:25.000000000 +0200
+@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo
+                                      GVolume              *volume,
+                                      ThunarShortcutsModel *model)
+ {
++  GList *lp;
++  gint  idx;
++
+   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
+   _thunar_return_if_fail (model->volume_monitor == volume_monitor);
+   _thunar_return_if_fail (G_IS_VOLUME (volume));
+   _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ 
++  /* check that the volume is not in the internal list already */
++  if (g_list_find (model->hidden_volumes, volume) != NULL)
++    return;
++
++  /* nor in the list of visible volumes */
++  for (idx = 0, lp = model->shortcuts; lp != NULL; ++idx, lp = lp->next)
++    {
++      if (THUNAR_SHORTCUT (lp->data)->volume == volume)
++        return;
++    }
++
+   /* place the volume on the hidden list */
+   model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume));
+ 
+diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c Thunar-1.4.0/thunar/thunar-tree-model.c
+--- Thunar-1.4.0.orig/thunar/thunar-tree-model.c	2012-11-03 07:42:39.000000000 +0200
++++ Thunar-1.4.0/thunar/thunar-tree-model.c	2012-11-03 08:09:36.000000000 +0200
+@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM
+                                 GVolume                *volume,
+                                 ThunarTreeModel        *model)
+ {
++  ThunarTreeModelItem *item = NULL;
++  GNode               *node;
++
+   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
+   _thunar_return_if_fail (model->volume_monitor == volume_monitor);
+   _thunar_return_if_fail (G_IS_VOLUME (volume));
+   _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+ 
++  /* check that the volume is not in the internal list already */
++  if (g_list_find (model->hidden_volumes, volume) != NULL)
++    return;
++
++  /* nor in the list of visible volumes */
++  for (node = model->root->children; node != NULL; node = node->next)
++    {
++      item = THUNAR_TREE_MODEL_ITEM (node->data);
++      if (item->volume == volume)
++        return;
++    }
++
+   /* place the volume on the hidden list */
+   model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume));
+ 
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index 552188f90..d4e85f681 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -1,36 +1,36 @@
-# $Id: PKGBUILD 164816 2012-08-06 17:52:50Z giovanni $
+# $Id: PKGBUILD 170154 2012-11-03 18:23:13Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vice
-pkgver=2.3
-pkgrel=6
+pkgver=2.4
+pkgrel=1
 pkgdesc="The Versatile Commodore 8-bit Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.viceteam.org/"
-depends=('alsa-lib' 'giflib' 'libxxf86vm' 'gtk2')
+depends=('alsa-lib' 'giflib' 'libxxf86vm' 'vte')
 makedepends=('xorg-font-utils')
 options=('!makeflags')
 install=vice.install
 source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz"
-        'vice-2.3-x11video.patch'
-        'vice-2.3-no-fc-cache.patch'
-        'vice-2.3-notexi-notxt.patch'
-        'vice-2.3-zlib-1.2.7.patch')
-md5sums=('b48d137874daad50c087a0686cbdde34'
-         '088292ce9efe785edfb2b0c7c670785e'
-         '873042d07f3768819b589a4c8fe24607'
-         '05159b6ef78e3b7dd5d362f766da4cd4'
-         '6d8736974a21c3862a4bf0fe0ee6e266')
+        'vice-2.4-x11video.patch'
+        'vice-2.4-no-fc-cache-no-lib64.patch'
+        'vice-2.4-notexi-notxt.patch'
+        'vice-2.4-zlib-1.2.7.patch')
+md5sums=('b017647a0c159bbe43cdb81762d1c577'
+         '99931efcb779734c9df069e94f0b38a5'
+         'b0d1392664decd3169740baf90661710'
+         '877f93db1550ea81386aae7c3b578442'
+         '9d9f62f05a967a5926df496e86404148')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/vice-2.3-x11video.patch"
-  patch -Np1 -i "${srcdir}/vice-2.3-no-fc-cache.patch"
-  patch -Np1 -i "${srcdir}/vice-2.3-notexi-notxt.patch"
-  patch -Np1 -i "${srcdir}/vice-2.3-zlib-1.2.7.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch"
 
   autoreconf
   ./configure --prefix=/usr \
diff --git a/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch b/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch
new file mode 100644
index 000000000..bb27aa3e7
--- /dev/null
+++ b/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch
@@ -0,0 +1,25 @@
+--- a/configure.in	2012-11-01 16:37:51.000000000 +0100
++++ b/configure.in	2012-11-03 18:07:35.000000000 +0100
+@@ -2090,12 +2090,7 @@
+ 
+ fi
+ 
+-AC_PATH_PROGS(FCCACHE, fc-cache, false)
+-if test x"$FCCACHE" = "xfalse"; then
+-  AM_CONDITIONAL(HAVE_FC_CACHE, false)
+-else
+-  AM_CONDITIONAL(HAVE_FC_CACHE, true)
+-fi
++AM_CONDITIONAL(HAVE_FC_CACHE, false)
+ 
+ if test x"$is_amigaos4" = "xyes"; then
+   if test x"$enable_sdlui" != "xyes"; then
+@@ -3424,7 +3419,7 @@
+     ;;
+   linux*)
+     if test x"$host_cpu" = "xx86_64"; then
+-      VICEDIR="$PREFIX/lib64/vice"
++      VICEDIR="$PREFIX/lib/vice"
+       AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
+     else
+       VICEDIR="$PREFIX/lib/vice"
diff --git a/extra/vice/vice-2.4-notexi-notxt.patch b/extra/vice/vice-2.4-notexi-notxt.patch
new file mode 100644
index 000000000..58121b702
--- /dev/null
+++ b/extra/vice/vice-2.4-notexi-notxt.patch
@@ -0,0 +1,28 @@
+--- a/doc/Makefile.am	2012-10-20 01:32:30.000000000 +0200
++++ b/doc/Makefile.am	2012-11-03 18:29:03.000000000 +0100
+@@ -79,19 +79,6 @@
+ 	$(srcdir)/fixdox.sh txt <vicetmp.txt | sed 's/ \+$$//' >$(builddir)/vice.txt
+ 	rm -f vicetmp.txt
+ 
+-$(builddir)/vice.pdf:	$(srcdir)/vice.texi
+-if BUILD_PDF
+-	sed 's/@heading NO WARRANTY/@center NO WARRANTY/g' <$(srcdir)/vice.texi >vicepdf.texi
+-	$(TEXI2DVI) -q --clean --pdf -o $(builddir)/vice.pdf vicepdf.texi
+-	rm -f vicepdf.texi
+-
+-PDF_DEPS=$(builddir)/vice.pdf
+-else
+-	touch $(builddir)/vice.pdf
+-
+-PDF_DEPS=
+-endif
+-
+ $(builddir)/vice.guide:	$(srcdir)/vice.texi
+ if BUILD_AMIGAGUIDE
+ 	$(srcdir)/texi2guide.sh $(MAKEGUIDE) $(builddir)/vice.guide $(srcdir)/vice.texi
+@@ -148,4 +135,4 @@
+ 	touch $(builddir)/vice.info
+ 	$(MAKEINFO) -o $(builddir)/vice.info --no-split $(srcdir)/vice.texi
+ 
+-INFO_DEPS = $(builddir)/vice.txt $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
++INFO_DEPS = $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
diff --git a/extra/vice/vice-2.4-x11video.patch b/extra/vice/vice-2.4-x11video.patch
new file mode 100644
index 000000000..423688ba9
--- /dev/null
+++ b/extra/vice/vice-2.4-x11video.patch
@@ -0,0 +1,11 @@
+--- a/src/arch/unix/x11/xaw/x11video.c	2012-10-28 22:26:24.000000000 +0100
++++ b/src/arch/unix/x11/xaw/x11video.c	2012-11-03 18:54:08.000000000 +0100
+@@ -60,6 +60,8 @@
+ #include <X11/Xutil.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/cursorfont.h>
++#include <X11/Xmd.h>
++#include <X11/extensions/shmproto.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/extra/vice/vice-2.4-zlib-1.2.7.patch b/extra/vice/vice-2.4-zlib-1.2.7.patch
new file mode 100644
index 000000000..f41c8afc5
--- /dev/null
+++ b/extra/vice/vice-2.4-zlib-1.2.7.patch
@@ -0,0 +1,37 @@
+--- a/src/zfile.c	2012-10-13 14:53:16.000000000 +0200
++++ b/src/zfile.c	2012-11-03 18:47:40.000000000 +0100
+@@ -198,10 +198,10 @@
+     do {
+         char buf[256];
+ 
+-        len = gzread(fdsrc, (void *)buf, 256);
++        len = gzread((gzFile)fdsrc, (void *)buf, 256);
+         if (len > 0) {
+             if (fwrite((void *)buf, 1, (size_t)len, fddest) < len) {
+-                gzclose(fdsrc);
++                gzclose((gzFile)fdsrc);
+                 fclose(fddest);
+                 ioutil_remove(tmp_name);
+                 lib_free(tmp_name);
+@@ -210,7 +210,7 @@
+         }
+     } while (len > 0);
+ 
+-    gzclose(fdsrc);
++    gzclose((gzFile)fdsrc);
+     fclose(fddest);
+ 
+     return tmp_name;
+@@ -779,10 +779,10 @@
+         char buf[256];
+         len = fread((void *)buf, 256, 1, fdsrc);
+         if (len > 0)
+-            gzwrite(fddest, (void *)buf, (unsigned int)len);
++            gzwrite((gzFile)fddest, (void *)buf, (unsigned int)len);
+     } while (len > 0);
+ 
+-    gzclose(fddest);
++    gzclose((gzFile)fddest);
+     fclose(fdsrc);
+ 
+     archdep_file_set_gzip(dest);
diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD
index 6f80312ed..59c62223c 100644
--- a/extra/xdg-user-dirs-gtk/PKGBUILD
+++ b/extra/xdg-user-dirs-gtk/PKGBUILD
@@ -1,25 +1,22 @@
-#  $Id: PKGBUILD 157004 2012-04-23 09:11:01Z ibiru $
+#  $Id: PKGBUILD 170124 2012-11-03 07:24:35Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=xdg-user-dirs-gtk
-pkgver=0.8
+pkgver=0.9
 pkgrel=1
 pkgdesc="Creates user dirs and asks to relocalize them"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gtk2' 'xdg-user-dirs')
+depends=('gtk3' 'xdg-user-dirs')
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2
-        lxde.patch)
-sha256sums=('971e5cd121606c437c2b07e189c8f34791ae0c4d81e155266d71acc7b263ad32'
-            '5db6a2fd5bb293deff0322e9f20a383130e05df2d35d64568a47b5fe63d6ebf4')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('4b908252515eb95b27427ef7c6b0e096febde716c0c89e8f03a79d23882b79c8')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i ../lxde.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }