Wed Jul 24 01:48:49 PDT 2013

35 files changed, 272 insertions, 635 deletions

diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD
index 2c9483fc3..7d4a34153 100644
--- a/extra/a52dec/PKGBUILD
+++ b/extra/a52dec/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149328 2012-02-06 20:28:08Z stephane $
+# $Id: PKGBUILD 191306 2013-07-23 13:24:20Z jgc $
 # Maintainer:
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=a52dec
 pkgver=0.7.4
-pkgrel=6
+pkgrel=7
 pkgdesc="A free library for decoding ATSC A/52 streams"
 url="http://liba52.sourceforge.net/"
 arch=('i686' 'x86_64')
@@ -17,10 +17,16 @@ source=("http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz"
 md5sums=('caa9f5bc44232dc8aeea773fea56be80'
          'fa16f224a7dceb7613824380abef0052')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/a52dec-0.7.4-build.patch"
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 -i ../a52dec-0.7.4-build.patch
+  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
+  mv configure.in configure.ac
   ./bootstrap
+}
+
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --enable-shared
   make
 }
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 7fc289cdd..4a3b83cb6 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190032 2013-07-13 12:39:56Z svenstaro $
+# $Id: PKGBUILD 191298 2013-07-23 11:52:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.10.0
-pkgrel=2
+pkgver=1.10.1
+pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://community.kde.org/KDE_PIM/Akonadi'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'postgresql')
 optdepends=('postgresql: PostgreSQL backend')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('bb94de6a4300bf8355e6a1ccce5846af')
+md5sums=('5b03c46e1e9da439e4ec63bf7b2087c2')
 
 prepare() {
   mkdir build
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index a76d0d289..e3508954b 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186990 2013-06-02 19:42:17Z heftig $
+# $Id: PKGBUILD 191326 2013-07-23 16:47:58Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.8.2
-pkgrel=2
+pkgver=3.8.3
+pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('79d21f2a7ebf1e91b2c2aa595f3a6dcf899258b1d2e307371440540c3d3a4ec3')
+sha256sums=('5f08079b6ccaa6ea8de9163ff0e43554347c12e13f0a60eb6ad06d291c116937')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index d6bb40f92..0b52b1fe4 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 186028 2013-05-20 14:50:00Z bisson $
+# $Id: PKGBUILD 191274 2013-07-23 03:29:14Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
 pkgver=0.97.8
-pkgrel=2
+pkgrel=3
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
 options=('!libtool')
 arch=('i686' 'x86_64')
 depends=('bzip2' 'libltdl')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf')
+backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/logrotate.d/clamav')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'service'
         'service.fresh'
@@ -22,7 +22,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver
 sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c'
           'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
           'cda9a087e5593992150cb456e34c5f6f589aca82'
-          '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
+          'bb488a56b0f6a0760446cde89c1e3321e2717b78'
           'a224ea9b4d0f4f196827347d54bed51e11c197ea'
           '1c8ef193919b041135115170acd6313f008de808')
 
diff --git a/extra/clamav/logrotate b/extra/clamav/logrotate
index 6a9051bed..5f6d87d29 100644
--- a/extra/clamav/logrotate
+++ b/extra/clamav/logrotate
@@ -1,8 +1,10 @@
 /var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
-    create 644 clamav clamav
-    sharedscripts
-    postrotate
-            /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
-            /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
-    endscript
+	create 644 clamav clamav
+	sharedscripts
+	missingok
+	notifempty
+	postrotate
+			/bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
+			/bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
+	endscript
 }
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 5ed08a417..60cec1307 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186989 2013-06-02 19:40:09Z heftig $
+# $Id: PKGBUILD 191304 2013-07-23 13:13:07Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
-pkgver=2.0.4
-pkgrel=2
+pkgver=2.0.6
+pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=(i686 x86_64)
 url="http://www.clutter-project.org/"
@@ -12,7 +12,7 @@ depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad)
 makedepends=(gobject-introspection)
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bad69cca7dd9c0d54d4f9fc27cba59dd8d8b329db058844716dbdecec6caba97')
+sha256sums=('0ecc5630b0578968201802b831a75904a26e6ffe38fb8b60209ef9da51f8b258')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 4a64e5ed4..c9a3f2d02 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190115 2013-07-15 20:06:47Z heftig $
+# $Id: PKGBUILD 191316 2013-07-23 14:05:15Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="System daemon for managing color devices"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/software/colord"
@@ -15,8 +15,15 @@ optdepends=('sane: UseSANE support [/etc/colord.conf]')
 options=('!libtool')
 install=colord.install
 backup=(etc/colord.conf)
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('081ce4457e9752c726e68820b1b079ab314093a0')
+source=($url/releases/$pkgname-$pkgver.tar.xz
+        udev-systemd.patch)
+sha1sums=('081ce4457e9752c726e68820b1b079ab314093a0'
+          '3b467b9674f767c804943d191beaf6bd1ba3a606')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../udev-systemd.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/colord/udev-systemd.patch b/extra/colord/udev-systemd.patch
new file mode 100644
index 000000000..311a92437
--- /dev/null
+++ b/extra/colord/udev-systemd.patch
@@ -0,0 +1,17 @@
+Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb.
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1200185
+
+--- colord-1.0.1.orig/rules/69-cd-sensors.rules.in
++++ colord-1.0.1/rules/69-cd-sensors.rules.in
+@@ -86,8 +86,8 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct
+ 
+ # color calibration device
+ ENV{COLORD_SENSOR_KIND}=="*?", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p"
+-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p"
++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{builtin}="hwdb --subsystem=usb"
+ 
+ # Allow the daemon to access the color devices
+ ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@daemon_user@"
diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD
index b355d8bdf..36b38a371 100644
--- a/extra/devhelp/PKGBUILD
+++ b/extra/devhelp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185584 2013-05-15 11:33:54Z heftig $
+# $Id: PKGBUILD 191281 2013-07-23 09:52:37Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=devhelp
 pkgver=3.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="API documentation browser for GNOME"
 arch=(i686 x86_64)
 license=(GPL)
@@ -14,6 +14,7 @@ depends=(webkitgtk3 hicolor-icon-theme)
 makedepends=(pkgconfig intltool python)
 options=('!libtool' '!emptydirs')
 install=devhelp.install
+groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7')
 
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index fa2c38551..78291d153 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188088 2013-06-08 19:38:24Z heftig $
+# $Id: PKGBUILD 191340 2013-07-23 17:20:12Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ install=$pkgname.install
 url="http://www.gnome.org"
 license=(GPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4f60403ec17b462fc39f59193093d9819c534bbce689e14cbab20bc262ca5870')
+sha256sums=('0b9e725d36a4c63ccb15b4e0f92932764c9a335e84af2ebeeb4c182760ef3f6e')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index 95f5c9ca8..cb5d94e54 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 188090 2013-06-08 19:44:06Z heftig $
+# $Id: PKGBUILD 191347 2013-07-23 17:52:56Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64')
 license=('LGPL2.1')
 url="http://www.gnome.org"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
+depends=('evolution-data-server' 'gtkhtml4' 'libmspack')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('948dbee5e31b364155719003a0a8b28dfa270aae5f364b5614faa0b262a7ff3a')
+sha256sums=('1883d0d375286583520800317fbf41be585d34b40166fd03dc14c3f237a6f660')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 58922c8d9..5aed6c4f9 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188089 2013-06-08 19:43:23Z heftig $
+# $Id: PKGBUILD 191343 2013-07-23 17:41:59Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b0ee1eae5f4752eeb0b62c3be2daa08195ab4fd19092bfe6e75d02ac457ebe3a')
+sha256sums=('d5cfd0cb68ed8bf6e9515a5a44f566e3d26d3813a22ee6e5b0f86029039b1766')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD
index d399218d4..8f3a78e4c 100644
--- a/extra/exempi/PKGBUILD
+++ b/extra/exempi/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: André Klitzing <aklitzing@online.de>
+
 pkgname=exempi
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="A library to parse XMP metadata"
 arch=(i686 x86_64)
@@ -10,17 +11,18 @@ license=('custom:BSD')
 depends=('gcc-libs' 'expat' 'zlib')
 makedepends=('boost')
 options=(!libtool)
-source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('f46d96975613593ee17aaf48cd350228')
+source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('0f8e5832299224684a65847eedf8d1e4'
+         'SKIP')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   install -d "$pkgdir/usr/share/licenses/$pkgname"
   install -m644 "$srcdir/$pkgname-$pkgver/COPYING" \
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index 5ff2c77db..a97b00fb2 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171997 2012-11-25 21:50:28Z bisson $
+# $Id: PKGBUILD 191292 2013-07-23 10:42:57Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fontforge
 pkgver=20120731_b
-pkgrel=3
+pkgrel=4
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'
diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD
index 8c7e38e31..ac2b31a67 100644
--- a/extra/genius/PKGBUILD
+++ b/extra/genius/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179965 2013-03-13 14:34:29Z jgc $
+# $Id: PKGBUILD 191334 2013-07-23 17:00:55Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 
 pkgname=genius
-pkgver=1.0.16
+pkgver=1.0.17
 pkgrel=1
 pkgdesc="Advanced calculator including a mathematical programming language"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!makeflags')
 install=genius.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('45ce3e0b02c109588ff9a4c74e7c3541b3de89ea93f20ab08178c51c6ab4fb78')
+sha256sums=('2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch
deleted file mode 100644
index fe92fbd94..000000000
--- a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-From ebf55199407d3be92162f5c2573c7f9c34614cb1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@gmx.de>
-Date: Thu, 2 Aug 2012 21:41:41 +0200
-Subject: [PATCH] Make Glib::Object subclassing more robust
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Rearrange how we register the interfaces, properties and signals of a newly
-created type so that:
-
-• The outcome is independent of the order of the arguments passed to
-Glib::Object::Subclass or Glib::Type->register.  This also avoids fallout from
-the change to hash randomization in perl 5.17.6.
-
-• We register things in the correct order: interfaces first, before entering
-class_init; then properties and signals from within class_init.  This also
-avoids prematurely creating the new type's class.
----
- GType.xs | 92 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
- NEWS     |  7 +++++
- 2 files changed, 77 insertions(+), 22 deletions(-)
-
-diff --git a/GType.xs b/GType.xs
-index 02e24a4..fdaad68 100644
---- a/GType.xs
-+++ b/GType.xs
-@@ -1234,13 +1234,10 @@ parse_signal_hash (GType instance_type,
- 
- 
- static void
--add_signals (GType instance_type, HV * signals)
-+add_signals (GType instance_type, HV * signals, AV * interfaces)
- {
--	GObjectClass *oclass;
- 	HE * he;
- 
--	oclass = g_type_class_ref (instance_type);
--
- 	hv_iterinit (signals);
- 	while (NULL != (he = hv_iternext (signals))) {
- 		I32 keylen;
-@@ -1250,9 +1247,36 @@ add_signals (GType instance_type, HV * signals)
- 
- 		/* the key is the signal name */
- 		signal_name = hv_iterkey (he, &keylen);
--		/* if the signal is defined at this point, we're going to
--		 * override the installed closure. */
--		signal_id = g_signal_lookup (signal_name, instance_type);
-+
-+		/* if, at this point, the signal is already defined in the
-+		 * ancestry or the interfaces we just added to instance_type,
-+		 * we can only override the installed closure.  trying to
-+		 * create a new signal with the same name is an error.
-+		 *
-+		 * unfortunately, we cannot simply use instance_type to do the
-+		 * lookup because g_signal_lookup would complain about it since
-+		 * it hasn't been fully loaded yet.  see
-+		 * <https://bugzilla.gnome.org/show_bug.cgi?id=691096>.
-+		 *
-+		 * FIXME: the "if (signal_id)" check in the hash ref block
-+		 * below could be removed since g_signal_newv also checks this.
-+		 * consequently, this lookup code could be moved into the class
-+		 * closure block below. */
-+		signal_id = g_signal_lookup (signal_name,
-+		                             g_type_parent (instance_type));
-+		if (!signal_id && interfaces) {
-+			int i;
-+			for (i = 0; i <= av_len (interfaces); i++) {
-+				GType interface_type;
-+				SV ** svp = av_fetch (interfaces, i, FALSE);
-+				if (!svp || !gperl_sv_is_defined (*svp))
-+					continue;
-+				interface_type = gperl_object_type_from_package (SvPV_nolen (*svp));
-+				signal_id = g_signal_lookup (signal_name, interface_type);
-+				if (signal_id)
-+					break;
-+			}
-+		}
- 
- 		/* parse the key's value... */
- 		value = hv_iterval (signals, he);
-@@ -1310,8 +1334,6 @@ add_signals (GType instance_type, HV * signals)
- 			       signal_name);
- 		}
- 	}
--
--	g_type_class_unref (oclass);
- }
- 
- typedef struct {
-@@ -1407,13 +1429,10 @@ prop_handler_lookup (GType instance_type,
- }
- 
- static void
--add_properties (GType instance_type, AV * properties)
-+add_properties (GType instance_type, GObjectClass * oclass, AV * properties)
- {
--	GObjectClass *oclass;
- 	int propid;
- 
--	oclass = g_type_class_ref (instance_type);
--
- 	for (propid = 0; propid <= av_len (properties); propid++) {
- 		SV * sv = *av_fetch (properties, propid, 1);
- 		GParamSpec * pspec = NULL;
-@@ -1452,8 +1471,6 @@ add_properties (GType instance_type, AV * properties)
- 		}
- 		g_object_class_install_property (oclass, propid + 1, pspec);
- 	}
--
--	g_type_class_unref (oclass);
- }
- 
- /*
-@@ -1776,12 +1793,26 @@ gperl_type_reg_quark (void)
- 	return q;
- }
- 
-+typedef struct {
-+	GType instance_type;
-+	AV *interfaces;
-+	AV *properties;
-+	HV *signals;
-+} GPerlClassData;
-+
- static void
--gperl_type_class_init (GObjectClass * class)
-+gperl_type_class_init (GObjectClass * class, GPerlClassData * class_data)
- {
- 	class->finalize     = gperl_type_finalize;
- 	class->get_property = gperl_type_get_property;
- 	class->set_property = gperl_type_set_property;
-+
-+	if (class_data->properties)
-+		add_properties (class_data->instance_type, class,
-+		                class_data->properties);
-+	if (class_data->signals)
-+		add_signals (class_data->instance_type,
-+		             class_data->signals, class_data->interfaces);
- }
- 
- static void
-@@ -2152,15 +2183,18 @@ g_type_register_object (class, parent_package, new_package, ...);
-     PREINIT:
- 	int i;
- 	GTypeInfo type_info;
-+	GPerlClassData class_data;
- 	GTypeQuery query;
- 	GType parent_type, new_type;
- 	char * new_type_name;
-     CODE:
- 	/* start with a clean slate */
- 	memset (&type_info, 0, sizeof (GTypeInfo));
-+	memset (&class_data, 0, sizeof (GPerlClassData));
- 	type_info.base_init = (GBaseInitFunc) gperl_type_base_init;
- 	type_info.class_init = (GClassInitFunc) gperl_type_class_init;
- 	type_info.instance_init = (GInstanceInitFunc) gperl_type_instance_init;
-+	type_info.class_data = &class_data;
- 
- 	/* yeah, i could just call gperl_object_type_from_package directly,
- 	 * but i want the error messages to be more informative. */
-@@ -2196,29 +2230,43 @@ g_type_register_object (class, parent_package, new_package, ...);
- 	/* mark this type as "one of ours". */
- 	g_type_set_qdata (new_type, gperl_type_reg_quark (), (gpointer) TRUE);
- 
--	/* now look for things we should initialize presently, e.g.
--	 * signals and properties and interfaces and such, things that
--	 * would generally go into a class_init. */
-+	/* put it into the class data so that add_signals and add_properties
-+	 * can use it. */
-+	class_data.instance_type = new_type;
-+
-+	/* now look for things we should initialize, e.g. signals and
-+	 * properties and interfaces.  put the corresponding data into the
-+	 * class_data struct.  the interfaces will be handled directly further
-+	 * below, while the properties and signals will be handled in the
-+	 * class_init function so that they have access to the class instance.
-+	 * this mimics the way things are supposed to be done in C: register
-+	 * interfaces in the get_type function, and register properties and
-+	 * signals in the class_init function. */
- 	for (i = 3 ; i < items ; i += 2) {
- 		char * key = SvPV_nolen (ST (i));
- 		if (strEQ (key, "signals")) {
- 			if (gperl_sv_is_hash_ref (ST (i+1)))
--				add_signals (new_type, (HV*)SvRV (ST (i+1)));
-+				class_data.signals = (HV*)SvRV (ST (i+1));
- 			else
- 				croak ("signals must be a hash of signalname => signalspec pairs");
- 		} else if (strEQ (key, "properties")) {
- 			if (gperl_sv_is_array_ref (ST (i+1)))
--				add_properties (new_type, (AV*)SvRV (ST (i+1)));
-+				class_data.properties = (AV*)SvRV (ST (i+1));
- 			else
- 				croak ("properties must be an array of GParamSpecs");
- 		} else if (strEQ (key, "interfaces")) {
- 			if (gperl_sv_is_array_ref (ST (i+1)))
--				add_interfaces (new_type, (AV*)SvRV (ST (i+1)));
-+				class_data.interfaces = (AV*)SvRV (ST (i+1));
- 			else
- 				croak ("interfaces must be an array of package names");
- 		}
- 	}
- 
-+	/* add the interfaces to the type now before we create its class and
-+	 * enter the class_init function. */
-+	if (class_data.interfaces)
-+		add_interfaces (new_type, class_data.interfaces);
-+
- 	/* instantiate the class right now.  perl doesn't let classes go
- 	 * away once they've been defined, so we'll just leak this ref and
- 	 * let the GObjectClass live as long as the program.  in fact,
-diff --git a/NEWS b/NEWS
-index 5606566..ad71da0 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,10 @@
-+Overview of changes in Glib <next> (unstable)
-+============================================
-+
-+* Make Glib::Object subclassing more robust.  This should in particular fix
-+  issues revealed by the change to hash randomization introduced in perl
-+  5.17.6.
-+
- Overview of changes in Glib 1.280 (stable)
- ==========================================
- 
--- 
-1.8.2.3
-
diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD
index f4a870312..47a6d4259 100644
--- a/extra/glib-perl/PKGBUILD
+++ b/extra/glib-perl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186376 2013-05-26 09:24:27Z bluewind $
+# $Id: PKGBUILD 191337 2013-07-23 17:10:45Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=glib-perl
-pkgver=1.280
-pkgrel=3
+pkgver=1.301
+pkgrel=1
 pkgdesc="Perl wrappers for glib 2.x, including GObject"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -12,17 +12,8 @@ url="http://gtk2-perl.sourceforge.net/"
 options=('!emptydirs')
 depends=('glib2' 'perl')
 makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz
-        0001-Make-Glib-Object-subclassing-more-robust.patch)
-md5sums=('1d81a8aec5f7f1182a96cfaaf119d866'
-         'ebe39d50eff182a1ad4390cbbef46e41')
-
-prepare() {
-  cd "${srcdir}/Glib-${pkgver}"
-
-  # Needed for gtk2-perl to compile against Perl 5.18
-  patch -Np1 -i "${srcdir}/0001-Make-Glib-Object-subclassing-more-robust.patch"
-}
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz)
+md5sums=('7c0d005a20afff174c99a83c72f9786b')
 
 build() {
   cd "${srcdir}/Glib-${pkgver}"
diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD
index cb0b1e043..06234012a 100644
--- a/extra/gnome-dictionary/PKGBUILD
+++ b/extra/gnome-dictionary/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183378 2013-04-21 22:09:49Z heftig $
+# $Id: PKGBUILD 191351 2013-07-23 18:22:13Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gnome-dictionary
-pkgver=3.6.0
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="Look up words in dictionary sources"
 arch=(i686 x86_64)
 url="http://gnome.org"
@@ -13,7 +13,7 @@ install=$pkgname.install
 options=(!libtool)
 groups=('gnome')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9')
+sha256sums=('faebbca7684aeef5ff4111305bc8e0c1790b0551445df404b68f3d7cf2c50421')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 06223609d..0b13c2970 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183406 2013-04-21 22:10:36Z heftig $
+# $Id: PKGBUILD 191300 2013-07-23 12:42:33Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ replaces=(gnome-themes)
 conflicts=(gnome-themes)
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5cc1b27a70ca6176343212159236332799b074885867e380ed9b3817e15dd1d1')
+sha256sums=('7e89f92c214b560e59edcbfac2263e49dccf201600871aa3d806ff1c562dff38')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index dae1cfeb1..067121854 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136438 2011-08-29 09:40:33Z ibiru $
+# $Id: PKGBUILD 191321 2013-07-23 15:15:03Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=6
+pkgrel=7
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -14,33 +14,43 @@ url="http://www.gnome.org"
 install=gnome-vfs.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
         gnutls-config.patch
-        gcrypt-config.patch)
+        gcrypt-config.patch
+        enable-deprecated.patch)
 sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
             '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d'
-            'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114')
+            'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114'
+            'ca2b9dffb1fa202c0d1f0d3648ef37cd8e84657a22d4c6746bb46e9a6cf1ee47')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   #Fix build with new gnutls
-  patch -Np1 -i "${srcdir}/gnutls-config.patch"
+  patch -Np1 -i ../gnutls-config.patch
   #fix build with new libgcrypt >= 1.5.0
-  patch -Np1 -i "${srcdir}/gcrypt-config.patch"
+  patch -Np1 -i ../gcrypt-config.patch
+  # remove -DG_DISABLE_DEPRECATED
+  patch -Np1 -i ../enable-deprecated.patch
+
+  sed -i -s 's|$(srcdir)/auto-test|auto-test|' test/Makefile.am
+}
+build() {
+  cd ${pkgname}-${pkgver}
   libtoolize --force
   gtkdocize
   aclocal
   autoconf
-  automake
-  ./configure --prefix=/usr --sysconfdir=/etc \
+  automake --add-missing
+  CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure \
+      --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-vfs-2.0 \
-      --enable-samba --disable-hal \
-      --enable-avahi --disable-howl \
+      --enable-samba --with-samba-includes=/usr/include/samba-4.0 \
+      --disable-hal --enable-avahi --disable-howl \
       --disable-openssl --enable-gnutls
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
diff --git a/extra/gnome-vfs/enable-deprecated.patch b/extra/gnome-vfs/enable-deprecated.patch
new file mode 100644
index 000000000..0f249b2bb
--- /dev/null
+++ b/extra/gnome-vfs/enable-deprecated.patch
@@ -0,0 +1,57 @@
+diff -up gnome-vfs-2.24.4/daemon/Makefile.am.bak gnome-vfs-2.24.4/daemon/Makefile.am
+--- gnome-vfs-2.24.4/daemon/Makefile.am.bak	2010-02-09 13:16:14.000000000 +0100
++++ gnome-vfs-2.24.4/daemon/Makefile.am	2013-03-27 17:01:25.000000000 +0100
+@@ -8,7 +8,6 @@ INCLUDES= \
+ 	-D_LARGEFILE64_SOURCE                   \
+ 	-D_POSIX_PTHREAD_SEMANTICS		\
+ 	-D_REENTRANT				\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+ 	-DGNOME_VFS_LIBDIR=\"$(libdir)\"	\
+diff -up gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak gnome-vfs-2.24.4/libgnomevfs/Makefile.am
+--- gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak	2010-02-09 13:16:14.000000000 +0100
++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am	2013-03-27 17:01:37.000000000 +0100
+@@ -19,7 +19,6 @@ INCLUDES =					\
+ 	-D_LARGEFILE64_SOURCE                   \
+ 	-D_POSIX_PTHREAD_SEMANTICS		\
+ 	-D_REENTRANT				\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
+ 	-DGNOME_VFS_BINDIR=\"$(bindir)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+diff -up gnome-vfs-2.24.4/modules/Makefile.am.bak gnome-vfs-2.24.4/modules/Makefile.am
+--- gnome-vfs-2.24.4/modules/Makefile.am.bak	2010-02-09 13:16:14.000000000 +0100
++++ gnome-vfs-2.24.4/modules/Makefile.am	2013-03-27 17:01:45.000000000 +0100
+@@ -18,7 +18,6 @@ INCLUDES =					\
+ 	-D_POSIX_PTHREAD_SEMANTICS		\
+ 	-D_REENTRANT				\
+ 	-DSSH_PROGRAM=\"$(SSH_PROGRAM)\"	\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+ 	-DGNOME_VFS_LIBDIR=\"$(libdir)\"	\
+diff -up gnome-vfs-2.24.4/programs/Makefile.am.bak gnome-vfs-2.24.4/programs/Makefile.am
+--- gnome-vfs-2.24.4/programs/Makefile.am.bak	2010-02-09 13:16:14.000000000 +0100
++++ gnome-vfs-2.24.4/programs/Makefile.am	2013-03-27 17:01:56.000000000 +0100
+@@ -4,8 +4,7 @@ INCLUDES =					\
+ 	-I$(top_srcdir)				\
+ 	-I$(top_builddir)			\
+ 	$(TEST_CFLAGS)				\
+-	$(VFS_CFLAGS)				\
+-	-DG_DISABLE_DEPRECATED
++	$(VFS_CFLAGS)
+ 
+ libraries =						\
+ 	$(top_builddir)/libgnomevfs/libgnomevfs-2.la	\
+diff -up gnome-vfs-2.24.4/test/Makefile.am.bak gnome-vfs-2.24.4/test/Makefile.am
+--- gnome-vfs-2.24.4/test/Makefile.am.bak	2013-03-27 17:01:11.000000000 +0100
++++ gnome-vfs-2.24.4/test/Makefile.am	2013-03-27 17:02:08.000000000 +0100
+@@ -6,7 +6,6 @@ INCLUDES =					\
+ 	-I$(top_builddir)/libgnomevfs           \
+ 	$(TEST_CFLAGS)				\
+ 	$(VFS_CFLAGS)				\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DMODULES_PATH=\"$(libdir)/vfs/modules\"
+ 
+ if OS_WIN32
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index 626e7713c..40e175c99 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186336 2013-05-25 00:10:26Z heftig $
+# $Id: PKGBUILD 191285 2013-07-23 10:02:47Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
 pkgver=0.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
@@ -21,6 +21,7 @@ optdepends=('gupnp-av: uPnP plugin'
             'libdmapsharing: DMAP sharing plugin'
             'json-glib: TMDb plugin')
 options=('!libtool' '!emptydirs')
+groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('28f83fd701b33aed7b843e5e3850d7d961310c7cb33ffebcb652160fff8ccd80')
 
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index 676e4577d..f4cfa88b7 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185396 2013-05-13 18:53:34Z heftig $
+# $Id: PKGBUILD 191287 2013-07-23 10:08:45Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gucharmap
 pkgver=3.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,6 +12,7 @@ url="http://www.gnome.org"
 depends=('dconf' 'gtk3' 'hicolor-icon-theme')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl' 'desktop-file-utils')
 options=('!libtool' '!emptydirs')
+groups=('gnome')
 install=gucharmap.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
 sha256sums=('08272386155bc1a7d6a2d1a0ee8d2e5ea08a9512c40dbd76b3b4c3f105604901')
diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD
index 74a75275a..8f943c5ce 100644
--- a/extra/imake/PKGBUILD
+++ b/extra/imake/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152805 2012-03-09 17:06:42Z andyrtr $
+# $Id: PKGBUILD 191324 2013-07-23 16:42:27Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=imake
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 pkgdesc="X.Org imake program and related utilities"
 arch=('i686' 'x86_64')
@@ -14,22 +14,25 @@ optdepends=('perl: for mkhtmlindex')
 source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2"
         'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2'
         'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2'
-        'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2'
-        'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2'
         'linuxconfig.patch'
         'LICENSE')
-sha1sums=('1fd3dca267d125ad86583d7f9663b6ff532cddd1'
+sha1sums=('a54c025d7ac9894b6bc919d13454c6adb12ae140'
           'a3d971a507a460233afd8ed46e9f06135fed634d'
           'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe'
-          '1f0f8aea1526c6c022f2cf16f7a6c67118c68336'
-          'c58b7252df481572ec1ccd77b9f1ab561ed89e45'
+          '2599afa039d2070bae9df6ce43da288b3a4adf97'
+          'ae22eb81d56d018f0b3b149f70965ebfef2385fd'
           '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0'
           'c5ecffb25ad079ba3858e3aec047d046df603a89')
 
-build() {
-  cd ${srcdir}/xorg-cf-files-1.0.4
+
+prepare() {
+  cd xorg-cf-files-1.0.5
   patch -p1 -i "${srcdir}/linuxconfig.patch"
-  cd "${srcdir}"
+}
+
+build() {
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
@@ -41,7 +44,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
diff --git a/extra/libdatrie/PKGBUILD b/extra/libdatrie/PKGBUILD
index 21eca6bfb..b033bfd69 100644
--- a/extra/libdatrie/PKGBUILD
+++ b/extra/libdatrie/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142248 2011-11-07 09:16:13Z jgc $
+# $Id: PKGBUILD 191328 2013-07-23 16:51:26Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com>
 
 pkgname=libdatrie
-pkgver=0.2.5
+pkgver=0.2.6
 pkgrel=1
 pkgdesc="Implementation of double-array structure for representing trie, as proposed by Junichi Aoe."
 url="http://linux.thai.net/projects/datrie"
@@ -11,8 +11,8 @@ license=('LGPL')
 arch=('i686' 'x86_64')
 depends=('glibc')
 options=('!libtool' '!emptydirs')
-source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c9b057d07198d66e1ac2eff32937d3d4')
+source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.xz)
+md5sums=('e253eb2433045f6e224c7fa44f9796e1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch b/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
deleted file mode 100644
index e67728051..000000000
--- a/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 56d6bc2e8855d25e03816509a0137c3a70410ae6 Mon Sep 17 00:00:00 2001
-From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
-Date: Mon, 29 Apr 2013 08:57:14 -0500
-Subject: [PATCH 06/10] [libpng16] Avoid dereferencing NULL pointer possibly
- returned from
-
-png_create_write_struct() (Andrew Church).
----
- ANNOUNCE   |  6 ++++--
- CHANGES    |  4 +++-
- pngwrite.c | 65 +++++++++++++++++++++++++++++++-------------------------------
- 3 files changed, 39 insertions(+), 36 deletions(-)
-
- (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.)
-
-diff --git a/pngwrite.c b/pngwrite.c
-index 33924aa..b71a3d3 100644
---- a/pngwrite.c
-+++ b/pngwrite.c
-@@ -494,51 +494,50 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
-       error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
- #endif /* PNG_USER_MEM_SUPPORTED */
-+   if (png_ptr != NULL)
-+   {
-+      /* Set the zlib control values to defaults; they can be overridden by the
-+       * application after the struct has been created.
-+       */
-+      png_ptr->zbuffer_size = PNG_ZBUF_SIZE;
- 
--   /* Set the zlib control values to defaults; they can be overridden by the
--    * application after the struct has been created.
--    */
--   png_ptr->zbuffer_size = PNG_ZBUF_SIZE;
--
--   /* The 'zlib_strategy' setting is irrelevant because png_default_claim in
--    * pngwutil.c defaults it according to whether or not filters will be used,
--    * and ignores this setting.
--    */
--   png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY;
--   png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION;
--   png_ptr->zlib_mem_level = 8;
--   png_ptr->zlib_window_bits = 15;
--   png_ptr->zlib_method = 8;
-+      /* The 'zlib_strategy' setting is irrelevant because png_default_claim in
-+       * pngwutil.c defaults it according to whether or not filters will be
-+       * used, and ignores this setting.
-+       */
-+      png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY;
-+      png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION;
-+      png_ptr->zlib_mem_level = 8;
-+      png_ptr->zlib_window_bits = 15;
-+      png_ptr->zlib_method = 8;
- 
- #ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
--   png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;
--   png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;
--   png_ptr->zlib_text_mem_level = 8;
--   png_ptr->zlib_text_window_bits = 15;
--   png_ptr->zlib_text_method = 8;
-+      png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;
-+      png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;
-+      png_ptr->zlib_text_mem_level = 8;
-+      png_ptr->zlib_text_window_bits = 15;
-+      png_ptr->zlib_text_method = 8;
- #endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
- 
--   /* This is a highly dubious configuration option; by default it is off, but
--    * it may be appropriate for private builds that are testing extensions not
--    * conformant to the current specification, or of applications that must not
--    * fail to write at all costs!
--    */
--#  ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED
-+      /* This is a highly dubious configuration option; by default it is off,
-+       * but it may be appropriate for private builds that are testing
-+       * extensions not conformant to the current specification, or of
-+       * applications that must not fail to write at all costs!
-+       */
-+#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED
-       png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
-       /* In stable builds only warn if an application error can be completely
-        * handled.
-        */
--#  endif
-+#endif
- 
--   /* App warnings are warnings in release (or release candidate) builds but
--    * are errors during development.
--    */
--#  if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC
-+      /* App warnings are warnings in release (or release candidate) builds but
-+       * are errors during development.
-+       */
-+#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC
-       png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN;
--#  endif
-+#endif
- 
--   if (png_ptr != NULL)
--   {
-       /* TODO: delay this, it can be done in png_init_io() (if the app doesn't
-        * do it itself) avoiding setting the default function if it is not
-        * required.
--- 
-1.8.2.2
-
diff --git a/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch b/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
deleted file mode 100644
index 0a305c150..000000000
--- a/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 127b08a265f99ce517ea31ec7988a91fc17da4d9 Mon Sep 17 00:00:00 2001
-From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
-Date: Sun, 5 May 2013 22:13:47 -0500
-Subject: [PATCH 09/10] [libpng16] Calculate our own zlib windowBits when
- decoding rather than
-
-trusting the CMF bytes in the PNG datastream.
----
- ANNOUNCE   |  6 +++--
- CHANGES    |  5 +++-
- pngrutil.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
- 3 files changed, 88 insertions(+), 10 deletions(-)
-
- (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.)
-
-diff --git a/pngrutil.c b/pngrutil.c
-index 01c3679..9c10e26 100644
---- a/pngrutil.c
-+++ b/pngrutil.c
-@@ -18,8 +18,6 @@
- 
- #ifdef PNG_READ_SUPPORTED
- 
--#define png_strtod(p,a,b) strtod(a,b)
--
- png_uint_32 PNGAPI
- png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
- {
-@@ -4165,6 +4163,75 @@ png_read_finish_row(png_structrp png_ptr)
- }
- #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
- 
-+#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED
-+/* This is the code to to select a windowBits value to match the smallest
-+ * possible sliding window needed to contain the entire uncompressed image.
-+ */
-+static unsigned int
-+required_window_bits(png_alloc_size_t data_size)
-+{
-+   unsigned int windowBits = 15;
-+   if (data_size <= 16384) /* else windowBits must be 15 */
-+   {
-+      unsigned int half_z_window_size = 1U << (windowBits-1);  /* 16384 */
-+
-+      do
-+      {
-+         half_z_window_size >>= 1;
-+         --windowBits;
-+      }
-+      while (windowBits > 8 && data_size <= half_z_window_size);
-+   }
-+   return windowBits;
-+}
-+/* This is used below to find the size of an image to pass to png_deflate_claim,
-+ * so it only needs to be accurate if the size is less than 16384 bytes (the
-+ * point at which a lower LZ window size can be used.)
-+ *
-+ * To do: merge this with png_image_size() in pngwutil.c and put the result
-+ * in png.c as a PNG_INTERNAL_FUNCTION.
-+ */
-+static png_alloc_size_t
-+png_read_image_size(png_structrp png_ptr)
-+{
-+   /* Only return sizes up to the maximum of a png_uint_32, do this by limiting
-+    * the width and height used to 15 bits.
-+    */
-+   png_uint_32 h = png_ptr->height;
-+
-+   if (png_ptr->rowbytes < 32768 && h < 32768)
-+   {
-+      if (png_ptr->interlaced)
-+      {
-+         /* Interlacing makes the image larger because of the replication of
-+          * both the filter byte and the padding to a byte boundary.
-+          */
-+         png_uint_32 w = png_ptr->width;
-+         unsigned int pd = png_ptr->pixel_depth;
-+         png_alloc_size_t cb_base;
-+         int pass;
-+
-+         for (cb_base=0, pass=0; pass<=6; ++pass)
-+         {
-+            png_uint_32 pw = PNG_PASS_COLS(w, pass);
-+
-+            if (pw > 0)
-+               cb_base += (PNG_ROWBYTES(pd, pw)+1) * PNG_PASS_ROWS(h, pass);
-+         }
-+
-+         return cb_base;
-+      }
-+
-+      else
-+         return (png_ptr->rowbytes+1) * h;
-+   }
-+
-+   else
-+      return 0xffffffffU;
-+}
-+
-+#endif /* PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED */
-+
- void /* PRIVATE */
- png_read_start_row(png_structrp png_ptr)
- {
-@@ -4449,14 +4516,20 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
-       png_free(png_ptr, buffer);
-    }
- 
--   /* Finally claim the zstream for the inflate of the IDAT data, use the bits
--    * value from the stream (note that this will result in a fatal error if the
--    * IDAT stream has a bogus deflate header window_bits value, but this should
--    * not be happening any longer!)
-+   /* Finally claim the zstream for the inflate of the IDAT data, using the
-+    * windowBts predicted from the uncompressed data size, not the value from
-+    * the stream.  If READ_OPTIMIZE_WINDOWBITS_SUPPORTED is not defined, then
-+    * simply use a 32kbyte window (windowBits=15).
-     */
--   if (png_inflate_claim(png_ptr, png_IDAT, 0) != Z_OK)
-+#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED
-+   if (png_inflate_claim(png_ptr, png_IDAT,
-+      required_window_bits(png_read_image_size(png_ptr))) != Z_OK)
-+#else
-+   if (png_inflate_claim(png_ptr, png_IDAT, 15) != Z_OK)
-+#endif
-       png_error(png_ptr, png_ptr->zstream.msg);
- 
-    png_ptr->flags |= PNG_FLAG_ROW_INIT;
- }
-+
- #endif /* PNG_READ_SUPPORTED */
--- 
-1.8.2.2
-
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index ab48303fc..936a01b78 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,40 +1,30 @@
-# $Id: PKGBUILD 184406 2013-05-06 19:38:28Z foutrelis $
+# $Id: PKGBUILD 191317 2013-07-23 14:38:48Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.6.2
-_apngver=1.6.2
-pkgrel=3
+pkgver=1.6.3
+_apngver=1.6.3
+pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64')
 url="http://www.libpng.org/pub/png/libpng.html"
 license=('custom')
 depends=('zlib' 'sh')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz"
-        0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
-        0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
-        adjust-apng-patch-for-libpng16-git-changes.patch)
-md5sums=('9d838f6fca9948a9f360a0cc1b516d5f'
-         '7d0c9f4b9a7f45dd5d1088e54b623c98'
-         '59b83234f60a7d1d179d9b0b6a0ebc01'
-         'b1f7922b6678305bdb7c23d5bd1763f3'
-         'f87704c3fb6d29f09b52178e89a42e2e')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
+        http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz)
+md5sums=('9307f8ab04f4be3c1889ffb504f0fe5c'
+         'SKIP'
+         '57007fc121baa2cdc48abcfb26300e78')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  # Add fixes from libpng16 branch
-  patch -Np1 -i ../0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
-  patch -Np1 -i ../0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
-
   # Add animated PNG (apng) support
   # see http://sourceforge.net/projects/libpng-apng/
-  patch -d .. -Np0 -i adjust-apng-patch-for-libpng16-git-changes.patch
   patch -Np1 -i ../libpng-$_apngver-apng.patch
 }
 
diff --git a/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch b/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch
deleted file mode 100644
index 26ac1c1cf..000000000
--- a/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libpng-1.6.2-apng.patch.orig	2013-05-06 12:09:16.000000000 +0300
-+++ libpng-1.6.2-apng.patch	2013-05-06 12:12:14.000000000 +0300
-@@ -1034,7 +1034,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l
-  
-           if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
-              png_chunk_benign_error(png_ptr, "Extra compressed data");
--@@ -4459,4 +4671,80 @@
-+@@ -4459,5 +4671,81 @@
-  
-     png_ptr->flags |= PNG_FLAG_ROW_INIT;
-  }
-@@ -1114,6 +1114,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l
- +}
- +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
- +#endif /* PNG_READ_APNG_SUPPORTED */
-+ 
-  #endif /* PNG_READ_SUPPORTED */
- diff -Naru libpng-1.6.2.org/pngset.c libpng-1.6.2/pngset.c
- --- libpng-1.6.2.org/pngset.c	2013-04-29 17:31:42.000000000 +0900
diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD
index 1a5df7ff1..7cba49902 100644
--- a/extra/libthai/PKGBUILD
+++ b/extra/libthai/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164508 2012-08-01 10:14:01Z jgc $
+# $Id: PKGBUILD 191330 2013-07-23 16:53:06Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com>
 
 pkgname=libthai
-pkgver=0.1.18
+pkgver=0.1.19
 pkgrel=1
 pkgdesc="Thai language support routines"
 url="http://linux.thai.net/projects/libthai"
@@ -12,8 +12,8 @@ license=('LGPL')
 depends=('libdatrie')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
-source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('0250fc5255c1e62b23f88c2d6b1d6262')
+source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('c4a6c3842257889f8f15ae192b66e797')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index a1ae6f35f..0d23fbe0d 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,27 +1,35 @@
-# $Id: PKGBUILD 186724 2013-05-30 19:02:49Z andyrtr $
+# $Id: PKGBUILD 191295 2013-07-23 11:13:07Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxcb
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=('i686' 'x86_64')
 url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'python2')
+depends=('xcb-proto>=1.8-2' 'libxdmcp' 'libxau')
+makedepends=('pkgconfig' 'libxslt' 'python')
 options=('!libtool')
 license=('custom')
 source=($url/dist/$pkgname-$pkgver.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch)
+        libxcb-1.1-no-pthread-stubs.patch
+        reorder-configure.patch)
 sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f'
-            '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310')
+            '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310'
+            '3e1adc51246e1f48545c1ab9703219c987685d241f1eab5d912b0840ce8a122a')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch
+  # https://bugs.freedesktop.org/show_bug.cgi?id=66413
+  patch -Np1 -i ../reorder-configure.patch
+  NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  export PYTHON=/usr/bin/python2 
-  ./autogen.sh --prefix=/usr \
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr \
     --enable-xinput \
     --enable-xkb \
     --disable-static
@@ -29,7 +37,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
   install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
diff --git a/extra/libxcb/reorder-configure.patch b/extra/libxcb/reorder-configure.patch
new file mode 100644
index 000000000..afeeffe7e
--- /dev/null
+++ b/extra/libxcb/reorder-configure.patch
@@ -0,0 +1,29 @@
+--- libxcb-1.9.1/configure.ac	2013-05-30 17:38:01.000000000 +0200
++++ libxcb-1.9.1/configure.ac.new	2013-06-30 21:01:30.134153288 +0200
+@@ -2,20 +2,21 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+ # Initialize Autoconf
+-AC_PREREQ(2.57)
+ AC_INIT([libxcb],
+         1.9.1,
+         [xcb@lists.freedesktop.org])
++AC_PREREQ(2.57)
++
++# Initialize Automake
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++
+ AC_CONFIG_SRCDIR([xcb.pc.in])
+ # Set common system defines for POSIX extensions, such as _GNU_SOURCE
+ # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
+ # to avoid autoconf errors.
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+-# Initialize Automake
+-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-
+ AM_PATH_PYTHON([2.6])
+ 
+ PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD
index 1c14ec0b2..17806e5f0 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 183446 2013-04-21 22:11:47Z heftig $
+# $Id: PKGBUILD 191279 2013-07-23 09:48:38Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=nautilus-sendto
 pkgver=3.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Nautilus context menu for sending files."
 arch=(i686 x86_64)
 url="http://download.gnome.org/sources/nautilus-sendto/"
@@ -14,6 +14,7 @@ depends=(glib2)
 makedepends=(gettext intltool gobject-introspection)
 options=('!libtool' '!emptydirs')
 install=nautilus-sendto.install
+groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('d99ea11a484bff8894097696a1afc8d7f44de4f064f78deeb6f598cecf0604bb')
 
diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD
index a99cc4d1b..560eec320 100644
--- a/extra/telepathy-mission-control/PKGBUILD
+++ b/extra/telepathy-mission-control/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186517 2013-05-28 10:02:46Z ioni $
+# $Id: PKGBUILD 191309 2013-07-23 13:29:40Z jgc $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Ju Liu <liuju86 at gmail dot com>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
@@ -20,7 +20,7 @@ md5sums=('e06fb0399ec435e59c74d79a2ace8a2d')
 
 build() {
     cd "$pkgname-$pkgver"
-    ./configure --prefix=/usr \
+    PYTHON=python2 ./configure --prefix=/usr \
     	--libexecdir=/usr/lib/telepathy \
 	--enable-gnome-keyring \
         --disable-schemas-compile
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 47a80be3c..ab0e1e16e 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188207 2013-06-12 20:16:30Z heftig $
+# $Id: PKGBUILD 191357 2013-07-23 21:01:37Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk
-pkgver=2.0.3
+pkgver=2.0.4
 pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@ conflicts=(webkitgtk3 libwebkit3)
 replaces=(webkitgtk3 libwebkit3)
 options=(!libtool !emptydirs)
 source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz)
-sha256sums=('9bf8a32afbf087c4fc2c652b193a52c44b180735ba9c7c8db88137904d458e1b')
+sha256sums=('bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f')
 
 build() {
   cd $pkgname-$pkgver