Tue Oct 8 02:32:53 PDT 2013

294 files changed, 1941 insertions, 14321 deletions

diff --git a/community/account-plugins/PKGBUILD b/community/account-plugins/PKGBUILD
deleted file mode 100644
index b5928821b..000000000
--- a/community/account-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 79484 2012-11-06 04:10:50Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=account-plugins
-pkgver=0.9
-pkgrel=1
-pkgdesc="Account configuration plugins for credentials preferences"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/online-accounts-account-plugins"
-license=('GPL')
-depends=('credentials-preferences' 'signon-keyring-extension' 'signon-plugin-oauth2')
-makedepends=('gobject-introspection' 'vala' 'intltool')
-optdepends=('python-gobject: for account-console tool')
-options=('!libtool')
-install=$pkgname.install
-source=(https://launchpad.net/online-accounts-account-plugins/12.10/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('58deed9e3305877bb4db426a51451ec0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/account-plugins/account-plugins.install b/community/account-plugins/account-plugins.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community/account-plugins/account-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD
index 709f26825..de121bebf 100644
--- a/community/almanah/PKGBUILD
+++ b/community/almanah/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90849 2013-05-14 21:40:34Z andrea $
+# $Id: PKGBUILD 98185 2013-10-07 12:08:18Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=almanah
 pkgver=0.10.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Small GTK+ application to allow you to keep a diary of your life"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/Almanah_Diary"
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 6e14bf1ac..b252b3314 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 94015 2013-07-13 12:31:02Z svenstaro $
+# $Id: PKGBUILD 98184 2013-10-07 12:07:00Z jgc $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 # Contributor: nathan owe ndowens04 at gmail dot com
 
 pkgname=cclive
-pkgver=0.7.13
-pkgrel=2
+pkgver=0.9.2
+pkgrel=1
 pkgdesc='Commandline downloader for popular video websites.'
 arch=('i686' 'x86_64')
 url='http://cclive.sourceforge.net/'
-license=('GPL3')
-depends=('boost-libs' 'pcre' 'curl' 'libquvi')
-makedepends=('boost' 'chrpath')
-source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz")
-md5sums=('654892be303c2738dd078dbe6c78595d')
+license=('AGPL3')
+depends=('boost-libs' 'pcre' 'curl' 'libquvi' 'glibmm')
+makedepends=('boost')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('b21f2ed68242901dc0439132a4ea6629')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr boost_cv_rpath_link_ldflag="-L/usr/lib"
   make
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  chrpath --delete "$pkgdir"/usr/bin/cclive
 }
diff --git a/community/cdck/PKGBUILD b/community/cdck/PKGBUILD
deleted file mode 100644
index 4a3dc6f32..000000000
--- a/community/cdck/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 65681 2012-02-21 21:16:27Z cbrannon $
-# Maintainer: Chris Brannon <chris@the-brannons.com>
-# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
-# Previous Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-# Contributor: Slash <demodevil5[at]yahoo[dot]com>
-
-pkgname=cdck
-pkgver=0.7.0
-pkgrel=4
-pkgdesc="A simple program to verify CD/DVD quality"
-arch=('i686' 'x86_64')
-url="http://swaj.net/unix/"
-license=('GPL')
-depends=(gcc-libs)
-makedepends=('perl')
-options=('!libtool')
-source=(http://swaj.net/unix/cdck/${pkgname}-${pkgver}.tar.gz)
-md5sums=('15029d54b99f2e5cf8aae28077669d3f')
-
-build() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr --mandir=/usr/share/man
-    PATH="/usr/bin/core_perl:$PATH" make
-}
-
-package() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index 8d6240c03..4f85c62de 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,44 +1,28 @@
-# $Id: PKGBUILD 95589 2013-08-14 21:07:27Z bgyorgy $
+# $Id: PKGBUILD 98187 2013-10-07 12:08:21Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
 # Based on gnome-control-center:
 # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=1.8.2
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
-depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet')
+depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet' 'cinnamon-settings-daemon')
 optdepends=('gnome-color-manager: for color management tasks')
 makedepends=('intltool' 'gnome-common')
 url="https://github.com/linuxmint/cinnamon-control-center"
 install=cinnamon-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
-        "gnomerrlabeler.patch"
-        "idle-delay.patch"
-        "remove_obex.patch")
-sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f'
-            'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db'
-            '98227484162071744b5a336a5b3915c211f5eb1559034b3d40e4a9d790fe0e31'
-            '3df65b1f5e691d4a4634c05698da6df79cb23a0ebf71b201f23c48742b75b6e4')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
+sha256sums=('2a8ea5c17e515afd47d0f76127dbc5172281ef2b6aaf8a5c800ff7079d6d80f2')
 
 build() {
   cd $pkgname-$pkgver
 
-  # Build fix for GNOME 3.8
-  patch -Np1 -i "$srcdir/gnomerrlabeler.patch"
-
-  # Runtime fix for GNOME 3.8
-  patch -Np1 -i "$srcdir/idle-delay.patch"
-
-  # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
-  patch -Np1 -i "$srcdir/remove_obex.patch"
-
   autoreconf -fi
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-systemd \
diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch
deleted file mode 100644
index 7160bc788..000000000
--- a/community/cinnamon-control-center/gnomerrlabeler.patch
+++ /dev/null
@@ -1,766 +0,0 @@
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c
---- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c	2013-04-15 16:04:38.000000000 +0200
-+++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c	2013-04-22 03:46:53.499944701 +0200
-@@ -31,12 +31,13 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
- #include <libgnome-desktop/gnome-rr-config.h>
--#include <libgnome-desktop/gnome-rr-labeler.h>
- #include <gdk/gdkx.h>
- #include <X11/Xlib.h>
- #include <glib/gi18n-lib.h>
- #include <gdesktop-enums.h>
- 
-+#include "cc-rr-labeler.h"
-+
- CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel)
- 
- #define DISPLAY_PANEL_PRIVATE(o) \
-@@ -75,7 +76,7 @@
- {
-   GnomeRRScreen       *screen;
-   GnomeRRConfig  *current_configuration;
--  GnomeRRLabeler *labeler;
-+  CcRRLabeler *labeler;
-   GnomeRROutputInfo         *current_output;
- 
-   GSettings      *clock_settings;
-@@ -200,7 +201,7 @@
-         g_signal_handler_disconnect (GTK_WIDGET (self), self->priv->focus_id_hide);
-     }
- 
--  gnome_rr_labeler_hide (self->priv->labeler);
-+  cc_rr_labeler_hide (self->priv->labeler);
-   g_object_unref (self->priv->labeler);
- 
-   G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object);
-@@ -293,16 +294,16 @@
-   self->priv->current_output = NULL;
- 
-   if (self->priv->labeler) {
--    gnome_rr_labeler_hide (self->priv->labeler);
-+    cc_rr_labeler_hide (self->priv->labeler);
-     g_object_unref (self->priv->labeler);
-   }
- 
--  self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
-+  self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration);
- 
-   if (cc_panel_get_shell (CC_PANEL (self)) == NULL)
--    gnome_rr_labeler_hide (self->priv->labeler);
-+    cc_rr_labeler_hide (self->priv->labeler);
-   else
--    gnome_rr_labeler_show (self->priv->labeler);
-+    cc_rr_labeler_show (self->priv->labeler);
- 
-   select_current_output_from_dialog_position (self);
- 
-@@ -2594,9 +2595,9 @@
-   if (self->priv->labeler == NULL)
-     return;
-   if (gtk_window_has_toplevel_focus (window))
--    gnome_rr_labeler_show (self->priv->labeler);
-+    cc_rr_labeler_show (self->priv->labeler);
-   else
--    gnome_rr_labeler_hide (self->priv->labeler);
-+    cc_rr_labeler_hide (self->priv->labeler);
- }
- 
- static void
-@@ -2606,9 +2607,9 @@
-     if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL)
-         return;
-     if (gtk_widget_get_visible (widget)) {
--        gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
-+        cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
-     } else {
--        gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
-+        cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
-     }
- }
- 
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c
---- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c	1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c	2013-04-22 03:42:12.379900127 +0200
-@@ -0,0 +1,601 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * cc-rr-labeler.c - Utility to label monitors to identify them
-+ * while they are being configured.
-+ *
-+ * Copyright 2008, Novell, Inc.
-+ *
-+ * This file is part of the Gnome Library.
-+ *
-+ * The Gnome Library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * The Gnome Library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ *
-+ * Author: Federico Mena-Quintero <federico@novell.com>
-+ */
-+
-+#include <config.h>
-+#include <glib/gi18n-lib.h>
-+#include <gtk/gtk.h>
-+
-+#include <X11/Xproto.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xatom.h>
-+#include <gdk/gdkx.h>
-+
-+#include "cc-rr-labeler.h"
-+
-+struct _CcRRLabelerPrivate {
-+	GnomeRRConfig *config;
-+
-+	int num_outputs;
-+
-+	GdkRGBA *palette;
-+	GtkWidget **windows;
-+
-+	GdkScreen  *screen;
-+	Atom        workarea_atom;
-+};
-+
-+enum {
-+	PROP_0,
-+	PROP_CONFIG,
-+	PROP_LAST
-+};
-+
-+G_DEFINE_TYPE (CcRRLabeler, cc_rr_labeler, G_TYPE_OBJECT);
-+
-+static void cc_rr_labeler_finalize (GObject *object);
-+static void setup_from_config (CcRRLabeler *labeler);
-+
-+static GdkFilterReturn
-+screen_xevent_filter (GdkXEvent      *xevent,
-+		      GdkEvent       *event,
-+		      CcRRLabeler *labeler)
-+{
-+	XEvent *xev;
-+
-+	xev = (XEvent *) xevent;
-+
-+	if (xev->type == PropertyNotify &&
-+	    xev->xproperty.atom == labeler->priv->workarea_atom) {
-+		/* update label positions */
-+		if (labeler->priv->windows != NULL) {
-+			cc_rr_labeler_hide (labeler);
-+			cc_rr_labeler_show (labeler);
-+		}
-+	}
-+
-+	return GDK_FILTER_CONTINUE;
-+}
-+
-+static void
-+cc_rr_labeler_init (CcRRLabeler *labeler)
-+{
-+	GdkWindow *gdkwindow;
-+
-+	labeler->priv = G_TYPE_INSTANCE_GET_PRIVATE (labeler, GNOME_TYPE_RR_LABELER, CcRRLabelerPrivate);
-+
-+	labeler->priv->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+						    "_NET_WORKAREA",
-+						    True);
-+
-+	labeler->priv->screen = gdk_screen_get_default ();
-+	/* code is not really designed to handle multiple screens so *shrug* */
-+	gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
-+	gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler);
-+	gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) | GDK_PROPERTY_CHANGE_MASK);
-+}
-+
-+static void
-+cc_rr_labeler_set_property (GObject *gobject, guint property_id, const GValue *value, GParamSpec *param_spec)
-+{
-+	CcRRLabeler *self = CC_RR_LABELER (gobject);
-+
-+	switch (property_id) {
-+	case PROP_CONFIG:
-+		self->priv->config = GNOME_RR_CONFIG (g_value_dup_object (value));
-+		return;
-+	default:
-+		G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, param_spec);
-+	}
-+}
-+
-+static GObject *
-+cc_rr_labeler_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)
-+{
-+	CcRRLabeler *self = (CcRRLabeler*) G_OBJECT_CLASS (cc_rr_labeler_parent_class)->constructor (type, n_construct_properties, construct_properties);
-+
-+	setup_from_config (self);
-+
-+	return (GObject*) self;
-+}
-+
-+static void
-+cc_rr_labeler_class_init (CcRRLabelerClass *klass)
-+{
-+	GObjectClass *object_class;
-+
-+	g_type_class_add_private (klass, sizeof (CcRRLabelerPrivate));
-+
-+	object_class = (GObjectClass *) klass;
-+
-+	object_class->set_property = cc_rr_labeler_set_property;
-+	object_class->finalize = cc_rr_labeler_finalize;
-+	object_class->constructor = cc_rr_labeler_constructor;
-+
-+	g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_object ("config",
-+											 "Configuration",
-+											 "RandR configuration to label",
-+											 GNOME_TYPE_RR_CONFIG,
-+											 G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
-+											 G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-+}
-+
-+static void
-+cc_rr_labeler_finalize (GObject *object)
-+{
-+	CcRRLabeler *labeler;
-+	GdkWindow      *gdkwindow;
-+
-+	labeler = CC_RR_LABELER (object);
-+
-+	gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
-+	gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler);
-+
-+	if (labeler->priv->config != NULL) {
-+		g_object_unref (labeler->priv->config);
-+	}
-+
-+	if (labeler->priv->windows != NULL) {
-+		cc_rr_labeler_hide (labeler);
-+		g_free (labeler->priv->windows);
-+	}
-+
-+	g_free (labeler->priv->palette);
-+
-+	G_OBJECT_CLASS (cc_rr_labeler_parent_class)->finalize (object);
-+}
-+
-+static int
-+count_outputs (GnomeRRConfig *config)
-+{
-+	int i;
-+	GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (config);
-+
-+	for (i = 0; outputs[i] != NULL; i++)
-+		;
-+
-+	return i;
-+}
-+
-+static void
-+make_palette (CcRRLabeler *labeler)
-+{
-+	/* The idea is that we go around an hue color wheel.  We want to start
-+	 * at red, go around to green/etc. and stop at blue --- because magenta
-+	 * is evil.  Eeeeek, no magenta, please!
-+	 *
-+	 * Purple would be nice, though.  Remember that we are watered down
-+	 * (i.e. low saturation), so that would be like Like berries with cream.
-+	 * Mmmmm, berries.
-+	 */
-+	double start_hue;
-+	double end_hue;
-+	int i;
-+
-+	g_assert (labeler->priv->num_outputs > 0);
-+
-+	labeler->priv->palette = g_new (GdkRGBA, labeler->priv->num_outputs);
-+
-+	start_hue = 0.0; /* red */
-+	end_hue   = 2.0/3; /* blue */
-+
-+	for (i = 0; i < labeler->priv->num_outputs; i++) {
-+		double h, s, v;
-+		double r, g, b;
-+
-+		h = start_hue + (end_hue - start_hue) / labeler->priv->num_outputs * i;
-+		s = 1.0 / 3;
-+		v = 1.0;
-+
-+		gtk_hsv_to_rgb (h, s, v, &r, &g, &b);
-+
-+		labeler->priv->palette[i].red   = r;
-+		labeler->priv->palette[i].green = g;
-+		labeler->priv->palette[i].blue  = b;
-+		labeler->priv->palette[i].alpha  = 1.0;
-+	}
-+}
-+
-+static void
-+rounded_rectangle (cairo_t *cr,
-+                   gint     x,
-+                   gint     y,
-+                   gint     width,
-+                   gint     height,
-+                   gint     x_radius,
-+                   gint     y_radius)
-+{
-+	gint x1, x2;
-+	gint y1, y2;
-+	gint xr1, xr2;
-+	gint yr1, yr2;
-+
-+	x1 = x;
-+	x2 = x1 + width;
-+	y1 = y;
-+	y2 = y1 + height;
-+
-+	x_radius = MIN (x_radius, width / 2.0);
-+	y_radius = MIN (y_radius, width / 2.0);
-+
-+	xr1 = x_radius;
-+	xr2 = x_radius / 2.0;
-+	yr1 = y_radius;
-+	yr2 = y_radius / 2.0;
-+
-+	cairo_move_to    (cr, x1 + xr1, y1);
-+	cairo_line_to    (cr, x2 - xr1, y1);
-+	cairo_curve_to   (cr, x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1);
-+	cairo_line_to    (cr, x2, y2 - yr1);
-+	cairo_curve_to   (cr, x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2);
-+	cairo_line_to    (cr, x1 + xr1, y2);
-+	cairo_curve_to   (cr, x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1);
-+	cairo_line_to    (cr, x1, y1 + yr1);
-+	cairo_curve_to   (cr, x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1);
-+	cairo_close_path (cr);
-+}
-+
-+#define LABEL_WINDOW_EDGE_THICKNESS 2
-+#define LABEL_WINDOW_PADDING 12
-+/* Look for panel-corner in:
-+ * http://git.gnome.org/browse/gnome-shell/tree/data/theme/gnome-shell.css
-+ * to match the corner radius */
-+#define LABEL_CORNER_RADIUS 6 + LABEL_WINDOW_EDGE_THICKNESS
-+
-+static void
-+label_draw_background_and_frame (GtkWidget *widget, cairo_t *cr, gboolean for_shape)
-+{
-+	GdkRGBA shape_color = { 0, 0, 0, 1 };
-+	GdkRGBA *rgba;
-+	GtkAllocation allocation;
-+
-+	rgba = g_object_get_data (G_OBJECT (widget), "rgba");
-+	gtk_widget_get_allocation (widget, &allocation);
-+
-+	cairo_save (cr);
-+	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-+
-+	/* edge outline */
-+	if (for_shape)
-+		gdk_cairo_set_source_rgba (cr, &shape_color);
-+	else
-+		cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
-+
-+	rounded_rectangle (cr,
-+	                   LABEL_WINDOW_EDGE_THICKNESS / 2.0,
-+	                   LABEL_WINDOW_EDGE_THICKNESS / 2.0,
-+	                   allocation.width - LABEL_WINDOW_EDGE_THICKNESS,
-+	                   allocation.height - LABEL_WINDOW_EDGE_THICKNESS,
-+	                   LABEL_CORNER_RADIUS, LABEL_CORNER_RADIUS);
-+	cairo_set_line_width (cr, LABEL_WINDOW_EDGE_THICKNESS);
-+	cairo_stroke (cr);
-+
-+	/* fill */
-+	if (for_shape) {
-+		gdk_cairo_set_source_rgba (cr, &shape_color);
-+	} else {
-+		rgba->alpha = 0.75;
-+		gdk_cairo_set_source_rgba (cr, rgba);
-+	}
-+
-+	rounded_rectangle (cr,
-+	                   LABEL_WINDOW_EDGE_THICKNESS,
-+	                   LABEL_WINDOW_EDGE_THICKNESS,
-+	                   allocation.width - LABEL_WINDOW_EDGE_THICKNESS * 2,
-+	                   allocation.height - LABEL_WINDOW_EDGE_THICKNESS * 2,
-+	                   LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0,
-+			   LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0);
-+	cairo_fill (cr);
-+
-+	cairo_restore (cr);
-+}
-+
-+static void
-+maybe_update_shape (GtkWidget *widget)
-+{
-+	cairo_t *cr;
-+	cairo_surface_t *surface;
-+	cairo_region_t *region;
-+
-+	/* fallback to XShape only for non-composited clients */
-+	if (gtk_widget_is_composited (widget)) {
-+		gtk_widget_shape_combine_region (widget, NULL);
-+		return;
-+	}
-+
-+	surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
-+						     CAIRO_CONTENT_COLOR_ALPHA,
-+						     gtk_widget_get_allocated_width (widget),
-+						     gtk_widget_get_allocated_height (widget));
-+
-+	cr = cairo_create (surface);
-+	label_draw_background_and_frame (widget, cr, TRUE);
-+	cairo_destroy (cr);
-+
-+	region = gdk_cairo_region_create_from_surface (surface);
-+	gtk_widget_shape_combine_region (widget, region);
-+
-+	cairo_surface_destroy (surface);
-+	cairo_region_destroy (region);
-+}
-+
-+static gboolean
-+label_window_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
-+{
-+	if (gtk_widget_is_composited (widget)) {
-+		/* clear any content */
-+		cairo_save (cr);
-+		cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-+		cairo_set_source_rgba (cr, 0, 0, 0, 0);
-+		cairo_paint (cr);
-+		cairo_restore (cr);
-+	}
-+
-+	maybe_update_shape (widget);
-+	label_draw_background_and_frame (widget, cr, FALSE);
-+
-+	return FALSE;
-+}
-+
-+static void
-+position_window (CcRRLabeler  *labeler,
-+		 GtkWidget       *window,
-+		 int              x,
-+		 int              y)
-+{
-+	GdkRectangle    workarea;
-+	GdkRectangle    monitor;
-+	int             monitor_num;
-+
-+	monitor_num = gdk_screen_get_monitor_at_point (labeler->priv->screen, x, y);
-+	gdk_screen_get_monitor_workarea (labeler->priv->screen, monitor_num, &workarea);
-+	gdk_screen_get_monitor_geometry (labeler->priv->screen,
-+                                         monitor_num,
-+                                         &monitor);
-+	gdk_rectangle_intersect (&monitor, &workarea, &workarea);
-+
-+	gtk_window_move (GTK_WINDOW (window), workarea.x, workarea.y);
-+}
-+
-+static void
-+label_window_realize_cb (GtkWidget *widget)
-+{
-+	cairo_region_t *region;
-+
-+	/* make the whole window ignore events */
-+	region = cairo_region_create ();
-+	gtk_widget_input_shape_combine_region (widget, region);
-+	cairo_region_destroy (region);
-+
-+	maybe_update_shape (widget);
-+}
-+
-+static void
-+label_window_composited_changed_cb (GtkWidget *widget, CcRRLabeler *labeler)
-+{
-+	if (gtk_widget_get_realized (widget))
-+		maybe_update_shape (widget);
-+}
-+
-+static GtkWidget *
-+create_label_window (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba)
-+{
-+	GtkWidget *window;
-+	GtkWidget *widget;
-+	char *str;
-+	const char *display_name;
-+	GdkRGBA black = { 0, 0, 0, 1.0 };
-+	int x, y;
-+	GdkScreen *screen;
-+	GdkVisual *visual;
-+
-+	window = gtk_window_new (GTK_WINDOW_POPUP);
-+	gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_TOOLTIP);
-+	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-+	gtk_widget_set_app_paintable (window, TRUE);
-+	screen = gtk_widget_get_screen (window);
-+	visual = gdk_screen_get_rgba_visual (screen);
-+
-+	if (visual != NULL)
-+		gtk_widget_set_visual (window, visual);
-+
-+	gtk_container_set_border_width (GTK_CONTAINER (window), LABEL_WINDOW_PADDING + LABEL_WINDOW_EDGE_THICKNESS);
-+
-+	/* This is semi-dangerous.  The color is part of the labeler->palette
-+	 * array.  Note that in cc_rr_labeler_finalize(), we are careful to
-+	 * free the palette only after we free the windows.
-+	 */
-+	g_object_set_data (G_OBJECT (window), "rgba", rgba);
-+
-+	g_signal_connect (window, "draw",
-+			  G_CALLBACK (label_window_draw_event_cb), labeler);
-+	g_signal_connect (window, "realize",
-+			  G_CALLBACK (label_window_realize_cb), labeler);
-+	g_signal_connect (window, "composited-changed",
-+			  G_CALLBACK (label_window_composited_changed_cb), labeler);
-+
-+	if (gnome_rr_config_get_clone (labeler->priv->config)) {
-+		/* Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name() */
-+
-+		/* Translators:  this is the feature where what you see on your
-+		 * laptop's screen is the same as your external projector.
-+		 * Here, "Mirrored" is being used as an adjective.  For example,
-+		 * the Spanish translation could be "Pantallas en Espejo".
-+		 */
-+		display_name = _("Mirrored Displays");
-+	} else
-+		display_name = gnome_rr_output_info_get_display_name (output);
-+
-+	str = g_strdup_printf ("<b>%s</b>", display_name);
-+	widget = gtk_label_new (NULL);
-+	gtk_label_set_markup (GTK_LABEL (widget), str);
-+	g_free (str);
-+
-+	/* Make the label explicitly black.  We don't want it to follow the
-+	 * theme's colors, since the label is always shown against a light
-+	 * pastel background.  See bgo#556050
-+	 */
-+	gtk_widget_override_color (widget,
-+				   gtk_widget_get_state_flags (widget),
-+				   &black);
-+
-+	gtk_container_add (GTK_CONTAINER (window), widget);
-+
-+	/* Should we center this at the top edge of the monitor, instead of using the upper-left corner? */
-+	gnome_rr_output_info_get_geometry (output, &x, &y, NULL, NULL);
-+	position_window (labeler, window, x, y);
-+
-+	gtk_widget_show_all (window);
-+
-+	return window;
-+}
-+
-+static void
-+setup_from_config (CcRRLabeler *labeler)
-+{
-+	labeler->priv->num_outputs = count_outputs (labeler->priv->config);
-+
-+	make_palette (labeler);
-+
-+	cc_rr_labeler_show (labeler);
-+}
-+
-+/**
-+ * cc_rr_labeler_new:
-+ * @config: Configuration of the screens to label
-+ *
-+ * Create a GUI element that will display colored labels on each connected monitor.
-+ * This is useful when users are required to identify which monitor is which, e.g. for
-+ * for configuring multiple monitors.
-+ * The labels will be shown by default, use cc_rr_labeler_hide to hide them.
-+ *
-+ * Returns: A new #CcRRLabeler
-+ */
-+CcRRLabeler *
-+cc_rr_labeler_new (GnomeRRConfig *config)
-+{
-+	g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), NULL);
-+
-+	return g_object_new (GNOME_TYPE_RR_LABELER, "config", config, NULL);
-+}
-+
-+/**
-+ * cc_rr_labeler_show:
-+ * @labeler: A #CcRRLabeler
-+ *
-+ * Show the labels.
-+ */
-+void
-+cc_rr_labeler_show (CcRRLabeler *labeler)
-+{
-+	int i;
-+	gboolean created_window_for_clone;
-+	GnomeRROutputInfo **outputs;
-+
-+	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
-+
-+	if (labeler->priv->windows != NULL)
-+		return;
-+
-+	labeler->priv->windows = g_new (GtkWidget *, labeler->priv->num_outputs);
-+
-+	created_window_for_clone = FALSE;
-+
-+	outputs = gnome_rr_config_get_outputs (labeler->priv->config);
-+
-+	for (i = 0; i < labeler->priv->num_outputs; i++) {
-+		if (!created_window_for_clone && gnome_rr_output_info_is_active (outputs[i])) {
-+			labeler->priv->windows[i] = create_label_window (labeler, outputs[i], labeler->priv->palette + i);
-+
-+			if (gnome_rr_config_get_clone (labeler->priv->config))
-+				created_window_for_clone = TRUE;
-+		} else
-+			labeler->priv->windows[i] = NULL;
-+	}
-+}
-+
-+/**
-+ * cc_rr_labeler_hide:
-+ * @labeler: A #CcRRLabeler
-+ *
-+ * Hide ouput labels.
-+ */
-+void
-+cc_rr_labeler_hide (CcRRLabeler *labeler)
-+{
-+	int i;
-+	CcRRLabelerPrivate *priv;
-+
-+	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
-+
-+	priv = labeler->priv;
-+
-+	if (priv->windows == NULL)
-+		return;
-+
-+	for (i = 0; i < priv->num_outputs; i++)
-+		if (priv->windows[i] != NULL) {
-+			gtk_widget_destroy (priv->windows[i]);
-+			priv->windows[i] = NULL;
-+	}
-+	g_free (priv->windows);
-+	priv->windows = NULL;
-+}
-+
-+/**
-+ * cc_rr_labeler_get_rgba_for_output:
-+ * @labeler: A #CcRRLabeler
-+ * @output: Output device (i.e. monitor) to query
-+ * @rgba_out: (out): Color of selected monitor.
-+ *
-+ * Get the color used for the label on a given output (monitor).
-+ */
-+void
-+cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out)
-+{
-+	int i;
-+	GnomeRROutputInfo **outputs;
-+
-+	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
-+	g_return_if_fail (GNOME_IS_RR_OUTPUT_INFO (output));
-+	g_return_if_fail (rgba_out != NULL);
-+
-+	outputs = gnome_rr_config_get_outputs (labeler->priv->config);
-+
-+	for (i = 0; i < labeler->priv->num_outputs; i++)
-+		if (outputs[i] == output) {
-+			*rgba_out = labeler->priv->palette[i];
-+			return;
-+		}
-+
-+	g_warning ("trying to get the color for unknown GnomeOutputInfo %p; returning magenta!", output);
-+
-+	rgba_out->red   = 1.0;
-+	rgba_out->green = 0;
-+	rgba_out->blue  = 1.0;
-+	rgba_out->alpha  = 1.0;
-+}
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h
---- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h	1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h	2013-04-22 03:42:12.383233540 +0200
-@@ -0,0 +1,64 @@
-+/* gnome-rr-labeler.h - Utility to label monitors to identify them
-+ * while they are being configured.
-+ *
-+ * Copyright 2008, Novell, Inc.
-+ *
-+ * This file is part of the Gnome Library.
-+ *
-+ * The Gnome Library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * The Gnome Library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ *
-+ * Author: Federico Mena-Quintero <federico@novell.com>
-+ */
-+
-+#ifndef CC_RR_LABELER_H
-+#define CC_RR_LABELER_H
-+
-+#define GNOME_DESKTOP_USE_UNSTABLE_API
-+#include <libgnome-desktop/gnome-rr-config.h>
-+
-+#define GNOME_TYPE_RR_LABELER            (cc_rr_labeler_get_type ())
-+#define CC_RR_LABELER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_LABELER, CcRRLabeler))
-+#define CC_RR_LABELER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GNOME_TYPE_RR_LABELER, CcRRLabelerClass))
-+#define GNOME_IS_RR_LABELER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_RR_LABELER))
-+#define GNOME_IS_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GNOME_TYPE_RR_LABELER))
-+#define CC_RR_LABELER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GNOME_TYPE_RR_LABELER, CcRRLabelerClass))
-+
-+typedef struct _CcRRLabeler CcRRLabeler;
-+typedef struct _CcRRLabelerClass CcRRLabelerClass;
-+typedef struct _CcRRLabelerPrivate CcRRLabelerPrivate;
-+
-+struct _CcRRLabeler {
-+	GObject parent;
-+
-+	/*< private >*/
-+	CcRRLabelerPrivate *priv;
-+};
-+
-+struct _CcRRLabelerClass {
-+	GObjectClass parent_class;
-+};
-+
-+GType cc_rr_labeler_get_type (void);
-+
-+CcRRLabeler *cc_rr_labeler_new (GnomeRRConfig *config);
-+
-+void cc_rr_labeler_show (CcRRLabeler *labeler);
-+
-+void cc_rr_labeler_hide (CcRRLabeler *labeler);
-+
-+void cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out);
-+
-+#endif
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am cinnamon-control-center-1.7.3/panels/display/Makefile.am
---- cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am	2013-04-15 16:04:38.000000000 +0200
-+++ cinnamon-control-center-1.7.3/panels/display/Makefile.am	2013-04-22 03:42:12.376566715 +0200
-@@ -19,6 +19,8 @@
- 	display-module.c	\
- 	cc-display-panel.c	\
- 	cc-display-panel.h	\
-+	cc-rr-labeler.c		\
-+	cc-rr-labeler.h		\
- 	scrollarea.c		\
- 	scrollarea.h		\
- 	$(MARSHALFILES)
diff --git a/community/cinnamon-control-center/idle-delay.patch b/community/cinnamon-control-center/idle-delay.patch
deleted file mode 100644
index bdf0a8a4a..000000000
--- a/community/cinnamon-control-center/idle-delay.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c
---- cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c	2013-08-14 22:10:57.491152667 +0200
-+++ cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c	2013-08-14 21:58:36.533247961 +0200
-@@ -978,9 +978,6 @@
-   has_lid = up_client_get_lid_is_present (self->priv->up_client);
- 
- out:
--  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid);
--  gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid);
--  gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid);    
-   gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries);
-   gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries);
-   gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries);
-@@ -1067,26 +1064,6 @@
-   g_signal_connect (widget, "changed",
-                     G_CALLBACK (combo_enum_changed_cb),
-                     self);
--
--  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action");
--  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
--                                               "combobox_lid_ac"));
--  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
--  set_value_for_combo (GTK_COMBO_BOX (widget), value);
--  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action");
--  g_signal_connect (widget, "changed",
--                    G_CALLBACK (combo_enum_changed_cb),
--                    self);
--
--  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action");
--  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
--                                               "combobox_lid_battery"));
--  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
--  set_value_for_combo (GTK_COMBO_BOX (widget), value);
--  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action");
--  g_signal_connect (widget, "changed",
--                    G_CALLBACK (combo_enum_changed_cb),
--                    self);
- 
-   widget = WID (self->priv->builder, "vbox_power");
-   gtk_widget_reparent (widget, (GtkWidget *) self);
-diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/power.ui cinnamon-control-center-1.8.2/panels/power/power.ui
---- cinnamon-control-center-1.8.2.orig/panels/power/power.ui	2013-05-22 18:25:19.000000000 +0200
-+++ cinnamon-control-center-1.8.2/panels/power/power.ui	2013-08-14 21:57:54.872240364 +0200
-@@ -222,50 +222,6 @@
-               </packing>
-             </child>
-             <child>
--              <object class="GtkLabel" id="label_lid_action">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="halign">end</property>
--                <property name="label" translatable="yes">When the lid is closed</property>
--              </object>
--              <packing>
--                <property name="left_attach">0</property>
--                <property name="top_attach">3</property>
--              </packing>
--            </child>
--            <child>
--              <object class="GtkComboBox" id="combobox_lid_battery">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="model">liststore_lid</property>
--                <property name="hexpand">True</property>
--                <accessibility>
--                  <relation type="labelled-by" target="label_header_battery"/>
--                  <relation type="labelled-by" target="label_lid_action"/>
--                </accessibility>
--              </object>
--              <packing>
--                <property name="left_attach">1</property>
--                <property name="top_attach">3</property>
--              </packing>
--            </child>
--            <child>
--              <object class="GtkComboBox" id="combobox_lid_ac">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="model">liststore_lid</property>
--                <property name="hexpand">True</property>
--                <accessibility>
--                  <relation type="labelled-by" target="label_header_ac"/>
--                  <relation type="labelled-by" target="label_lid_action"/>
--                </accessibility>
--              </object>
--              <packing>
--                <property name="left_attach">2</property>
--                <property name="top_attach">3</property>
--              </packing>
--            </child>
--            <child>
-               <object class="GtkSeparator" id="separator_indicator">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
-@@ -468,12 +424,10 @@
-   </object>
-   <object class="GtkSizeGroup" id="sizegroup_combos">
-     <widgets>
--      <widget name="combobox_lid_battery"/>
--      <widget name="combobox_lid_ac"/>    
-       <widget name="combobox_critical"/>
-       <widget name="combobox_sleep_battery"/>
-       <widget name="combobox_sleep_ac"/>
-       <widget name="combobox_sleep_ac"/>
-     </widgets>
-   </object>
--</interface>
-\ No newline at end of file
-+</interface>
-diff -Naur cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c
---- cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c	2013-08-14 22:10:57.541153876 +0200
-+++ cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c	2013-08-14 21:55:41.905692072 +0200
-@@ -352,10 +352,6 @@
-                       1, &value,
-                       -1);
- 
--  /* set both battery and ac keys */
--  g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value);
--  g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value);
--
-   set_idle_delay_from_dpms (self, value);
- }
- 
-@@ -385,7 +381,7 @@
- {
-   GtkTreeIter iter;
-   GtkTreeModel *model;
--  gint value;
-+  guint value;
-   gint value_tmp, value_prev;
-   gboolean ret;
-   guint i;
-@@ -400,7 +396,7 @@
-   i = 0;
- 
-   /* try to make the UI match the AC setting */
--  value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac");
-+  g_settings_get (self->priv->session_settings, "idle-delay", "u", &value);
-   do
-     {
-       gtk_tree_model_get (model, &iter,
-@@ -511,7 +507,7 @@
-   /* bind the auto dim checkbox */
-   widget = WID ("screen_auto_reduce_checkbutton");
-   g_settings_bind (self->priv->gsd_settings,
--                   "idle-dim-battery",
-+                   "idle-dim",
-                    widget, "active",
-                    G_SETTINGS_BIND_DEFAULT);
- 
diff --git a/community/cinnamon-control-center/remove_obex.patch b/community/cinnamon-control-center/remove_obex.patch
deleted file mode 100644
index abcf1be88..000000000
--- a/community/cinnamon-control-center/remove_obex.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/panels/bluetooth/bluetooth.ui
-+++ b/panels/bluetooth/bluetooth.ui
-@@ -543,34 +543,6 @@
-                                 <property name="position">3</property>
-                               </packing>
-                             </child>
--                            <child>
--                              <object class="GtkBox" id="browse_box">
--                                <property name="visible">True</property>
--                                <property name="can_focus">False</property>
--                                <child>
--                                  <placeholder/>
--                                </child>
--                                <child>
--                                  <object class="GtkButton" id="browse_button">
--                                    <property name="label" translatable="yes">Browse Files...</property>
--                                    <property name="can_focus">True</property>
--                                    <property name="receives_default">True</property>
--                                    <property name="use_action_appearance">False</property>
--                                  </object>
--                                  <packing>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                    <property name="pack_type">end</property>
--                                    <property name="position">1</property>
--                                  </packing>
--                                </child>
--                              </object>
--                              <packing>
--                                <property name="expand">False</property>
--                                <property name="fill">True</property>
--                                <property name="position">4</property>
--                              </packing>
--                            </child>
-                           </object>
-                           <packing>
-                             <property name="expand">False</property>
---- a/panels/bluetooth/cc-bluetooth-panel.c
-+++ b/panels/bluetooth/cc-bluetooth-panel.c
-@@ -311,7 +311,6 @@ cc_bluetooth_panel_update_properties (Cc
- 	gtk_widget_hide (WID ("keyboard_box"));
- 	gtk_widget_hide (WID ("sound_box"));
- 	gtk_widget_hide (WID ("mouse_box"));
--	gtk_widget_hide (WID ("browse_box"));
- 	gtk_widget_hide (WID ("send_box"));
- 
- 	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
-@@ -367,10 +366,10 @@ cc_bluetooth_panel_update_properties (Cc
- 
- 			uuids = (const char **) g_value_get_boxed (&value);
- 			for (i = 0; uuids && uuids[i] != NULL; i++) {
--				if (g_str_equal (uuids[i], "OBEXObjectPush"))
-+				if (g_str_equal (uuids[i], "OBEXObjectPush")) {
- 					gtk_widget_show (WID ("send_box"));
--				else if (g_str_equal (uuids[i], "OBEXFileTransfer"))
--					gtk_widget_show (WID ("browse_box"));
-+					break;
-+				}
- 			}
- 			g_value_unset (&value);
- 		}
-@@ -538,34 +537,6 @@ send_callback (GtkButton        *button,
- 	g_free (alias);
- }
- 
--static void
--mount_finish_cb (GObject *source_object,
--		 GAsyncResult *res,
--		 gpointer user_data)
--{
--	GError *error = NULL;
--
--	if (bluetooth_browse_address_finish (source_object, res, &error) == FALSE) {
--		g_printerr ("Failed to mount OBEX volume: %s", error->message);
--		g_error_free (error);
--		return;
--	}
--}
--
--static void
--browse_callback (GtkButton        *button,
--		 CcBluetoothPanel *self)
--{
--	char *bdaddr;
--
--	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
--
--	bluetooth_browse_address (G_OBJECT (self), bdaddr,
--				  GDK_CURRENT_TIME, mount_finish_cb, NULL);
--
--	g_free (bdaddr);
--}
--
- /* Visibility/Discoverable */
- static void discoverable_changed (BluetoothClient  *client,
- 				  GParamSpec       *spec,
-@@ -894,8 +865,6 @@ cc_bluetooth_panel_init (CcBluetoothPane
- 			  G_CALLBACK (keyboard_callback), self);
- 	g_signal_connect (G_OBJECT (WID ("sound_link")), "activate-link",
- 			  G_CALLBACK (sound_callback), self);
--	g_signal_connect (G_OBJECT (WID ("browse_button")), "clicked",
--			  G_CALLBACK (browse_callback), self);
- 	g_signal_connect (G_OBJECT (WID ("send_button")), "clicked",
- 			  G_CALLBACK (send_callback), self);
- 	g_signal_connect (G_OBJECT (WID ("switch_connection")), "notify::active",
-                             
diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD
new file mode 100644
index 000000000..d9d585db2
--- /dev/null
+++ b/community/cinnamon-desktop/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Alexandre Filgueria <alexfilgueira@antergos.com>
+# Contributor:  Jan de Groot <jan@archlinux.org>
+
+pkgname=cinnamon-desktop
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Library with common API for various Cinnamon modules"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes)
+makedepends=(intltool gobject-introspection itstool gnome-common)
+url="https://github.com/linuxmint/cinnamon-desktop"
+options=(!libtool)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz")
+sha256sums=('dd4ef4c14699a0566ae8e7e060a7db8574ef65dcdac80751de350788ea99ff3c')
+
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static \
+    --with-gnome-distributor="Arch Linux"
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index f935b5bab..66ed0d014 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -4,34 +4,37 @@
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-screensaver
-pkgver=1.8.0
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://github.com/linuxmint/cinnamon-screensaver"
 backup=(etc/pam.d/cinnamon-screensaver)
-depends=('cinnamon' 'gnome-screensaver')
+depends=('cinnamon' 'cinnamon-desktop')
 makedepends=('intltool' 'gnome-common')
 options=(!emptydirs)
 source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
        cinnamon-screensaver.pam
        fix-dbus-compatibility.patch
        lock_screen_on_suspend.patch)
-sha256sums=('e85722d5af2ecbed98f50909285b335d7635214bf8cada49964f60bb5d1339c1'
+sha256sums=('90da7f811892f667202ecd1240091f9c4d253eebe223bbfedb3d544dd68b3fc7'
             'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
             'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6'
             '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
 
-
   # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes
   patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch
 
   # Lock screen on suspend with systemd
   patch -Np1 -i ${srcdir}/lock_screen_on_suspend.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
                --libexecdir=/usr/lib/cinnamon-screensaver \
@@ -45,9 +48,6 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver"
 
-  # Remove conflicts with gnome-screensaver
-  rm "$pkgdir"/usr/bin/gnome-screensaver{,-command}
-
   # Autostart only in Cinnamon
   cp "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" \
     "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD
new file mode 100644
index 000000000..c73cb60eb
--- /dev/null
+++ b/community/cinnamon-session/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=cinnamon-session
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="The Cinnamon Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(systemd dconf gsettings-desktop-schemas gtk3
+         hicolor-icon-theme libgl libsm libxtst upower)
+makedepends=(intltool mesa json-glib gtk-doc xtrans gnome-common)
+options=('!emptydirs')
+install=cinnamon-session.install
+url="https://github.com/linuxmint/cinnamon-session"
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
+        timeout.patch)
+sha256sums=('d1eba64a5484f086f257ee75799d12afd77373fbdb0ced8d3ae48eadcd02a878'
+            'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Increase timeout, for slow machines
+  patch -Np1 -i ../timeout.patch
+}
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --libexecdir=/usr/lib/cinnamon-session \
+      --disable-schemas-compile --enable-systemd --disable-gconf
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-session/cinnamon-session.install b/community/cinnamon-session/cinnamon-session.install
new file mode 100644
index 000000000..f7e8c46ac
--- /dev/null
+++ b/community/cinnamon-session/cinnamon-session.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/cinnamon-session/timeout.patch b/community/cinnamon-session/timeout.patch
new file mode 100644
index 000000000..f4f5b64ca
--- /dev/null
+++ b/community/cinnamon-session/timeout.patch
@@ -0,0 +1,24 @@
+diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
+--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
+@@ -36,7 +36,7 @@
+ #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
+ 
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
+ 
+ typedef void (*GsmFillHandleProvider) (const char *provides,
+                                        const char *default_provider,
+diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
+--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
+@@ -30,7 +30,7 @@
+ #include <X11/Xatom.h>
+ 
+ /* Wait up to this long for a running check to finish */
+-#define PROPERTY_CHANGE_TIMEOUT 5000
++#define PROPERTY_CHANGE_TIMEOUT 12000
+ 
+ /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
+ #define NO_ACCEL            0
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
new file mode 100644
index 000000000..127c715ba
--- /dev/null
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=cinnamon-settings-daemon
+pkgver=2.0.1
+pkgrel=1
+pkgdesc="The Cinnamon Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dconf' 'cinnamon-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
+         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'libxklavier'
+         'libgnomekbd')
+makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl' 'gnome-common')
+options=('!emptydirs' '!libtool')
+install=cinnamon-settings-daemon.install
+url="https://github.com/linuxmint/cinnamon-settings-daemon"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
+sha256sums=('f03f5ea46bec11a6a0ed02b232dab8cb99a84fd8a9b52a76a454a7ba74dc1168')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install b/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install
new file mode 100644
index 000000000..f7e8c46ac
--- /dev/null
+++ b/community/cinnamon-settings-daemon/cinnamon-settings-daemon.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index cd3603d04..a873998db 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 97850 2013-09-30 10:27:55Z allan $
+# $Id: PKGBUILD 98186 2013-10-07 12:08:20Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.8.8
-pkgrel=5
+pkgver=1.9.2
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
-depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth'
-         'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session'
+depends=('accountsservice' 'caribou' 'clutter-gtk' 'cjs' 'gnome-bluetooth'
+         'gnome-icon-theme' 'gnome-menus' 'cinnamon-settings-daemon' 'cinnamon-session'
          'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg'
-         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow'
-         'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat'
-         'gnome-panel')
+         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' 'python2-pexpect'
+         'python2-pyinotify' 'python2-lxml' 'webkitgtk' 'gnome-panel' 'python2' 'cinnamon-translations')
 makedepends=('gnome-common' 'intltool')
 optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
             'cinnamon-screensaver: lock screen'
@@ -27,66 +26,38 @@ options=('!libtool' '!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
         "remove_GC.patch"
-        "keyboard_applet.patch"
         "fix-control-center-check.patch"
-        "gnome-3.8.patch"
-        "switch-applications.patch"
-        "fallback-helpers.patch"
-        "idle-dim.patch"
-        "background.patch"
-        "bluetooth_obex_transfer.patch"
-        "disable-mpris-support.patch")
-sha256sums=('1bce982e6333e7bd27a1df9f37eb9139360c2fef667c7a998a79f216d4a0921d'
+        "background.patch")
+sha256sums=('0abaa8da02c4d626084aa482adc551af154796c4c35faaebebdac896ce72aa6d'
             '3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680'
-            'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
             'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
-            '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e'
-            '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
-            'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
-            'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100'
-            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f'
-            '4497f3e0a97c364845d8a3a3b3b75e7dc9d475dc39f56b2106f8c4b9e5111ac2'
-            'f1eb8110718434e1dc2cf0a308757a787390382dfccd1c8cc80488b93cf6a9f7')
+            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f')
 
-build() {
+prepare() {
   cd ${srcdir}/Cinnamon*
 
   # Python2 fix
-  sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \
-    files/usr/bin/$pkgname-menu-editor \
-    files/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py
+  sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor
   find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
   # Fix crasher when disconnecting from wifi
   patch -Np1 -i ../remove_GC.patch
 
-  # Fix Keyboard applet
-  # https://github.com/linuxmint/Cinnamon/issues/1337
-  patch -Np1 -i ../keyboard_applet.patch
-
   # Check for the cc-panel path, not for the unneeded binary
   patch -Np1 -i ../fix-control-center-check.patch
 
-  # https://github.com/linuxmint/Cinnamon/pull/1888
-  patch -Np1 -i ../gnome-3.8.patch
-
-  # Fix windows switcher keybinding with default settings in GNOME 3.8
-  patch -Np1 -i ../switch-applications.patch
-
-  # Start media keys and mount helpers with the session
-  patch -Np1 -i ../fallback-helpers.patch
-
-  # Fix brightness applet for GNOME 3.8
-  patch -Np1 -i ../idle-dim.patch
-
   # Fix missing backgrounds
   patch -Np1 -i ../background.patch
 
-  # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8
-  patch -Np1 -i ../bluetooth_obex_transfer.patch
+  # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
+  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings.desktop
 
-  # Disable MPRIS support (workaround for FS#35282)
-  patch -Np1 -i ../disable-mpris-support.patch
+  # fix for the python2 PAM module  
+  sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
+}
+
+build() {
+  cd ${srcdir}/Cinnamon*
 
   ./autogen.sh --prefix=/usr \
                --sysconfdir=/etc \
@@ -96,7 +67,7 @@ build() {
                --disable-schemas-compile \
                --enable-compile-warnings=yes \
                --with-session-tracking=systemd
-  make
+  make CFLAGS="${CFLAGS} -Wno-deprecated -Wno-deprecated-declarations"
 }
 
 package() {
@@ -105,7 +76,4 @@ package() {
 
   # Remove leftover files after patching
   find "$pkgdir" -type f -name *.orig | xargs rm
-
-  # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
-  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' "$pkgdir/usr/share/applications/cinnamon-settings.desktop"
 }
diff --git a/community/cinnamon/bluetooth_obex_transfer.patch b/community/cinnamon/bluetooth_obex_transfer.patch
deleted file mode 100644
index 0e632c48b..000000000
--- a/community/cinnamon/bluetooth_obex_transfer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
-@@ -455,22 +455,6 @@ MyApplet.prototype = {
-                 this._applet.send_to_address(device.bdaddr, device.alias);
-             }));
-         }
--        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
--            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
--                this._applet.browse_address(device.bdaddr, event.get_time(),
--                    Lang.bind(this, function(applet, result) {
--                        try {
--                            applet.browse_address_finish(result);
--                        } catch (e) {
--                            this._ensureSource();
--                            this._source.notify(new MessageTray.Notification(this._source,
--                                 _("Bluetooth"),
--                                 _("Error browsing device"),
--                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
--                        }
--                    }));
--            }));
--        }
- 
-         switch (device.type) {
-         case GnomeBluetoothApplet.Type.KEYBOARD:
diff --git a/community/cinnamon/disable-mpris-support.patch b/community/cinnamon/disable-mpris-support.patch
deleted file mode 100644
index dff615f4f..000000000
--- a/community/cinnamon/disable-mpris-support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
---- Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js	2013-08-14 16:44:19.955273614 +0000
-+++ Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js	2013-08-14 16:46:34.171029992 +0000
-@@ -600,13 +600,6 @@
- 
-             // menu not showed by default
-             this._players = {};
--            // watch players
--            for (var p=0; p<compatible_players.length; p++) {
--                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
--                    Lang.bind(this, this._addPlayer),
--                    Lang.bind(this, this._removePlayer)
--                );
--            }
- 
-             this._control = new Gvc.MixerControl({ name: 'Cinnamon Volume Control' });
-             this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged));
diff --git a/community/cinnamon/fallback-helpers.patch b/community/cinnamon/fallback-helpers.patch
deleted file mode 100644
index b6810cdba..000000000
--- a/community/cinnamon/fallback-helpers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session
---- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-25 01:30:35.435650613 +0200
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Cinnamon (Software Rendering)
--RequiredComponents=cinnamon2d;gnome-settings-daemon;
-+RequiredComponents=cinnamon2d;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
- DesktopName=GNOME
- 
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session
---- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-25 01:30:33.645607769 +0200
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Cinnamon
--RequiredComponents=cinnamon;gnome-settings-daemon;
-+RequiredComponents=cinnamon;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
- DesktopName=GNOME
- 
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch
deleted file mode 100644
index b79ea497a..000000000
--- a/community/cinnamon/gnome-3.8.patch
+++ /dev/null
@@ -1,4186 +0,0 @@
-From 2ba97ed278777fcb96b86cd58e9176536585ad2d Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 19 Apr 2013 13:19:50 -0400
-Subject: [PATCH 01/16] Disable XInput on cinnamon startup (for 3.8 compat)
- This has no effect on < 1.14 clutter
-
----
- src/main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main.c b/src/main.c
-index 418fb60..ac90d91 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -260,6 +260,7 @@
-   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
- 
-   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
-+  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
-   g_setenv ("NO_GAIL", "1", TRUE);
-   g_setenv ("NO_AT_BRIDGE", "1", TRUE);
-   meta_init ();
--- 
-1.8.1.6
-
-
-From 72133f97fbd99c78169cec49e18b97da3edba524 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 19 Apr 2013 13:21:40 -0400
-Subject: [PATCH 02/16] Explain change
-
----
- src/main.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index ac90d91..9d37975 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -257,10 +257,12 @@
- 
-   g_option_context_free (ctx);
- 
-+  /* Disable XInput extension - required for 3.8 compatibility */
-+  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
-+
-   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
- 
-   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
--  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
-   g_setenv ("NO_GAIL", "1", TRUE);
-   g_setenv ("NO_AT_BRIDGE", "1", TRUE);
-   meta_init ();
--- 
-1.8.1.6
-
-
-From 28210e29e3e0d81c68320b9511574a168f5779e4 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 16 Apr 2013 17:01:30 -0400
-Subject: [PATCH 03/16] Add backgroundManager - this is needed for gnome 3.8
- compatibility, as gnome-settings-daemon no longer handles the desktop
- background.
-
----
- configure.ac                                       |   7 +-
- data/org.cinnamon.gschema.xml.in                   |  71 +++-
- .../cinnamon-settings/modules/cs_backgrounds.py    |  31 +-
- js/ui/main.js                                      |   3 +-
- src/Makefile.am                                    |   2 +
- src/cinnamon-background-manager.c                  | 411 +++++++++++++++++++++
- src/cinnamon-background-manager.h                  |  57 +++
- 7 files changed, 562 insertions(+), 20 deletions(-)
- create mode 100644 src/cinnamon-background-manager.c
- create mode 100644 src/cinnamon-background-manager.h
-
-diff --git a/configure.ac b/configure.ac
-index 0aa47c5..a2a9479 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,6 +68,7 @@ GTK_MIN_VERSION=3.0.0
- GIO_MIN_VERSION=2.29.10
- POLKIT_MIN_VERSION=0.100
- STARTUP_NOTIFICATION_MIN_VERSION=0.11
-+GNOME_DESKTOP_MIN_VERSION=3.0.0
- 
- # Collect more than 20 libraries for a prize!
- PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
-@@ -82,7 +83,8 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
-                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
- 			       libcanberra
-                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
--                               libnm-glib libnm-util gnome-keyring-1)
-+                               libnm-glib libnm-util gnome-keyring-1
-+                               gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION)
- 
- PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
- 
-@@ -106,7 +108,8 @@ AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
- CFLAGS=$saved_CFLAGS
- LIBS=$saved_LIBS
- 
--PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
-+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 
-+                      gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION x11)
- PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
- PKG_CHECK_MODULES(TRAY, gtk+-3.0)
- PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
-diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
-index f12f8c5..939ea70 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -746,6 +746,23 @@
-     </key>
-   </schema>
- 
-+
-+  <enum id="bg_style">
-+    <value nick="none" value="0"/>
-+    <value nick="wallpaper" value="1"/>
-+    <value nick="centered" value="2"/>
-+    <value nick="scaled" value="3"/>
-+    <value nick="stretched" value="4"/>
-+    <value nick="zoom" value="5"/>
-+    <value nick="spanned" value="6"/>
-+  </enum>
-+
-+  <enum id="bg_shading">
-+    <value nick="solid" value="0"/>
-+    <value nick="vertical" value="1"/>
-+    <value nick="horizontal" value="2"/>
-+  </enum>
-+
-   <schema id="org.cinnamon.background" path="/org/cinnamon/background/">
-     <key name="mode" type="s">
-       <default>"wallpaper"</default>
-@@ -776,8 +793,60 @@
-         This key defines the delay for the slideshow.
-       </description>
-     </key>
-+    <key name="draw-background" type="b">
-+      <default>true</default>
-+      <_summary>Draw Desktop Background</_summary>
-+      <_description>Have GNOME draw the desktop background.</_description>
-+    </key>
-+    <key name="picture-options" enum="bg_style">
-+      <default>'zoom'</default>
-+      <_summary>Picture Options</_summary>
-+      <_description>
-+        Determines how the image set by wallpaper_filename is rendered.
-+        Possible values are "none", "wallpaper", "centered", "scaled",
-+        "stretched", "zoom", "spanned".
-+      </_description>
-+    </key>
-+    <key name="picture-uri" type="s">
-+      <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
-+      <_summary>Picture URI</_summary>
-+      <_description>
-+        URI to use for the background image. Not that the backend only supports
-+        local (file://) URIs.
-+      </_description>
-+    </key>
-+    <key name="picture-opacity" type="i">
-+      <range min="0" max="100"/>
-+      <default>100</default>
-+      <_summary>Picture Opacity</_summary>
-+      <_description>
-+        Opacity with which to draw the background picture.
-+      </_description>
-+    </key>
-+    <key name="primary-color" type="s">
-+      <default>'#023c88'</default>
-+      <_summary>Primary Color</_summary>
-+      <_description>
-+        Left or Top color when drawing gradients, or the solid color.
-+      </_description>
-+    </key>
-+    <key name="secondary-color" type="s">
-+      <default>'#5789ca'</default>
-+      <_summary>Secondary Color</_summary>
-+      <_description>
-+        Right or Bottom color when drawing gradients, not used for solid color.
-+      </_description>
-+    </key>
-+    <key name="color-shading-type" enum="bg_shading">
-+      <default>'solid'</default>
-+      <_summary>Color Shading Type</_summary>
-+      <_description>
-+        How to shade the background color. Possible values are "horizontal",
-+        "vertical", and "solid".
-+      </_description>
-+    </key>
-   </schema>
--  
-+
-   <schema id="org.cinnamon.screensaver" path="/org/cinnamon/screensaver/">
-     <key name="default-message" type="s">
-       <default>""</default>
---- linuxmint-Cinnamon-a464dc9.orig/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 18:01:56.000000000 +0200
-+++ linuxmint-Cinnamon-a464dc9/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py  2013-04-30 23:36:46.718385152 +0200
-@@ -232,11 +232,11 @@
-     
- 
- class BackgroundWallpaperPane (Gtk.VBox):
--    def __init__(self, sidepage, gnome_background_schema):
-+    def __init__(self, sidepage, cinnamon_background_schema):
-         Gtk.VBox.__init__(self)
-         self.set_spacing(5)
-         
--        self._gnome_background_schema = gnome_background_schema
-+        self._cinnamon_background_schema = cinnamon_background_schema
-         self._sidepage = sidepage
-         
-         scw = Gtk.ScrolledWindow()
-@@ -263,15 +263,15 @@
-         if wallpaper:
-             for key in wallpaper:
-                 if key == "filename":
--                    self._gnome_background_schema.set_string("picture-uri", "file://" + wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("picture-uri", "file://" + wallpaper[key])
-                 elif key == "pcolor":
--                    self._gnome_background_schema.set_string("primary-color", wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("primary-color", wallpaper[key])
-                 elif key == "scolor":
--                    self._gnome_background_schema.set_string("secondary-color", wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("secondary-color", wallpaper[key])
-                 elif key == "shade_type":
--                    self._gnome_background_schema.set_string("color-shading-type", wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("color-shading-type", wallpaper[key])
-                 elif key == "options":
--                    self._gnome_background_schema.set_string("picture-options", wallpaper[key])
-+                    self._cinnamon_background_schema.set_string("picture-options", wallpaper[key])
-             if (not "metadataFile" in wallpaper) or (wallpaper["metadataFile"] == ""):
-                 self._sidepage.remove_wallpaper_button.set_sensitive(True)
-     
-@@ -445,12 +445,11 @@
-             f = open(filename, "w")
-             f.write(xml_data)
-             f.close()
--            Gio.Settings("org.gnome.desktop.background").set_string("picture-uri", "file://" + filename)
-+            Gio.Settings("org.cinnamon.background").set_string("picture-uri", "file://" + filename)
- 
- class BackgroundSidePage (SidePage):
-     def __init__(self, name, icon, keywords, advanced, content_box):
-         SidePage.__init__(self, name, icon, keywords, advanced, content_box, -1)
--        self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background")
-         self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background")
-         self._add_wallpapers_dialog = AddWallpapersDialog()
-         
-@@ -515,8 +514,8 @@
-         self.mainbox.set_visible_window(False)
-         self.content_box.pack_start(self.mainbox, True, True, 3)
-         
--        self.wallpaper_pane = BackgroundWallpaperPane(self, self._gnome_background_schema)
--        self.slideshow_pane = BackgroundSlideshowPane(self, self._gnome_background_schema, self._cinnamon_background_schema)
-+        self.wallpaper_pane = BackgroundWallpaperPane(self, self._cinnamon_background_schema)
-+        self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema, self._cinnamon_background_schema)
-         if self._cinnamon_background_schema["mode"] == "slideshow":
-             self.mainbox.add(self.slideshow_pane)
-         else:
-@@ -536,21 +535,21 @@
-         l = Gtk.Label(_("Picture aspect"))
-         l.set_alignment(0, 0.5)
-         advanced_options_box.pack_start(l, False, False, 0)
--        self.picture_options = GSettingsComboBox("", "org.gnome.desktop.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS)
-+        self.picture_options = GSettingsComboBox("", "org.cinnamon.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS)
-         advanced_options_box.pack_start(self.picture_options, False, False, 0)
-         
-         l = Gtk.Label(_("Gradient"))
-         l.set_alignment(0, 0.5)
-         advanced_options_box.pack_start(l, False, False, 0)
--        self.color_shading_type = GSettingsComboBox("", "org.gnome.desktop.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES)
-+        self.color_shading_type = GSettingsComboBox("", "org.cinnamon.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES)
-         advanced_options_box.pack_start(self.color_shading_type, False, False, 0)
-         
-         hbox = Gtk.HBox()
-         l = Gtk.Label(_("Colors"))
-         hbox.pack_start(l, False, False, 2)
--        self.primary_color = GSettingsColorChooser("org.gnome.desktop.background", "primary-color", None)
-+        self.primary_color = GSettingsColorChooser("org.cinnamon.background", "primary-color", None)
-         hbox.pack_start(self.primary_color, False, False, 2)
--        self.secondary_color = GSettingsColorChooser("org.gnome.desktop.background", "secondary-color", None)
-+        self.secondary_color = GSettingsColorChooser("org.cinnamon.background", "secondary-color", None)
-         hbox.pack_start(self.secondary_color, False, False, 2)
-         advanced_options_box.pack_start(hbox, False, False, 0)
-         self.content_box.show_all()
-
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 74154ab..99aee95 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -86,6 +86,7 @@ let _cssStylesheet = null;
- let dynamicWorkspaces = null;
- let nWorks = null;
- let tracker = null;
-+let backgroundManager = null;
- let desktopShown;
- 
- let workspace_names = [];
-@@ -214,7 +215,7 @@ function start() {
-     // be predictable anyways.
-     tracker = Cinnamon.WindowTracker.get_default();
-     Cinnamon.AppUsage.get_default();
--
-+    backgroundManager = Cinnamon.BackgroundManager.get_default();
-     // The stage is always covered so Clutter doesn't need to clear it; however
-     // the color is used as the default contents for the Muffin root background
-     // actor so set it anyways.
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3bab29c..6bac83c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -105,6 +105,7 @@ cinnamon_public_headers_h =		\
- 	cinnamon-app-system.h		\
- 	cinnamon-app-usage.h		\
- 	cinnamon-arrow.h			\
-+	cinnamon-background-manager.h	\
- 	cinnamon-doc-system.h		\
- 	cinnamon-embedded-window.h		\
- 	cinnamon-generic-container.h	\
-@@ -142,6 +143,7 @@ libcinnamon_la_SOURCES =		\
- 	cinnamon-app-system.c		\
- 	cinnamon-app-usage.c		\
- 	cinnamon-arrow.c			\
-+	cinnamon-background-manager.c	\
- 	cinnamon-doc-system.c		\
- 	cinnamon-embedded-window.c		\
- 	cinnamon-generic-container.c	\
-diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c
-new file mode 100644
-index 0000000..9d95250
---- /dev/null
-+++ b/src/cinnamon-background-manager.c
-@@ -0,0 +1,411 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright © 2001 Ximian, Inc.
-+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-+ * Copyright 2007 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#include "config.h"
-+
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+#include <locale.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <gio/gio.h>
-+#include <gdk/gdk.h>
-+#include <gdk/gdkx.h>
-+
-+#define GNOME_DESKTOP_USE_UNSTABLE_API
-+#include <libgnome-desktop/gnome-bg.h>
-+#include <X11/Xatom.h>
-+
-+#include "cinnamon-background-manager.h"
-+
-+#define CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerPrivate))
-+
-+struct CinnamonBackgroundManagerPrivate
-+{
-+        GSettings   *settings;
-+        GnomeBG     *bg;
-+
-+        GnomeBGCrossfade *fade;
-+
-+        GDBusProxy  *proxy;
-+        guint        proxy_signal_id;
-+};
-+
-+static void     cinnamon_background_manager_class_init  (CinnamonBackgroundManagerClass *klass);
-+static void     cinnamon_background_manager_init        (CinnamonBackgroundManager      *background_manager);
-+static void     cinnamon_background_manager_finalize    (GObject             *object);
-+
-+static void setup_bg (CinnamonBackgroundManager *manager);
-+static void connect_screen_signals (CinnamonBackgroundManager *manager);
-+
-+G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT)
-+
-+static gpointer manager_object = NULL;
-+
-+static gboolean
-+dont_draw_background (CinnamonBackgroundManager *manager)
-+{
-+        return !g_settings_get_boolean (manager->priv->settings,
-+                                        "draw-background");
-+}
-+
-+static void
-+on_crossfade_finished (CinnamonBackgroundManager *manager)
-+{
-+        g_object_unref (manager->priv->fade);
-+        manager->priv->fade = NULL;
-+}
-+
-+static void
-+draw_background (CinnamonBackgroundManager *manager,
-+                 gboolean              use_crossfade)
-+{
-+        GdkDisplay *display;
-+        int         n_screens;
-+        int         i;
-+
-+        display = gdk_display_get_default ();
-+        n_screens = gdk_display_get_n_screens (display);
-+
-+        for (i = 0; i < n_screens; ++i) {
-+                GdkScreen *screen;
-+                GdkWindow *root_window;
-+                cairo_surface_t *surface;
-+
-+                screen = gdk_display_get_screen (display, i);
-+
-+                root_window = gdk_screen_get_root_window (screen);
-+
-+                surface = gnome_bg_create_surface (manager->priv->bg,
-+                                                   root_window,
-+                                                   gdk_screen_get_width (screen),
-+                                                   gdk_screen_get_height (screen),
-+                                                   TRUE);
-+
-+                if (use_crossfade) {
-+
-+                        if (manager->priv->fade != NULL) {
-+                                g_object_unref (manager->priv->fade);
-+                        }
-+
-+                        manager->priv->fade = gnome_bg_set_surface_as_root_with_crossfade (screen, surface);
-+                        g_signal_connect_swapped (manager->priv->fade, "finished",
-+                                                  G_CALLBACK (on_crossfade_finished),
-+                                                  manager);
-+                } else {
-+                        gnome_bg_set_surface_as_root (screen, surface);
-+                }
-+
-+                cairo_surface_destroy (surface);
-+        }
-+}
-+
-+static void
-+on_bg_transitioned (GnomeBG              *bg,
-+                    CinnamonBackgroundManager *manager)
-+{
-+        draw_background (manager, FALSE);
-+}
-+
-+static gboolean
-+settings_change_event_cb (GSettings            *settings,
-+                          gpointer              keys,
-+                          gint                  n_keys,
-+                          CinnamonBackgroundManager *manager)
-+{
-+        gnome_bg_load_from_preferences (manager->priv->bg,
-+                                        manager->priv->settings);
-+        return FALSE;
-+}
-+
-+static void
-+on_screen_size_changed (GdkScreen            *screen,
-+                        CinnamonBackgroundManager *manager)
-+{
-+        draw_background (manager, FALSE);
-+}
-+
-+static void
-+watch_bg_preferences (CinnamonBackgroundManager *manager)
-+{
-+        g_signal_connect (manager->priv->settings,
-+                          "change-event",
-+                          G_CALLBACK (settings_change_event_cb),
-+                          manager);
-+}
-+
-+static void
-+on_bg_changed (GnomeBG              *bg,
-+               CinnamonBackgroundManager *manager)
-+{
-+        draw_background (manager, TRUE);
-+}
-+
-+static void
-+setup_bg (CinnamonBackgroundManager *manager)
-+{
-+        g_return_if_fail (manager->priv->bg == NULL);
-+
-+        manager->priv->bg = gnome_bg_new ();
-+
-+        g_signal_connect (manager->priv->bg,
-+                          "changed",
-+                          G_CALLBACK (on_bg_changed),
-+                          manager);
-+
-+        g_signal_connect (manager->priv->bg,
-+                          "transitioned",
-+                          G_CALLBACK (on_bg_transitioned),
-+                          manager);
-+
-+        connect_screen_signals (manager);
-+        watch_bg_preferences (manager);
-+        gnome_bg_load_from_preferences (manager->priv->bg,
-+                                        manager->priv->settings);
-+}
-+
-+static void
-+setup_bg_and_draw_background (CinnamonBackgroundManager *manager)
-+{
-+        setup_bg (manager);
-+        draw_background (manager, FALSE);
-+}
-+
-+static void
-+disconnect_session_manager_listener (CinnamonBackgroundManager *manager)
-+{
-+        if (manager->priv->proxy && manager->priv->proxy_signal_id) {
-+                g_signal_handler_disconnect (manager->priv->proxy,
-+                                             manager->priv->proxy_signal_id);
-+                manager->priv->proxy_signal_id = 0;
-+        }
-+}
-+
-+static void
-+on_session_manager_signal (GDBusProxy   *proxy,
-+                           const gchar  *sender_name,
-+                           const gchar  *signal_name,
-+                           GVariant     *parameters,
-+                           gpointer      user_data)
-+{
-+        CinnamonBackgroundManager *manager = CINNAMON_BACKGROUND_MANAGER (user_data);
-+
-+        if (g_strcmp0 (signal_name, "SessionRunning") == 0) {
-+                setup_bg_and_draw_background (manager);
-+                disconnect_session_manager_listener (manager);
-+        }
-+}
-+
-+static void
-+draw_background_after_session_loads (CinnamonBackgroundManager *manager)
-+{
-+        GError *error = NULL;
-+        GDBusProxyFlags flags;
-+
-+        flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
-+                G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
-+        manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-+                                                              flags,
-+                                                              NULL, /* GDBusInterfaceInfo */
-+                                                              "org.gnome.SessionManager",
-+                                                              "/org/gnome/SessionManager",
-+                                                              "org.gnome.SessionManager",
-+                                                              NULL, /* GCancellable */
-+                                                              &error);
-+        if (manager->priv->proxy == NULL) {
-+                g_warning ("Could not listen to session manager: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy,
-+                                                           "g-signal",
-+                                                           G_CALLBACK (on_session_manager_signal),
-+                                                           manager);
-+}
-+
-+
-+static void
-+disconnect_screen_signals (CinnamonBackgroundManager *manager)
-+{
-+        GdkDisplay *display;
-+        int         i;
-+        int         n_screens;
-+
-+        display = gdk_display_get_default ();
-+        n_screens = gdk_display_get_n_screens (display);
-+
-+        for (i = 0; i < n_screens; ++i) {
-+                GdkScreen *screen;
-+                screen = gdk_display_get_screen (display, i);
-+                g_signal_handlers_disconnect_by_func (screen,
-+                                                      G_CALLBACK (on_screen_size_changed),
-+                                                      manager);
-+        }
-+}
-+
-+static void
-+connect_screen_signals (CinnamonBackgroundManager *manager)
-+{
-+        GdkDisplay *display;
-+        int         i;
-+        int         n_screens;
-+
-+        display = gdk_display_get_default ();
-+        n_screens = gdk_display_get_n_screens (display);
-+
-+        for (i = 0; i < n_screens; ++i) {
-+                GdkScreen *screen;
-+                screen = gdk_display_get_screen (display, i);
-+                g_signal_connect (screen,
-+                                  "monitors-changed",
-+                                  G_CALLBACK (on_screen_size_changed),
-+                                  manager);
-+                g_signal_connect (screen,
-+                                  "size-changed",
-+                                  G_CALLBACK (on_screen_size_changed),
-+                                  manager);
-+        }
-+}
-+
-+static void
-+draw_background_changed (GSettings            *settings,
-+                         const char           *key,
-+                         CinnamonBackgroundManager *manager)
-+{
-+        if (dont_draw_background (manager) == FALSE)
-+                setup_bg_and_draw_background (manager);
-+}
-+
-+gboolean
-+cinnamon_background_manager_start (CinnamonBackgroundManager *manager)
-+{
-+        manager->priv->settings = g_settings_new ("org.cinnamon.background");
-+        g_signal_connect (manager->priv->settings, "changed::draw-background",
-+                          G_CALLBACK (draw_background_changed), manager);
-+
-+        setup_bg_and_draw_background (manager);
-+            //draw_background_after_session_loads (manager);
-+
-+
-+        return TRUE;
-+}
-+
-+void
-+cinnamon_background_manager_stop (CinnamonBackgroundManager *manager)
-+{
-+        CinnamonBackgroundManagerPrivate *p = manager->priv;
-+
-+        g_debug ("Stopping background manager");
-+
-+        disconnect_screen_signals (manager);
-+
-+        if (manager->priv->proxy) {
-+                disconnect_session_manager_listener (manager);
-+                g_object_unref (manager->priv->proxy);
-+        }
-+
-+        g_signal_handlers_disconnect_by_func (manager->priv->settings,
-+                                              settings_change_event_cb,
-+                                              manager);
-+
-+        if (p->settings != NULL) {
-+                g_object_unref (p->settings);
-+                p->settings = NULL;
-+        }
-+
-+        if (p->bg != NULL) {
-+                g_object_unref (p->bg);
-+                p->bg = NULL;
-+        }
-+}
-+
-+/**
-+ * cinnamon_background_manager_get_default:
-+ *
-+ * Return Value: (transfer none): The global #CinnamonBackgroundManager singleton
-+ */
-+CinnamonBackgroundManager *
-+cinnamon_background_manager_get_default ()
-+{
-+  static CinnamonBackgroundManager *instance = NULL;
-+
-+  if (instance == NULL)
-+    instance = g_object_new (CINNAMON_TYPE_BACKGROUND_MANAGER, NULL);
-+
-+  return instance;
-+}
-+
-+static GObject *
-+cinnamon_background_manager_constructor (GType                  type,
-+                                    guint                  n_construct_properties,
-+                                    GObjectConstructParam *construct_properties)
-+{
-+        CinnamonBackgroundManager      *background_manager;
-+
-+        background_manager = CINNAMON_BACKGROUND_MANAGER (G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->constructor (type,
-+                                                                                                                        n_construct_properties,
-+                                                                                                                        construct_properties));
-+
-+        return G_OBJECT (background_manager);
-+}
-+
-+static void
-+cinnamon_background_manager_class_init (CinnamonBackgroundManagerClass *klass)
-+{
-+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-+
-+        object_class->constructor = cinnamon_background_manager_constructor;
-+        object_class->finalize = cinnamon_background_manager_finalize;
-+
-+        g_type_class_add_private (klass, sizeof (CinnamonBackgroundManagerPrivate));
-+}
-+
-+static void
-+cinnamon_background_manager_init (CinnamonBackgroundManager *manager)
-+{
-+        manager->priv = CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE (manager);
-+        cinnamon_background_manager_start (manager);
-+}
-+
-+static void
-+cinnamon_background_manager_finalize (GObject *object)
-+{
-+        CinnamonBackgroundManager *background_manager;
-+
-+        g_return_if_fail (object != NULL);
-+        g_return_if_fail (CINNAMON_IS_BACKGROUND_MANAGER (object));
-+
-+        background_manager = CINNAMON_BACKGROUND_MANAGER (object);
-+
-+        g_return_if_fail (background_manager->priv != NULL);
-+
-+        G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->finalize (object);
-+}
-diff --git a/src/cinnamon-background-manager.h b/src/cinnamon-background-manager.h
-new file mode 100644
-index 0000000..9a56e32
---- /dev/null
-+++ b/src/cinnamon-background-manager.h
-@@ -0,0 +1,57 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#ifndef __CINNAMON_BACKGROUND_MANAGER_H
-+#define __CINNAMON_BACKGROUND_MANAGER_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define CINNAMON_TYPE_BACKGROUND_MANAGER         (cinnamon_background_manager_get_type ())
-+#define CINNAMON_BACKGROUND_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManager))
-+#define CINNAMON_BACKGROUND_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass))
-+#define CINNAMON_IS_BACKGROUND_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER))
-+#define CINNAMON_IS_BACKGROUND_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), CINNAMON_TYPE_BACKGROUND_MANAGER))
-+#define CINNAMON_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass))
-+
-+typedef struct CinnamonBackgroundManagerPrivate CinnamonBackgroundManagerPrivate;
-+
-+typedef struct
-+{
-+        GObject                     parent;
-+        CinnamonBackgroundManagerPrivate *priv;
-+} CinnamonBackgroundManager;
-+
-+typedef struct
-+{
-+        GObjectClass   parent_class;
-+} CinnamonBackgroundManagerClass;
-+
-+GType                   cinnamon_background_manager_get_type            (void);
-+
-+CinnamonBackgroundManager *cinnamon_background_manager_get_default (void);
-+
-+gboolean                cinnamon_background_manager_start               (CinnamonBackgroundManager *manager);
-+void                    cinnamon_background_manager_stop                (CinnamonBackgroundManager *manager);
-+
-+G_END_DECLS
-+
-+#endif /* __CINNAMON_BACKGROUND_MANAGER_H */
--- 
-1.8.1.6
-
-
-From c971d472a88f8ea725b2bef33715016e111732d9 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 16 Apr 2013 18:28:16 -0400
-Subject: [PATCH 04/16] Change default background
-
----
- data/org.cinnamon.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
-index 939ea70..6d8c82d 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -808,7 +808,7 @@
-       </_description>
-     </key>
-     <key name="picture-uri" type="s">
--      <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
-+      <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default>
-       <_summary>Picture URI</_summary>
-       <_description>
-         URI to use for the background image. Not that the backend only supports
--- 
-1.8.1.6
-
-
-From 0147459229b449757bac9a92c173c4bd3c2f9eca Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 16 Apr 2013 18:41:16 -0400
-Subject: [PATCH 05/16] Use distro-agnostic background..
-
----
- data/org.cinnamon.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
-index 6d8c82d..567dca8 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -808,7 +808,7 @@
-       </_description>
-     </key>
-     <key name="picture-uri" type="s">
--      <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default>
-+      <default>'file:///usr/share/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
-       <_summary>Picture URI</_summary>
-       <_description>
-         URI to use for the background image. Not that the backend only supports
--- 
-1.8.1.6
-
-
-From 706d244a9dbe2ace9860044e2245a285d8473f47 Mon Sep 17 00:00:00 2001
-From: dalcde <dalcde@yahoo.com.hk>
-Date: Mon, 15 Apr 2013 18:34:48 +0800
-Subject: [PATCH 06/16] [GDbus] Port DBus to GDBus (AltLinux patch)
-
----
- .../applets/brightness@cinnamon.org/applet.js      |  39 +-
- .../cinnamon/applets/power@cinnamon.org/applet.js  | 102 ++--
- .../cinnamon/applets/sound@cinnamon.org/applet.js  | 511 ++++++---------------
- .../cinnamon/applets/xrandr@cinnamon.org/applet.js |  19 +-
- js/misc/gnomeSession.js                            | 147 ++----
- js/misc/modemManager.js                            |  79 ++--
- js/misc/screenSaver.js                             |  89 ++--
- js/ui/appletManager.js                             |   1 -
- js/ui/automountManager.js                          | 106 ++---
- js/ui/autorunManager.js                            |  27 +-
- js/ui/calendar.js                                  |  71 +--
- js/ui/cinnamonDBus.js                              |  96 ++--
- js/ui/endSessionDialog.js                          |  79 ++--
- js/ui/keyboard.js                                  |  48 +-
- js/ui/layout.js                                    |  14 +-
- js/ui/magnifierDBus.js                             | 134 ++++--
- js/ui/main.js                                      |   6 -
- js/ui/messageTray.js                               |  13 +-
- js/ui/notificationDaemon.js                        | 193 ++++----
- js/ui/scripting.js                                 |  34 +-
- 20 files changed, 774 insertions(+), 1034 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
-index 9cbda80..9087b25 100644
---- a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
-@@ -5,7 +5,6 @@ const St = imports.gi.St;
- const PopupMenu = imports.ui.popupMenu;
- const GLib = imports.gi.GLib;
- const Gio = imports.gi.Gio;
--const DBus = imports.dbus;
- 
- /* constants */
- const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
-@@ -14,24 +13,25 @@ const DimSettingsBattery = "idle-dim-battery";
- const PowerBusName = 'org.gnome.SettingsDaemon';
- const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
- 
--/* DBus interface */
--const PowerManagerInterface = {
--    name: 'org.gnome.SettingsDaemon.Power.Screen',
--    methods:
--        [
--            { name: 'GetPercentage', inSignature: '', outSignature: 'u' },
--            { name: 'SetPercentage', inSignature: 'u', outSignature: 'u' },
--            { name: 'StepUp', inSignature: '', outSignature: 'u' },
--            { name: 'StepDown', inSignature: '', outSignature: 'u' },
--        ],
--    signals:
--        [
--            { name: 'Changed', inSignature: '', outSignature: '' },
--        ]
--};
-+const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power.Screen">
-+<method name="GetPercentage">
-+    <arg type="u" direction="out"/>
-+</method>
-+<method name="SetPercentage">
-+    <arg type="u" direction="in"/>
-+    <arg type="u" direction="out"/>
-+</method>
-+<method name="StepUp">
-+    <arg type="u" direction="out"/>
-+</method>
-+<method name="StepDown">
-+    <arg type="u" direction="out"/>
-+</method>
-+<signal name="Changed" />
-+</interface>;
- 
- /* DBus magic */
--let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
-+const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
- 
- /* TextImageMenuItem taken from sound@cinnamon.org applet */
- let icon_path = "/usr/share/cinnamon/theme/";
-@@ -100,7 +100,7 @@ MyApplet.prototype = {
-         Applet.IconApplet.prototype._init.call(this, orientation, panel_height);
-         
-         try {
--            this._proxy = new PowerManagerProxy(DBus.session, PowerBusName, PowerObjectPath);
-+            this._proxy = new PowerManagerProxy(Gio.DBus.session, PowerBusName, PowerObjectPath);
-             
-             this.menuManager = new PopupMenu.PopupMenuManager(this);
-             this.menu = new Applet.AppletPopupMenu(this, orientation);
-@@ -137,7 +137,8 @@ MyApplet.prototype = {
-                     this.menu.addMenuItem(this._settingsMenu);
-                 
-                     //get notified
--                    this._proxy.connect('Changed', Lang.bind(this, this._getBrightness));
-+                    this._proxy.connectSignal('Changed', Lang.bind(this, this._getBrightness));
-+                    
-                     this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
-                 } else {
-                     this.set_applet_tooltip(_("Brightness"));
-diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-index c342fe7..b6b2bcd 100644
---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-@@ -1,6 +1,5 @@
- const Applet = imports.ui.applet;
- const Gio = imports.gi.Gio;
--const DBus = imports.dbus;
- const Lang = imports.lang;
- const St = imports.gi.St;
- const PopupMenu = imports.ui.popupMenu;
-@@ -42,34 +41,46 @@ const LabelDisplay = {
-     TIME: 'time'
- };
- 
--const PowerManagerInterface = {
--    name: 'org.gnome.SettingsDaemon.Power',
--    methods: [
--        { name: 'GetDevices', inSignature: '', outSignature: 'a(susdut)' },
--        { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' },
--        ],
--    signals: [
--        { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' },
--        ],
--    properties: [
--        { name: 'Icon', signature: 's', access: 'read' },
--        ]
--};
--let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
--
--const SettingsManagerInterface = {
--	name: 'org.freedesktop.DBus.Properties',
--	methods: [
--		{ name: 'Get', inSignature: 's,s', outSignature: 'v' },
--		{ name: 'GetAll', inSignature: 's', outSignature: 'a{sv}' },
--		{ name: 'Set', inSignature: 's,s,v', outSignature: '' }
--	],
--	signals: [
--	{name: 'PropertiesChanged', inSignature:'s,a{sv},a[s]', outSignature:''}
--	]
--};
--
--let SettingsManagerProxy = DBus.makeProxyClass(SettingsManagerInterface);
-+const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
-+<method name="GetDevices">
-+    <arg type="a(susdut)" direction="out"/>
-+</method>
-+<method name="GetPrimaryDevice">
-+    <arg type="(susdut)" direction="out"/>
-+</method>
-+<signal name="PropertiesChanged">
-+    <arg type="s"/>
-+    <arg type="a{sv}"/>
-+    <arg type="a[s]"/>
-+</signal>
-+<property name="Icon" type="s" access="read" />
-+</interface>;
-+
-+const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
-+
-+const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties">
-+<method name="Get">
-+    <arg type="s" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="v" direction="out"/>
-+</method>
-+<method name="GetAll">
-+    <arg type="s" direction="in"/>
-+    <arg type="a{sv}" direction="out"/>
-+</method>
-+<method name="Set">
-+    <arg type="s" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="v" direction="in"/>
-+</method>
-+<signal name="PropertiesChanged">
-+    <arg type="s"/>
-+    <arg type="a{sv}"/>
-+    <arg type="a[s]"/>
-+</signal>
-+</interface>;
-+
-+const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface);
- 
- function DeviceItem() {
-     this._init.apply(this, arguments);
-@@ -143,11 +154,11 @@ MyApplet.prototype = {
-             this.menuManager = new PopupMenu.PopupMenuManager(this);
-             this.menu = new Applet.AppletPopupMenu(this, orientation);
-             this.menuManager.addMenu(this.menu);            
--            
-+
-             //this.set_applet_icon_symbolic_name('battery-missing');            
--            this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
--            this._smProxy = new SettingsManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
--            
-+            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
-+            this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
-+
-             let icon = this.actor.get_children()[0];
-             this.actor.remove_actor(icon);
-             let box = new St.BoxLayout({ name: 'batteryBox' });
-@@ -306,18 +317,19 @@ MyApplet.prototype = {
-         this._devicesChanged();
-     },
- 
--    _devicesChanged: function() {        
--        this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) {
--            if (icon) {    
--                this.set_applet_icon_symbolic_name('battery-missing');
--                let gicon = Gio.icon_new_for_string(icon);
--                this._applet_icon.gicon = gicon;
--                this.actor.show();
--            } else {
--                this.menu.close();
--                this.actor.hide();
--            }
--        }));
-+
-+    _devicesChanged: function() {
-+        this.set_applet_icon_symbolic_name('battery-missing');
-+        let icon = this._proxy.Icon;
-+        if (icon) {
-+            let gicon = Gio.icon_new_for_string(icon);
-+            this.setGIcon(gicon);
-+            this.actor.show();
-+        } else {
-+            this.menu.close();
-+            this.actor.hide();
-+        }
-+
-         this._readPrimaryDevice();
-         this._readOtherDevices();
-         this._updateLabel();
-diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-index 50c4e1e..c8427ac 100644
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -1,7 +1,6 @@
- const Applet = imports.ui.applet;
- const Mainloop = imports.mainloop;
- const Gio = imports.gi.Gio;
--const DBus = imports.dbus;
- const Lang = imports.lang;
- const Cinnamon = imports.gi.Cinnamon;
- const Clutter = imports.gi.Clutter;
-@@ -12,95 +11,50 @@ const Gvc = imports.gi.Gvc;
- const Pango = imports.gi.Pango;
- const Tooltips = imports.ui.tooltips;
- 
--const PropIFace = {
--    name: 'org.freedesktop.DBus.Properties',
--    signals: [{ name: 'PropertiesChanged',
--                inSignature: 'a{sv}'}]
--};
--
--const MediaServer2IFace = {
--    name: 'org.mpris.MediaPlayer2',
--    methods: [{ name: 'Raise',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Quit',
--                inSignature: '',
--                outSignature: '' }],
--    properties: [{ name: 'CanRaise',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanQuit',
--                   signature: 'b',
--                   access: 'read'}],
--};
--
--const MediaServer2PlayerIFace = {
--    name: 'org.mpris.MediaPlayer2.Player',
--    methods: [{ name: 'PlayPause',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Pause',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Play',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Stop',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Next',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'Previous',
--                inSignature: '',
--                outSignature: '' },
--              { name: 'SetPosition',
--                inSignature: 'ox',
--                outSignature: '' }],
--    properties: [{ name: 'Metadata',
--                   signature: 'a{sv}',
--                   access: 'read'},
--                 { name: 'Shuffle',
--                   signature: 'b',
--                   access: 'readwrite'},
--                 { name: 'Rate',
--                   signature: 'd',
--                   access: 'readwrite'},
--                 { name: 'LoopStatus',
--                   signature: 'b',
--                   access: 'readwrite'},
--                 { name: 'Volume',
--                   signature: 'd',
--                   access: 'readwrite'},
--                 { name: 'PlaybackStatus',
--                   signature: 's',
--                   access: 'read'},
--                 { name: 'Position',
--                   signature: 'x',
--                   access: 'read'},
--                 { name: 'CanGoNext',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanGoPrevious',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanPlay',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanPause',
--                   signature: 'b',
--                   access: 'read'},
--                 { name: 'CanSeek',
--                   signature: 'b',
--                   access: 'read'}],
--    signals: [{ name: 'Seeked',
--                inSignature: 'x' }]
--};
-+const PropIFace = <interface name="org.freedesktop.DBus.Properties">
-+<signal name="PropertiesChanged">
-+    <arg type="a{sv}"/>
-+</signal>
-+</interface>;
-+
-+const MediaServer2IFace = <interface name="org.mpris.MediaPlayer2">
-+<method name="Raise" />
-+<method name="Quit" />
-+<property name="CanRaise" type="b" access="read" />
-+<property name="CanQuit" type="b" access="read" />
-+</interface>;
-+
-+const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player">
-+<method name="PlayPause" />
-+<method name="Pause" />
-+<method name="Play" />
-+<method name="Stop" />
-+<method name="Next" />
-+<method name="Previous" />
-+<method name="SetPosition">
-+    <arg type="a{ov}" direction="in"/>
-+</method>
-+<property name='Metadata' access='read' type='a{sv}' />
-+<property name='Shuffle' access='readwrite' type='b' />
-+<property name='Rate' access='readwrite' type='d' />
-+<property name='LoopStatus' access='readwrite' type='s' />
-+<property name='Volume' access='readwrite' type='d' />
-+<property name='PlaybackStatus' access='read' type='s' />
-+<property name='Position' access='read' type='x' />
-+<property name="CanGoNext" type="b" access="read" />
-+<property name="CanGoPrevious" type="b" access="read" />
-+<property name="CanPlay" type="b" access="read" />
-+<property name="CanPause" type="b" access="read" />
-+<property name="CanSeek" type="b" access="read" />
-+<signal name="Seeked">
-+    <arg type="x"/>
-+</signal>
-+</interface>;
- 
- /* global values */
- let icon_path = "/usr/share/cinnamon/theme/";
--let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp" ];
--let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ];
-+let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ];
-+let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ];
- /* dummy vars for translation */
- let x = _("Playing");
- x = _("Paused");
-@@ -112,131 +66,20 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */
- const ICON_SIZE = 28;
- 
- 
--function Prop() {
--    this._init.apply(this, arguments);
--}
--
--Prop.prototype = {
--    _init: function(owner) {
--        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
--    }
--}
--DBus.proxifyPrototype(Prop.prototype, PropIFace)
--
--function MediaServer2() {
--    this._init.apply(this, arguments);
--}
--
--MediaServer2.prototype = {
--    _init: function(owner) {
--        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
--    },
--    getRaise: function(callback) {
--        this.GetRemote('CanRaise', Lang.bind(this,
--            function(raise, ex) {
--                if (!ex)
--                    callback(this, raise);
--            }));
--    },
--    getQuit: function(callback) {
--        this.GetRemote('CanQuit', Lang.bind(this,
--            function(quit, ex) {
--                if (!ex)
--                    callback(this, quit);
--            }));
--    }
-+var PropProxy = Gio.DBusProxy.makeProxyWrapper(PropIFace);
-+function Prop(owner, initCallback, cancellable) {
-+    return new PropProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
- }
--DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace)
- 
--function MediaServer2Player() {
--    this._init.apply(this, arguments);
-+var MediaServer2Proxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2IFace);
-+function MediaServer2(owner, initCallback, cancellable) {
-+    return new MediaServer2Proxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
- }
- 
--MediaServer2Player.prototype = {
--    _init: function(owner) {
--        this._owner = owner;
--        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
--    },
--    getMetadata: function(callback) {
--        this.GetRemote('Metadata', Lang.bind(this,
--            function(metadata, ex) {
--                if (!ex)
--                    callback(this, metadata);
--            }));
--    },
--    getPlaybackStatus: function(callback) {
--        this.GetRemote('PlaybackStatus', Lang.bind(this,
--            function(status, ex) {
--                if (!ex)
--                    callback(this, status);
--            }));
--    },
--    getRate: function(callback) {
--        this.GetRemote('Rate', Lang.bind(this,
--            function(rate, ex) {
--                if (!ex)
--                    callback(this, rate);
--            }));
--    },
--    getPosition: function(callback) {
--        this.GetRemote('Position', Lang.bind(this,
--            function(position, ex) {
--                if (!ex)
--                    callback(this, position);
--            }));
--    },
--    setPosition: function(value) {
--        this.SetRemote('Position', value);
--    },
--    getShuffle: function(callback) {
--        this.GetRemote('Shuffle', Lang.bind(this,
--            function(shuffle, ex) {
--                if (!ex)
--                    callback(this, shuffle);
--            }));
--    },
--    setShuffle: function(value) {
--        this.SetRemote('Shuffle', value);
--    },
--    getVolume: function(callback) {
--        this.GetRemote('Volume', Lang.bind(this,
--            function(volume, ex) {
--                if (!ex)
--                    callback(this, volume);
--            }));
--    },
--    setVolume: function(value) {
--        this.SetRemote('Volume', parseFloat(value));
--    },
--    getRepeat: function(callback) {
--        this.GetRemote('LoopStatus', Lang.bind(this,
--            function(repeat, ex) {
--                if (!ex) {
--                    if (repeat == "None")
--                        repeat = false
--                    else
--                        repeat = true
--                    callback(this, repeat);
--                }
--            }));
--    },
--    setRepeat: function(value) {
--        if (value)
--            value = "Playlist"
--        else
--            value = "None"
--        this.SetRemote('LoopStatus', value);
--    },
--    getCanSeek: function(callback) {
--        this.GetRemote('CanSeek', Lang.bind(this,
--            function(canSeek, err) {
--                if (!err) {
--                    callback(this, canSeek);
--                }
--            }));
--    }
-+var MediaServer2PlayerProxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2PlayerIFace);
-+function MediaServer2Player(owner, initCallback, cancellable) {
-+    return new MediaServer2PlayerProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
- }
--DBus.proxifyPrototype(MediaServer2Player.prototype, MediaServer2PlayerIFace)
- 
- function TrackInfo() {
-     this._init.apply(this, arguments);
-@@ -355,7 +198,6 @@ Player.prototype = {
-     _init: function(system_status_button, owner) {
-         PopupMenu.PopupMenuSection.prototype._init.call(this);
- 
--        this.showPosition = true; // @todo: Get from settings
-         this._owner = owner;
-         this._system_status_button = system_status_button;
-         this._name = this._owner.split('.')[3];
-@@ -389,7 +231,7 @@ Player.prototype = {
-         this.infos_top.add_actor(this._artist.getActor());
-         this.infos_bottom.add_actor(this._album.getActor());
-         this.infos_top.add_actor(this._title.getActor());
--
-+        this.infos_bottom.add_actor(this._time.getActor());
-         this._trackInfosTop.set_child(this.infos_top);
-         this._trackInfosBottom.set_child(this.infos_bottom);
- 
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -414,45 +414,20 @@
-         this._trackControls.set_child(this.controls);
-         this.addActor(this._trackControls);
- 
--        this._seekControls = new St.Bin({style_class: 'sound-seek', x_align: St.Align.START});
--        this.seekControls = new St.BoxLayout({style_class: 'sound-seek-box'});
--        this.seekControls.add_actor(this._time.getActor());
--
--        this._positionSlider = new PopupMenu.PopupSliderMenuItem(0);
--        this._positionSlider.connect('value-changed', Lang.bind(this, function(item) {
--            let time = item._value * this._songLength;
--            this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength));
--        }));
--        this._positionSlider.connect('drag-end', Lang.bind(this, function(item) {
--            let time = item._value * this._songLength;
--            this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength));
--            this._wantedSeekValue = Math.round(time * 1000000);
--            this._mediaServerPlayer.SetPositionRemote(this._trackObj, time * 1000000);
--        }));
--
--        this.sliderBin = new St.Bin({style_class: 'sound-seek-slider'});
--        this.sliderBin.set_child(this._positionSlider.actor);
--        this.seekControls.add_actor(this.sliderBin);
--        this._seekControls.set_child(this.seekControls);
--        this.addActor(this._seekControls);
--
--        this._mediaServer.getRaise(Lang.bind(this, function(sender, raise) {
--            if (raise) {
--                this._raiseButton = new ControlButton('go-up',
--                    Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); }));
--                this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player"));
--                this.controls.add_actor(this._raiseButton.getActor());
--            }
--        }));
--
--        this._mediaServer.getQuit(Lang.bind(this, function(sender, quit) {
--            if (quit) {
--                this._quitButton = new ControlButton('window-close',
--                    Lang.bind(this, function () { this._mediaServer.QuitRemote(); }));
--                this.controls.add_actor(this._quitButton.getActor());
--                this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player"));
--            }
--        }));
-+    let CanRaise = this._mediaServer.CanRaise;
-+    let CanQuit = this._mediaServer.CanQuit;
-+    if (CanRaise) {
-+            this._raiseButton = new ControlButton('go-up',
-+                          Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); }));
-+            this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player"));
-+            this.controls.add_actor(this._raiseButton.getActor());
-+    }
-+    if (CanQuit) {
-+            this._quitButton = new ControlButton('window-close',
-+                         Lang.bind(this, function () { this._mediaServer.QuitRemote(); }));
-+            this.controls.add_actor(this._quitButton.getActor());
-+            this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player"));
-+    }
- 
-         /* this players don't support seek */
-         if (support_seek.indexOf(this._name) == -1) {
-@@ -465,39 +440,23 @@
-         this._getMetadata();
-         this._currentTime = 0;
-         this._getPosition();
--        this._wantedSeekValue = 0;
--        this._updatePositionSlider();
- 
--        this._prop.connect('PropertiesChanged', Lang.bind(this, function(sender, iface, value) {
-+        this._prop.connectSignal('PropertiesChanged', Lang.bind(this, function(sender, iface, value) {
-             if (value["PlaybackStatus"])
--                this._setStatus(iface, value["PlaybackStatus"]);
-+                this._setStatus(value["PlaybackStatus"]);
-             if (value["Metadata"])
--                this._setMetadata(iface, value["Metadata"]);
--            //qmmp
--            if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-+                this._setMetadata(value["Metadata"]);
-+            // qmmp
-+            if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
-                 if (value["playbackStatus"])
--                    this._setStatus(iface, value["playbackStatus"]);
-+                    this._setStatus(value["playbackStatus"]);
-                 if (value["metadata"])
--                    this._setMetadata(sender, value["metadata"]);
--            } 
--        }));
--
--        this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) {
--            if (value > 0) {
--                this._setPosition(value);
--            }
--            // Seek initiated by the position slider
--            else if (this._wantedSeekValue > 0) {
--                // Some broken gstreamer players (Banshee) reports always 0
--                // when the track is seeked so we set the position at the
--                // value we set on the slider
--                this._setPosition(this._wantedSeekValue);
-+                    this._setMetadata(value["metadata"]);
-             }
--            // Seek value send by the player
--            else
--                this._setPosition(value);
-+        }));
- 
--            this._wantedSeekValue = 0;
-+        this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
-+            this._setPosition(sender, value);
-         }));
- 
-         Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
-
-@@ -512,45 +303,26 @@ Player.prototype = {
-         this._playerInfo.setText(this._getName() + " - " + _(status));
-     },
- 
--    _updatePositionSlider: function(position) {
--        this._mediaServerPlayer.getCanSeek(Lang.bind(this, function(sender, canSeek) {
--            this._canSeek = canSeek;
--            
--            if (this._songLength == 0 || position == false)
--                this._canSeek = false
--
--            // Clem: The following code was commented out. When the next song started, it resulted in hiding the sound menu, making it hard for the user to repeatedly click on the next song button.
--            // There's probably a better fix and this was not tested with players which don't support seeking, but it fixes the regression created by the slider (apparently when the slider is hidden it closes the menu)
--            // if (this._playerStatus == "Playing" && this._canSeek && this.showPosition)
--            //     this._positionSlider.actor.show();
--            // else
--            //     this._positionSlider.actor.hide();
--        }));
--    },
--
--    _setPosition: function(value) {
--        if (value == null && this._playerStatus != 'Stopped') {
--            this._updatePositionSlider(false);
--        }
--        else {
--            this._currentTime = value / 1000000;
--            this._updateTimer();
--        }
-+    _setPosition: function(sender, value) {
-+        this._stopTimer();
-+        this._currentTime = value / 1000000;
-+        this._updateTimer();
-+        if (this._playerStatus == "Playing")
-+            this._runTimer();
-     },
- 
-     _getPosition: function() {
--        this._mediaServerPlayer.getPosition(Lang.bind(this, function(sender, value) {
--            this._setPosition(value);
--        }));
-+    this._setPosition(this._mediaServerPlayer.Position);
-+        Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
-     },
- 
--    _setMetadata: function(sender, metadata) {
-+    _setMetadata: function(metadata) {
-         if (metadata["mpris:length"]) {
-             // song length in secs
--            this._songLength = metadata["mpris:length"] / 1000000;
-+            this._songLength = metadata["mpris:length"].unpack() / 1000000;
-             // FIXME upstream
-             if (this._name == "quodlibet")
--                this._songLength = metadata["mpris:length"] / 1000;
-+                this._songLength = metadata["mpris:length"].unpack() / 1000;
-             // reset timer
-             this._stopTimer();
-             if (this._playerStatus == "Playing")
-@@ -559,26 +333,29 @@ Player.prototype = {
-             this._stopTimer();
-         }
-         if (metadata["xesam:artist"])
--            this._artist.setLabel(metadata["xesam:artist"].toString());
-+            this._artist.setLabel(metadata["xesam:artist"].unpack());
-         else
-             this._artist.setLabel(_("Unknown Artist"));
-         if (metadata["xesam:album"])
--            this._album.setLabel(metadata["xesam:album"].toString());
-+            this._album.setLabel(metadata["xesam:album"].unpack());
-         else
-             this._album.setLabel(_("Unknown Album"));
-         if (metadata["xesam:title"])
--            this._title.setLabel(metadata["xesam:title"].toString());
-+            this._title.setLabel(metadata["xesam:title"].unpack());
-         else
-             this._title.setLabel(_("Unknown Title"));
--        
--        if (metadata["mpris:trackid"]) {
--            this._trackObj = metadata["mpris:trackid"];
--        }
-+        /*if (metadata["mpris:trackid"]) {
-+            this._trackId = {
-+                _init: function() {
-+                    DBus.session.proxifyObject(this, this._owner, metadata["mpris:trackid"]);
-+                }
-+            }
-+        }*/
- 
-         let change = false;
-         if (metadata["mpris:artUrl"]) {
--            if (this._trackCoverFile != metadata["mpris:artUrl"].toString()) {
--                this._trackCoverFile = metadata["mpris:artUrl"].toString();
-+            if (this._trackCoverFile != metadata["mpris:artUrl"].unpack()) {
-+                this._trackCoverFile = metadata["mpris:artUrl"].unpack();
-                 change = true;
-             }
-         }
-@@ -600,8 +377,7 @@ Player.prototype = {
-                     cover.read_async(null, null, Lang.bind(this, this._onReadCover));
-                 }
-                 else {
--                    cover_path = decodeURIComponent(this._trackCoverFile);
--                    cover_path = cover_path.replace("file://", "");
-+                    cover_path = decodeURIComponent(this._trackCoverFile.substr(7));
-                     this._showCover(cover_path);
-                 }
-             }
-@@ -611,13 +387,10 @@ Player.prototype = {
-     },
- 
-     _getMetadata: function() {
--        this._mediaServerPlayer.getMetadata(Lang.bind(this,
--            this._setMetadata
--        ));
-+    this._setMetadata(this._mediaServerPlayer.Metadata);
-     },
- 
--    _setStatus: function(sender, status) {
--        this._updatePositionSlider();
-+    _setStatus: function(status) {
-         this._playerStatus = status;
-         if (status == "Playing") {
-             this._playButton.setIcon("media-playback-pause");
-@@ -631,53 +404,39 @@ Player.prototype = {
-             this._playButton.setIcon("media-playback-start");
-             this._stopTimer();
-         }
--
-         this._playerInfo.setImage("player-" + status.toLowerCase());
-         this._setName(status);
-     },
- 
-     _getStatus: function() {
--        this._mediaServerPlayer.getPlaybackStatus(Lang.bind(this,
--            this._setStatus
--        ));
-+    this._setStatus(this._mediaServerPlayer.PlaybackStatus);
-     },
- 
-     _updateRate: function() {
--        this._mediaServerPlayer.getRate(Lang.bind(this, function(sender, rate) {
--            this._rate = rate;
--        }));
-+    this._rate = this._mediaServerPlayer.Rate;
-     },
- 
-     _updateTimer: function() {
--        if (this.showPosition && this._canSeek) {
--            if (!isNaN(this._currentTime) && !isNaN(this._songLength) && this._currentTime > 0)
--                this._positionSlider.setValue(this._currentTime / this._songLength);
--            else
--                this._positionSlider.setValue(0);
--        }
-         this._time.setLabel(this._formatTime(this._currentTime) + " / " + this._formatTime(this._songLength));
-     },
- 
-     _runTimer: function() {
--        if (this._playerStatus == 'Playing') {
--            this._timeoutId = Mainloop.timeout_add_seconds(1, Lang.bind(this, this._runTimer));
--            this._currentTime += 1;
--            this._updateTimer();
--        }
-+        /*if (!Tweener.resumeTweens(this)) {
-+            Tweener.addTween(this,
-+                { time: this._songLength - this._currentTime,
-+                  transition: 'linear',
-+                  onUpdate: Lang.bind(this, this._updateTimer) });
-+        }*/
-     },
- 
-     _pauseTimer: function() {
--        if (this._timeoutId != 0) {
--            Mainloop.source_remove(this._timeoutId);
--            this._timeoutId = 0;
--        }
--        this._updateTimer();
-+        //Tweener.pauseTweens(this);
-     },
- 
-     _stopTimer: function() {
-+        /*Tweener.removeTweens(this);
-         this._currentTime = 0;
--        this._pauseTimer();
--        this._updateTimer();
-+        this._updateTimer();*/
-     },
- 
-     _formatTime: function(s) {
-@@ -771,7 +530,7 @@ MediaPlayerLauncher.prototype = {
-     },
- 
-     activate: function (event) {
--    	this._menu.actor.hide();
-+        this._menu.actor.hide();
-         this._app.activate_full(-1, event.get_time());
-         return true;
-     }
-@@ -799,7 +558,7 @@ MyApplet.prototype = {
-             this._players = {};
-             // watch players
-             for (var p=0; p<compatible_players.length; p++) {
--                DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
-+                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
-                     Lang.bind(this, this._addPlayer),
-                     Lang.bind(this, this._removePlayer)
-                 );
-@@ -930,7 +689,7 @@ MyApplet.prototype = {
-         return Object.keys(this._players).length;
-     },
- 
--    _addPlayer: function(owner) {
-+    _addPlayer: function(connection, owner) {
-         // ensure menu is empty
-         this._cleanup();
-         this._volumeControlShown = false;
-@@ -945,12 +704,12 @@ MyApplet.prototype = {
-         this._readOutput();
-     },
- 
--    _removePlayer: function(owner) {
-+    _removePlayer: function(connection, owner) {
-         delete this._players[owner];
-         this._cleanup();
-         this._volumeControlShown = false;
-         for (owner in this._players) {
--            this._addPlayer(owner);
-+            this._addPlayer(connection, owner);
-         }
-         this.menu.emit('players-loaded', true);
- 
-@@ -974,21 +733,21 @@ MyApplet.prototype = {
-         this._volumeControlShown = true;
- 
-         if (this._nbPlayers()==0){
--        	this._availablePlayers = new Array();
-+            this._availablePlayers = new Array();
-             let appsys = Cinnamon.AppSystem.get_default();
-             let allApps = appsys.get_all();
-             let listedDesktopFiles = new Array();
-             for (let y=0; y<allApps.length; y++) {
--            	let app = allApps[y];
--            	let entry = app.get_tree_entry();
--            	let path = entry.get_desktop_file_path();
--            	for (var p=0; p<compatible_players.length; p++) {
-+                let app = allApps[y];
-+                let entry = app.get_tree_entry();
-+                let path = entry.get_desktop_file_path();
-+                for (var p=0; p<compatible_players.length; p++) {
-                     let desktopFile = compatible_players[p]+".desktop";
--            		if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) {
--                		this._availablePlayers.push(app);
-+                    if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) {
-+                        this._availablePlayers.push(app);
-                         listedDesktopFiles.push(desktopFile);
--            		}
--           		}
-+                    }
-+                }
-             }
- 
-             if (this._availablePlayers.length > 0){
-@@ -1137,19 +896,19 @@ MyApplet.prototype = {
-             this._mutedChanged (null, null, '_output');
-             this._volumeChanged (null, null, '_output');
-             let sinks = this._control.get_sinks();
--	        this._selectDeviceItem.menu.removeAll();
--	        for (let i = 0; i < sinks.length; i++) {
--	        	let sink = sinks[i];
--	        	let menuItem = new PopupMenu.PopupMenuItem(sink.get_description());
--	        	if (sinks[i].get_id() == this._output.get_id()) {
--	        		menuItem.setShowDot(true);
--	        	}
--	        	menuItem.connect('activate', Lang.bind(this, function() {
--	        		log('Changing default sink to ' + sink.get_description());
--	                this._control.set_default_sink(sink);
--	            }));
--	            this._selectDeviceItem.menu.addMenuItem(menuItem);
--	        }
-+            this._selectDeviceItem.menu.removeAll();
-+            for (let i = 0; i < sinks.length; i++) {
-+                let sink = sinks[i];
-+                let menuItem = new PopupMenu.PopupMenuItem(sink.get_description());
-+                if (sinks[i].get_id() == this._output.get_id()) {
-+                    menuItem.setShowDot(true);
-+                }
-+                menuItem.connect('activate', Lang.bind(this, function() {
-+                    log('Changing default sink to ' + sink.get_description());
-+                    this._control.set_default_sink(sink);
-+                }));
-+                this._selectDeviceItem.menu.addMenuItem(menuItem);
-+            }
-         } else {
-             this._outputSlider.setValue(0);
-             this.setIconName('audio-volume-muted-symbolic');
-diff --git a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
-index 0dcf74d..c2d152a 100644
---- a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
-@@ -1,6 +1,6 @@
- /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
- 
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const Gdk = imports.gi.Gdk;
- const GLib = imports.gi.GLib;
- const GnomeDesktop = imports.gi.GnomeDesktop;
-@@ -22,13 +22,14 @@ let rotations = [ [ GnomeDesktop.RRRotation.ROTATION_0, N_("Normal") ],
- 		  [ GnomeDesktop.RRRotation.ROTATION_180, N_("Upside-down") ]
- 		];
- 
--const XRandr2Iface = {
--    name: 'org.gnome.SettingsDaemon.XRANDR_2',
--    methods: [
--	{ name: 'ApplyConfiguration', inSignature: 'xx', outSignature: '' },
--    ]
--};
--let XRandr2 = DBus.makeProxyClass(XRandr2Iface);
-+const XRandr2Iface = <interface name="org.gnome.SettingsDaemon.XRANDR_2">
-+<method name="ApplyConfiguration">
-+    <arg type="x" direction="in"/>
-+    <arg type="x" direction="in"/>
-+</method>
-+</interface>;
-+
-+const XRandr2 = Gio.DBusProxy.makeProxyWrapper(XRandr2Iface);
- 
- function MyApplet(orientation, panel_height) {
-     this._init(orientation, panel_height);
-@@ -48,7 +49,7 @@ MyApplet.prototype = {
-             this.menu = new Applet.AppletPopupMenu(this, orientation);
-             this.menuManager.addMenu(this.menu);            
-                                 
--            this._proxy = new XRandr2(DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR');
-+            this._proxy = new XRandr2(Gio.DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR');
- 
-             try {
-                 this._screen = new GnomeDesktop.RRScreen({ gdk_screen: Gdk.Screen.get_default() });
-diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
-index a2b61fd..e21d3a8 100644
---- a/js/misc/gnomeSession.js
-+++ b/js/misc/gnomeSession.js
-@@ -1,20 +1,18 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const Lang = imports.lang;
- const Signals = imports.signals;
- 
--const PresenceIface = {
--    name: 'org.gnome.SessionManager.Presence',
--    methods: [{ name: 'SetStatus',
--                inSignature: 'u',
--                outSignature: '' }],
--    properties: [{ name: 'status',
--                   signature: 'u',
--                   access: 'readwrite' }],
--    signals: [{ name: 'StatusChanged',
--                inSignature: 'u' }]
--};
-+const PresenceIface = <interface name="org.gnome.SessionManager.Presence">
-+<method name="SetStatus">
-+    <arg type="u" direction="in"/>
-+</method>
-+<property name="status" type="u" access="readwrite"/>
-+<signal name="StatusChanged">
-+    <arg type="u" direction="out"/>
-+</signal>
-+</interface>;
- 
- const PresenceStatus = {
-     AVAILABLE: 0,
-@@ -23,104 +21,37 @@ const PresenceStatus = {
-     IDLE: 3
- };
- 
--function Presence() {
--    this._init();
-+var PresenceProxy = Gio.DBusProxy.makeProxyWrapper(PresenceIface);
-+function Presence(initCallback, cancellable) {
-+    return new PresenceProxy(Gio.DBus.session, 'org.gnome.SessionManager',
-+                             '/org/gnome/SessionManager/Presence', initCallback, cancellable);
- }
- 
--Presence.prototype = {
--    _init: function() {
--        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this);
--    },
--
--    getStatus: function(callback) {
--        this.GetRemote('status', Lang.bind(this,
--            function(status, ex) {
--                if (!ex)
--                    callback(this, status);
--            }));
--    },
--
--    setStatus: function(status) {
--        this.SetStatusRemote(status);
--    }
--};
--DBus.proxifyPrototype(Presence.prototype, PresenceIface);
--
--// Note inhibitors are immutable objects, so they don't
--// change at runtime (changes always come in the form
--// of new inhibitors)
--const InhibitorIface = {
--    name: 'org.gnome.SessionManager.Inhibitor',
--    properties: [{ name: 'app_id',
--                   signature: 's',
--                   access: 'readonly' },
--                 { name: 'client_id',
--                   signature: 's',
--                   access: 'readonly' },
--                 { name: 'reason',
--                   signature: 's',
--                   access: 'readonly' },
--                 { name: 'flags',
--                   signature: 'u',
--                   access: 'readonly' },
--                 { name: 'toplevel_xid',
--                   signature: 'u',
--                   access: 'readonly' },
--                 { name: 'cookie',
--                   signature: 'u',
--                   access: 'readonly' }],
--};
--
--function Inhibitor(objectPath) {
--    this._init(objectPath);
-+const InhibitorIface = <interface name="org.gnome.SessionManager.Inhibitor">
-+<property name="app_id" type="s" access="read" />
-+<property name="client_id" type="s" access="read" />
-+<property name="reason" type="s" access="read" />
-+<property name="flags" type="u" access="read" />
-+<property name="toplevel_xid" type="u" access="read" />
-+<property name="cookie" type="u" access="read" />
-+</interface>;
-+
-+var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
-+function Inhibitor(objectPath, initCallback, cancellable) {
-+    return new InhibitorProxy(Gio.DBus.session, 'org.gnome.SessionManager', objectPath, initCallback, cancellable);
- }
- 
--Inhibitor.prototype = {
--    _init: function(objectPath) {
--        DBus.session.proxifyObject(this,
--                                   'org.gnome.SessionManager',
--                                   objectPath);
--        this.isLoaded = false;
--        this._loadingPropertiesCount = InhibitorIface.properties.length;
--        for (let i = 0; i < InhibitorIface.properties.length; i++) {
--            let propertyName = InhibitorIface.properties[i].name;
--            this.GetRemote(propertyName, Lang.bind(this,
--                function(value, exception) {
--                    if (exception)
--                        return;
--
--                    this[propertyName] = value;
--                    this._loadingPropertiesCount--;
--
--                    if (this._loadingPropertiesCount == 0) {
--                        this.isLoaded = true;
--                        this.emit('is-loaded');
--                    }
--                }));
--        }
--    },
--};
--DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface);
--Signals.addSignalMethods(Inhibitor.prototype);
--
--
--// Not the full interface, only the methods we use
--const SessionManagerIface = {
--    name: 'org.gnome.SessionManager',
--    methods: [
--        { name: 'Logout', inSignature: 'u', outSignature: '' },
--        { name: 'Shutdown', inSignature: '', outSignature: '' },
--        { name: 'CanShutdown', inSignature: '', outSignature: 'b' }
--    ]
--};
--
--function SessionManager() {
--    this._init();
-+const SessionManagerIface = <interface name="org.gnome.SessionManager">
-+<method name="Logout">
-+    <arg type="u" direction="in" />
-+</method>
-+<method name="Shutdown" />
-+<method name="CanShutdown">
-+    <arg type="b" direction="out" />
-+</method>
-+</interface>;
-+
-+var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);
-+function SessionManager(initCallback, cancellable) {
-+    return new SessionManagerProxy(Gio.DBus.session, 'org.gnome.SessionManager', '/org/gnome/SessionManager', initCallback, cancellable);
- }
--
--SessionManager.prototype = {
--    _init: function() {
--        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager');
--    }
--};
--DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface);
-\ No newline at end of file
-diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
-index befd142..f35f925 100644
---- a/js/misc/modemManager.js
-+++ b/js/misc/modemManager.js
-@@ -1,6 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const Lang = imports.lang;
- const Cinnamon = imports.gi.Cinnamon;
- const Signals = imports.signals;
-@@ -8,33 +8,43 @@ const Signals = imports.signals;
- // The following are not the complete interfaces, just the methods we need
- // (or may need in the future)
- 
--const ModemGsmNetworkInterface = {
--    name: 'org.freedesktop.ModemManager.Modem.Gsm.Network',
--    methods: [
--        { name: 'GetRegistrationInfo', inSignature: '', outSignature: 'uss' },
--        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' }
--    ],
--    properties: [
--        { name: 'AccessTechnology', signature: 'u', access: 'read' }
--    ],
--    signals: [
--        { name: 'SignalQuality', inSignature: 'u' },
--        { name: 'RegistrationInfo', inSignature: 'uss' }
--    ]
--};
--const ModemGsmNetworkProxy = DBus.makeProxyClass(ModemGsmNetworkInterface);
--
--const ModemCdmaInterface = {
--    name: 'org.freedesktop.ModemManager.Modem.Cdma',
--    methods: [
--        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' },
--        { name: 'GetServingSystem', inSignature: '', outSignature: 'usu' }
--    ],
--    signals: [
--        { name: 'SignalQuality', inSignature: 'u' }
--    ]
--};
--const ModemCdmaProxy = DBus.makeProxyClass(ModemCdmaInterface);
-+const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
-+<method name="GetRegistrationInfo">
-+    <arg type="u" direction="out" />
-+    <arg type="s" direction="out" />
-+    <arg type="s" direction="out" />
-+</method>
-+<method name="GetSignalQuality">
-+    <arg type="u" direction="out" />
-+</method>
-+<property name="AccessTechnology" type="u" access="read" />
-+<signal name="SignalQuality">
-+    <arg type="u" direction="out" />
-+</signal>
-+<signal name="RegistrationInfo">
-+    <arg type="u" direction="out" />
-+    <arg type="s" direction="out" />
-+    <arg type="s" direction="out" />
-+</signal>
-+</interface>;
-+
-+const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface);
-+
-+const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.Cdma">
-+<method name="GetSignalQuality">
-+    <arg type="u" direction="out" />
-+</method>
-+<method name="GetServingSystem">
-+    <arg type="u" direction="out" />
-+    <arg type="s" direction="out" />
-+    <arg type="u" direction="out" />
-+</method>
-+<signal name="SignalQuality">
-+    <arg type="u" direction="out" />
-+</signal>
-+</interface>;
-+
-+const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
- 
- let _providersTable;
- function _getProvidersTable() {
-@@ -50,17 +60,17 @@ function ModemGsm() {
- 
- ModemGsm.prototype = {
-     _init: function(path) {
--        this._proxy = new ModemGsmNetworkProxy(DBus.system, 'org.freedesktop.ModemManager', path);
-+        this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
- 
-         this.signal_quality = 0;
-         this.operator_name = null;
- 
-         // Code is duplicated because the function have different signatures
--        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
-+        this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, [quality]) {
-             this.signal_quality = quality;
-             this.emit('notify::signal-quality');
-         }));
--        this._proxy.connect('RegistrationInfo', Lang.bind(this, function(proxy, status, code, name) {
-+        this._proxy.connectSignal('RegistrationInfo', Lang.bind(this, function(proxy, sender, [status, code, name]) {
-             this.operator_name = this._findOperatorName(name, code);
-             this.emit('notify::operator-name');
-         }));
-@@ -154,12 +164,13 @@ function ModemCdma() {
- }
- 
- ModemCdma.prototype = {
--    _init: function(path) {
--        this._proxy = new ModemCdmaProxy(DBus.system, 'org.freedesktop.ModemManager', path);
-+    _init: function(path) {        
-+        this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
- 
-         this.signal_quality = 0;
-         this.operator_name = null;
--        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
-+        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, sender, params) {
-+            this.signal_quality = params[0];
-             this.signal_quality = quality;
-             this.emit('notify::signal-quality');
- 
-diff --git a/js/misc/screenSaver.js b/js/misc/screenSaver.js
-index c471856..aec883f 100644
---- a/js/misc/screenSaver.js
-+++ b/js/misc/screenSaver.js
-@@ -1,53 +1,48 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
- const Lang = imports.lang;
--
--const ScreenSaverIface = {
--    name: 'org.gnome.ScreenSaver',
--    methods: [{ name: 'GetActive',
--                inSignature: '',
--                outSignature: 'b' },
--              { name: 'Lock',
--                inSignature: '' },
--              { name: 'SetActive',
--                inSignature: 'b' }],
--    signals: [{ name: 'ActiveChanged',
--                inSignature: 'b' }]
--};
-+const Gio = imports.gi.Gio;
-+
-+const ScreenSaverIface = <interface name="org.gnome.ScreenSaver">
-+<method name="GetActive">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="Lock" />
-+<method name="SetActive">
-+    <arg type="b" direction="in" />
-+</method>
-+<signal name="ActiveChanged">
-+    <arg type="b" direction="out" />
-+</signal>
-+</interface>;
-+
-+const ScreenSaverInfo = Gio.DBusInterfaceInfo.new_for_xml(ScreenSaverIface);
- 
- function ScreenSaverProxy() {
--    this._init();
-+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-+                                  g_interface_name: ScreenSaverInfo.name,
-+                                  g_interface_info: ScreenSaverInfo,
-+                                  g_name: 'org.gnome.ScreenSaver',
-+                                  g_object_path: '/org/gnome/ScreenSaver',
-+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
-+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-+    self.init(null);
-+    self.screenSaverActive = false;
-+
-+    self.connectSignal('ActiveChanged', function(proxy, senderName, [isActive]) {
-+        self.screenSaverActive = isActive;
-+    });
-+    self.connect('notify::g-name-owner', function() {
-+        if (self.g_name_owner) {
-+            self.GetActiveRemote(function(result, excp) {
-+                if (result) {
-+                    let [isActive] = result;
-+                    self.screenSaverActive = isActive;
-+                }
-+            });
-+        } else
-+            self.screenSaverActive = false;
-+    });
-+
-+    return self;
- }
--
--ScreenSaverProxy.prototype = {
--    _init: function() {
--        DBus.session.proxifyObject(this,
--                                   'org.gnome.ScreenSaver',
--                                   '/org/gnome/ScreenSaver');
--
--        DBus.session.watch_name('org.gnome.ScreenSaver',
--                                false, // do not launch a name-owner if none exists
--                                Lang.bind(this, this._onSSAppeared),
--                                Lang.bind(this, this._onSSVanished));
--
--        this.screenSaverActive = false;
--        this.connect('ActiveChanged',
--                     Lang.bind(this, this._onActiveChanged));
--    },
--
--    _onSSAppeared: function(owner) {
--        this.GetActiveRemote(Lang.bind(this, function(isActive) {
--            this.screenSaverActive = isActive;
--        }))
--    },
--
--    _onSSVanished: function(oldOwner) {
--        this.screenSaverActive = false;
--    },
--
--    _onActiveChanged: function(object, isActive) {
--        this.screenSaverActive = isActive;
--    }
--};
--DBus.proxifyPrototype(ScreenSaverProxy.prototype, ScreenSaverIface);
-diff --git a/js/ui/appletManager.js b/js/ui/appletManager.js
-index abf8136..830d80d 100644
---- a/js/ui/appletManager.js
-+++ b/js/ui/appletManager.js
-@@ -7,7 +7,6 @@ const Cinnamon = imports.gi.Cinnamon;
- const Main = imports.ui.main;
- const Applet = imports.ui.applet;
- const Extension = imports.ui.extension;
--const DBus = imports.dbus;
- 
- // Maps uuid -> metadata object
- var appletMeta;
-diff --git a/js/ui/automountManager.js b/js/ui/automountManager.js
-index fa73bfe..f29f9f3 100644
---- a/js/ui/automountManager.js
-+++ b/js/ui/automountManager.js
-@@ -1,7 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
- const Lang = imports.lang;
--const DBus = imports.dbus;
- const Mainloop = imports.mainloop;
- const Gio = imports.gi.Gio;
- const Params = imports.misc.params;
-@@ -15,63 +14,57 @@ const SETTING_ENABLE_AUTOMOUNT = 'automount';
- 
- const AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
- 
--const ConsoleKitSessionIface = {
--    name: 'org.freedesktop.ConsoleKit.Session',
--    methods: [{ name: 'IsActive',
--                inSignature: '',
--                outSignature: 'b' }],
--    signals: [{ name: 'ActiveChanged',
--                inSignature: 'b' }]
--};
-+const ConsoleKitSessionIface = <interface name="org.freedesktop.ConsoleKit.Session">
-+<method name="isActive">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="ActiveChanged">
-+    <arg type="b" direction="in" />
-+</method>
-+</interface>;
- 
--const ConsoleKitSessionProxy = DBus.makeProxyClass(ConsoleKitSessionIface);
-+const ConsoleKitSessionProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
- 
--const ConsoleKitManagerIface = {
--    name: 'org.freedesktop.ConsoleKit.Manager',
--    methods: [{ name: 'GetCurrentSession',
--                inSignature: '',
--                outSignature: 'o' }]
--};
-+const ConsoleKitManagerIface = <interface name="org.freedesktop.ConsoleKit.Manager">
-+<method name="GetCurrentSession">
-+    <arg type="o" direction="out" />
-+</method>
-+</interface>;
- 
--function ConsoleKitManager() {
--    this._init();
--};
--
--ConsoleKitManager.prototype = {
--    _init: function() {
--        this.sessionActive = true;
--
--        DBus.system.proxifyObject(this,
--                                  'org.freedesktop.ConsoleKit',
--                                  '/org/freedesktop/ConsoleKit/Manager');
-+const ConsoleKitManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ConsoleKitManagerIface);
- 
--        DBus.system.watch_name('org.freedesktop.ConsoleKit',
--                               false, // do not launch a name-owner if none exists
--                               Lang.bind(this, this._onManagerAppeared),
--                               Lang.bind(this, this._onManagerVanished));
--    },
--
--    _onManagerAppeared: function(owner) {
--        this.GetCurrentSessionRemote(Lang.bind(this, this._onCurrentSession));
--    },
--
--    _onManagerVanished: function(oldOwner) {
--        this.sessionActive = true;
--    },
--
--    _onCurrentSession: function(session) {
--        this._ckSession = new ConsoleKitSessionProxy(DBus.system, 'org.freedesktop.ConsoleKit', session);
--
--        this._ckSession.connect
--            ('ActiveChanged', Lang.bind(this, function(object, isActive) {
--                this.sessionActive = isActive;            
--            }));
--        this._ckSession.IsActiveRemote(Lang.bind(this, function(isActive) {
--            this.sessionActive = isActive;            
--        }));
-+function ConsoleKitManager() {
-+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
-+                                  g_interface_name: ConsoleKitManagerInfo.name,
-+                                  g_interface_info: ConsoleKitManagerInfo,
-+                                  g_name: 'org.freedesktop.ConsoleKit',
-+                                  g_object_path: '/org/freedesktop/ConsoleKit/Manager',
-+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
-+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-+    
-+    self._updateSessionActive = function() {
-+        if (self.g_name_owner) {
-+            self.GetCurrentSessionRemote(function([session]) {
-+                self._ckSession = new ConsoleKitSessionProxy(Gio.DBus.system, 'org.freedesktop.ConsoleKit', session);
-+
-+                self._ckSession.connectSignal('ActiveChanged', function(object, senderName, [isActive]) {
-+                    self.sessionActive = isActive;
-+                });
-+                self._ckSession.IsActiveRemote(function([isActive]) {
-+                    self.sessionActive = isActive;
-+                });
-+            });
-+        } else {
-+            self.sessionActive = true;
-+        }
-     }
--};
--DBus.proxifyPrototype(ConsoleKitManager.prototype, ConsoleKitManagerIface);
-+    self.connect('notify::g-name-owner',
-+                 Lang.bind(self, self._updateSessionActive));
-+ 
-+    self._updateSessionActive();
-+    self.init(null);
-+    return self;
-+}
- 
- function AutomountManager() {
-     this._init();
-@@ -85,9 +78,8 @@ AutomountManager.prototype = {
-         this.ckListener = new ConsoleKitManager();
- 
-         this._ssProxy = new ScreenSaver.ScreenSaverProxy();
--        this._ssProxy.connect('ActiveChanged',
--                              Lang.bind(this,
--                                        this._screenSaverActiveChanged));
-+        this._ssProxy.connectSignal('ActiveChanged',
-+                                    Lang.bind(this, this._screenSaverActiveChanged));
- 
-         this._volumeMonitor = Gio.VolumeMonitor.get();
- 
-@@ -110,7 +102,7 @@ AutomountManager.prototype = {
-         Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
-     },
- 
--    _screenSaverActiveChanged: function(object, isActive) {
-+    _screenSaverActiveChanged: function(object, senderName, [isActive]) {
-         if (!isActive) {
-             this._volumeQueue.forEach(Lang.bind(this, function(volume) {
-                 this._checkAndMountVolume(volume);
-diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
-index 02cd4da..99b6fbe 100644
---- a/js/ui/autorunManager.js
-+++ b/js/ui/autorunManager.js
-@@ -1,7 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
- const Lang = imports.lang;
--const DBus = imports.dbus;
- const Gio = imports.gi.Gio;
- const St = imports.gi.St;
- 
-@@ -61,25 +60,19 @@ function startAppForMount(app, mount) {
- 
- /******************************************/
- 
--const HotplugSnifferIface = {
--    name: 'org.Cinnamon.HotplugSniffer',
--    methods: [{ name: 'SniffURI',
--                inSignature: 's',
--                outSignature: 'as' }]
--};
--
--const HotplugSniffer = function() {
--    this._init();
--};
-+const HotplugSnifferIface = <interface name="org.Cinnamon.HotplugSniffer">
-+<method name="SniffURI">
-+    <arg type="s" direction="in" />
-+    <arg type="as" direction="out" />
-+</method>
-+</interface>;
- 
--HotplugSniffer.prototype = {
--    _init: function() {
--        DBus.session.proxifyObject(this,
-+const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
-+function HotplugSniffer() {
-+    return new HotplugSnifferProxy(Gio.DBus.session,
-                                    'org.Cinnamon.HotplugSniffer',
-                                    '/org/Cinnamon/HotplugSniffer');
--    },
--};
--DBus.proxifyPrototype(HotplugSniffer.prototype, HotplugSnifferIface);
-+}
- 
- function ContentTypeDiscoverer(callback) {
-     this._init(callback);
-diff --git a/js/ui/calendar.js b/js/ui/calendar.js
-index ff4777a..a97e2a9 100644
---- a/js/ui/calendar.js
-+++ b/js/ui/calendar.js
-@@ -1,6 +1,5 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
- const Clutter = imports.gi.Clutter;
- const Gio = imports.gi.Gio;
- const Lang = imports.lang;
-@@ -194,30 +193,34 @@ EmptyEventSource.prototype = {
- };
- Signals.addSignalMethods(EmptyEventSource.prototype);
- 
--const CalendarServerIface = {
--    name: 'org.Cinnamon.CalendarServer',
--    methods: [{ name: 'GetEvents',
--                inSignature: 'xxb',
--                outSignature: 'a(sssbxxa{sv})' }],
--    signals: [{ name: 'Changed',
--                inSignature: '' }]
--};
--
--const CalendarServer = function () {
--    this._init();
--};
--
--CalendarServer.prototype = {
--     _init: function() {
--         DBus.session.proxifyObject(this, 'org.Cinnamon.CalendarServer', '/org/Cinnamon/CalendarServer');
--     }
--};
--
--DBus.proxifyPrototype(CalendarServer.prototype, CalendarServerIface);
-+const CalendarServerIface = <interface name="org.Cinnamon.CalendarServer">
-+<method name="GetEvents">
-+    <arg type="x" direction="in" />
-+    <arg type="x" direction="in" />
-+    <arg type="b" direction="in" />
-+    <arg type="a(sssbxxa{sv})" direction="out" />
-+</method>
-+<signal name="Changed" />
-+</interface>;
-+
-+const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
-+
-+function CalendarServer() {
-+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-+				   g_interface_name: CalendarServerInfo.name,
-+				   g_interface_info: CalendarServerInfo,
-+				   g_name: 'org.Cinnamon.CalendarServer',
-+				   g_object_path: '/org/Cinnamon/CalendarServer',
-+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
-+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-+
-+    self.init(null);
-+    return self;
-+}
- 
- // an implementation that reads data from a session bus service
--function DBusEventSource(owner) {
--    this._init(owner);
-+function DBusEventSource() {
-+    this._init();
- }
- 
- function _datesEqual(a, b) {
-@@ -240,16 +243,18 @@ function _dateIntervalsOverlap(a0, a1, b0, b1)
- 
- 
- DBusEventSource.prototype = {
--    _init: function(owner) {
-+    _init: function() {
-         this._resetCache();
- 
--        this._dbusProxy = new CalendarServer(owner);
--        this._dbusProxy.connect('Changed', Lang.bind(this, this._onChanged));
-+        this._dbusProxy = new CalendarServer();
-+        this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
- 
--        DBus.session.watch_name('org.Cinnamon.CalendarServer',
--                                false, // do not launch a name-owner if none exists
--                                Lang.bind(this, this._onNameAppeared),
--                                Lang.bind(this, this._onNameVanished));
-+        this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
-+            if (this._dbusProxy.g_name_owner)
-+                this._onNameAppeared();
-+            else
-+                this._onNameVanished();
-+        }));
-     },
- 
-     _resetCache: function() {
-@@ -272,7 +277,7 @@ DBusEventSource.prototype = {
-         this._loadEvents(false);
-     },
- 
--    _onEventsReceived: function(appointments) {
-+    _onEventsReceived: function([appointments]) {
-         let newEvents = [];
-         if (appointments != null) {
-             for (let n = 0; n < appointments.length; n++) {
-@@ -295,9 +300,9 @@ DBusEventSource.prototype = {
- 
-     _loadEvents: function(forceReload) {
-         if (this._curRequestBegin && this._curRequestEnd){
--            let callFlags = 0;
-+            let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
-             if (forceReload)
--                callFlags |= DBus.CALL_FLAG_START;
-+                callFlags = Gio.DBusCallFlags.NONE;
-             this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
-                                             this._curRequestEnd.getTime() / 1000,
-                                             forceReload,
-diff --git a/js/ui/cinnamonDBus.js b/js/ui/cinnamonDBus.js
-index 600e92f..5d4eb1c 100644
---- a/js/ui/cinnamonDBus.js
-+++ b/js/ui/cinnamonDBus.js
-@@ -1,7 +1,7 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
- const Lang = imports.lang;
-+const Gio = imports.gi.Gio;
- 
- const Config = imports.misc.config;
- const Flashspot = imports.ui.flashspot;
-@@ -9,48 +9,53 @@ const Main = imports.ui.main;
- const AppletManager = imports.ui.appletManager;
- const DeskletManager = imports.ui.deskletManager;
- 
--const CinnamonIface = {
--    name: 'org.Cinnamon',
--    methods: [{ name: 'Eval',
--                inSignature: 's',
--                outSignature: 'bs'
--              },
--              { name: 'ScreenshotArea',
--                inSignature: 'biiiibs',
--                outSignature: ''
--              },
--              { name: 'ScreenshotWindow',
--                inSignature: 'bbbs',
--                outSignature: ''
--              },
--              { name: 'Screenshot',
--                inSignature: 'bbs',
--                outSignature: ''
--              },
--              {
--                name: 'FlashArea',
--                inSignature: 'iiii',
--                outSignature: ''
--              },
--              {
--                name: 'highlightApplet',
--                inSignature: 'sb',
--                outSignature: ''
--              },
--              {
--                name: 'activateCallback',
--                inSignature: 'ssb',
--                outSignature: ''
--              }
--             ],
--    signals: [],
--    properties: [{ name: 'OverviewActive',
--                   signature: 'b',
--                   access: 'readwrite' },
--                 { name: 'CinnamonVersion',
--                   signature: 's',
--                   access: 'read' }]
--};
-+
-+const CinnamonIface = <interface name="org.Cinnamon">
-+<method name="Eval">
-+    <arg type="s" direction="in" name="script" />
-+    <arg type="b" direction="out" name="success" />
-+    <arg type="s" direction="out" name="result" />
-+</method>
-+<method name="ScreenshotArea">
-+include_cursor
-+    <arg type="b" direction="in" name="include_cursor"/>
-+    <arg type="i" direction="in" name="x"/>
-+    <arg type="i" direction="in" name="y"/>
-+    <arg type="i" direction="in" name="width"/>
-+    <arg type="i" direction="in" name="height"/>
-+    <arg type="b" direction="in" name="flash"/>
-+    <arg type="s" direction="in" name="filename"/>
-+</method>
-+<method name="ScreenshotWindow">
-+    <arg type="b" direction="in" name="include_frame"/>
-+    <arg type="b" direction="in" name="include_cursor"/>
-+    <arg type="b" direction="in" name="flash"/>
-+    <arg type="s" direction="in" name="filename"/>
-+</method>
-+<method name="Screenshot">
-+    <arg type="b" direction="in" name="include_frame"/>
-+    <arg type="b" direction="in" name="flash"/>
-+    <arg type="s" direction="in" name="filename"/>
-+</method>
-+<method name="FlashArea">
-+include_cursor
-+    <arg type="i" direction="in" name="x"/>
-+    <arg type="i" direction="in" name="y"/>
-+    <arg type="i" direction="in" name="width"/>
-+    <arg type="i" direction="in" name="height"/>
-+</method>
-+<method name="highlightApplet">
-+    <arg type="s" direction="in" />
-+    <arg type="b" direction="in" />
-+</method>
-+<method name="activateCallback">
-+    <arg type="s" direction="in" />
-+    <arg type="s" direction="in" />
-+    <arg type="b" direction="in" />
-+</method>
-+<property name="OverviewActive" type="b" access="readwrite" />
-+<property name="CinnamonVersion" type="s" access="read" />
-+</interface>;
- 
- function Cinnamon() {
-     this._init();
-@@ -58,7 +63,8 @@ function Cinnamon() {
- 
- Cinnamon.prototype = {
-     _init: function() {
--        DBus.session.exportObject('/org/Cinnamon', this);
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(CinnamonIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, '/org/Cinnamon');
-     },
- 
-     /**
-@@ -215,5 +221,3 @@ Cinnamon.prototype = {
-     CinnamonVersion: Config.PACKAGE_VERSION
- };
- 
--DBus.conformExport(Cinnamon.prototype, CinnamonIface);
--
-diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
-index e909f5f..4f1f7d0 100644
---- a/js/ui/endSessionDialog.js
-+++ b/js/ui/endSessionDialog.js
-@@ -18,19 +18,19 @@
-  * 02110-1335, USA.
-  */
- 
--const DBus = imports.dbus;
- const Lang = imports.lang;
- const Signals = imports.signals;
- 
- const AccountsService = imports.gi.AccountsService;
- const Clutter = imports.gi.Clutter;
-+const Gio = imports.gi.Gio;
- const GLib = imports.gi.GLib;
- const Gtk = imports.gi.Gtk;
- const Pango = imports.gi.Pango;
- const St = imports.gi.St;
- const Cinnamon = imports.gi.Cinnamon;
- 
--const GnomeSession = imports.misc.gnomeSession
-+const GnomeSession = imports.misc.gnomeSession;
- const ModalDialog = imports.ui.modalDialog;
- const Tweener = imports.ui.tweener;
- 
-@@ -40,20 +40,20 @@ const _ITEM_ICON_SIZE = 48;
- const _DIALOG_ICON_SIZE = 32;
- 
- const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
--
--const EndSessionDialogIface = {
--    name: 'org.gnome.SessionManager.EndSessionDialog',
--    methods: [{ name: 'Open',
--                inSignature: 'uuuao',
--                outSignature: ''
--              }
--             ],
--    signals: [{ name: 'Canceled',
--                inSignature: '',
--              }],
--    properties: []
--};
--
-+const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessionDialog">
-+<method name="Open">
-+    <arg type="u" direction="in" />
-+    <arg type="u" direction="in" />
-+    <arg type="u" direction="in" />
-+    <arg type="ao" direction="in" />
-+</method>
-+<signal name="ConfirmedLogout" />
-+<signal name="ConfirmedReboot" />
-+<signal name="ConfirmedShutdown" />
-+<signal name="Canceled" />
-+<signal name="Closed" />
-+</interface>;
-+ 
- const logoutDialogContent = {
-     subjectWithUser: _("Log Out %s"),
-     subject: _("Log Out"),
-@@ -230,8 +230,6 @@ function _setLabelText(label, text) {
- function EndSessionDialog() {
-     if (_endSessionDialog == null) {
-         this._init();
--        DBus.session.exportObject('/org/gnome/SessionManager/EndSessionDialog',
--                                  this);
-         _endSessionDialog = this;
-     }
- 
-@@ -328,6 +326,9 @@ EndSessionDialog.prototype = {
-                                           if (this._applicationList.get_children().length == 0)
-                                               scrollView.hide();
-                                       }));
-+
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
-     },
- 
-     _onDestroy: function() {
-@@ -442,25 +443,19 @@ EndSessionDialog.prototype = {
- 
-     close: function() {
-         ModalDialog.ModalDialog.prototype.close.call(this);
--        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
--                                 'org.gnome.SessionManager.EndSessionDialog',
--                                 'Closed', '', []);
-+        this._dbusImpl.emit_signal('Closed', null);
-     },
- 
-     cancel: function() {
-         this._stopTimer();
--        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
--                                 'org.gnome.SessionManager.EndSessionDialog',
--                                 'Canceled', '', []);
-+        this._dbusImpl.emit_signal('Canceled', null);
-         this.close(global.get_current_time());
-     },
- 
-     _confirm: function(signal) {
-         this._fadeOutDialog();
-         this._stopTimer();
--        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
--                                 'org.gnome.SessionManager.EndSessionDialog',
--                                 signal, '', []);
-+        this._dbusImpl.emit_signal(signal, null);
-     },
- 
-     _onOpened: function() {
-@@ -512,39 +507,41 @@ EndSessionDialog.prototype = {
-         this._updateContent();
-     },
- 
--    OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) {
-+    OpenAsync: function(parameters, invocation) {
-+        let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters;
-         this._totalSecondsToStayOpen = totalSecondsToStayOpen;
-         this._inhibitors = [];
-         this._applicationList.destroy_children();
-         this._type = type;
- 
--        if (!(this._type in DialogContent))
--            throw new DBus.DBusError('org.Cinnamon.ModalDialog.TypeError',
--                                     "Unknown dialog type requested");
-+        if (!(this._type in DialogContent)) {
-+            invocation.report_dbus_error('org.Cinnamon.ModalDialog.TypeError',
-+                                         "Unknown dialog type requested");
-+            return;
-+        }
- 
-         for (let i = 0; i < inhibitorObjectPaths.length; i++) {
--            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i]);
-+            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], Lang.bind(this, function(proxy, error) {
-+                this._onInhibitorLoaded(proxy);
-+            }));
- 
--            inhibitor.connect('is-loaded',
--                              Lang.bind(this, function() {
--                                  this._onInhibitorLoaded(inhibitor);
--                              }));
-             this._inhibitors.push(inhibitor);
-         }
- 
-         this._updateButtons();
- 
--        if (!this.open(timestamp))
--            throw new DBus.DBusError('org.Cinnamon.ModalDialog.GrabError',
--                                     "Cannot grab pointer and keyboard");
-+        if (!this.open(timestamp)) {
-+            invocation.report_dbus_error('org.Cinnamon.ModalDialog.GrabError',
-+                                         "Cannot grab pointer and keyboard");
-+            return;
-+        }
- 
-         this._updateContent();
- 
-         let signalId = this.connect('opened',
-                                     Lang.bind(this, function() {
--                                        callback();
-+                                        invocation.return_value(null);
-                                         this.disconnect(signalId);
-                                     }));
-     }
- };
--DBus.conformExport(EndSessionDialog.prototype, EndSessionDialogIface);
-diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
-index f55cf93..69edb51 100644
---- a/js/ui/keyboard.js
-+++ b/js/ui/keyboard.js
-@@ -2,7 +2,6 @@
- 
- const Caribou = imports.gi.Caribou;
- const Clutter = imports.gi.Clutter;
--const DBus = imports.dbus;
- const Gdk = imports.gi.Gdk;
- const Gio = imports.gi.Gio;
- const GLib = imports.gi.GLib;
-@@ -38,28 +37,27 @@ const PRETTY_KEYS = {
-     'Alt_L': 'Alt'
- };
- 
--const CaribouKeyboardIface = {
--    name: 'org.gnome.Caribou.Keyboard',
--    methods:    [ { name: 'Show',
--                    inSignature: 'u',
--                    outSignature: ''
--                  },
--                  { name: 'Hide',
--                    inSignature: 'u',
--                    outSignature: ''
--                  },
--                  { name: 'SetCursorLocation',
--                    inSignature: 'iiii',
--                    outSignature: ''
--                  },
--                  { name: 'SetEntryLocation',
--                    inSignature: 'iiii',
--                    outSignature: ''
--                  } ],
--    properties: [ { name: 'Name',
--                    signature: 's',
--                    access: 'read' } ]
--};
-+const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
-+<method name='Show'>
-+    <arg type='u' direction='in' />
-+</method>
-+<method name='Hide'>
-+    <arg type='u' direction='in' />
-+</method>
-+<method name='SetCursorLocation'>
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+</method>
-+<method name='SetEntryLocation'>
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+    <arg type='i' direction='in' />
-+</method>
-+<property name='Name' access='read' type='s' />
-+</interface>;
- 
- function Key() {
-     this._init.apply(this, arguments);
-@@ -199,7 +197,8 @@ function Keyboard() {
- 
- Keyboard.prototype = {
-     _init: function () {
--        DBus.session.exportObject('/org/gnome/Caribou/Keyboard', this);
-+        this._impl = Gio.DBusExportedObject.wrapJSObject(CaribouKeyboardIface, this);
-+        this._impl.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard');
- 
-         this.actor = null;
- 
-@@ -541,7 +540,6 @@ Keyboard.prototype = {
-         return 'cinnamon';
-     }
- };
--DBus.conformExport(Keyboard.prototype, CaribouKeyboardIface);
- 
- function KeyboardSource() {
-     this._init.apply(this, arguments);
-diff --git a/js/ui/layout.js b/js/ui/layout.js
-index 3446e7a..7523b6f 100644
---- a/js/ui/layout.js
-+++ b/js/ui/layout.js
-@@ -488,12 +488,14 @@ Chrome.prototype = {
- 
-         this._screenSaverActive = false;
-         this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
--        this._screenSaverProxy.connect('ActiveChanged', Lang.bind(this, this._onScreenSaverActiveChanged));
--        this._screenSaverProxy.GetActiveRemote(Lang.bind(this,
--            function(result, err) {
--                if (!err)
--                    this._onScreenSaverActiveChanged(this._screenSaverProxy, result);
--            }));
-+        this._screenSaverProxy.connectSignal('ActiveChanged', Lang.bind(this, function(proxy, senderName, [isActive]) {
-+            this._onScreenSaverActiveChanged(isActive);
-+        }));
-+        this._screenSaverProxy.GetActiveRemote(Lang.bind(this, function(result, err) {
-+            if (!err)
-+                this._onScreenSaverActiveChanged(result[0]);
-+        }));
-+
- 
-         this._relayout();
-     },
-diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js
-index 72bba26..4d21797 100644
---- a/js/ui/magnifierDBus.js
-+++ b/js/ui/magnifierDBus.js
-@@ -1,6 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const Main = imports.ui.main;
- 
- const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
-@@ -10,47 +10,85 @@ const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
- 
- // Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
- // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
--const MagnifierIface = {
--    name: MAG_SERVICE_NAME,
--    methods: [
--                { name: 'setActive', inSignature: 'b', outSignature: '' },
--                { name: 'isActive', inSignature: '', outSignature: 'b' },
--                { name: 'showCursor', inSignature: '', outSignature: '' },
--                { name: 'hideCursor', inSignature: '', outSignature: ''  },
--                { name: 'createZoomRegion', inSignature: 'ddaiai', outSignature: 'o' },
--                { name: 'addZoomRegion', inSignature: 'o', outSignature: 'b' },
--                { name: 'getZoomRegions', inSignature: '', outSignature: 'ao' },
--                { name: 'clearAllZoomRegions', inSignature: '', outSignature: '' },
--                { name: 'fullScreenCapable', inSignature: '', outSignature: 'b' },
--
--                { name: 'setCrosswireSize', inSignature: 'i', outSignature: '' },
--                { name: 'getCrosswireSize', inSignature: '', outSignature: 'i' },
--                { name: 'setCrosswireLength', inSignature: 'i', outSignature: '' },
--                { name: 'getCrosswireLength', inSignature: '', outSignature: 'i' },
--                { name: 'setCrosswireClip', inSignature: 'b', outSignature: '' },
--                { name: 'getCrosswireClip', inSignature: '', outSignature: 'b' },
--                { name: 'setCrosswireColor', inSignature: 'u', outSignature: '' },
--                { name: 'getCrosswireColor', inSignature: '', outSignature: 'u' }
--             ],
--    signals: [],
--    properties: []
--};
-+const MagnifierIface = <interface name={MAG_SERVICE_NAME}>
-+<method name="setActive">
-+    <arg type="b" direction="in" />
-+</method>
-+<method name="isActive">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="showCursor" />
-+<method name="hideCursor" />
-+<method name="createZoomRegion">
-+    <arg type="d" direction="in" />
-+    <arg type="d" direction="in" />
-+    <arg type="ai" direction="in" />
-+    <arg type="ai" direction="in" />
-+    <arg type="o" direction="out" />
-+</method>
-+<method name="addZoomRegion">
-+    <arg type="o" direction="in" />
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="getZoomRegions">
-+    <arg type="ao" direction="out" />
-+</method>
-+<method name="clearAllZoomRegions" />
-+<method name="fullScreenCapable">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="setCrosswireSize">
-+    <arg type="i" direction="in" />
-+</method>
-+<method name="getCrosswireSize">
-+    <arg type="i" direction="out" />
-+</method>
-+<method name="setCrosswireLength">
-+    <arg type="i" direction="in" />
-+</method>
-+<method name="getCrosswireLength">
-+    <arg type="i" direction="out" />
-+</method>
-+<method name="setCrosswireClip">
-+    <arg type="b" direction="in" />
-+</method>
-+<method name="getCrosswireClip">
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="setCrosswireColor">
-+    <arg type="u" direction="in" />
-+</method>
-+<method name="getCrosswireColor">
-+    <arg type="u" direction="out" />
-+</method>
-+</interface>;
- 
- // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
- // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
--const ZoomRegionIface = {
--    name: ZOOM_SERVICE_NAME,
--    methods: [
--                { name: 'setMagFactor', inSignature: 'dd', outSignature: ''},
--                { name: 'getMagFactor', inSignature: '', outSignature: 'dd' },
--                { name: 'setRoi', inSignature: 'ai', outSignature: '' },
--                { name: 'getRoi', inSignature: '', outSignature: 'ai' },
--                { name: 'shiftContentsTo', inSignature: 'ii', outSignature: 'b' },
--                { name: 'moveResize', inSignature: 'ai', outSignature: '' }
--             ],
--    signals: [],
--    properties: []
--};
-+const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}>
-+<method name="setMagFactor">
-+    <arg type="d" direction="in" />
-+    <arg type="d" direction="in" />
-+</method>
-+<method name="getMagFactor">
-+    <arg type="d" direction="out" />
-+    <arg type="d" direction="out" />
-+</method>
-+<method name="setRoi">
-+    <arg type="ai" direction="in" />
-+</method>
-+<method name="getRoi">
-+    <arg type="ai" direction="out" />
-+</method>
-+<method name="shiftContentsTo">
-+    <arg type="i" direction="in" />
-+    <arg type="i" direction="in" />
-+    <arg type="b" direction="out" />
-+</method>
-+<method name="moveResize">
-+    <arg type="ai" direction="in" />
-+</method>
-+</interface>;
- 
- // For making unique ZoomRegion DBus proxy object paths of the form:
- // '/org/gnome/Magnifier/ZoomRegion/zoomer0',
-@@ -64,7 +102,9 @@ function CinnamonMagnifier() {
- CinnamonMagnifier.prototype = {
-     _init: function() {
-         this._zoomers = {};
--        DBus.session.exportObject(MAG_SERVICE_PATH, this);
-+
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(MagnifierIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, MAG_SERVICE_PATH);
-     },
- 
-     /**
-@@ -195,10 +235,10 @@ CinnamonMagnifier.prototype = {
-         Main.magnifier.clearAllZoomRegions();
-         for (let objectPath in this._zoomers) {
-             let proxyAndZoomer = this._zoomers[objectPath];
-+            proxyAndZoomer.proxy.destroy();
-             proxyAndZoomer.proxy = null;
-             proxyAndZoomer.zoomRegion = null;
-             delete this._zoomers[objectPath];
--            DBus.session.unexportObject(proxyAndZoomer);
-         }
-         this._zoomers = {};
-     },
-@@ -300,8 +340,9 @@ function CinnamonMagnifierZoomRegion(zoomerObjectPath, zoomRegion) {
- CinnamonMagnifierZoomRegion.prototype = {
-     _init: function(zoomerObjectPath, zoomRegion) {
-         this._zoomRegion = zoomRegion;
--        DBus.session.proxifyObject(this, ZOOM_SERVICE_NAME, zoomerObjectPath);
--        DBus.session.exportObject(zoomerObjectPath, this);
-+
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ZoomRegionIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, zoomerObjectPath);
-     },
- 
-     /**
-@@ -376,8 +417,9 @@ CinnamonMagnifierZoomRegion.prototype = {
-     moveResize: function(viewPort) {
-         let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
-         this._zoomRegion.setViewPort(viewRect);
-+    },
-+
-+    destroy: function() {
-+        this._dbusImpl.unexport();
-     }
- };
--
--DBus.conformExport(CinnamonMagnifier.prototype, MagnifierIface);
--DBus.conformExport(CinnamonMagnifierZoomRegion.prototype, ZoomRegionIface);
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 99aee95..b602915 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -1,7 +1,6 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
- const Clutter = imports.gi.Clutter;
--const DBus= imports.dbus;
- const Gio = imports.gi.Gio;
- const GLib = imports.gi.GLib;
- const Gtk = imports.gi.Gtk;
-@@ -199,11 +198,6 @@ function start() {
- 
-     cinnamonDBusService = new CinnamonDBus.Cinnamon();
-     lookingGlassDBusService = new LookingGlassDBus.CinnamonLookingGlass();
--    // Force a connection now; dbus.js will do this internally
--    // if we use its name acquisition stuff but we aren't right
--    // now; to do so we'd need to convert from its async calls
--    // back into sync ones.
--    DBus.session.flush();
- 
-     // Ensure CinnamonWindowTracker and CinnamonAppUsage are initialized; this will
-     // also initialize CinnamonAppSystem first.  CinnamonAppSystem
-diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
-index 18d6615..8bed028 100644
---- a/js/ui/messageTray.js
-+++ b/js/ui/messageTray.js
-@@ -1388,12 +1388,17 @@ function MessageTray() {
- 
- MessageTray.prototype = {
-     _init: function() {
--        this._presence = new GnomeSession.Presence();
-+        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
-+            this._onStatusChanged(proxy.status);
-+        }));
-+
-         this._userStatus = GnomeSession.PresenceStatus.AVAILABLE;
-         this._busy = false;
-         this._backFromAway = false;
--        this._presence.connect('StatusChanged', Lang.bind(this, this._onStatusChanged));
--        this._presence.getStatus(Lang.bind(this, this._onStatusChanged));
-+        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
-+            this._onStatusChanged(status);
-+        }));
-+
- 
-         this._notificationBin = new St.Bin();
-         this._notificationBin.hide();
-@@ -1548,7 +1553,7 @@ MessageTray.prototype = {
-         this._updateState();
-     },
- 
--    _onStatusChanged: function(presence, status) {
-+    _onStatusChanged: function(status) {
-         this._backFromAway = (this._userStatus == GnomeSession.PresenceStatus.IDLE && this._userStatus != status);
-         this._userStatus = status;
- 
-diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
-index bee8ffd..b037e07 100644
---- a/js/ui/notificationDaemon.js
-+++ b/js/ui/notificationDaemon.js
-@@ -1,7 +1,7 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
- const Clutter = imports.gi.Clutter;
--const DBus = imports.dbus;
-+const Gio = imports.gi.Gio;
- const GLib = imports.gi.GLib;
- const Lang = imports.lang;
- const Cinnamon = imports.gi.Cinnamon;
-@@ -14,49 +14,52 @@ const Params = imports.misc.params;
- 
- let nextNotificationId = 1;
- 
--// Should really be defined in dbus.js
--const BusIface = {
--    name: 'org.freedesktop.DBus',
--    methods: [{ name: 'GetConnectionUnixProcessID',
--                inSignature: 's',
--                outSignature: 'i' }]
--};
--
--const Bus = function () {
--    this._init();
--};
--
--Bus.prototype = {
--     _init: function() {
--         DBus.session.proxifyObject(this, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
--     }
--};
-+// Should really be defined in Gio.js
-+const BusIface = <interface name="org.freedesktop.DBus">
-+<method name="GetConnectionUnixProcessID">
-+    <arg type="s" direction="in" />
-+    <arg type="u" direction="out" />
-+</method>
-+</interface>;
-+
-+var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface);
-+function Bus() {
-+    return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
-+}
- 
--DBus.proxifyPrototype(Bus.prototype, BusIface);
--
--const NotificationDaemonIface = {
--    name: 'org.freedesktop.Notifications',
--    methods: [{ name: 'Notify',
--                inSignature: 'susssasa{sv}i',
--                outSignature: 'u'
--              },
--              { name: 'CloseNotification',
--                inSignature: 'u',
--                outSignature: ''
--              },
--              { name: 'GetCapabilities',
--                inSignature: '',
--                outSignature: 'as'
--              },
--              { name: 'GetServerInformation',
--                inSignature: '',
--                outSignature: 'ssss'
--              }],
--    signals: [{ name: 'NotificationClosed',
--                inSignature: 'uu' },
--              { name: 'ActionInvoked',
--                inSignature: 'us' }]
--};
-+const NotificationDaemonIface = <interface name="org.freedesktop.Notifications">
-+<method name="Notify">
-+    <arg type="s" direction="in"/>
-+    <arg type="u" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="s" direction="in"/>
-+    <arg type="as" direction="in"/>
-+    <arg type="a{sv}" direction="in"/>
-+    <arg type="i" direction="in"/>
-+    <arg type="u" direction="out"/>
-+</method>
-+<method name="CloseNotification">
-+    <arg type="u" direction="in"/>
-+</method>
-+<method name="GetCapabilities">
-+    <arg type="as" direction="out"/>
-+</method>
-+<method name="GetServerInformation">
-+    <arg type="s" direction="out"/>
-+    <arg type="s" direction="out"/>
-+    <arg type="s" direction="out"/>
-+    <arg type="s" direction="out"/>
-+</method>
-+<signal name="NotificationClosed">
-+    <arg type="u"/>
-+    <arg type="u"/>
-+</signal>
-+<signal name="ActionInvoked">
-+    <arg type="u"/>
-+    <arg type="s"/>
-+</signal>
-+</interface>;
- 
- const NotificationClosedReason = {
-     EXPIRED: 1,
-@@ -88,7 +91,8 @@ function NotificationDaemon() {
- 
- NotificationDaemon.prototype = {
-     _init: function() {
--        DBus.session.exportObject('/org/freedesktop/Notifications', this);
-+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this);
-+        this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications');
- 
-         this._sources = [];
-         this._senderToPid = {};
-@@ -213,8 +217,8 @@ NotificationDaemon.prototype = {
-         return source;
-     },
- 
--    Notify: function(appName, replacesId, icon, summary, body,
--                     actions, hints, timeout) {
-+    NotifyAsync: function(params, invocation) {
-+        let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
-         let id;
-         
-         let rewrites = rewriteRules[appName];
-@@ -257,51 +261,55 @@ NotificationDaemon.prototype = {
-         }
-         this._notifications[id] = ndata;
- 
--        let sender = DBus.getCurrentMessageContext().sender;
-+        let sender = invocation.get_sender();
-         let pid = this._senderToPid[sender];
- 
-         let source = this._getSource(appName, pid, ndata, sender, null);
- 
-         if (source) {
-             this._notifyForSource(source, ndata);
--            return id;
-+            return invocation.return_value(GLib.Variant.new('(u)', [id]));
-         }
- 
-         if (replacesId) {
-             // There's already a pending call to GetConnectionUnixProcessID,
-             // which will see the new notification data when it finishes,
-             // so we don't have to do anything.
--            return id;
-+            return invocation.return_value(GLib.Variant.new('(u)', [id]));
-         }
- 
--        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this,
--            function (pid, ex) {
--                // The app may have updated or removed the notification
--                ndata = this._notifications[id];
--                if (!ndata)
--                    return;
--
--                source = this._getSource(appName, pid, ndata, sender, null);
--
--                // We only store sender-pid entries for persistent sources.
--                // Removing the entries once the source is destroyed
--                // would result in the entries associated with transient
--                // sources removed once the notification is shown anyway.
--                // However, keeping these pairs would mean that we would
--                // possibly remove an entry associated with a persistent
--                // source when a transient source for the same sender is
--                // distroyed.
--                if (!source.isTransient) {
--                    this._senderToPid[sender] = pid;
--                    source.connect('destroy', Lang.bind(this,
--                        function() {
--                            delete this._senderToPid[sender];
--                        }));
--                }
--                this._notifyForSource(source, ndata);
--            }));
-+        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this, function (result, excp) {
-+            // The app may have updated or removed the notification
-+            ndata = this._notifications[id];
-+            if (!ndata)
-+                return;
- 
--        return id;
-+            if (excp) {
-+                logError(excp, 'Call to GetConnectionUnixProcessID failed');
-+                return;
-+            }
-+
-+            let [pid] = result;
-+            source = this._getSource(appName, pid, ndata, sender);
-+
-+            // We only store sender-pid entries for persistent sources.
-+            // Removing the entries once the source is destroyed
-+            // would result in the entries associated with transient
-+            // sources removed once the notification is shown anyway.
-+            // However, keeping these pairs would mean that we would
-+            // possibly remove an entry associated with a persistent
-+            // source when a transient source for the same sender is
-+            // distroyed.
-+            if (!source.isTransient) {
-+                this._senderToPid[sender] = pid;
-+                source.connect('destroy', Lang.bind(this, function() {
-+                    delete this._senderToPid[sender];
-+                }));
-+            }
-+            this._notifyForSource(source, ndata);
-+        }));
-+
-+        return invocation.return_value(GLib.Variant.new('(u)', [id]));
-     },
- 
-     _notifyForSource: function(source, ndata) {
-@@ -441,17 +449,13 @@ NotificationDaemon.prototype = {
-     },
- 
-     _emitNotificationClosed: function(id, reason) {
--        DBus.session.emit_signal('/org/freedesktop/Notifications',
--                                 'org.freedesktop.Notifications',
--                                 'NotificationClosed', 'uu',
--                                 [id, reason]);
-+        this._dbusImpl.emit_signal('NotificationClosed',
-+                                   GLib.Variant.new('(uu)', [id, reason]));
-     },
- 
-     _emitActionInvoked: function(id, action) {
--        DBus.session.emit_signal('/org/freedesktop/Notifications',
--                                 'org.freedesktop.Notifications',
--                                 'ActionInvoked', 'us',
--                                 [id, action]);
-+        this._dbusImpl.emit_signal('ActionInvoked',
-+                                   GLib.Variant.new('(us)', [id, action]));
-     },
- 
-     _onTrayIconAdded: function(o, icon) {
-@@ -465,8 +469,6 @@ NotificationDaemon.prototype = {
-     }
- };
- 
--DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface);
--
- function Source(title, pid, sender, trayIcon) {
-     this._init(title, pid, sender, trayIcon);
- }
-@@ -481,15 +483,12 @@ Source.prototype = {
- 
-         this.pid = pid;
-         if (sender)
--            // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for
--            // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation,
--            // we should save the id here and call unwatch_name() with it in destroy().
--            // Moving to GDBus is the work in progress: https://bugzilla.gnome.org/show_bug.cgi?id=648651
--            // and https://bugzilla.gnome.org/show_bug.cgi?id=622921 .
--            DBus.session.watch_name(sender,
--                                    false,
--                                    null,
--                                    Lang.bind(this, this._onNameVanished));
-+            this._nameWatcherId = Gio.DBus.session.watch_name(sender,
-+                                                              Gio.BusNameWatcherFlags.NONE,
-+                                                              null,
-+                                                              Lang.bind(this, this._onNameVanished));
-+        else
-+            this._nameWatcherId = 0;
- 
-         this._setApp();
-         if (this.app)
-@@ -596,6 +595,10 @@ Source.prototype = {
-     },
- 
-     destroy: function() {
-+        if (this._nameWatcherId) {
-+            Gio.DBus.session.unwatch_name(this._nameWatcherId);
-+            this._nameWatcherId = 0;
-+        }
-         MessageTray.Source.prototype.destroy.call(this);
-     }
- };
-diff --git a/js/ui/scripting.js b/js/ui/scripting.js
-index 42c4f6d..9163d29 100644
---- a/js/ui/scripting.js
-+++ b/js/ui/scripting.js
-@@ -1,6 +1,5 @@
- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
- 
--const DBus = imports.dbus;
- const Gio = imports.gi.Gio;
- const Mainloop = imports.mainloop;
- const Meta = imports.gi.Meta;
-@@ -70,24 +69,21 @@ function waitLeisure() {
-     };
- }
- 
--const PerfHelperIface = {
--    name: 'org.Cinnamon.PerfHelper',
--    methods: [{ name: 'CreateWindow', inSignature: 'iibb', outSignature: '' },
--              { name: 'WaitWindows', inSignature: '', outSignature: '' },
--              { name: 'DestroyWindows', inSignature: '', outSignature: ''}]
--};
--
--const PerfHelper = function () {
--    this._init();
--};
--
--PerfHelper.prototype = {
--     _init: function() {
--         DBus.session.proxifyObject(this, 'org.Cinnamon.PerfHelper', '/org/Cinnamon/PerfHelper');
--     }
--};
--
--DBus.proxifyPrototype(PerfHelper.prototype, PerfHelperIface);
-+const PerfHelperIface = <interface name="org.gnome.Shell.PerfHelper">
-+<method name="CreateWindow">
-+    <arg type="i" direction="in" />
-+    <arg type="i" direction="in" />
-+    <arg type="b" direction="in" />
-+    <arg type="b" direction="in" />
-+</method>
-+<method name="WaitWindows" />
-+<method name="DestroyWindows" />
-+</interface>;
-+
-+var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface);
-+function PerfHelper() {
-+    return new PerfHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper');
-+}
- 
- let _perfHelper = null;
- function _getPerfHelper() {
--- 
-1.8.1.6
-
-
-From 135d2228bbf6d3b1be5f90e0e599cd3880e06d93 Mon Sep 17 00:00:00 2001
-From: dalcde <dalcde@yahoo.com.hk>
-Date: Tue, 16 Apr 2013 16:58:30 +0800
-Subject: [PATCH 07/16] [GDBus][Sound/Power Applet] Fix dbus port issues
-
----
- files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-index b6b2bcd..fad39ab 100644
---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-@@ -212,7 +212,7 @@ MyApplet.prototype = {
-             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-             this.menu.addSettingsAction(_("Power Settings"), 'power');
- 
--            this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged));
-+            this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged));
-             this._devicesChanged();            
-         }
-         catch (e) {
--- 
-1.8.1.6
-
-
-From 5880ce34538ec2791b5e58cc3ffc07e41c189c82 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 19 Apr 2013 19:09:18 -0400
-Subject: [PATCH 08/16] Fix gicon error - power applet
-
----
- files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-index fad39ab..3a13eab 100644
---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-@@ -323,7 +323,7 @@ MyApplet.prototype = {
-         let icon = this._proxy.Icon;
-         if (icon) {
-             let gicon = Gio.icon_new_for_string(icon);
--            this.setGIcon(gicon);
-+            this._applet_icon.gicon = gicon
-             this.actor.show();
-         } else {
-             this.menu.close();
--- 
-1.8.1.6
-
-
-From 647bd58c93541acdba11cd11d586d2cb08a0a4eb Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 19 Apr 2013 19:44:33 -0400
-Subject: [PATCH 09/16] Remove unused
-
----
- src/cinnamon-background-manager.c | 34 ----------------------------------
- 1 file changed, 34 deletions(-)
-
-diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c
-index 9d95250..67427ed 100644
---- a/src/cinnamon-background-manager.c
-+++ b/src/cinnamon-background-manager.c
-@@ -66,8 +66,6 @@ struct CinnamonBackgroundManagerPrivate
- 
- G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT)
- 
--static gpointer manager_object = NULL;
--
- static gboolean
- dont_draw_background (CinnamonBackgroundManager *manager)
- {
-@@ -223,36 +221,6 @@ struct CinnamonBackgroundManagerPrivate
- }
- 
- static void
--draw_background_after_session_loads (CinnamonBackgroundManager *manager)
--{
--        GError *error = NULL;
--        GDBusProxyFlags flags;
--
--        flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
--                G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
--        manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
--                                                              flags,
--                                                              NULL, /* GDBusInterfaceInfo */
--                                                              "org.gnome.SessionManager",
--                                                              "/org/gnome/SessionManager",
--                                                              "org.gnome.SessionManager",
--                                                              NULL, /* GCancellable */
--                                                              &error);
--        if (manager->priv->proxy == NULL) {
--                g_warning ("Could not listen to session manager: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy,
--                                                           "g-signal",
--                                                           G_CALLBACK (on_session_manager_signal),
--                                                           manager);
--}
--
--
--static void
- disconnect_screen_signals (CinnamonBackgroundManager *manager)
- {
-         GdkDisplay *display;
-@@ -312,8 +280,6 @@ struct CinnamonBackgroundManagerPrivate
-                           G_CALLBACK (draw_background_changed), manager);
- 
-         setup_bg_and_draw_background (manager);
--            //draw_background_after_session_loads (manager);
--
- 
-         return TRUE;
- }
--- 
-1.8.1.6
-
-
-From 7a8233638187d00798cf3a4b66a27d707eaec804 Mon Sep 17 00:00:00 2001
-From: dalcde <dalcde@yahoo.com.hk>
-Date: Sat, 20 Apr 2013 15:42:13 +0800
-Subject: [PATCH 10/16] [GDBus][Power applet] Some fixes and cleanup
-
----
- .../cinnamon/applets/power@cinnamon.org/applet.js  | 52 ++++++----------------
- 1 file changed, 14 insertions(+), 38 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-index 3a13eab..5f81d91 100644
---- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
-@@ -48,40 +48,11 @@ const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
- <method name="GetPrimaryDevice">
-     <arg type="(susdut)" direction="out"/>
- </method>
--<signal name="PropertiesChanged">
--    <arg type="s"/>
--    <arg type="a{sv}"/>
--    <arg type="a[s]"/>
--</signal>
- <property name="Icon" type="s" access="read" />
- </interface>;
- 
- const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
- 
--const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties">
--<method name="Get">
--    <arg type="s" direction="in"/>
--    <arg type="s" direction="in"/>
--    <arg type="v" direction="out"/>
--</method>
--<method name="GetAll">
--    <arg type="s" direction="in"/>
--    <arg type="a{sv}" direction="out"/>
--</method>
--<method name="Set">
--    <arg type="s" direction="in"/>
--    <arg type="s" direction="in"/>
--    <arg type="v" direction="in"/>
--</method>
--<signal name="PropertiesChanged">
--    <arg type="s"/>
--    <arg type="a{sv}"/>
--    <arg type="a[s]"/>
--</signal>
--</interface>;
--
--const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface);
--
- function DeviceItem() {
-     this._init.apply(this, arguments);
- }
-@@ -156,8 +127,16 @@ MyApplet.prototype = {
-             this.menuManager.addMenu(this.menu);            
- 
-             //this.set_applet_icon_symbolic_name('battery-missing');            
--            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
--            this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
-+            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
-+                                               Lang.bind(this, function(proxy, error) {
-+                                                             if (error) {
-+                                                                 global.log(error.message);
-+
-+                                                                 return;
-+                                                             }
-+                                                             this._proxy.connect('g-properties-changed', Lang.bind(this, this._devicesChanged));
-+                                                             this._devicesChanged();
-+                                               }));
- 
-             let icon = this.actor.get_children()[0];
-             this.actor.remove_actor(icon);
-@@ -211,9 +190,6 @@ MyApplet.prototype = {
- 
-             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-             this.menu.addSettingsAction(_("Power Settings"), 'power');
--
--            this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged));
--            this._devicesChanged();            
-         }
-         catch (e) {
-             global.logError(e);
-@@ -245,14 +221,14 @@ MyApplet.prototype = {
-     },
-     
-     _readPrimaryDevice: function() {
--        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) {
-+        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
-             if (error) {
-                 this._hasPrimary = false;
-                 this._primaryDeviceId = null;
-                 this._batteryItem.actor.hide();                
-                 return;
-             }
--            let [device_id, device_type, icon, percentage, state, seconds] = device;
-+            let [[device_id, device_type, icon, percentage, state, seconds]] = result;
-             if (device_type == UPDeviceType.BATTERY) {
-                 this._hasPrimary = true;
-                 let time = Math.round(seconds / 60);
-@@ -290,7 +266,7 @@ MyApplet.prototype = {
-     },
- 
-     _readOtherDevices: function() {
--        this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
-+        this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) {
-             this._deviceItems.forEach(function(i) { i.destroy(); });
-             this._deviceItems = [];
- 
-@@ -336,7 +312,7 @@ MyApplet.prototype = {
-     },
-     
-     _updateLabel: function() {
--        this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
-+        this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) {
-             if (error) {
-                 this._mainLabel.set_text("");
-                 return;
--- 
-1.8.1.6
-
-
-From 1a74c4a4d010a6ddcd2350b1ea298710bc1c08b1 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 10:59:54 -0400
-Subject: [PATCH 11/16] Move CLUTTER_DISABLE_XINPUT to session startup file
-
----
- files/usr/bin/gnome-session-cinnamon | 2 +-
- src/main.c                           | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon
-index 315f135..56c37f5 100755
---- a/files/usr/bin/gnome-session-cinnamon
-+++ b/files/usr/bin/gnome-session-cinnamon
-@@ -1,3 +1,3 @@
- #! /bin/sh
--exec gnome-session --session cinnamon "$@"
-+exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@"
- 
-diff --git a/src/main.c b/src/main.c
-index 9d37975..418fb60 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -257,9 +257,6 @@
- 
-   g_option_context_free (ctx);
- 
--  /* Disable XInput extension - required for 3.8 compatibility */
--  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
--
-   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
- 
-   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
--- 
-1.8.1.6
-
-
-From dfa107fd874866da2f634c65a90e2c13a447464c Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 12:23:29 -0400
-Subject: [PATCH 12/16] Add Xinput disable to cinnamon2d
-
----
- files/usr/bin/cinnamon2d | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/bin/cinnamon2d b/files/usr/bin/cinnamon2d
-index 1eced99..7f42517 100755
---- a/files/usr/bin/cinnamon2d
-+++ b/files/usr/bin/cinnamon2d
-@@ -1,2 +1,2 @@
- #!/bin/bash
--CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
-+CLUTTER_DISABLE_XINPUT=1 CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
--- 
-1.8.1.6
-
-
-From 28b39b2372a571ddcc1298f34f2d7e653f6b2e96 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 12:29:43 -0400
-Subject: [PATCH 13/16] Fix session file
-
----
- files/usr/bin/gnome-session-cinnamon | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon
-index 56c37f5..31c9eff 100755
---- a/files/usr/bin/gnome-session-cinnamon
-+++ b/files/usr/bin/gnome-session-cinnamon
-@@ -1,3 +1,3 @@
- #! /bin/sh
--exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@"
-+CLUTTER_DISABLE_XINPUT=1 exec gnome-session --session cinnamon "$@"
- 
--- 
-1.8.1.6
-
-
-From aba3a7666d3679e5803862af07edc47e7b093b11 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 12:36:45 -0400
-Subject: [PATCH 14/16] Add cinnamon3d command
-
----
- files/usr/bin/cinnamon3d | 2 ++
- 1 file changed, 2 insertions(+)
- create mode 100644 files/usr/bin/cinnamon3d
-
-diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d
-new file mode 100644
-index 0000000..4891783
---- /dev/null
-+++ b/files/usr/bin/cinnamon3d
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+CLUTTER_DISABLE_XINPUT=1 cinnamon $@
--- 
-1.8.1.6
-
-
-From 3e1cdf6d88ade9abe5a0b8773b565d345c01f2cb Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Sat, 20 Apr 2013 12:37:26 -0400
-Subject: [PATCH 15/16] Fix perms
-
----
- files/usr/bin/cinnamon3d | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 files/usr/bin/cinnamon3d
-
-diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d
-old mode 100644
-new mode 100755
--- 
-1.8.1.6
-
-
-From 7904eaf179918f4f97b328f2b5f340776544ca49 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 22 Apr 2013 18:27:39 -0400
-Subject: [PATCH 16/16] Sledgehammer merge of:
-
-f251f0b77d01cb9a80212b1dce2538c60a5bf59e
-
-Don't ask...
----
- .../share/cinnamon/applets/sound@cinnamon.org/applet.js    | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-index c8427ac..a7b2e09 100644
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -53,8 +53,8 @@ const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player">
- 
- /* global values */
- let icon_path = "/usr/share/cinnamon/theme/";
--let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ];
--let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ];
-+let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp"];
-+let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ];
- /* dummy vars for translation */
- let x = _("Playing");
- x = _("Paused");
-
-@@ -377,7 +384,8 @@ Player.prototype = {
-                     cover.read_async(null, null, Lang.bind(this, this._onReadCover));
-                 }
-                 else {
--                    cover_path = decodeURIComponent(this._trackCoverFile.substr(7));
-+                    cover_path = decodeURIComponent(this._trackCoverFile);
-+                    cover_path = cover_path.replace("file://", "");
-                     this._showCover(cover_path);
-                 }
-             }
--- 
-1.8.1.6
-
-From 1f209cec0fa0e9d12b3c29884302f4b8e70ff4c9 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Thu, 9 May 2013 11:48:08 -0400
-Subject: [PATCH] Fix notifications and other stuff
-
----
- .../cinnamon/applets/sound@cinnamon.org/applet.js  |   2 +-
- js/ui/notificationDaemon.js                        |   7 +-
- src/main.c                                         | 169 ++++++++++++---------
- 3 files changed, 103 insertions(+), 75 deletions(-)
-
-diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
-index b037e07..58b2df3 100644
---- a/js/ui/notificationDaemon.js
-+++ b/js/ui/notificationDaemon.js
-@@ -220,7 +220,12 @@ NotificationDaemon.prototype = {
-     NotifyAsync: function(params, invocation) {
-         let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
-         let id;
--        
-+
-+        for (let hint in hints) {
-+            // unpack the variants
-+            hints[hint] = hints[hint].deep_unpack();
-+        }
-+
-         let rewrites = rewriteRules[appName];
-         if (rewrites) {
-             for (let i = 0; i < rewrites.length; i++) {
-diff --git a/src/main.c b/src/main.c
-index 418fb60..773fb65 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -34,99 +34,122 @@
- #define OVERRIDES_SCHEMA "org.cinnamon.overrides"
- 
- static void
-+cinnamon_dbus_acquire_name (GDBusProxy *bus,
-+                         guint32     request_name_flags,
-+                         guint32    *request_name_result,
-+                         gchar      *name,
-+                         gboolean    fatal)
-+{
-+  GError *error = NULL;
-+  GVariant *request_name_variant;
-+
-+  if (!(request_name_variant = g_dbus_proxy_call_sync (bus,
-+                                                       "RequestName",
-+                                                       g_variant_new ("(su)", name, request_name_flags),
-+                                                       0, /* call flags */
-+                                                       -1, /* timeout */
-+                                                       NULL, /* cancellable */
-+                                                       &error)))
-+    {
-+      g_printerr ("failed to acquire %s: %s\n", name, error->message);
-+      if (!fatal)
-+        return;
-+      exit (1);
-+    }
-+  g_variant_get (request_name_variant, "(u)", request_name_result);
-+}
-+
-+static void
-+cinnamon_dbus_acquire_names (GDBusProxy *bus,
-+                          guint32     request_name_flags,
-+                          gchar      *name,
-+                          gboolean    fatal, ...) G_GNUC_NULL_TERMINATED;
-+
-+static void
-+cinnamon_dbus_acquire_names (GDBusProxy *bus,
-+                          guint32     request_name_flags,
-+                          gchar      *name,
-+                          gboolean    fatal, ...)
-+{
-+  va_list al;
-+  guint32 request_name_result;
-+  va_start (al, fatal);
-+  for (;;)
-+  {
-+    cinnamon_dbus_acquire_name (bus,
-+                             request_name_flags,
-+                             &request_name_result,
-+                             name, fatal);
-+    name = va_arg (al, gchar *);
-+    if (!name)
-+      break;
-+    fatal = va_arg (al, gboolean);
-+  }
-+  va_end (al);
-+}
-+
-+static void
- cinnamon_dbus_init (gboolean replace)
- {
-+  GDBusConnection *session;
-+  GDBusProxy *bus;
-   GError *error = NULL;
--  DBusGConnection *session;
--  DBusGProxy *bus;
-   guint32 request_name_flags;
-   guint32 request_name_result;
- 
--  /** TODO:
--   * In the future we should use GDBus for this.  However, in
--   * order to do that, we need to port all of the JavaScript
--   * code.  Otherwise, the name will be claimed on the wrong
--   * connection.
--   */
--  session = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-+  session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
- 
--  bus = dbus_g_proxy_new_for_name (session,
--                                   DBUS_SERVICE_DBUS,
--                                   DBUS_PATH_DBUS,
--                                   DBUS_INTERFACE_DBUS);
-+  if (error) {
-+    g_printerr ("Failed to connect to session bus: %s", error->message);
-+    exit (1);
-+  }
- 
--  request_name_flags = DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT;
-+  bus = g_dbus_proxy_new_sync (session,
-+                               G_DBUS_PROXY_FLAGS_NONE,
-+                               NULL, /* interface info */
-+                               "org.freedesktop.DBus",
-+                               "/org/freedesktop/DBus",
-+                               "org.freedesktop.DBus",
-+                               NULL, /* cancellable */
-+                               &error);
-+
-+  request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT;
-   if (replace)
-     request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, CINNAMON_DBUS_SERVICE,
--                          G_TYPE_UINT, request_name_flags,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_printerr ("failed to acquire org.Cinnamon: %s\n", error->message);
--      exit (1);
--    }
-+
-+  cinnamon_dbus_acquire_name (bus,
-+                           request_name_flags,
-+                           &request_name_result,
-+                           CINNAMON_DBUS_SERVICE, TRUE);
-   if (!(request_name_result == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER
-         || request_name_result == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER))
-     {
--      g_printerr ("%s already exists on bus and --replace not specified\n",
--                  CINNAMON_DBUS_SERVICE);
-+      g_printerr (CINNAMON_DBUS_SERVICE " already exists on bus and --replace not specified\n");
-       exit (1);
-     }
- 
--  /* Also grab org.gnome.Panel to replace any existing panel process */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error, G_TYPE_STRING,
--                          "org.gnome.Panel", G_TYPE_UINT,
--                          DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
--                          G_TYPE_INVALID, G_TYPE_UINT,
--                          &request_name_result, G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire org.gnome.Panel: %s\n", error->message);
--      exit (1);
--    }
--
--  /* ...and the org.gnome.Magnifier service.
--   */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, MAGNIFIER_DBUS_SERVICE,
--                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire %s: %s\n", MAGNIFIER_DBUS_SERVICE, error->message);
--      /* Failing to acquire the magnifer service is not fatal.  Log the error,
--       * but keep going. */
--    }
--
--  /* ...and the org.freedesktop.Notifications service; we always
--   * specify REPLACE_EXISTING to ensure we kill off
--   * notification-daemon if it was running.
-+  /*
-+   * We always specify REPLACE_EXISTING to ensure we kill off
-+   * the existing service if it was running.
-    */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, "org.freedesktop.Notifications",
--                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire org.freedesktop.Notifications: %s\n", error->message);
--    }
-+  request_name_flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE;
- 
-+  cinnamon_dbus_acquire_names (bus,
-+                            request_name_flags,
-+  /* Also grab org.gnome.Panel to replace any existing panel process */
-+                            "org.gnome.Panel", TRUE,
-+  /* ...and the org.gnome.Magnifier service. */
-+                            MAGNIFIER_DBUS_SERVICE, FALSE,
-+  /* ...and the org.freedesktop.Notifications service. */
-+                            "org.freedesktop.Notifications", FALSE,
-+                            NULL);
-   /* ...and the on-screen keyboard service */
--  if (!dbus_g_proxy_call (bus, "RequestName", &error,
--                          G_TYPE_STRING, "org.gnome.Caribou.Keyboard",
--                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING,
--                          G_TYPE_INVALID,
--                          G_TYPE_UINT, &request_name_result,
--                          G_TYPE_INVALID))
--    {
--      g_print ("failed to acquire org.gnome.Caribou.Keyboard: %s\n", error->message);
--    }
--
-+  cinnamon_dbus_acquire_name (bus,
-+                           DBUS_NAME_FLAG_REPLACE_EXISTING,
-+                           &request_name_result,
-+                           "org.gnome.Caribou.Keyboard", FALSE);
-   g_object_unref (bus);
-+  g_object_unref (session);
- }
- 
- static void
--- 
-1.8.1.6
-
---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
-@@ -801,7 +801,7 @@
-             this._players = {};
-             // watch players
-             for (var p=0; p<compatible_players.length; p++) {
--                DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
-+                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
-                     Lang.bind(this, this._addPlayer),
-                     Lang.bind(this, this._removePlayer)
-                 );
--- 
-1.8.1.6
\ No newline at end of file
diff --git a/community/cinnamon/idle-dim.patch b/community/cinnamon/idle-dim.patch
deleted file mode 100644
index 17f5af616..000000000
--- a/community/cinnamon/idle-dim.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
---- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-04-30 18:01:56.000000000 +0200
-+++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-05-02 19:32:12.934254811 +0200
-@@ -9,8 +9,7 @@
- 
- /* constants */
- const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
--const DimSettingsAc = "idle-dim-ac";
--const DimSettingsBattery = "idle-dim-battery";
-+const DimSettings = "idle-dim";
- const PowerBusName = 'org.gnome.SettingsDaemon';
- const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
- 
-@@ -116,10 +115,8 @@
-             
-             this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings"));
-             
--            let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc);
--            this._settingsMenu.menu.addMenuItem(dimSwitchAc);
--            let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery);
--            this._settingsMenu.menu.addMenuItem(dimSwitchBattery);
-+            let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings);
-+            this._settingsMenu.menu.addMenuItem(dimSwitch);
-                       
-             //initial update.
-             //We have to wait until dbus calls back to decide whether to display brightness controls.
-@@ -145,7 +142,7 @@
-                     this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-                 }
-                 
--                this.menu.addSettingsAction(_("Settings"), "screen");
-+                this.menu.addSettingsAction(_("Settings"), "screensaver");
- 		    }));
-         }
-         catch (e) {
diff --git a/community/cinnamon/keyboard_applet.patch b/community/cinnamon/keyboard_applet.patch
deleted file mode 100644
index 6b3694086..000000000
--- a/community/cinnamon/keyboard_applet.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/applet.js b/applet.js
---- a/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
-@@ -1,9 +1,10 @@
- const Applet = imports.ui.applet;
--const Gkbd = imports.gi.Gkbd;
- const Lang = imports.lang;
--const Cinnamon = imports.gi.Cinnamon;
-+const Gio = imports.gi.Gio;
-+const GLib = imports.gi.GLib;
- const St = imports.gi.St;
- const Gtk = imports.gi.Gtk;
-+const GnomeDesktop = imports.gi.GnomeDesktop;
- const Main = imports.ui.main;
- const PopupMenu = imports.ui.popupMenu;
- const Util = imports.misc.util;
-@@ -15,11 +16,12 @@
- LayoutMenuItem.prototype = {
-     __proto__: PopupMenu.PopupBaseMenuItem.prototype,
- 
--    _init: function(config, id, indicator, long_name) {
-+    _init: function(ipsettings, id, index, indicator, long_name) {
-         PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
- 
--        this._config = config;
-+        this._ipsettings = ipsettings;
-         this._id = id;
-+        this._index = index;
-         this.label = new St.Label({ text: long_name });
-         this.indicator = indicator;
-         this.addActor(this.label);
-@@ -28,7 +30,7 @@
- 
-     activate: function(event) {
-         PopupMenu.PopupBaseMenuItem.prototype.activate.call(this);
--        this._config.lock_group(this._id);
-+        this._ipsettings.set_value('current', GLib.Variant.new_uint32(this._index));
-     }
- };
- 
-@@ -54,18 +56,18 @@
-             this._layoutItems = [ ];
- 
-             this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
--            this._config = Gkbd.Configuration.get();
--            this._config.connect('changed', Lang.bind(this, this._syncConfig));
--            this._config.connect('group-changed', Lang.bind(this, this._syncGroup));
-+            this._xkbInfo = new GnomeDesktop.XkbInfo();
-+            this._ipsettings = new Gio.Settings({ schema: 'org.gnome.desktop.input-sources' });
-+            this._ipsettings.connect('changed::sources', Lang.bind(this, this._syncConfig));
-+            this._ipsettings.connect('changed::current', Lang.bind(this, this._syncGroup));
-             global.settings.connect('changed::keyboard-applet-use-flags', Lang.bind(this, this._reload_settings));
--            this._config.start_listen();
- 
-             this._syncConfig();
- 
-             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-             this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
-                 Main.overview.hide();
--                Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
-+                Util.spawn(['gkbd-keyboard-display', '-l', this._selectedLayout._id]);
-             }));                                
-             this.menu.addAction(_("Show Character Table"), Lang.bind(this, function() {
-                 Main.overview.hide();
-@@ -98,7 +100,6 @@
-     },
-     
-     _reload_settings: function() {
--        this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
-         this._syncConfig();
-     },
-     
-@@ -127,8 +128,8 @@
-     _syncConfig: function() {
-         this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
- 
--        let groups = this._config.get_group_names();
--        if (groups.length > 1) {
-+        let sources = this._ipsettings.get_value('sources');
-+        if (sources.n_children() > 1) {
-             this.actor.show();
-         } else {
-             this.menu.close();
-@@ -141,25 +142,29 @@
-         for (let i = 0; i < this._labelActors.length; i++)
-             this._labelActors[i].destroy();
- 
--        let short_names = this._adjustGroupNames(this._config.get_short_group_names());
--
-         this._selectedLayout = null;
-         this._layoutItems = [ ];
-         this._labelActors = [ ];
--        for (let i = 0; i < groups.length; i++) {
--            let icon_name = this._config.get_group_name(i);
-+        for (let i = 0; i < sources.n_children(); i++) {
-+            let [type, id] = sources.get_child_value(i).deep_unpack();
-+            let displayName = id;
-+            let shortName = id;
-+            let xkbLayout = id;
-+            if (type == 'xkb') {
-+                [_exists, displayName, shortName, xkbLayout, _xkbVariant] = this._xkbInfo.get_layout_info(id);
-+            } // TODO: errorhandling, handle 'ibus'
-+            let icon_name = xkbLayout; // FIXME: Really?
-             let actor;
-             if (this._showFlags)
-                 actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.FULLCOLOR, style_class: 'popup-menu-icon' });
-             else
--                actor = new St.Label({ text: short_names[i] });
--            let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
--            item._short_group_name = short_names[i];
-+                actor = new St.Label({ text: shortName });
-+            let item = new LayoutMenuItem(this._ipsettings, id, i, actor, displayName);
-             item._icon_name = icon_name;
-             this._layoutItems.push(item);
-             this.menu.addMenuItem(item, i);
- 
--            let shortLabel = new St.Label({ text: short_names[i] });
-+            let shortLabel = new St.Label({ text: shortName });
-             this._labelActors.push(shortLabel);
-         }
- 
-@@ -167,17 +172,17 @@
-     },
- 
-     _syncGroup: function() {
--        let selected = this._config.get_current_group();
-+        let current = this._ipsettings.get_uint('current');
- 
-         if (this._selectedLayout) {
-             this._selectedLayout.setShowDot(false);
-             this._selectedLayout = null;
-         }
- 
--        let item = this._layoutItems[selected];
-+        let item = this._layoutItems[current];
-         item.setShowDot(true);
- 
--        let selectedLabel = this._labelActors[selected];
-+        let selectedLabel = this._labelActors[current];
- 
-         if (this._showFlags) {
-             this.set_applet_icon_name(item._icon_name);
diff --git a/community/cinnamon/switch-applications.patch b/community/cinnamon/switch-applications.patch
deleted file mode 100644
index 1254a7ce4..000000000
--- a/community/cinnamon/switch-applications.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
---- linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-24 21:19:49.262020614 +0200
-@@ -43,8 +43,8 @@
-     # Cinnamon stuff
-     [_("Toggle Scale"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-down", True, "cinnamon"],
-     [_("Toggle Expo"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-up", True, "cinnamon"],
--    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows", True, "cinnamon"],
--    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows-backward", True, "cinnamon"],
-+    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications", True, "cinnamon"],
-+    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications-backward", True, "cinnamon"],
-     [_("Run dialog (must restart Cinnamon)"), "org.gnome.desktop.wm.keybindings", "panel-run-dialog", True, "cinnamon"],
-     [_("Menu button (must restart Cinnamon)"), "org.cinnamon.muffin", "overlay-key", False, "cinnamon"],
- 
-diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js
---- linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js	2013-04-15 15:55:01.000000000 +0200
-+++ linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js	2013-04-24 21:21:22.447677094 +0200
-@@ -131,11 +131,11 @@
-                                             Lang.bind(this, this._showWorkspaceSwitcher));
-         Meta.keybindings_set_custom_handler('switch-to-workspace-down',
-                                             Lang.bind(this, this._showWorkspaceSwitcher));
--        Meta.keybindings_set_custom_handler('switch-windows',
-+        Meta.keybindings_set_custom_handler('switch-applications',
-                                             Lang.bind(this, this._startAppSwitcher));
-         Meta.keybindings_set_custom_handler('switch-group',
-                                             Lang.bind(this, this._startAppSwitcher));
--        Meta.keybindings_set_custom_handler('switch-windows-backward',
-+        Meta.keybindings_set_custom_handler('switch-applications-backward',
-                                             Lang.bind(this, this._startAppSwitcher));
-         Meta.keybindings_set_custom_handler('switch-group-backward',
-                                             Lang.bind(this, this._startAppSwitcher));
diff --git a/community/cjs/PKGBUILD b/community/cjs/PKGBUILD
new file mode 100644
index 000000000..7c6439e20
--- /dev/null
+++ b/community/cjs/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=cjs
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Javascript Bindings for Cinnamon"
+arch=(i686 x86_64)
+url="https://github.com/linuxmint/cjs"
+license=(GPL)
+depends=(cairo gobject-introspection js185 dbus-glib)
+makedepends=(gnome-common)
+options=('!libtool')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cjs/archive/${pkgver}.tar.gz")
+sha256sums=('2fea6c491e6ce8567201f14c0e926181154d798d4811dd65da477c014bfb2a9a')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # Python2 fix
+  sed -i 's|#! /usr/bin/env python|#! /usr/bin/env python2|' \
+  		scripts/make-tests
+
+  ./autogen.sh --prefix=/usr --disable-static --libexecdir=/usr/lib
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  # Needs a display
+  make -k check || :
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/consonance/PKGBUILD b/community/consonance/PKGBUILD
deleted file mode 100644
index f70d45618..000000000
--- a/community/consonance/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 82327 2013-01-15 11:34:58Z allan $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
-# Contributor: Auguste Pop <auguste [at] gmail [dot] com>
-# Contributor: boenki <boenki at gmx dot de>
-# Contributor: sujith_m82 <m.sujith@gmail.com>
-
-pkgname=consonance
-pkgver=0.5.1
-pkgrel=10
-pkgdesc="A lightweight GTK+ music manager that aims to be fast, bloat-free and light on memory consumption"
-arch=('i686' 'x86_64')
-url="http://sites.google.com/site/consonancemanager"
-license=('GPL')
-depends=('curl' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'libao' 'libmad'
-         'libcdio-paranoia' 'libmodplug' 'libnotify' 'libsndfile' 'sqlite3'
-         'taglib')
-install=$pkgname.install
-source=($url/releases-1/$pkgname-$pkgver.tar.gz
-        libnotify.patch
-        cdio-includes.patch)
-md5sums=('2a195dd2314f7b65cc57cc871a4c5a47'
-         'caa1e8b41723950fd926bfefccbbd8ac'
-         '239b451ba8795f8c287e994a7e32d859')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  patch -Np1 -i "$srcdir"/libnotify.patch
-  patch -Np1 -i "$srcdir"/cdio-includes.patch
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/consonance/cdio-includes.patch b/community/consonance/cdio-includes.patch
deleted file mode 100644
index c570468b1..000000000
--- a/community/consonance/cdio-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr consonance-0.5.1.orig/src/cdda.h consonance-0.5.1/src/cdda.h
---- consonance-0.5.1.orig/src/cdda.h	2013-01-14 05:14:54.000000000 +0200
-+++ consonance-0.5.1/src/cdda.h	2013-01-14 05:15:16.000000000 +0200
-@@ -18,7 +18,7 @@
- #ifndef CDDA_H
- #define CDDA_H
- 
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #include <cdio/cd_types.h>
- 
- struct con_cdda_decoder {
diff --git a/community/consonance/consonance.install b/community/consonance/consonance.install
deleted file mode 100644
index f1474aee3..000000000
--- a/community/consonance/consonance.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install()
-{
-    usr/bin/update-desktop-database -q
-}
-
-post_upgrade()
-{
-    post_install
-}
-
-post_remove()
-{
-    post_install
-}
diff --git a/community/consonance/libnotify.patch b/community/consonance/libnotify.patch
deleted file mode 100644
index f59acbfd9..000000000
--- a/community/consonance/libnotify.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/statusicon.c b/src/statusicon.c
-index f72e808..04efa58 100644
---- a/src/statusicon.c
-+++ b/src/statusicon.c
-@@ -47,11 +47,10 @@ void show_osd(struct con_win *cwin)
- 
- 	/* Create notification instance */
- 
--	osd = notify_notification_new_with_status_icon(
-+	osd = notify_notification_new(
- 		cwin->cstate->curr_mobj->tags->title,
- 		(const gchar *)body,
--		NULL,
--		GTK_STATUS_ICON(cwin->status_icon));
-+		gtk_status_icon_get_icon_name(GTK_STATUS_ICON(cwin->status_icon)));
- 	notify_notification_set_timeout(osd, OSD_TIMEOUT);
- 
- 	/* Add album art if set */
diff --git a/community/credentials-preferences/PKGBUILD b/community/credentials-preferences/PKGBUILD
deleted file mode 100644
index e4172f82d..000000000
--- a/community/credentials-preferences/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 87397 2013-03-30 21:57:57Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=credentials-preferences
-_pkgname=credentials-control-center
-pkgver=0.1.5
-pkgrel=1
-pkgdesc="Control panel for configuring online account credentials and settings"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/gnome-control-center-signon"
-license=('GPL' 'LGPL')
-depends=('libaccounts-glib' 'libsignon-glib' 'gtk3')
-makedepends=('gobject-introspection' 'vala' 'intltool' 'itstool')
-options=('!libtool')
-install=$pkgname.install
-source=(https://launchpad.net/gnome-control-center-signon/13.04/$pkgver/+download/$_pkgname-$pkgver.tar.xz
-        http://pkgbuild.com/~bgyorgy/sources/$_pkgname-translations-20121018.tar.gz)
-md5sums=('deaa290c89dffee5198f3f0f6f2e1fe1'
-         '702d6b39136e10ba6dfad0afd300b2af')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # Install updated language files
-  rename $_pkgname- '' ../po/$_pkgname-*.po
-  mv -f -t po ../po/*
-  printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS
-
-  # Fix helper script
-  sed -i 's/test/test -e/' online-accounts-preferences.in
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/credentials-preferences/credentials-preferences.install b/community/credentials-preferences/credentials-preferences.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community/credentials-preferences/credentials-preferences.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD
deleted file mode 100644
index d4d820d93..000000000
--- a/community/dee/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 97721 2013-09-27 20:10:42Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=dee
-pkgver=1.2.7
-pkgrel=1
-pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/dee"
-license=('LGPL')
-depends=('glib2' 'icu')
-makedepends=('python2' 'gobject-introspection' 'vala')
-options=('!libtool')
-source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('b92f27f0a99cac24c2128880601bb7d7')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # Install GI overrides for python 3 as well
-  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
-  ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py"
-}
diff --git a/community/ekg/PKGBUILD b/community/ekg/PKGBUILD
deleted file mode 100644
index 484ddb151..000000000
--- a/community/ekg/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 94723 2013-07-29 16:25:52Z bpiotrowski $
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-
-pkgname=ekg
-pkgver=1.8rc2
-pkgrel=1
-pkgdesc="A text-mode Gadu-Gadu client"
-arch=('i686' 'x86_64')
-url="http://ekg.chmurka.net/"
-license=('GPL')
-depends=('libjpeg' 'aspell' 'python2' 'giflib' 'libgadu')
-source=(http://ekg.chmurka.net/$pkgname-$pkgver.tar.gz)
-md5sums=('f697c711da91ddf57c882114539e92fe')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's#gg%s#ekg%s#' src/ekg.c
-  ./configure --prefix=/usr --with-pthread --enable-aspell --with-python
-  make
-}
-
-package() {
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/include $pkgdir/usr/lib
-}
diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD
deleted file mode 100644
index bb85acd5d..000000000
--- a/community/ekg2/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 96537 2013-08-31 09:41:14Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=ekg2
-pkgver=0.3.1
-pkgrel=8
-pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client'
-arch=('i686' 'x86_64')
-url="http://ekg2.org/"
-license=('GPL')
-depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib')
-optdepends=('xosd: xosd support'
-	    'sqlite: sqlite support'
-            'gtk2: gtk support')
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz
-        ekg2-0.3.1-giflib5.patch)
-md5sums=('68fc05b432c34622df6561eaabef5a40'
-         'e5855316bf7e9b456ebabb7cb9340e98')
-
-prepare() {
-  cd $pkgname-$pkgver
-  sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h
-  patch -Np1 -i ../ekg2-0.3.1-giflib5.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/ekg2 \
-    --with-libgadu \
-    --with-xosd \
-    --enable-unicode \
-    --enable-shared \
-    --without-gpg \
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod
-  rm -rf "$pkgdir"/usr/libexec
-  chmod -R 755 "$pkgdir"/usr/lib/perl5
-  chmod +s "$pkgdir"/usr/lib/ekg2/ioctld
-}
diff --git a/community/ekg2/ekg2-0.3.1-giflib5.patch b/community/ekg2/ekg2-0.3.1-giflib5.patch
deleted file mode 100644
index d11b1ecec..000000000
--- a/community/ekg2/ekg2-0.3.1-giflib5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c
---- a/plugins/gg/commands.c	2011-03-17 18:08:11.000000000 +0100
-+++ b/plugins/gg/commands.c	2013-08-31 11:31:42.521377436 +0200
-@@ -1029,14 +1029,15 @@ static int token_gif_load (char *fname,
- 	GifFileType *file;
- 	int fd;
- 	fd = open(fname, O_RDONLY);
-+	int giferror;
- 	if (fd == -1) {
- 		snprintf(errbuf, sizeof(errbuf), "open(%s): %m", fname);
- 		goto err;
- 	}
- 	
--	if (!(file = DGifOpenFileHandle(fd))) {
-+	if (!(file = DGifOpenFileHandle(fd, giferror))) {
- 		snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", 
--			GifLastError());
-+			GifErrorString(giferror));
- 		goto err2;
- 	}
- 
-@@ -1046,7 +1047,7 @@ static int token_gif_load (char *fname,
- 	}
- 	
- 	if (DGifSlurp(file) != GIF_OK) {
--		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifLastError());
-+		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifErrorString(GIF_ERROR));
- 		goto err3;
- 	}
- 
diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD
index 2e690f13d..4ce4b5a74 100644
--- a/community/emerillon/PKGBUILD
+++ b/community/emerillon/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=emerillon
 pkgver=0.1.90
-pkgrel=4
+pkgrel=5
 pkgdesc="Map viewer for OpenStreetMap"
 arch=('i686' 'x86_64')
 url="http://projects.gnome.org/emerillon/"
@@ -18,7 +18,11 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile
+              --disable-static --disable-schemas-compile --disable-maintainer-mode
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD
deleted file mode 100644
index d9e7a0399..000000000
--- a/community/fssos-nsvs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 90505 2013-05-12 23:35:37Z eric $
-# Maintainer: Dale Blount <dale@archlinux.org>
-
-pkgname=fssos-nsvs
-pkgver=0.5
-pkgrel=11
-pkgdesc="NSVS for FSSOS"
-arch=('i686' 'x86_64')
-url="http://fssos.sourceforge.net/"
-license=('GPL')
-depends=('bash' 'mariadb')
-backup=('etc/nsvsd.conf')
-options=('!libtool' '!makeflags')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz"
-        'nsvsd.service')
-md5sums=('3f17c2f6339f1a322b712b467023d825'
-         '9c791d2086e13f774548d9d6ba2cf9d5')
-
-build() {
-  cd nsvs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
-  make CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-}
-
-package() {
-  cd nsvs-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service"
-}
diff --git a/community/fssos-nsvs/fssos-nsvs.install b/community/fssos-nsvs/fssos-nsvs.install
deleted file mode 100644
index 253ae64d2..000000000
--- a/community/fssos-nsvs/fssos-nsvs.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    if [ -z "`grep '^nsvsd::' /etc/group`" ]; then
-	groupadd -g 83 nsvsd
-    fi
-    if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then
-	useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    userdel nsvsd &> /dev/null
-    groupdel nsvsd &> /dev/null
-}
diff --git a/community/fssos-nsvs/nsvsd.service b/community/fssos-nsvs/nsvsd.service
deleted file mode 100644
index 8c3d12b67..000000000
--- a/community/fssos-nsvs/nsvsd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Name Service Via Sockets Daemon
-
-[Service]
-ExecStart=/usr/bin/nsvsd -f /etc/nsvsd.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index f35596fea..9a3f81196 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92909 2013-06-18 13:47:52Z heftig $
+# $Id: PKGBUILD 98198 2013-10-07 12:11:31Z jgc $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -6,21 +6,21 @@
 # Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Plugins for gedit"
 arch=(x86_64 i686)
 license=(GPL)
 url="http://live.gnome.org/GeditPlugins"
 depends=(gedit python-dbus)
-makedepends=(intltool gnome-doc-utils vte3 libgit2-glib)
+makedepends=(intltool gnome-doc-utils vte3 libgit2-glib itstool)
 optdepends=('gucharmap: for charmap plugin'
             'vte3: for embedded terminal'
             'libgit2-glib: for git plugin')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz")
-sha256sums=('2340910ed49acfaab7e8d30142e087f70e55c1a55f8b755d4f9014bce3923c80')
+source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz")
+sha256sums=('17cb703a09a0346b6a73d0e34eec87cde9073ffd5e0168741f0830a419ab57cd')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD
index 5276b2464..68b379cd0 100644
--- a/community/glabels/PKGBUILD
+++ b/community/glabels/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 79126 2012-10-30 23:07:20Z heftig $
+# $Id: PKGBUILD 98190 2013-10-07 12:08:24Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: yugrotavele <yugrotavele at archlinux dot us>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=glabels
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Creating labels and business cards the very easy way"
 arch=('i686' 'x86_64')
 url="http://glabels.org/"
 license=('GPL' 'LGPL')
-depends=('librsvg' 'evolution-data-server>=3.6.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
+depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
 makedepends=('barcode' 'intltool' 'gnome-doc-utils')
 options=('!libtool')
 install=$pkgname.install
diff --git a/community/gnome-applets/01_battstat_upower.patch b/community/gnome-applets/01_battstat_upower.patch
deleted file mode 100644
index fa31e720b..000000000
--- a/community/gnome-applets/01_battstat_upower.patch
+++ /dev/null
@@ -1,622 +0,0 @@
-From 18a2f4aa3ba2c8c9fc3718b15a9ab366fdd35f05 Mon Sep 17 00:00:00 2001
-From: Joachim Breitner <mail@joachim-breitner.de>
-Date: Mon, 5 Jul 2010 12:20:04 +0200
-Subject: [PATCH] [battstat applet] upower support
-
-As HAL is being deprecated, the battstat applet is adjusted to talk to
-upower, using libupower-glib. (Bug #607254)
----
- battstat/Makefile.am          |    6 +-
- battstat/battstat-upower.c    |  330 +++++++++++++++++++++++++++++++++++++++++
- battstat/battstat-upower.h    |   33 ++++
- battstat/battstat_applet.c    |    7 +-
- battstat/docs/C/battstat.xml  |   18 ++-
- battstat/docs/de/battstat.xml |   22 +++-
- battstat/docs/eu/battstat.xml |   20 ++-
- battstat/power-management.c   |   66 +++++++--
- configure.in                  |   22 +++
- 9 files changed, 493 insertions(+), 31 deletions(-)
- create mode 100644 battstat/battstat-upower.c
- create mode 100644 battstat/battstat-upower.h
-
-Index: gnome-applets-3.4.1/battstat/Makefile.am
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/Makefile.am	2012-04-13 19:02:29.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/Makefile.am	2012-04-19 00:28:17.246029051 +0200
-@@ -27,6 +27,7 @@
- 	$(GNOME_APPLETS_CFLAGS)			\
- 	$(LIBNOTIFY_CFLAGS)			\
- 	$(HAL_CFLAGS)				\
-+	$(UPOWER_CFLAGS)			\
- 	$(APMINC)				\
- 	$(ACPIINC)				\
- 	$(WARN_CFLAGS)				\
-@@ -48,13 +49,17 @@
- 	acpi-freebsd.c \
- 	acpi-freebsd.h \
- 	battstat-hal.c \
--	battstat-hal.h
-+	battstat-hal.h \
-+	battstat-upower.c \
-+	battstat-upower.h
- 
- 
- battstat_applet_2_LDADD = \
- 		     $(GNOME_APPLETS_LIBS) \
- 		     $(LIBNOTIFY_LIBS) \
- 		     $(HAL_LIBS) \
-+		     $(UPOWER_LIBS) \
-+		     $(LIBM) \
- 		     $(APMLIB)
- 
- schemasdir   = @GCONF_SCHEMA_FILE_DIR@
-Index: gnome-applets-3.4.1/battstat/battstat-upower.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-3.4.1/battstat/battstat-upower.c	2012-04-19 00:28:17.246029051 +0200
-@@ -0,0 +1,301 @@
-+/*
-+ *  Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de>
-+ *
-+ * Based on battstat-hal.c:
-+ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
-+ *
-+ * $Id$
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_UPOWER
-+
-+#include <upower.h>
-+#include <math.h>
-+
-+#include "battstat-upower.h"
-+
-+static UpClient *upc;
-+static void (*status_updated_callback) (void);
-+
-+
-+/* status_updated_callback() can not be called directly because at the time of
-+ * the device-remove signal, the device is not actually removed from the list
-+ * of devices known to the up_client object (see libupower-glib/up-client.c in
-+ * upower). Waiting for the next idle timer works around this issue and has has
-+ * the additionaly benefit of possibly running status_updated_callback only
-+ * once when several events happen very soon after each other.
-+ */
-+static gboolean status_update_scheduled;
-+
-+static gboolean
-+update_status_idle (gpointer junk)
-+{
-+  if (status_updated_callback)
-+    status_updated_callback ();
-+
-+  return status_update_scheduled = FALSE;
-+}
-+
-+static void
-+schedule_status_callback (void)
-+{
-+  if (status_update_scheduled)
-+    return;
-+
-+  status_update_scheduled = TRUE;
-+  g_idle_add (update_status_idle, NULL);
-+}
-+
-+static void
-+device_cb (UpClient *client, UpDevice *device, gpointer user_data) {
-+  schedule_status_callback();
-+}
-+
-+/* ---- public functions ---- */
-+
-+char *
-+battstat_upower_initialise (void (*callback) (void))
-+{
-+  status_updated_callback = callback;
-+
-+  if( upc != NULL )
-+    return g_strdup( "Already initialised!" );
-+
-+  if( (upc = up_client_new() ) == NULL )
-+    goto error_out;
-+
-+  if (! up_client_enumerate_devices_sync( upc, NULL, NULL ) ) {
-+    goto error_shutdownclient;
-+  }
-+
-+  g_signal_connect_after( upc, "device-changed", device_cb, NULL );
-+  g_signal_connect_after( upc, "device-added", device_cb, NULL );
-+  g_signal_connect_after( upc, "device-removed", device_cb, NULL );
-+
-+  return NULL;
-+
-+error_shutdownclient:
-+  g_object_unref( upc );
-+  upc = NULL;
-+
-+error_out:
-+  return "Can not initialize upower";
-+}
-+
-+void
-+battstat_upower_cleanup( void )
-+{
-+  if( upc == NULL )
-+    return;
-+  
-+  g_object_unref( upc );
-+  upc = NULL;
-+}
-+
-+#include "battstat.h"
-+
-+/* This function currently exists to allow the multiple batteries supported
-+ * by the upower backend to appear as a single composite battery device (since
-+ * at the current time this is all that battstat supports).
-+ *
-+ * This entire function is filled with logic to make multiple batteries
-+ * appear as one "composite" battery.  Comments included as appropriate.
-+ *
-+ * For more information about some of the assumptions made in the following
-+ * code please see the following mailing list post and the resulting thread:
-+ *
-+ *   http://lists.freedesktop.org/archives/hal/2005-July/002841.html
-+ */
-+void
-+battstat_upower_get_battery_info( BatteryStatus *status )
-+{
-+
-+  GPtrArray *devices = up_client_get_devices( upc );
-+
-+  /* The calculation to get overall percentage power remaining is as follows:
-+   *
-+   *    Sum( Current charges ) / Sum( Full Capacities )
-+   *
-+   * We can't just take an average of all of the percentages since this
-+   * doesn't deal with the case that one battery might have a larger
-+   * capacity than the other.
-+   *
-+   * In order to do this calculation, we need to keep a running total of
-+   * current charge and full capacities.
-+   */
-+  double current_charge_total = 0, full_capacity_total = 0;
-+
-+  /* Record the time remaining as reported by upower.  This is used in the event
-+   * that the system has exactly one battery (since, then, upower is capable
-+   * of providing an accurate time remaining report and we should trust it.)
-+   */
-+  gint64 remaining_time = 0;
-+
-+  /* The total (dis)charge rate of the system is the sum of the rates of
-+   * the individual batteries.
-+   */
-+  double rate_total = 0;
-+
-+  /* We need to know if we should report the composite battery as present
-+   * at all.  The logic is that if at least one actual battery is installed
-+   * then the composite battery will be reported to exist.
-+   */
-+  int present = 0;
-+
-+  /* We need to know if we are on AC power or not.  Eventually, we can look
-+   * at the AC adaptor upower devices to determine that.  For now, we assume that
-+   * if any battery is discharging then we must not be on AC power.  Else, by
-+   * default, we must be on AC.
-+   */
-+  int on_ac_power = 1;
-+
-+  /* Finally, we consider the composite battery to be "charging" if at least
-+   * one of the actual batteries in the system is charging.
-+   */
-+  int charging = 0;
-+
-+  /* For each physical battery bay... */
-+  int i;
-+  for( i = 0; i < devices->len; i++ )
-+  {
-+    UpDevice *upd = g_ptr_array_index( devices, i );
-+
-+    int type, state;
-+    double current_charge, full_capacity, rate;
-+    gint64 time_to_full, time_to_empty;
-+    
-+    g_object_get( upd,
-+      "kind", &type,
-+      "state", &state,
-+      "energy", &current_charge,
-+      "energy-full", &full_capacity,
-+      "energy-rate", &rate,
-+      "time-to-full", &time_to_full,
-+      "time-to-empty", &time_to_empty,
-+      NULL );
-+
-+    /* Only count batteries here */
-+
-+    if (type != UP_DEVICE_KIND_BATTERY)
-+      continue;
-+
-+    /* At least one battery present -> composite battery is present. */
-+    present++;
-+
-+    /* At least one battery charging -> composite battery is charging. */
-+    if( state == UP_DEVICE_STATE_CHARGING )
-+      charging = 1;
-+
-+    /* At least one battery is discharging -> we're not on AC. */
-+    if( state == UP_DEVICE_STATE_DISCHARGING )
-+      on_ac_power = 0;
-+
-+    /* Sum the totals for current charge, design capacity, (dis)charge rate. */
-+    current_charge_total += current_charge;
-+    full_capacity_total += full_capacity;
-+    rate_total += rate;
-+
-+    /* Record remaining time too, incase this is the only battery. */
-+    remaining_time = (state == UP_DEVICE_STATE_DISCHARGING ? time_to_empty : time_to_full);
-+  }
-+
-+  if( !present || full_capacity_total <= 0 || (charging && !on_ac_power) )
-+  {
-+    /* Either no battery is present or something has gone horribly wrong.
-+     * In either case we must return that the composite battery is not
-+     * present.
-+     */
-+    status->present = FALSE;
-+    status->percent = 0;
-+    status->minutes = -1;
-+    status->on_ac_power = TRUE;
-+    status->charging = FALSE;
-+
-+    g_ptr_array_unref( devices );
-+    return;
-+  }
-+
-+  /* Else, our composite battery is present. */
-+  status->present = TRUE;
-+
-+  /* As per above, overall charge is:
-+   *
-+   *    Sum( Current charges ) / Sum( Full Capacities )
-+   */
-+  status->percent = ( current_charge_total / full_capacity_total ) * 100.0 + 0.5;
-+
-+  if( present == 1 )
-+  {
-+    /* In the case of exactly one battery, report the time remaining figure
-+     * from upower directly since it might have come from an authorative source
-+     * (ie: the PMU or APM subsystem).
-+     *
-+     * upower gives remaining time in seconds with a 0 to mean that the
-+     * remaining time is unknown.  Battstat uses minutes and -1 for 
-+     * unknown time remaining.
-+     */
-+
-+    if( remaining_time == 0 )
-+      status->minutes = -1;
-+    else
-+      status->minutes = (remaining_time + 30) / 60;
-+  }
-+  /* Rest of cases to deal with multiple battery systems... */
-+  else if( !on_ac_power && rate_total != 0 )
-+  {
-+    /* Then we're discharging.  Calculate time remaining until at zero. */
-+
-+    double remaining;
-+
-+    remaining = current_charge_total;
-+    remaining /= rate_total;
-+    status->minutes = (int) floor( remaining * 60.0 + 0.5 );
-+  }
-+  else if( charging && rate_total != 0 )
-+  {
-+    /* Calculate time remaining until charged.  For systems with more than
-+     * one battery, this code is very approximate.  The assumption is that if
-+     * one battery reaches full charge before the other that the other will
-+     * start charging faster due to the increase in available power (similar
-+     * to how a laptop will charge faster if you're not using it).
-+     */
-+
-+    double remaining;
-+
-+    remaining = full_capacity_total - current_charge_total;
-+    if( remaining < 0 )
-+      remaining = 0;
-+    remaining /= rate_total;
-+
-+    status->minutes = (int) floor( remaining * 60.0 + 0.5 );
-+  }
-+  else
-+  {
-+    /* On AC power and not charging -or- rate is unknown. */
-+    status->minutes = -1;
-+  }
-+
-+  /* These are simple and well-explained above. */
-+  status->charging = charging;
-+  status->on_ac_power = on_ac_power;
-+  
-+  g_ptr_array_unref( devices );
-+}
-+
-+#endif /* HAVE_UPOWER */
-Index: gnome-applets-3.4.1/battstat/battstat-upower.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-3.4.1/battstat/battstat-upower.h	2012-04-19 00:28:17.254029051 +0200
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de>
-+ *
-+ * Based on battstat-hal.h:
-+ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
-+ *
-+ * $Id$
-+ */
-+
-+#ifndef _battstat_upower_h_
-+#define _battstat_upower_h_
-+
-+char *battstat_upower_initialise (void (*) (void));
-+void battstat_upower_cleanup (void);
-+
-+#include "battstat.h"
-+void battstat_upower_get_battery_info (BatteryStatus *status);
-+
-+#endif /* _battstat_upower_h_ */
-Index: gnome-applets-3.4.1/battstat/battstat_applet.c
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/battstat_applet.c	2012-04-13 19:02:29.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/battstat_applet.c	2012-04-19 00:28:17.254029051 +0200
-@@ -1188,9 +1188,12 @@
- 
-   char *comments = g_strdup_printf ("%s\n\n%s",
- 		  _("This utility shows the status of your laptop battery."),
--		  power_management_using_hal () ?
-+		  power_management_using_upower () ?
-+		  	/* true */ _("upower backend enabled.") :
-+		  (power_management_using_hal () ?
- 		  	/* true */ _("HAL backend enabled.") :
--			/* false */ _("Legacy (non-HAL) backend enabled."));
-+			/* false */ _("Legacy (non-HAL) backend enabled.")
-+		  ));
- 
-   gtk_show_about_dialog( NULL,
-     "version",             VERSION,
-Index: gnome-applets-3.4.1/battstat/docs/C/battstat.xml
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/docs/C/battstat.xml	2012-04-15 15:49:58.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/docs/C/battstat.xml	2012-04-19 00:28:17.254029051 +0200
-@@ -226,10 +226,13 @@
-      <title>Power Management Backends</title>
- 
-      <para>
--      The battery monitor supports a number of power management backends. If it
--      is available, the monitor will attempt to use the freedesktop.org
--      <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware Abstraction
--      Layer)</ulink>. If it is unavailable or unsupported on your platform, the
-+      The battery monitor supports a number of power management backends.
-+      If it is available, the monitor will attempt to use the freedesktop.org
-+      <ulink url="http://upower.freedesktop.org/">upower</ulink> interface.
-+      If it is unavailable or unsupported on your platform, it will fall back
-+      to the freedesktop.org
-+      <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware
-+      Abstraction Layer)</ulink>. If that is also not availble, the
-       battery monitor will attempt direct access to the power management system.
-      </para>
-      <para>
-@@ -410,10 +413,10 @@
-     <sect2 id="battstat-troubleshooting-backends">
-      <title>Determining the backend</title>
-      <para>
--       If you are using the Hardware Abstraction Layer
--       (see <xref linkend="battstat-power-backends"/>) then that will be
--       indicated in the about dialog by placing a star next to the author of the
--       HAL backend.
-+       If you are using the upower interface, or the the Hardware
-+       Abstraction Layer (see <xref linkend="battstat-power-backends"/>) then
-+       that will be indicated in the about dialog by placing a star next to the
-+       author of the HAL backend.
-     <figure id="battstat-credits-hal"> 
-       <title>Check you're using the HAL backend</title> 
-       <screenshot> 
-Index: gnome-applets-3.4.1/battstat/power-management.c
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/power-management.c	2012-04-13 19:02:29.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/power-management.c	2012-04-19 00:28:17.254029051 +0200
-@@ -41,6 +41,7 @@
- 
- #include "battstat.h"
- #include "battstat-hal.h"
-+#include "battstat-upower.h"
- 
- #define ERR_ACPID _("Can't access ACPI events in /var/run/acpid.socket! "    \
-                     "Make sure the ACPI subsystem is working and "           \
-@@ -66,6 +67,9 @@
- #ifdef HAVE_HAL
- static int using_hal;
- #endif
-+#ifdef HAVE_UPOWER
-+static int using_upower;
-+#endif
- 
- /*
-  * What follows is a series of platform-specific apm_readinfo functions
-@@ -390,6 +394,14 @@
-     return NULL;
-   }
- 
-+#ifdef HAVE_UPOWER
-+  if( using_upower )
-+  {
-+    battstat_upower_get_battery_info( status );
-+    return NULL;
-+  }
-+#endif
-+
- #ifdef HAVE_HAL
-   if( using_hal )
-   {
-@@ -430,27 +442,36 @@
- const char *
- power_management_initialise (int no_hal, void (*callback) (void))
- {
-+  char *err;
-+  err = g_strdup( ":(" );
- #ifdef __linux__
-   struct stat statbuf;
- #endif
--#ifdef HAVE_HAL
--  char *err;
-+#ifdef HAVE_UPOWER
-+  err = battstat_upower_initialise (callback);
- 
--  if( no_hal )
--    err = g_strdup( ":(" );
--  else
--    err = battstat_hal_initialise (callback);
--
--
--  if( err == NULL ) /* HAL is up */
-+  if( err == NULL ) /* UPOWER is up */
-   {
-     pm_initialised = 1;
--    using_hal = TRUE;
-+    using_upower = TRUE;
-     return NULL;
-+  } 
-+#endif
-+
-+#ifdef HAVE_HAL
-+  if(! no_hal ) {
-+    err = battstat_hal_initialise (callback);
-+
-+    if( err == NULL ) /* HAL is up */
-+    {
-+      pm_initialised = 1;
-+      using_hal = TRUE;
-+      return NULL;
-+    }
-   }
--  else
--    /* fallback to legacy methods */
--    g_free( err );
-+
-+  /* fallback to legacy methods */
-+  g_free( err );
- #endif
-     
- #ifdef __linux__
-@@ -498,6 +519,15 @@
- void
- power_management_cleanup( void )
- {
-+#ifdef HAVE_UPOWER
-+  if( using_upower )
-+  {
-+    battstat_upower_cleanup();
-+    pm_initialised = 1;
-+    return;
-+  }
-+#endif
-+
- #ifdef HAVE_HAL
-   if( using_hal )
-   {
-@@ -525,6 +555,16 @@
- }
- 
- int
-+power_management_using_upower( void )
-+{
-+#ifdef HAVE_UPOWER
-+  return using_upower;
-+#else
-+  return 0;
-+#endif
-+}
-+
-+int
- power_management_using_hal( void )
- {
- #ifdef HAVE_HAL
-Index: gnome-applets-3.4.1/configure.in
-===================================================================
---- gnome-applets-3.4.1.orig/configure.in	2012-04-15 15:45:36.000000000 +0200
-+++ gnome-applets-3.4.1/configure.in	2012-04-19 00:28:17.254029051 +0200
-@@ -23,6 +23,7 @@
- LIBWNCK_REQUIRED=2.91.0
- LIBNOTIFY_REQUIRED=0.7
- HAL_REQUIRED=0.5.3
-+UPOWER_REQUIRED=0.9.4
- DBUS_REQUIRED=1.1.2
- DBUS_GLIB_REQUIRED=0.74
- PYGOBJECT_REQUIRED=2.26
-@@ -223,6 +224,30 @@
- AC_SUBST(HAL_CFLAGS)
- AC_SUBST(HAL_LIBS)
- 
-+dnl -- check for libupower-glib (optional) --------------------------------------------
-+UPOWER_CFLAGS=
-+UPOWER_LIBS=
-+AC_ARG_WITH(upower,[  --without-upower           build without upower support])
-+
-+if test "x$with_upower" != xno; then
-+	PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED,
-+		  HAVE_UPOWER="yes",
-+		  HAVE_UPOWER="no")
-+
-+	LT_LIB_M
-+	if test "x$HAVE_UPOWER" = "xyes"; then
-+		AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available])
-+	fi
-+else
-+	AC_MSG_WARN(["upower support disabled"])
-+fi
-+
-+AC_SUBST(UPOWER_CFLAGS)
-+AC_SUBST(UPOWER_LIBS)
-+AC_SUBST(LIBM)
-+
-+
-+
- dnl -- check for gucharmap (optional) -----------------------------------------
- 
- PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
-@@ -739,5 +764,6 @@
- 	Using DBUS:			$HAVE_DBUS
- 	Using NetworkManager:		$HAVE_NETWORKMANAGER
- 	Using HAL:			$HAVE_HAL
-+	Using UPOWER:			$HAVE_UPOWER
- 	Enabling IPv6:			$have_ipv6
- " >&2
diff --git a/community/gnome-applets/PKGBUILD b/community/gnome-applets/PKGBUILD
deleted file mode 100644
index 193c879af..000000000
--- a/community/gnome-applets/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 88683 2013-04-21 22:16:53Z heftig $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-applets
-pkgver=3.5.92
-pkgrel=3
-pkgdesc="Small applications for the GNOME panel"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('cpupower' 'gucharmap' 'gstreamer0.10-base-plugins' 'gnome-panel' 'libgtop' 'upower')
-makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'networkmanager' 'rarian')
-url="https://live.gnome.org/GnomeApplets"
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gnome-applets-cpupower.patch
-        disable-gweather-applet.patch
-        fix-autoconf.patch
-        01_battstat_upower.patch)
-sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83'
-            '942276d7cc18224d9f5b1b57314746ad4d713ee0dcf4aedb25fa72e92db75e65'
-            '47f6b477c0f76ebb1e8ffc6fe9bd2fac9ac7f511f059cf4bb2687f8425bfb4a8'
-            '0acd58aee458345e378d5f77256e04b13e3a4c06b166aac390a92309b864e8a4'
-            '364c9264c76721b42e85eecc48443852ead1bd730d9de937dd2ae00889db836a')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  sed -i 's@^#!.*python$@#!/usr/bin/python2@' invest-applet/invest/*
-
-  # Use cpupower instead of cpufreq
-  patch -Np1 -i "$srcdir/gnome-applets-cpupower.patch"
-
-  # Add UPower support
-  patch -Np1 -i "$srcdir/01_battstat_upower.patch"
-
-  # Disable gweather applet, because it's not compatible with libgweather 3.8
-  patch -Np1 -i "$srcdir/disable-gweather-applet.patch"
-
-  # Fix build
-  patch -Np1 -i "$srcdir/fix-autoconf.patch"
-
-  # Turn off unneeded warnings
-  CFLAGS="$CFLAGS -w"
-
-  autoreconf -fi
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --disable-schemas-install --disable-scrollkeeper \
-              --enable-mixer-applet \
-              PYTHON=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  mkdir -m755 -p "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -r "$pkgdir"/etc/gconf
-}
diff --git a/community/gnome-applets/disable-gweather-applet.patch b/community/gnome-applets/disable-gweather-applet.patch
deleted file mode 100644
index 26f7e4d6b..000000000
--- a/community/gnome-applets/disable-gweather-applet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
---- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
-+++ gnome-applets-3.5.92/configure.in	2013-04-09 10:39:54.214243015 +0200
-@@ -251,7 +251,7 @@
- 
-  dnl -- check for libgweather (required for gweather applet) ------------------
- build_libgweather_applets=false
--PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED,
-+PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED gweather-3.0 <= 3.7,
- 	          build_libgweather_applets=true,
- 		  AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
- AC_SUBST(LIBGWEATHER_CFLAGS)
diff --git a/community/gnome-applets/fix-autoconf.patch b/community/gnome-applets/fix-autoconf.patch
deleted file mode 100644
index fc36c743c..000000000
--- a/community/gnome-applets/fix-autoconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
---- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
-+++ gnome-applets-3.5.92/configure.in	2013-04-09 09:48:48.427334056 +0200
-@@ -4,7 +4,7 @@
- AC_INIT(gnome-applets, 3.5.92)
- AC_PREREQ(2.59)
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
- AC_CONFIG_MACRO_DIR(m4)
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/community/gnome-applets/gnome-applets-cpupower.patch b/community/gnome-applets/gnome-applets-cpupower.patch
deleted file mode 100644
index 134a617fc..000000000
--- a/community/gnome-applets/gnome-applets-cpupower.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in
---- gnome-applets-3.1.90/configure.in.cpupower	2011-08-31 18:49:00.628945807 -0400
-+++ gnome-applets-3.1.90/configure.in	2011-08-31 18:49:17.397946966 -0400
-@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
- LIBCPUFREQ_LIBS=
- if test "x$have_libcpufreq" = "xyes"; then
-    AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
--   LIBCPUFREQ_LIBS=-lcpufreq
-+   LIBCPUFREQ_LIBS=-lcpupower
- fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
diff --git a/community/gnome-applets/gnome-applets.install b/community/gnome-applets/gnome-applets.install
deleted file mode 100644
index e3441e722..000000000
--- a/community/gnome-applets/gnome-applets.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-applets
-
-post_install() {
-  gconfpkg --install ${pkgname}
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  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/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
index 4ae65559c..b6779e91b 100644
--- a/community/gnome-panel/PKGBUILD
+++ b/community/gnome-panel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97693 2013-09-27 16:05:09Z bgyorgy $
+# $Id: PKGBUILD 98191 2013-10-07 12:08:25Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-panel
 pkgname=('gnome-panel' 'gnome-flashback-session')
 pkgver=3.8.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="Legacy GNOME panel"
@@ -16,13 +16,18 @@ makedepends=('gobject-introspection' 'intltool' 'itstool' 'networkmanager')
 install=$pkgbase.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
+        libgweather-3.10.patch
         session.patch)
 sha256sums=('d1cda458a38cb4f7d2a50c61b1a72f4bf4c39cab65ae0e6cfdc4e0c122252e7a'
+            'd9e21449fc6c5f235673fe47e5b817ac7597490518a557908b14ca875263d90e'
             'cd4c21cf394ea5a702c660bb0d31cae31260bec1cee4e7ca8ee6c8aec2707ebb')
 
 prepare() {
   cd "$pkgbase-$pkgver"
 
+  # Fix build with libgweather 3.10
+  patch -Np1 -i "$srcdir/libgweather-3.10.patch"
+
   # Add more required components to the session file
   patch -Np1 -i "$srcdir/session.patch"
 }
diff --git a/community/gnome-panel/libgweather-3.10.patch b/community/gnome-panel/libgweather-3.10.patch
new file mode 100644
index 000000000..0a6e0e4e4
--- /dev/null
+++ b/community/gnome-panel/libgweather-3.10.patch
@@ -0,0 +1,15 @@
+diff -Naur gnome-panel-3.6.2.orig/applets/clock/clock-location.c gnome-panel-3.6.2/applets/clock/clock-location.c
+--- gnome-panel-3.6.2.orig/applets/clock/clock-location.c	2013-09-27 02:39:03.315952789 +0000
++++ gnome-panel-3.6.2/applets/clock/clock-location.c	2013-09-27 02:40:24.552036953 +0000
+@@ -542,9 +542,8 @@
+ 	}
+ 
+ 	priv->weather_info =
+-		gweather_info_new_for_world (priv->world,
+-					     priv->loc,
+-					     GWEATHER_FORECAST_LIST);
++		gweather_info_new (priv->loc,
++				   GWEATHER_FORECAST_LIST);
+ 	g_signal_connect (priv->weather_info, "updated",
+ 			  G_CALLBACK (weather_info_updated), loc);
+ 
diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD
index de2149b50..ec02738b0 100644
--- a/community/gnome-phone-manager/PKGBUILD
+++ b/community/gnome-phone-manager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95475 2013-08-12 20:33:04Z bgyorgy $
+# $Id: PKGBUILD 98192 2013-10-07 12:08:26Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-phone-manager
 pkgver=0.69
-pkgrel=2
+pkgrel=3
 pkgdesc="Control your mobile phone from your GNOME desktop"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/PhoneManager"
diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD
index 9649da0d5..864708ec6 100644
--- a/community/gnome-screensaver/PKGBUILD
+++ b/community/gnome-screensaver/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96399 2013-08-27 14:10:08Z bgyorgy $
+# $Id: PKGBUILD 98193 2013-10-07 12:08:28Z jgc $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-screensaver
 pkgver=3.6.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Legacy GNOME screensaver"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -25,7 +25,7 @@ sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
             'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb'
             '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
 
   # Upstream patch that moves gnome-screensaver desktop file out of autostart
@@ -36,6 +36,10 @@ build() {
 
   # Lock screen on suspend with systemd
   patch -Np1 -i "$srcdir/lock_screen_on_suspend.patch"
+}
+
+build() {
+  cd "$pkgname-$pkgver"
 
   autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD
deleted file mode 100644
index 8c2ae9f43..000000000
--- a/community/gnome-settings-daemon-compat/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 88930 2013-04-24 22:24:31Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-settings-daemon-compat
-_pkgname=gnome-settings-daemon
-pkgver=3.6.4
-pkgrel=3
-pkgdesc="Compatibility package that provides background, media keys and mount helpers for the Gnome Flashback session"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-settings-daemon')
-makedepends=('docbook-xsl' 'intltool' 'xf86-input-wacom')
-url="https://live.gnome.org/GnomeFlashback"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
-        standalone-background-helper.patch
-        standalone-media-keys-helper.patch
-        draw-background-unconditionally.patch
-        sessionisactive-port.patch
-        revert-input-sources.patch
-        xinput.patch 
-        remove-libgsd-dependency.patch
-        move-desktop-file.patch)
-sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
-            '2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9'
-            'ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162'
-            '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a'
-            '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915'
-            '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a'
-            'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d'
-            '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c'
-            'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4')
-
-build() {
-  cd $_pkgname-$pkgver
-
-  # Build background and media keys helpers as a stand alone binary
-  patch -Np1 -i ../standalone-background-helper.patch
-  patch -Np1 -i ../standalone-media-keys-helper.patch
-
-  # Always draw background
-  patch -Np1 -i ../draw-background-unconditionally.patch
-
-  # Port to gnome-session's SessionIsActive property
-  patch -Np1 -i ../sessionisactive-port.patch
-
-  # Add compatibility patches for media keys plugin
-  patch -Np1 -i ../revert-input-sources.patch
-  patch -Np1 -i ../xinput.patch
-
-  # Remove libgsd dependency
-  patch -Np1 -i ../remove-libgsd-dependency.patch
-
-  # Move desktop files out of autostart, so they can be easily reusable in custom sessions
-  patch -Np1 -i ../move-desktop-file.patch
-
-  autoreconf -fi
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \
-              --disable-static --enable-systemd
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make -C plugins/common
-  make -C plugins/automount
-  make -C plugins/background
-  make -C plugins/media-keys
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make -C plugins/automount DESTDIR="$pkgdir" install
-  make -C plugins/background DESTDIR="$pkgdir" install
-  make -C plugins/media-keys DESTDIR="$pkgdir" install
-}
diff --git a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch b/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch
deleted file mode 100644
index c279420de..000000000
--- a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c	2013-04-10 16:33:15.858860586 +0200
-@@ -69,110 +69,6 @@
- 
- static gpointer manager_object = NULL;
- 
--static gboolean
--dont_draw_background (GsdBackgroundManager *manager)
--{
--        return !g_settings_get_boolean (manager->priv->settings,
--                                        "draw-background");
--}
--
--static gboolean
--nautilus_is_drawing_background (GsdBackgroundManager *manager)
--{
--       Atom           window_id_atom;
--       Window         nautilus_xid;
--       Atom           actual_type;
--       int            actual_format;
--       unsigned long  nitems;
--       unsigned long  bytes_after;
--       unsigned char *data;
--       Atom           wmclass_atom;
--       gboolean       running;
--       gint           error;
--       gboolean       show_desktop_icons;
--
--       show_desktop_icons = g_settings_get_boolean (manager->priv->settings,
--                                                     "show-desktop-icons");
--       if (! show_desktop_icons) {
--               return FALSE;
--       }
--
--       window_id_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
--                                     "NAUTILUS_DESKTOP_WINDOW_ID", True);
--
--       if (window_id_atom == None) {
--               return FALSE;
--       }
--
--       XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
--                           GDK_ROOT_WINDOW (),
--                           window_id_atom,
--                           0,
--                           1,
--                           False,
--                           XA_WINDOW,
--                           &actual_type,
--                           &actual_format,
--                           &nitems,
--                           &bytes_after,
--                           &data);
--
--       if (data != NULL) {
--               nautilus_xid = *(Window *) data;
--               XFree (data);
--       } else {
--               return FALSE;
--       }
--
--       if (actual_type != XA_WINDOW) {
--               return FALSE;
--       }
--       if (actual_format != 32) {
--               return FALSE;
--       }
--
--       wmclass_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLASS", False);
--
--       gdk_error_trap_push ();
--
--       XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
--                           nautilus_xid,
--                           wmclass_atom,
--                           0,
--                           24,
--                           False,
--                           XA_STRING,
--                           &actual_type,
--                           &actual_format,
--                           &nitems,
--                           &bytes_after,
--                           &data);
--
--       error = gdk_error_trap_pop ();
--
--       if (error == BadWindow) {
--               return FALSE;
--       }
--
--       if (actual_type == XA_STRING &&
--           nitems == 24 &&
--           bytes_after == 0 &&
--           actual_format == 8 &&
--           data != NULL &&
--           !strcmp ((char *)data, "desktop_window") &&
--           !strcmp ((char *)data + strlen ((char *)data) + 1, "Nautilus")) {
--               running = TRUE;
--       } else {
--               running = FALSE;
--       }
--
--       if (data != NULL) {
--               XFree (data);
--       }
--
--       return running;
--}
--
- static void
- on_crossfade_finished (GsdBackgroundManager *manager)
- {
-@@ -189,11 +85,6 @@
-         int         i;
- 
- 
--        if (nautilus_is_drawing_background (manager) ||
--            dont_draw_background (manager)) {
--                return;
--        }
--
-         gnome_settings_profile_start (NULL);
- 
-         display = gdk_display_get_default ();
-@@ -408,8 +299,7 @@
-                          const char           *key,
-                          GsdBackgroundManager *manager)
- {
--        if (dont_draw_background (manager) == FALSE)
--                setup_bg_and_draw_background (manager);
-+        setup_bg_and_draw_background (manager);
- }
- 
- gboolean
-@@ -422,24 +312,8 @@
-         gnome_settings_profile_start (NULL);
- 
-         manager->priv->settings = g_settings_new ("org.gnome.desktop.background");
--        g_signal_connect (manager->priv->settings, "changed::draw-background",
--                          G_CALLBACK (draw_background_changed), manager);
- 
--        /* If this is set, nautilus will draw the background and is
--	 * almost definitely in our session.  however, it may not be
--	 * running yet (so is_nautilus_running() will fail).  so, on
--	 * startup, just don't do anything if this key is set so we
--	 * don't waste time setting the background only to have
--	 * nautilus overwrite it.
--	 */
--        show_desktop_icons = g_settings_get_boolean (manager->priv->settings,
--                                                     "show-desktop-icons");
--
--        if (!show_desktop_icons) {
--                setup_bg (manager);
--        } else {
--                draw_background_after_session_loads (manager);
--        }
-+        setup_bg (manager);
- 
-         gnome_settings_profile_end (NULL);
- 
diff --git a/community/gnome-settings-daemon-compat/move-desktop-file.patch b/community/gnome-settings-daemon-compat/move-desktop-file.patch
deleted file mode 100644
index fe9272767..000000000
--- a/community/gnome-settings-daemon-compat/move-desktop-file.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 23:13:10.169941000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 23:13:41.064001562 +0200
-@@ -9,4 +9,3 @@
- NoDisplay=true
- OnlyShowIn=GNOME;Unity;
- X-GNOME-Autostart-Notify=true
--AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am	2013-04-24 23:13:12.830004000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am	2013-04-24 23:13:36.613896914 +0200
-@@ -21,7 +21,7 @@
- 	$(SYSTEMD_LIBS)			\
- 	$(AUTOMOUNT_LIBS)
- 
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/applications
- autostart_in_files = gnome-fallback-mount-helper.desktop.in
- autostart_in_in_files = gnome-fallback-mount-helper.desktop.in.in
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 23:13:07.229872000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 23:13:43.670729520 +0200
-@@ -9,4 +9,3 @@
- NoDisplay=true
- OnlyShowIn=GNOME;Unity;
- X-GNOME-Autostart-Notify=true
--AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-04-24 23:13:04.913151000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-24 23:13:47.907495798 +0200
-@@ -17,7 +17,7 @@
- 	$(SETTINGS_PLUGIN_LIBS)		\
- 	$(BACKGROUND_LIBS)
- 
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/applications
- autostart_in_files = gnome-fallback-background-helper.desktop.in
- autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:12:58.579668000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:13:51.747586073 +0200
-@@ -9,4 +9,3 @@
- NoDisplay=true
- OnlyShowIn=GNOME;Unity;
- X-GNOME-Autostart-Notify=true
--AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am	2013-04-24 23:13:02.026416000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am	2013-04-24 23:13:54.570985777 +0200
-@@ -75,7 +75,7 @@
- 	$(MEDIA_KEYS_LIBS)			\
- 	-lm
- 
--autostartdir = $(sysconfdir)/xdg/autostart
-+autostartdir = $(datadir)/applications
- autostart_in_files = gnome-fallback-media-keys-helper.desktop.in
- autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
diff --git a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
deleted file mode 100644
index b843ac2ce..000000000
--- a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c
---- gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c	2013-04-10 17:19:51.796298000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c	2013-04-10 17:31:27.382311947 +0200
-@@ -28,13 +28,43 @@
- #include <glib/gi18n.h>
- #include <gio/gio.h>
- 
--#include "gnome-settings-profile.h"
--#include "gnome-settings-session.h"
- #include "gsd-automount-manager.h"
- #include "gsd-autorun.h"
- 
- #define GSD_AUTOMOUNT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_AUTOMOUNT_MANAGER, GsdAutomountManagerPrivate))
- 
-+#define GNOME_SESSION_DBUS_NAME      "org.gnome.SessionManager"
-+#define GNOME_SESSION_DBUS_OBJECT    "/org/gnome/SessionManager"
-+#define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager"
-+
-+GDBusProxy *
-+get_session_proxy (void)
-+{
-+        static GDBusProxy *session_proxy;
-+        GError *error =  NULL;
-+
-+        if (session_proxy != NULL) {
-+                g_object_ref (session_proxy);
-+        } else {
-+                session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-+                                                               G_DBUS_PROXY_FLAGS_NONE,
-+                                                               NULL,
-+                                                               GNOME_SESSION_DBUS_NAME,
-+                                                               GNOME_SESSION_DBUS_OBJECT,
-+                                                               GNOME_SESSION_DBUS_INTERFACE,
-+                                                               NULL,
-+                                                               &error);
-+                if (error) {
-+                        g_warning ("Failed to connect to the session manager: %s", error->message);
-+                        g_error_free (error);
-+                } else {
-+                        g_object_add_weak_pointer (G_OBJECT (session_proxy), (gpointer*)&session_proxy);
-+                }
-+        }
-+
-+        return session_proxy;
-+}
-+
- struct GsdAutomountManagerPrivate
- {
-         GSettings   *settings;
-@@ -315,7 +345,7 @@
- static void
- do_initialize_session (GsdAutomountManager *manager)
- {
--        manager->priv->session = gnome_settings_session_get_session_proxy ();
-+        manager->priv->session = get_session_proxy ();
-         g_signal_connect (manager->priv->session, "g-properties-changed",
-                           G_CALLBACK (session_props_changed), manager);
-         session_props_changed (manager->priv->session, NULL, NULL, manager);
-@@ -490,13 +520,10 @@
-                                        GError              **error)
- {
-         g_debug ("Starting automounting manager");
--        gnome_settings_profile_start (NULL);
- 
-         manager->priv->settings = g_settings_new ("org.gnome.desktop.media-handling");
-         setup_automounter (manager);
- 
--        gnome_settings_profile_end (NULL);
--
-         return TRUE;
- }
- 
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am	2013-04-10 17:33:09.697997021 +0200
-@@ -8,7 +8,6 @@
- 	gsd-autorun.h
- 
- gnome_fallback_mount_helper_CPPFLAGS = \
--	-I$(top_srcdir)/gnome-settings-daemon		\
- 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- 	$(AM_CPPFLAGS)
- 
-@@ -20,8 +19,7 @@
- gnome_fallback_mount_helper_LDADD =	\
- 	$(SETTINGS_PLUGIN_LIBS)		\
- 	$(SYSTEMD_LIBS)			\
--	$(AUTOMOUNT_LIBS)		\
--	$(top_builddir)/gnome-settings-daemon/libgsd.la
-+	$(AUTOMOUNT_LIBS)
- 
- autostartdir = $(sysconfdir)/xdg/autostart
- autostart_in_files = gnome-fallback-mount-helper.desktop.in
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c	2013-04-10 17:19:51.792965000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c	2013-04-10 17:22:46.930334951 +0200
-@@ -42,7 +42,6 @@
- #include <libgnome-desktop/gnome-bg.h>
- #include <X11/Xatom.h>
- 
--#include "gnome-settings-profile.h"
- #include "gsd-background-manager.h"
- 
- #define GSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManagerPrivate))
-@@ -85,8 +84,6 @@
-         int         i;
- 
- 
--        gnome_settings_profile_start (NULL);
--
-         display = gdk_display_get_default ();
-         n_screens = gdk_display_get_n_screens (display);
- 
-@@ -121,8 +118,6 @@
- 
-                 cairo_surface_destroy (surface);
-         }
--
--        gnome_settings_profile_end (NULL);
- }
- 
- static void
-@@ -309,14 +304,11 @@
-         gboolean show_desktop_icons;
- 
-         g_debug ("Starting background manager");
--        gnome_settings_profile_start (NULL);
- 
-         manager->priv->settings = g_settings_new ("org.gnome.desktop.background");
- 
-         setup_bg (manager);
- 
--        gnome_settings_profile_end (NULL);
--
-         return TRUE;
- }
- 
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-04-10 17:43:32.768975155 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-10 17:43:19.115328380 +0200
-@@ -6,18 +6,16 @@
- 	gsd-background-manager.h
- 
- gnome_fallback_background_helper_CPPFLAGS = \
--	-I$(top_srcdir)/gnome-settings-daemon		\
- 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- 	$(AM_CPPFLAGS)
- 
- gnome_fallback_background_helper_CFLAGS =	\
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
- 	$(BACKGROUND_CFLAGS)
- 
- gnome_fallback_background_helper_LDADD =	\
- 	$(SETTINGS_PLUGIN_LIBS)		\
--	$(BACKGROUND_LIBS)		\
--	$(top_builddir)/gnome-settings-daemon/libgsd.la
-+	$(BACKGROUND_LIBS)
- 
- autostartdir = $(sysconfdir)/xdg/autostart
- autostart_in_files = gnome-fallback-background-helper.desktop.in
diff --git a/community/gnome-settings-daemon-compat/revert-input-sources.patch b/community/gnome-settings-daemon-compat/revert-input-sources.patch
deleted file mode 100644
index dc769de4e..000000000
--- a/community/gnome-settings-daemon-compat/revert-input-sources.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From cc45fec342713745f391533a202976e97670f9e5 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 12 Dec 2012 09:31:40 +0000
-Subject: Revert "media-keys: Add key bindings to switch input sources"
-
-These are now provided by gnome-shell.
-
-This reverts commit fc58c347900f906e304591135ca6c13d9950ab4d.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=690106
----
-diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-index b56b5d1..25e5f3e 100644
---- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-@@ -175,16 +175,6 @@
-       <_summary>Magnifier zoom out</_summary>
-       <_description>Binding for the magnifier to zoom out</_description>
-     </key>
--    <key name="switch-input-source" type="s">
--      <default>''</default>
--      <_summary>Switch input source</_summary>
--      <_description>Binding to select the next input source</_description>
--    </key>
--    <key name="switch-input-source-backward" type="s">
--      <default>''</default>
--      <_summary>Switch input source backward</_summary>
--      <_description>Binding to select the previous input source</_description>
--    </key>
-   </schema>
- 
-   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index e5977d0..cd6fbc2 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -98,10 +98,6 @@ static const gchar introspection_xml[] =
- #define VOLUME_STEP 6           /* percents for one volume button press */
- #define MAX_VOLUME 65536.0
- 
--#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources"
--#define KEY_CURRENT_INPUT_SOURCE "current"
--#define KEY_INPUT_SOURCES        "sources"
--
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -1807,40 +1803,6 @@ do_keyboard_brightness_action (GsdMediaKeysManager *manager,
- }
- 
- static void
--do_switch_input_source_action (GsdMediaKeysManager *manager,
--                               MediaKeyType         type)
--{
--        GSettings *settings;
--        GVariant *sources;
--        gint i, n;
--
--        settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
--        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
--
--        n = g_variant_n_children (sources);
--        if (n < 2)
--                goto out;
--
--        i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE);
--
--        if (type == SWITCH_INPUT_SOURCE_KEY)
--                i += 1;
--        else
--                i -= 1;
--
--        if (i < 0)
--                i = n - 1;
--        else if (i >= n)
--                i = 0;
--
--        g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i);
--
-- out:
--        g_variant_unref (sources);
--        g_object_unref (settings);
--}
--
--static void
- do_custom_action (GsdMediaKeysManager *manager,
-                   MediaKey            *key,
-                   gint64               timestamp)
-@@ -1999,10 +1961,6 @@ do_action (GsdMediaKeysManager *manager,
-         case BATTERY_KEY:
-                 do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp);
-                 break;
--        case SWITCH_INPUT_SOURCE_KEY:
--        case SWITCH_INPUT_SOURCE_BACKWARD_KEY:
--                do_switch_input_source_action (manager, type);
--                break;
-         /* Note, no default so compiler catches missing keys */
-         case CUSTOM_KEY:
-                 g_assert_not_reached ();
-diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
-index a16d0e7..437ed2c 100644
---- a/plugins/media-keys/shortcuts-list.h
-+++ b/plugins/media-keys/shortcuts-list.h
-@@ -80,8 +80,6 @@ typedef enum {
-         KEYBOARD_BRIGHTNESS_DOWN_KEY,
-         KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
-         BATTERY_KEY,
--        SWITCH_INPUT_SOURCE_KEY,
--        SWITCH_INPUT_SOURCE_BACKWARD_KEY,
-         CUSTOM_KEY
- } MediaKeyType;
- 
-@@ -148,8 +146,6 @@ static struct {
-         { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" },
-         { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" },
-         { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" },
--        { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL },
--        { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL },
-         { BATTERY_KEY, NULL, "XF86Battery" },
- };
- 
---
-cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/sessionisactive-port.patch b/community/gnome-settings-daemon-compat/sessionisactive-port.patch
deleted file mode 100644
index dc5fd260e..000000000
--- a/community/gnome-settings-daemon-compat/sessionisactive-port.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 32b0b2d85629ae765543df1d940a5ca3c37dcec1 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Tue, 06 Nov 2012 22:47:05 +0000
-Subject: [wip] Port to gnome-session's SessionIsActive property
-
-Rather than maintaining the systemd code here, monitor gnome-session's
-SessionIsActive property.  This allows us to drop the compile-time
-dependency on systemd.
-
-The power plugin is declared dependent on systemd at runtime, but the
-rest of the code should operate in more "basic functionality" mode.
----
-(limited to 'plugins/automount')
-
-diff --git a/plugins/automount/gsd-automount-manager.c b/plugins/automount/gsd-automount-manager.c
-index 7912f19..d8e9e07 100644
---- a/plugins/automount/gsd-automount-manager.c
-+++ b/plugins/automount/gsd-automount-manager.c
-@@ -42,7 +42,7 @@ struct GsdAutomountManagerPrivate
- 	GVolumeMonitor *volume_monitor;
- 	unsigned int automount_idle_id;
- 
--        GnomeSettingsSession *session;
-+        GDBusProxy *session;
-         gboolean session_is_active;
-         gboolean screensaver_active;
-         guint ss_watch_id;
-@@ -288,17 +288,21 @@ mount_added_callback (GVolumeMonitor *monitor,
- 
- 
- static void
--session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointer user_data)
-+session_props_changed (GDBusProxy *session, GVariant *v, char **props, gpointer user_data)
- {
-         GsdAutomountManager *manager = user_data;
-         GsdAutomountManagerPrivate *p = manager->priv;
-+        GVariant *active_v = NULL;
-+        gboolean is_active;
- 
--        if (gnome_settings_session_get_state (session) == GNOME_SETTINGS_SESSION_STATE_ACTIVE) {
--                p->session_is_active = TRUE;
--        }
--        else {
--                p->session_is_active = FALSE;
--        }
-+        active_v = g_dbus_proxy_get_cached_property (session, "SessionIsActive");
-+        if (!active_v)
-+                return;
-+
-+        g_variant_get (active_v, "b", &is_active);
-+        g_variant_unref (active_v);
-+        g_printerr ("AUTOMOUNT: session is active: %d -> %d\n", p->session_is_active, is_active);
-+        p->session_is_active = is_active;
- 
-         if (!p->session_is_active) {
-                 if (p->volume_queue != NULL) {
-@@ -311,10 +315,10 @@ session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointe
- static void
- do_initialize_session (GsdAutomountManager *manager)
- {
--        manager->priv->session = gnome_settings_session_new ();
--        g_signal_connect (manager->priv->session, "notify::state",
--                          G_CALLBACK (session_state_changed), manager);
--        session_state_changed (manager->priv->session, NULL, manager);
-+        manager->priv->session = gnome_settings_session_get_session_proxy ();
-+        g_signal_connect (manager->priv->session, "g-properties-changed",
-+                          G_CALLBACK (session_props_changed), manager);
-+        session_props_changed (manager->priv->session, NULL, NULL, manager);
- }
- 
- #define SCREENSAVER_NAME "org.gnome.ScreenSaver"
---
-cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch
deleted file mode 100644
index b52de042f..000000000
--- a/community/gnome-settings-daemon-compat/standalone-background-helper.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
---- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-10 17:39:36.446882275 +0200
-@@ -2,7 +2,6 @@
-   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins" path="/org/gnome/settings-daemon/plugins/">
-     <child name="a11y-keyboard" schema="org.gnome.settings-daemon.plugins.a11y-keyboard"/>
-     <child name="a11y-settings" schema="org.gnome.settings-daemon.plugins.a11y-settings"/>
--    <child name="background" schema="org.gnome.settings-daemon.plugins.background"/>
-     <child name="clipboard" schema="org.gnome.settings-daemon.plugins.clipboard"/>
-     <child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
-     <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
-@@ -45,18 +44,6 @@
-       <_summary>Priority to use for this plugin</_summary>
-       <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
-     </key>
--  </schema>
--  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.background" path="/org/gnome/settings-daemon/plugins/background/">
--    <key name="active" type="b">
--      <default>true</default>
--      <_summary>Activation of this plugin</_summary>
--      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
--    </key>
--    <key name="priority" type="i">
--      <default>97</default>
--      <_summary>Priority to use for this plugin</_summary>
--      <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
--    </key>
-   </schema>
-   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.clipboard" path="/org/gnome/settings-daemon/plugins/clipboard/">
-     <key name="active" type="b">
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in
---- gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in	2012-04-07 15:21:20.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,8 +0,0 @@
--[GNOME Settings Plugin]
--Module=background
--IAge=0
--_Name=Background
--_Description=Background plugin
--Authors=
--Copyright=Copyright © 2007
--Website=
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c	2013-04-10 17:39:36.450215685 +0200
-@@ -0,0 +1,65 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ * Author: Tomas Bzatek <tbzatek@redhat.com>
-+ */
-+
-+#include "config.h"
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <unistd.h>
-+#include <gtk/gtk.h>
-+
-+#include "gsd-background-manager.h"
-+
-+int
-+main (int argc,
-+      char **argv)
-+{
-+        GMainLoop *loop;
-+        GsdBackgroundManager *manager;
-+        GError *error = NULL;
-+
-+        g_type_init ();
-+        gtk_init (&argc, &argv);
-+
-+        bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
-+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+        textdomain (GETTEXT_PACKAGE);
-+
-+        loop = g_main_loop_new (NULL, FALSE);
-+        manager = gsd_background_manager_new ();
-+
-+        gsd_background_manager_start (manager, &error);
-+
-+        if (error != NULL) {
-+                g_printerr ("Unable to start the background manager: %s",
-+                            error->message);
-+
-+                g_error_free (error);
-+                _exit (1);
-+        }
-+
-+        g_main_loop_run (loop);
-+
-+        gsd_background_manager_stop (manager);
-+        g_main_loop_unref (loop);
-+
-+        return 0;
-+}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-10 17:39:36.450215685 +0200
-@@ -0,0 +1,12 @@
-+[Desktop Entry]
-+_Name=Background
-+_Comment=Background plugin
-+Exec=@LIBEXECDIR@/gnome-fallback-background-helper
-+Icon=desktop
-+Terminal=false
-+Type=Application
-+Categories=
-+NoDisplay=true
-+OnlyShowIn=GNOME;Unity;
-+X-GNOME-Autostart-Notify=true
-+AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,104 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include <glib/gi18n-lib.h>
--#include <gmodule.h>
--
--#include "gnome-settings-plugin.h"
--#include "gsd-background-plugin.h"
--#include "gsd-background-manager.h"
--
--struct GsdBackgroundPluginPrivate {
--        GsdBackgroundManager *manager;
--};
--
--#define GSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginPrivate))
--
--GNOME_SETTINGS_PLUGIN_REGISTER (GsdBackgroundPlugin, gsd_background_plugin)
--
--static void
--gsd_background_plugin_init (GsdBackgroundPlugin *plugin)
--{
--        plugin->priv = GSD_BACKGROUND_PLUGIN_GET_PRIVATE (plugin);
--
--        g_debug ("GsdBackgroundPlugin initializing");
--
--        plugin->priv->manager = gsd_background_manager_new ();
--}
--
--static void
--gsd_background_plugin_finalize (GObject *object)
--{
--        GsdBackgroundPlugin *plugin;
--
--        g_return_if_fail (object != NULL);
--        g_return_if_fail (GSD_IS_BACKGROUND_PLUGIN (object));
--
--        g_debug ("GsdBackgroundPlugin finalizing");
--
--        plugin = GSD_BACKGROUND_PLUGIN (object);
--
--        g_return_if_fail (plugin->priv != NULL);
--
--        if (plugin->priv->manager != NULL) {
--                g_object_unref (plugin->priv->manager);
--        }
--
--        G_OBJECT_CLASS (gsd_background_plugin_parent_class)->finalize (object);
--}
--
--static void
--impl_activate (GnomeSettingsPlugin *plugin)
--{
--        gboolean res;
--        GError  *error;
--
--        g_debug ("Activating background plugin");
--
--        error = NULL;
--        res = gsd_background_manager_start (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager, &error);
--        if (! res) {
--                g_warning ("Unable to start background manager: %s", error->message);
--                g_error_free (error);
--        }
--}
--
--static void
--impl_deactivate (GnomeSettingsPlugin *plugin)
--{
--        g_debug ("Deactivating background plugin");
--        gsd_background_manager_stop (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager);
--}
--
--static void
--gsd_background_plugin_class_init (GsdBackgroundPluginClass *klass)
--{
--        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
--        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
--
--        object_class->finalize = gsd_background_plugin_finalize;
--
--        plugin_class->activate = impl_activate;
--        plugin_class->deactivate = impl_deactivate;
--
--        g_type_class_add_private (klass, sizeof (GsdBackgroundPluginPrivate));
--}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,59 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#ifndef __GSD_BACKGROUND_PLUGIN_H__
--#define __GSD_BACKGROUND_PLUGIN_H__
--
--#include <glib.h>
--#include <glib-object.h>
--#include <gmodule.h>
--
--#include "gnome-settings-plugin.h"
--
--G_BEGIN_DECLS
--
--#define GSD_TYPE_BACKGROUND_PLUGIN                (gsd_background_plugin_get_type ())
--#define GSD_BACKGROUND_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPlugin))
--#define GSD_BACKGROUND_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
--#define GSD_IS_BACKGROUND_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_BACKGROUND_PLUGIN))
--#define GSD_IS_BACKGROUND_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_BACKGROUND_PLUGIN))
--#define GSD_BACKGROUND_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
--
--typedef struct GsdBackgroundPluginPrivate GsdBackgroundPluginPrivate;
--
--typedef struct
--{
--        GnomeSettingsPlugin    parent;
--        GsdBackgroundPluginPrivate *priv;
--} GsdBackgroundPlugin;
--
--typedef struct
--{
--        GnomeSettingsPluginClass parent_class;
--} GsdBackgroundPluginClass;
--
--GType   gsd_background_plugin_get_type            (void) G_GNUC_CONST;
--
--/* All the plugins must implement this function */
--G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
--
--G_END_DECLS
--
--#endif /* __GSD_BACKGROUND_PLUGIN_H__ */
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-10 17:40:20.117885180 +0200
-@@ -1,80 +1,34 @@
--NULL =
-+libexec_PROGRAMS = gnome-fallback-background-helper
- 
--plugin_name = background
-+gnome_fallback_background_helper_SOURCES = \
-+	gnome-fallback-background-helper.c \
-+	gsd-background-manager.c \
-+	gsd-background-manager.h
- 
--libexec_PROGRAMS = gsd-test-background
--
--gsd_test_background_SOURCES =		\
--	test-background.c		\
--	gsd-background-manager.h	\
--	gsd-background-manager.c	\
--	$(NULL)
--
--gsd_test_background_CPPFLAGS =				\
-+gnome_fallback_background_helper_CPPFLAGS = \
- 	-I$(top_srcdir)/gnome-settings-daemon		\
--	-I$(top_srcdir)/plugins/common			\
- 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- 	$(AM_CPPFLAGS)
- 
--gsd_test_background_CFLAGS = \
--	$(PLUGIN_CFLAGS)		\
-+gnome_fallback_background_helper_CFLAGS =	\
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(BACKGROUND_CFLAGS)		\
--	$(AM_CFLAGS)
--
--gsd_test_background_LDADD =				\
--	$(top_builddir)/gnome-settings-daemon/libgsd.la	\
--	$(SETTINGS_PLUGIN_LIBS)				\
--	$(BACKGROUND_LIBS)				\
--	$(NULL)
--
--plugin_LTLIBRARIES = \
--	libbackground.la		\
--	$(NULL)
--
--libbackground_la_SOURCES =		\
--	gsd-background-plugin.h		\
--	gsd-background-plugin.c		\
--	gsd-background-manager.h	\
--	gsd-background-manager.c	\
--	$(NULL)
-+	$(BACKGROUND_CFLAGS)
- 
--libbackground_la_CPPFLAGS = \
--	-I$(top_srcdir)/gnome-settings-daemon		\
--	-I$(top_srcdir)/plugins/background/libbackground   \
--	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
--	$(AM_CPPFLAGS)
--
--libbackground_la_CFLAGS = \
--	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(BACKGROUND_CFLAGS)		\
--	$(AM_CFLAGS)
--
--libbackground_la_LDFLAGS =		\
--	$(GSD_PLUGIN_LDFLAGS)		\
--	$(NULL)
--
--libbackground_la_LIBADD  =		\
-+gnome_fallback_background_helper_LDADD =	\
- 	$(SETTINGS_PLUGIN_LIBS)		\
- 	$(BACKGROUND_LIBS)		\
--	$(NULL)
--
--plugin_in_files =		\
--	background.gnome-settings-plugin.in	\
--	$(NULL)
-+	$(top_builddir)/gnome-settings-daemon/libgsd.la
- 
--plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-+autostartdir = $(sysconfdir)/xdg/autostart
-+autostart_in_files = gnome-fallback-background-helper.desktop.in
-+autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in
-+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
- 
--EXTRA_DIST = 			\
--	$(plugin_in_files)	\
--	$(NULL)
-+$(autostart_in_files): $(autostart_in_in_files)
-+	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
- 
--CLEANFILES = 			\
--	$(plugin_DATA)		\
--	$(NULL)
-+@INTLTOOL_DESKTOP_RULE@
- 
--DISTCLEANFILES =		\
--	$(plugin_DATA)		\
--	$(NULL)
-+EXTRA_DIST = $(autostart_in_in_files)
- 
--@GSD_INTLTOOL_PLUGIN_RULE@
-+CLEANFILES = $(autostart_DATA) $(autostart_in_files)
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c gnome-settings-daemon-3.6.4/plugins/background/test-background.c
---- gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c	2012-06-01 22:02:53.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/test-background.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,7 +0,0 @@
--#define NEW gsd_background_manager_new
--#define START gsd_background_manager_start
--#define STOP gsd_background_manager_stop
--#define MANAGER GsdBackgroundManager
--#include "gsd-background-manager.h"
--
--#include "test-plugin.h"
-diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in
---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.in	2013-04-10 17:39:36.450215685 +0200
-@@ -21,9 +21,9 @@
- [type: gettext/glade]plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui
- [type: gettext/ini]plugins/a11y-settings/a11y-settings.gnome-settings-plugin.in
- plugins/automount/gnome-fallback-mount-helper.desktop.in.in
-+plugins/background/gnome-fallback-background-helper.desktop.in.in
- plugins/automount/gsd-automount-manager.c
- plugins/automount/gsd-autorun.c
--[type: gettext/ini]plugins/background/background.gnome-settings-plugin.in
- [type: gettext/ini]plugins/clipboard/clipboard.gnome-settings-plugin.in
- [type: gettext/ini]plugins/color/color.gnome-settings-plugin.in
- plugins/color/gsd-color-manager.c
-diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip
---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip	2012-04-07 18:58:07.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.skip	2013-04-10 17:39:36.453549095 +0200
-@@ -20,6 +20,7 @@
- data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in
- data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
- data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
-+plugins/background/gnome-fallback-background-helper.desktop.in
- plugins/automount/gnome-fallback-mount-helper.desktop.in
- plugins/power/org.gnome.settings-daemon.plugins.power.policy.in
- plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in
diff --git a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
deleted file mode 100644
index 61be1737e..000000000
--- a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
+++ /dev/null
@@ -1,564 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
---- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-24 03:11:02.893859531 +0200
-+++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-24 13:43:11.128884064 +0200
-@@ -9,7 +9,6 @@
-     <child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/>
-     <child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
-     <child name="keyboard" schema="org.gnome.settings-daemon.plugins.keyboard"/>
--    <child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/>
-     <child name="mouse" schema="org.gnome.settings-daemon.plugins.mouse"/>
-     <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/>
-     <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c	2013-04-24 13:43:11.132217470 +0200
-@@ -0,0 +1,65 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ * Author: Tomas Bzatek <tbzatek@redhat.com>
-+ */
-+
-+#include "config.h"
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <unistd.h>
-+#include <gtk/gtk.h>
-+
-+#include "gsd-media-keys-manager.h"
-+
-+int
-+main (int argc,
-+      char **argv)
-+{
-+        GMainLoop *loop;
-+        GsdMediaKeysManager *manager;
-+        GError *error = NULL;
-+
-+        g_type_init ();
-+        gtk_init (&argc, &argv);
-+
-+        bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
-+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+        textdomain (GETTEXT_PACKAGE);
-+
-+        loop = g_main_loop_new (NULL, FALSE);
-+        manager = gsd_media_keys_manager_new ();
-+
-+        gsd_media_keys_manager_start (manager, &error);
-+
-+        if (error != NULL) {
-+                g_printerr ("Unable to start the media-keys manager: %s",
-+                            error->message);
-+
-+                g_error_free (error);
-+                _exit (1);
-+        }
-+
-+        g_main_loop_run (loop);
-+
-+        gsd_media_keys_manager_stop (manager);
-+        g_main_loop_unref (loop);
-+
-+        return 0;
-+}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 13:43:11.132217470 +0200
-@@ -0,0 +1,12 @@
-+[Desktop Entry]
-+_Name=Media keys
-+_Comment=Media keys plugin
-+Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper
-+Icon=multimedia
-+Terminal=false
-+Type=Application
-+Categories=
-+NoDisplay=true
-+OnlyShowIn=GNOME;Unity;
-+X-GNOME-Autostart-Notify=true
-+AutostartCondition=GNOME3 if-session gnome-fallback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c	2013-04-24 13:43:11.132217470 +0200
-@@ -44,7 +44,6 @@
- #include <gudev/gudev.h>
- #endif
- 
--#include "gnome-settings-profile.h"
- #include "gsd-marshal.h"
- #include "gsd-media-keys-manager.h"
- 
-@@ -622,8 +621,6 @@
-         char **custom_paths;
-         int i;
- 
--        gnome_settings_profile_start (NULL);
--
-         gdk_error_trap_push ();
- 
-         manager->priv->keys = g_ptr_array_new_with_free_func ((GDestroyNotify) media_key_free);
-@@ -661,8 +658,6 @@
-         gdk_flush ();
-         if (gdk_error_trap_pop ())
-                 g_warning ("Grab failed for some keys, another application may already have access the them.");
--
--        gnome_settings_profile_end (NULL);
- }
- 
- static void
-@@ -2090,7 +2085,6 @@
-         char *theme_name;
- 
-         g_debug ("Starting media_keys manager");
--        gnome_settings_profile_start (NULL);
- 
-         manager->priv->settings = g_settings_new (SETTINGS_BINDING_DIR);
-         g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
-@@ -2137,19 +2131,14 @@
- 
-         /* Start filtering the events */
-         for (l = manager->priv->screens; l != NULL; l = l->next) {
--                gnome_settings_profile_start ("gdk_window_add_filter");
--
-                 g_debug ("adding key filter for screen: %d",
-                          gdk_screen_get_number (l->data));
- 
-                 gdk_window_add_filter (gdk_screen_get_root_window (l->data),
-                                        (GdkFilterFunc) filter_key_events,
-                                        manager);
--                gnome_settings_profile_end ("gdk_window_add_filter");
-         }
- 
--        gnome_settings_profile_end (NULL);
--
-         manager->priv->start_idle_id = 0;
- 
-         return FALSE;
-@@ -2161,8 +2150,6 @@
- {
-         const char * const subsystems[] = { "input", "usb", "sound", NULL };
- 
--        gnome_settings_profile_start (NULL);
--
-         if (supports_xinput2_devices (&manager->priv->opcode) == FALSE) {
-                 g_debug ("No Xinput2 support, disabling plugin");
-                 return TRUE;
-@@ -2179,8 +2166,6 @@
-          * The rest (grabbing and setting the keys) can happen in an
-          * idle.
-          */
--        gnome_settings_profile_start ("gvc_mixer_control_new");
--
-         manager->priv->volume = gvc_mixer_control_new ("GNOME Volume Control Media Keys");
- 
-         g_signal_connect (manager->priv->volume,
-@@ -2198,14 +2183,10 @@
- 
-         gvc_mixer_control_open (manager->priv->volume);
- 
--        gnome_settings_profile_end ("gvc_mixer_control_new");
--
-         manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
- 
-         register_manager (manager_object);
- 
--        gnome_settings_profile_end (NULL);
--
-         return TRUE;
- }
- 
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,104 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include <glib/gi18n-lib.h>
--#include <gmodule.h>
--
--#include "gnome-settings-plugin.h"
--#include "gsd-media-keys-plugin.h"
--#include "gsd-media-keys-manager.h"
--
--struct GsdMediaKeysPluginPrivate {
--        GsdMediaKeysManager *manager;
--};
--
--#define GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginPrivate))
--
--GNOME_SETTINGS_PLUGIN_REGISTER (GsdMediaKeysPlugin, gsd_media_keys_plugin)
--
--static void
--gsd_media_keys_plugin_init (GsdMediaKeysPlugin *plugin)
--{
--        plugin->priv = GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE (plugin);
--
--        g_debug ("GsdMediaKeysPlugin initializing");
--
--        plugin->priv->manager = gsd_media_keys_manager_new ();
--}
--
--static void
--gsd_media_keys_plugin_finalize (GObject *object)
--{
--        GsdMediaKeysPlugin *plugin;
--
--        g_return_if_fail (object != NULL);
--        g_return_if_fail (GSD_IS_MEDIA_KEYS_PLUGIN (object));
--
--        g_debug ("GsdMediaKeysPlugin finalizing");
--
--        plugin = GSD_MEDIA_KEYS_PLUGIN (object);
--
--        g_return_if_fail (plugin->priv != NULL);
--
--        if (plugin->priv->manager != NULL) {
--                g_object_unref (plugin->priv->manager);
--        }
--
--        G_OBJECT_CLASS (gsd_media_keys_plugin_parent_class)->finalize (object);
--}
--
--static void
--impl_activate (GnomeSettingsPlugin *plugin)
--{
--        gboolean res;
--        GError  *error;
--
--        g_debug ("Activating media_keys plugin");
--
--        error = NULL;
--        res = gsd_media_keys_manager_start (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager, &error);
--        if (! res) {
--                g_warning ("Unable to start media_keys manager: %s", error->message);
--                g_error_free (error);
--        }
--}
--
--static void
--impl_deactivate (GnomeSettingsPlugin *plugin)
--{
--        g_debug ("Deactivating media_keys plugin");
--        gsd_media_keys_manager_stop (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager);
--}
--
--static void
--gsd_media_keys_plugin_class_init (GsdMediaKeysPluginClass *klass)
--{
--        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
--        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
--
--        object_class->finalize = gsd_media_keys_plugin_finalize;
--
--        plugin_class->activate = impl_activate;
--        plugin_class->deactivate = impl_deactivate;
--
--        g_type_class_add_private (klass, sizeof (GsdMediaKeysPluginPrivate));
--}
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,59 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#ifndef __GSD_MEDIA_KEYS_PLUGIN_H__
--#define __GSD_MEDIA_KEYS_PLUGIN_H__
--
--#include <glib.h>
--#include <glib-object.h>
--#include <gmodule.h>
--
--#include "gnome-settings-plugin.h"
--
--G_BEGIN_DECLS
--
--#define GSD_TYPE_MEDIA_KEYS_PLUGIN                (gsd_media_keys_plugin_get_type ())
--#define GSD_MEDIA_KEYS_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPlugin))
--#define GSD_MEDIA_KEYS_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
--#define GSD_IS_MEDIA_KEYS_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN))
--#define GSD_IS_MEDIA_KEYS_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MEDIA_KEYS_PLUGIN))
--#define GSD_MEDIA_KEYS_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
--
--typedef struct GsdMediaKeysPluginPrivate GsdMediaKeysPluginPrivate;
--
--typedef struct
--{
--        GnomeSettingsPlugin    parent;
--        GsdMediaKeysPluginPrivate *priv;
--} GsdMediaKeysPlugin;
--
--typedef struct
--{
--        GnomeSettingsPluginClass parent_class;
--} GsdMediaKeysPluginClass;
--
--GType   gsd_media_keys_plugin_get_type            (void) G_GNUC_CONST;
--
--/* All the plugins must implement this function */
--G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
--
--G_END_DECLS
--
--#endif /* __GSD_MEDIA_KEYS_PLUGIN_H__ */
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am	2013-04-24 14:26:01.414463895 +0200
-@@ -1,17 +1,11 @@
- icondir = $(datadir)/icons/hicolor
- context = actions
- 
--plugin_name = media-keys
--
--NULL =
--
- SUBDIRS = cut-n-paste
--plugin_LTLIBRARIES = libmedia-keys.la
- 
- BUILT_SOURCES = 			\
- 	gsd-marshal.h			\
--	gsd-marshal.c			\
--	$(NULL)
-+	gsd-marshal.c
- 
- gsd-marshal.c: gsd-marshal.list
- 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --body --internal > $@
-@@ -19,62 +13,16 @@
- gsd-marshal.h: gsd-marshal.list
- 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --internal > $@
- 
--libmedia_keys_la_SOURCES = 		\
--	gsd-media-keys-plugin.h		\
--	gsd-media-keys-plugin.c		\
--	gsd-media-keys-manager.h	\
--	gsd-media-keys-manager.c	\
--	gsd-osd-window.c		\
--	gsd-osd-window.h		\
--	gsd-osd-window-private.h	\
--	shortcuts-list.h		\
--	$(BUILT_SOURCES)		\
--	$(NULL)
--
--libmedia_keys_la_CPPFLAGS = \
--	-I$(top_srcdir)/data/					\
--	-I$(top_srcdir)/gnome-settings-daemon			\
--	-I$(top_srcdir)/plugins/common				\
--	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
--	-DBINDIR=\"$(bindir)\"					\
--	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
--	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
--	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
--	$(AM_CPPFLAGS)
--
--libmedia_keys_la_CFLAGS = \
--	$(PLUGIN_CFLAGS)		\
--	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(MEDIA_KEYS_CFLAGS)		\
--	$(AM_CFLAGS)
--
--libmedia_keys_la_LDFLAGS = 		\
--	$(GSD_PLUGIN_LDFLAGS)
--
--libmedia_keys_la_LIBADD  = 		\
--	$(top_builddir)/plugins/common/libcommon.la			\
--	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
--	$(MEDIA_KEYS_LIBS)						\
--	$(SETTINGS_PLUGIN_LIBS)						\
--	-lm
--
--plugin_in_files = 		\
--	media-keys.gnome-settings-plugin.in
--
--plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
--
- noinst_PROGRAMS = test-media-window
- 
- test_media_window_SOURCES =			\
- 	gsd-osd-window.c			\
- 	gsd-osd-window.h			\
- 	gsd-osd-window-private.h		\
--	test-media-window.c			\
--	$(NULL)
-+	test-media-window.c
- 
- test_media_window_CPPFLAGS = \
- 	-I$(top_srcdir)/data/					\
--	-I$(top_srcdir)/gnome-settings-daemon			\
- 	-I$(top_srcdir)/plugins/common				\
- 	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
- 	-DDATADIR=\""$(datadir)"\"				\
-@@ -93,21 +41,19 @@
- 	$(SETTINGS_PLUGIN_LIBS)			\
- 	-lm
- 
--libexec_PROGRAMS = gsd-test-media-keys
-+libexec_PROGRAMS = gnome-fallback-media-keys-helper
- 
--gsd_test_media_keys_SOURCES =			\
-+gnome_fallback_media_keys_helper_SOURCES =	\
- 	gsd-media-keys-manager.c		\
- 	gsd-media-keys-manager.h		\
- 	gsd-osd-window.c			\
- 	gsd-osd-window.h			\
- 	gsd-osd-window-private.h		\
--	test-media-keys.c			\
--	$(BUILT_SOURCES)			\
--	$(NULL)
-+	gnome-fallback-media-keys-helper.c	\
-+	$(BUILT_SOURCES)
- 
--gsd_test_media_keys_CPPFLAGS = \
-+gnome_fallback_media_keys_helper_CPPFLAGS = \
- 	-I$(top_srcdir)/data/					\
--	-I$(top_srcdir)/gnome-settings-daemon			\
- 	-I$(top_srcdir)/plugins/common				\
- 	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
- 	-DBINDIR=\"$(bindir)\"					\
-@@ -116,14 +62,12 @@
- 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
- 	$(AM_CPPFLAGS)
- 
--gsd_test_media_keys_CFLAGS = \
-+gnome_fallback_media_keys_helper_CFLAGS = \
- 	$(PLUGIN_CFLAGS)		\
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(MEDIA_KEYS_CFLAGS)		\
--	$(AM_CFLAGS)
-+	$(MEDIA_KEYS_CFLAGS)
- 
--gsd_test_media_keys_LDADD = \
--	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
-+gnome_fallback_media_keys_helper_LDADD = \
- 	$(top_builddir)/plugins/common/libcommon.la			\
- 	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
- 	$(SETTINGS_DAEMON_LIBS)			\
-@@ -131,17 +75,24 @@
- 	$(MEDIA_KEYS_LIBS)			\
- 	-lm
- 
-+autostartdir = $(sysconfdir)/xdg/autostart
-+autostart_in_files = gnome-fallback-media-keys-helper.desktop.in
-+autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in
-+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-+
-+$(autostart_in_files): $(autostart_in_in_files)
-+	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+ 
-+@INTLTOOL_DESKTOP_RULE@
-+
- EXTRA_DIST = 				\
- 	gsd-marshal.list		\
- 	README.media-keys-API		\
- 	test-media-window-clutter.c	\
--	$(plugin_in_files)
-+	$(autostart_in_in_files)
- 
- CLEANFILES = 			\
- 	$(BUILT_SOURCES)	\
--	$(plugin_DATA)
--
--DISTCLEANFILES =		\
--	$(plugin_DATA)
-+	$(autostart_DATA)	\
-+	$(autostart_in_files)
- 
--@GSD_INTLTOOL_PLUGIN_RULE@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in	2012-04-07 15:21:20.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,8 +0,0 @@
--[GNOME Settings Plugin]
--Module=media-keys
--IAge=0
--_Name=Media keys
--_Description=Media keys plugin
--Authors=
--Copyright=Copyright © 2007
--Website=
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c	2012-06-01 22:02:53.000000000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,7 +0,0 @@
--#define NEW gsd_media_keys_manager_new
--#define START gsd_media_keys_manager_start
--#define STOP gsd_media_keys_manager_stop
--#define MANAGER GsdMediaKeysManager
--#include "gsd-media-keys-manager.h"
--
--#include "test-plugin.h"
-diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in
---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in	2013-04-24 03:11:02.897192946 +0200
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.in	2013-04-24 13:43:11.132217470 +0200
-@@ -34,7 +34,7 @@
- [type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in
- plugins/media-keys/cut-n-paste/gvc-mixer-control.c
- plugins/media-keys/gsd-media-keys-manager.c
--[type: gettext/ini]plugins/media-keys/media-keys.gnome-settings-plugin.in
-+plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
- plugins/mouse/gsd-mouse-manager.c
- [type: gettext/ini]plugins/mouse/mouse.gnome-settings-plugin.in
- plugins/power/gpm-common.c
-diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip
---- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip	2013-04-24 03:11:02.897192946 +0200
-+++ gnome-settings-daemon-3.6.4/po/POTFILES.skip	2013-04-24 13:43:11.132217470 +0200
-@@ -22,5 +22,6 @@
- data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
- plugins/background/gnome-fallback-background-helper.desktop.in
- plugins/automount/gnome-fallback-mount-helper.desktop.in
-+plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in
- plugins/power/org.gnome.settings-daemon.plugins.power.policy.in
- plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in
diff --git a/community/gnome-settings-daemon-compat/xinput.patch b/community/gnome-settings-daemon-compat/xinput.patch
deleted file mode 100644
index 67c8082cb..000000000
--- a/community/gnome-settings-daemon-compat/xinput.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 07 Feb 2013 04:14:22 +0000
-Subject: Fix media-keys handling with GTK+ 3.7.8
-
-GDK now requests XI 2.3 and if the X server supports that
-version, subsequent requests for a lower version yield
-a BadValue. Therefore, we need to change the code in
-gsd-input-helper.c to request 2.3 as well.
----
-diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
-index 54427af..d5d2a2a 100644
---- a/plugins/common/gsd-input-helper.c
-+++ b/plugins/common/gsd-input-helper.c
-@@ -144,18 +144,11 @@ supports_xinput2_devices (int *opcode)
-         gdk_error_trap_push ();
- 
-         major = 2;
--        minor = 0;
-+        minor = 3;
- 
-         if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
-                 gdk_error_trap_pop_ignored ();
--                /* try for 2.2, maybe gtk has already announced 2.2 support */
--                gdk_error_trap_push ();
--                major = 2;
--                minor = 2;
--                if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
--                    gdk_error_trap_pop_ignored ();
-                     return FALSE;
--                }
-         }
-         gdk_error_trap_pop_ignored ();
- 
---
-cgit v0.9.1
diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD
index 8a7bde9c5..f000022d6 100644
--- a/community/gnonlin/PKGBUILD
+++ b/community/gnonlin/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 76165 2012-09-12 12:34:14Z arodseth $
+# $Id: PKGBUILD 98219 2013-10-07 15:43:14Z spupykin $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gnonlin
-pkgver=0.10.17
+pkgver=1.1.90
 pkgrel=1
 pkgdesc='Library for creating non-linear video editors'
 arch=('x86_64' 'i686')
 url='http://gnonlin.sourceforge.net/'
-depends=('gstreamer0.10>=0.10.36')
-makedepends=('python' 'gstreamer0.10-base-plugins>=0.10.36' 'pkgconfig')
+depends=('gstreamer')
+makedepends=('python' 'gst-plugins-base' 'pkgconfig')
 options=('!libtool')
 license=('LGPL')
-source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2")
+source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz")
 sha256sums=('e4a2dd8af1c0c97f2f63e918a25c26e871c896e88b7ee85948509f68f29e8935')
+sha256sums=('b2214ee45583a4532d110e852e2aecf787cefa8fe50f44c8234fb55713feba61')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index 618d79414..3772bee45 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81579 2012-12-24 15:01:10Z spupykin $
+# $Id: PKGBUILD 98195 2013-10-07 12:08:31Z jgc $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet-gtk
 pkgver=0.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A frontend for GNUnet"
 arch=('i686' 'x86_64')
 url="http://gnunet.org"
diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD
index 7550aed59..ae05b5186 100644
--- a/community/goaccess/PKGBUILD
+++ b/community/goaccess/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95903 2013-08-18 15:28:38Z fyan $
+# $Id: PKGBUILD 98175 2013-10-07 01:47:21Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Josh VanderLinden <arch@cloudlery.com>
 # Contributor: Nicolas Storme <nicolas@atelier-web.com>
 
 pkgname=goaccess
-pkgver=0.6
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="An open source real-time web log analyzer and interactive viewer"
 arch=('i686' 'x86_64')
@@ -24,4 +24,4 @@ package() {
   make prefix="$pkgdir/usr" install
 }
 
-sha512sums=('cd3fb241a9d84f2f9023c179a96d441f7f7d52e9c7227b31a3a18761c60ae6abdbfc70799c0a2c5ceb8788afd36eeaaf55ed7944310fb5809dd403d7fe09dfbd')
+sha512sums=('67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b')
diff --git a/community/gst-editing-services/PKGBUILD b/community/gst-editing-services/PKGBUILD
new file mode 100644
index 000000000..c7c38a563
--- /dev/null
+++ b/community/gst-editing-services/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 98225 2013-10-07 15:51:20Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Lubosz Sarnecki <lubosz@gmail.com>
+# Contributor: Kerrick Staley <mail@kerrickstaley.com>
+# Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
+
+pkgname=gst-editing-services
+pkgver=1.1.90.1.1774.fb6aabf
+pkgrel=1
+pkgdesc='GStreamer editing services (Git version)'
+arch=('i686' 'x86_64')
+license=('LGPL')
+url='http://gstreamer.freedesktop.org/modules/gst-editing-services.html'
+depends=('gst-plugins-base')
+makedepends=('git' 'intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
+options=('!libtool')
+source=('git://anongit.freedesktop.org/gstreamer/gst-editing-services')
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $srcdir/gst-editing-services
+  version=$(grep AC_INIT configure.ac | sed 's/AC_INIT(GStreamer Editing Services, //' | sed 's/,//')
+  hash=$(git log --pretty=format:'%h' -n 1)
+  revision=$(git rev-list --count HEAD)
+  echo $version.$revision.$hash
+}
+
+build() {
+  cd $srcdir/gst-editing-services
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/gst-editing-services
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/gst-python/PKGBUILD b/community/gst-python/PKGBUILD
new file mode 100644
index 000000000..c18cf9d9e
--- /dev/null
+++ b/community/gst-python/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 98229 2013-10-07 15:57:05Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gst-python
+pkgver=1.1.90
+pkgrel=2
+pkgdesc="Python bindings for GStreamer"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://gstreamer.freedesktop.org/"
+depends=('python2-gobject' 'gst-plugins-base')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2)
+md5sums=('16d85442b98fab61bab66a53eb571d6a')
+
+build() {
+  cd "${srcdir}/gst-python-${pkgver}"
+  export PYTHON=python2
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/gst-python-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD
deleted file mode 100644
index cda7de6b6..000000000
--- a/community/gwibber/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 97853 2013-09-30 10:27:58Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gwibber
-pkgver=3.6.0
-pkgrel=5
-pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu"
-arch=('i686' 'x86_64')
-url="http://gwibber.com/"
-license=('GPL')
-depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-pillow' 'python2-xdg' 'dconf')
-makedepends=('intltool' 'vala')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        lp_934530.patch
-        lp_1051801.patch
-        lp_1088775.patch
-        gtkspell3-port.patch
-        gwibber-pillow.patch)
-md5sums=('5988e36e9f592c6eca6537ba6878307a'
-         '8c43ae0ed96c52602befeff640a8672a'
-         '0eb53f4f248a6c600b6c6dfaac12341f'
-         '5698a3b1699c018719b193362486c9b5'
-         'e8c657543542d8141fdfe4b87a24d7fe'
-         '8380d55786490965dfad37be09216dcb')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  # Apply some fixes from Ubuntu
-  patch -Np1 -i "$srcdir/lp_934530.patch"
-  patch -Np1 -i "$srcdir/lp_1051801.patch"
-  patch -Np1 -i "$srcdir/lp_1088775.patch"
-
-  # Port to the new gtkspell3
-  patch -Np1 -i "$srcdir/gtkspell3-port.patch"
-
-  # Port to python-pillow
-  patch -Np1 -i "$srcdir/gwibber-pillow.patch"
-
-  # Use the standalone accounts configuration panel
-  sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala
-  sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py
-
-  # Remove unneeded dependency on libdbusmenu
-  sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in}
-
-  # Fix libaccounts-glib dependency
-  sed -i 's/--pkg accounts/--pkg libaccounts-glib/' */Makefile.{am,in} */*/Makefile.{am,in}
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  autoreconf -fi
-  intltoolize --force
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --disable-schemas-compile --disable-unity
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/gwibber/gtkspell3-port.patch b/community/gwibber/gtkspell3-port.patch
deleted file mode 100644
index a7cc5da37..000000000
--- a/community/gwibber/gtkspell3-port.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur gwibber-3.6.0.orig/configure.ac gwibber-3.6.0/configure.ac
---- gwibber-3.6.0.orig/configure.ac	2012-10-03 02:09:08.000000000 +0200
-+++ gwibber-3.6.0/configure.ac	2013-03-28 21:34:39.227995294 +0100
-@@ -159,10 +159,10 @@
- 
- if test "x$enable_spell" = "xyes"; then
-         PKG_CHECK_MODULES(GTKSPELL,
--                  gtkspell-3.0)
-+                  gtkspell3-3.0)
-         AC_SUBST(GTKSPELL_CFLAGS)
-         AC_SUBST(GTKSPELL_CFLAGS)
--	GTKSPELL_PKG="--pkg gtkspell-3.0"
-+	GTKSPELL_PKG="--pkg gtkspell3-3.0"
-         AC_SUBST(GTKSPELL_PKG)
- fi
- 
-diff -Naur gwibber-3.6.0.orig/libgwibber-gtk/entry.vala gwibber-3.6.0/libgwibber-gtk/entry.vala
---- gwibber-3.6.0.orig/libgwibber-gtk/entry.vala	2012-08-21 06:14:19.000000000 +0200
-+++ gwibber-3.6.0/libgwibber-gtk/entry.vala	2013-03-28 21:36:32.830637428 +0100
-@@ -141,7 +141,8 @@
- #if HAVE_GTKSPELL
-             try
-             {
--              var spell = new Gtk.Spell.attach(this, null);
-+              var spell = new GtkSpell.Checker();
-+              spell.attach(this);
-             }
-             catch (Error e)
-             {
diff --git a/community/gwibber/gwibber-pillow.patch b/community/gwibber/gwibber-pillow.patch
deleted file mode 100644
index 211d22e73..000000000
--- a/community/gwibber/gwibber-pillow.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py gwibber-3.6.0/gwibber/microblog/util/imagehandler.py
---- gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py	2012-08-21 06:14:09.000000000 +0200
-+++ gwibber-3.6.0/gwibber/microblog/util/imagehandler.py	2013-09-15 15:03:07.056371930 +0200
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
- 
--import os, hashlib, urllib2, Image
-+import os, hashlib, urllib2
-+from PIL import Image
- 
- DEFAULT_AVATAR = 'http://digg.com/img/udl.png'
- 
-diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/resources.py gwibber-3.6.0/gwibber/microblog/util/resources.py
---- gwibber-3.6.0.orig/gwibber/microblog/util/resources.py	2012-08-21 06:14:09.000000000 +0200
-+++ gwibber-3.6.0/gwibber/microblog/util/resources.py	2013-09-15 15:02:36.825648020 +0200
-@@ -8,7 +8,7 @@
- from hashlib import sha1
- from os import makedirs, remove, environ
- from os.path import join, isdir, realpath, exists
--import Image
-+from PIL import Image
- from datetime import datetime
- from gwibber.microblog import network
- from gwibber.microblog.util.const import *
diff --git a/community/gwibber/gwibber.install b/community/gwibber/gwibber.install
deleted file mode 100644
index d973d53f7..000000000
--- a/community/gwibber/gwibber.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/gwibber/lp_1051801.patch b/community/gwibber/lp_1051801.patch
deleted file mode 100644
index 706c79e54..000000000
--- a/community/gwibber/lp_1051801.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'bin/gwibber-service'
---- old/bin/gwibber-service	2012-02-13 20:39:02 +0000
-+++ new/bin/gwibber-service	2012-09-20 06:35:40 +0000
-@@ -74,6 +74,7 @@
- message_monitor = dispatcher.MessagesMonitor()
- """
- 
-+dbus.mainloop.glib.threads_init()
- logger.debug("Setting up monitors")
- connection_monitor = dispatcher.ConnectionMonitor()
- urlshortener = dispatcher.URLShorten()
-
diff --git a/community/gwibber/lp_1088775.patch b/community/gwibber/lp_1088775.patch
deleted file mode 100644
index 2f3b318d0..000000000
--- a/community/gwibber/lp_1088775.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-=== modified file 'gwibber/microblog/plugins/facebook/__init__.py'
---- old/gwibber/microblog/plugins/facebook/__init__.py	2012-09-24 20:55:20 +0000
-+++ new/gwibber/microblog/plugins/facebook/__init__.py	2013-01-14 15:41:35 +0000
-@@ -326,7 +326,10 @@
-     
-     if data.has_key("privacy"):
-       m["privacy"] = {}
--      m["privacy"]["description"] = data["privacy"]["description"]
-+      if data["privacy"].has_key("description"):
-+        m["privacy"]["description"] = data["privacy"]["description"]
-+      else:
-+        m["privacy"]["description"] = ""
-       m["privacy"]["value"] = data["privacy"]["value"]
- 
-     # Handle target for wall posts with a specific recipient
-
diff --git a/community/gwibber/lp_934530.patch b/community/gwibber/lp_934530.patch
deleted file mode 100644
index 6f2bd4302..000000000
--- a/community/gwibber/lp_934530.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-=== modified file 'gwibber/microblog/network.py'
---- old/gwibber/microblog/network.py	2012-03-31 15:02:54 +0000
-+++ new/gwibber/microblog/network.py	2012-06-13 16:48:52 +0000
-@@ -37,8 +37,14 @@
-       logger.error("HTTP Error for %s - error code: %s", e.geturl().split("?")[0], e.getcode())
-       self.res = "HTTP error: {0}".format(e.getcode())
-     except urllib2.URLError, e:
--      logger.error("Network failure: %s", e.reason)
--      self.res = "Network error: {0}".format(e.reason)
-+      logger.error("Network failure: %s", e.message)
-+      self.res = "Network error: {0}".format(e.message)
-+    except IOError, e:
-+      logger.error("Network failure: %s", e.message)
-+      self.res = "Network error: {0}".format(e.message)
-+    except:
-+      logger.error("Network failure: UNKNOWN")
-+      self.res = "Network error: UNKNOWN"
- 
-   def get_json(self):
-     try:
-
diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD
deleted file mode 100644
index da7660150..000000000
--- a/community/libmatio/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 88815 2013-04-23 01:03:57Z eric $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libmatio
-pkgver=1.5.1
-pkgrel=1
-pkgdesc='C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files'
-arch=('x86_64' 'i686')
-license=('LGPL')
-url='http://sourceforge.net/projects/matio'
-depends=('zlib')
-options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.bz2")
-sha1sums=('12b8ed59688b2f41903ddc3e7975f21f10fe42bb')
-
-build() {
-  cd matio-$pkgver
-  ./configure --prefix=/usr --enable-shared 
-  make
-}
-
-check() {
-  cd matio-$pkgver
-  make check
-}
- 
-package() {
-  cd matio-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD
deleted file mode 100644
index d17506366..000000000
--- a/community/libsignon-glib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 92688 2013-06-12 04:57:26Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=libsignon-glib
-pkgver=1.10
-pkgrel=1
-pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/accounts-sso/"
-license=('LGPL')
-depends=('signon')
-makedepends=('python2-gobject')
-options=('!libtool')
-source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('224f66c9662843705da4b35d781a50d6aeb8ca5f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static \
-              PYTHON=python2
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # Install GI overrides for python 3 as well
-  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
-  ln -s ../../../../python2.7/site-packages/gi/overrides/Signon.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Signon.py"
-}
diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD
deleted file mode 100644
index f7198378c..000000000
--- a/community/mpdscribble/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 82753 2013-01-23 20:52:45Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowwski.pl>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: evr <evanroman at gmail>
-# Contributor: Luiz Ribeiro <luizribeiro@gmail.com>
-
-pkgname=mpdscribble
-pkgver=0.22
-pkgrel=6
-pkgdesc='MPD client which submits track info to Last.fm'
-url='http://mpd.wikia.com/wiki/Client:Mpdscribble'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup' 'glib2' 'libmpdclient')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2
-        service)
-sha256sums=('1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41'
-            '8a6568235e8b2ac7535a6f99f4401450a4162bac0cacb938af2ec39a808e1132')
-
-build() {
-  cd mpdscribble-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-http-client=soup
-
-  make
-}
-
-package() {
-  cd mpdscribble-$pkgver
-
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/service \
-    "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service
-
-  # default config is really an example
-  install -D -m644 "${pkgdir}"/etc/mpdscribble.conf \
-    "${pkgdir}"/usr/share/mpdscribble/mpdscribble.conf.example
-  rm -f "${pkgdir}"/etc/mpdscribble.conf
-
-  install -d "${pkgdir}"/var/cache/mpdscribble
-  touch "${pkgdir}"/var/cache/mpdscribble/mpdscribble.cache
-}
diff --git a/community/mpdscribble/mpdscribble.install b/community/mpdscribble/mpdscribble.install
deleted file mode 100644
index e7038d5d8..000000000
--- a/community/mpdscribble/mpdscribble.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  echo 'An example config is provided in /usr/share/mpdscribble/mpdscribble.conf.example'
-  echo
-  echo 'For system-wide config copy this file to /etc/mpdscribble.conf'
-  echo 'For per-user config copy this file to ~/.mpdscribble/mpdscribble.conf'
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-pre_upgrade() {
-  # removed /etc/mpdscribble.conf on FEB 19 2011
-  # only display warning for people with mpdscribble older then 0.21
-  if (( "$(vercmp 0.21-1 $2)" > 0 )) && [[ -f /etc/mpdscribble.conf ]]
-  then
-    echo "$1 is new $2 is old"
-    cp /etc/mpdscribble.conf /etc/mpdscribble.conf.oldbackup
-    echo 'The package does not provide /etc/mpdscribble.conf anymore.'
-    echo 'Copied /etc/mpdscribble.conf to /etc/mpdscribble.conf.oldbackup'
-    echo
-    echo 'The example file is now located at /etc/mpdscribble.conf.example'
-  fi
-}
diff --git a/community/mpdscribble/service b/community/mpdscribble/service
deleted file mode 100644
index 25f64d7d5..000000000
--- a/community/mpdscribble/service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=last.fm updater for MPD
-After=mpd.service
-
-[Service]
-ExecStart=/usr/bin/mpdscribble --no-daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index c96db6f68..1b211fb4f 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97469 2013-09-20 21:13:42Z bpiotrowski $
+# $Id: PKGBUILD 98183 2013-10-07 12:06:59Z jgc $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Eivind Uggedal <eivind@uggedal.com>
 
 pkgname=mpv
 pkgver=0.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index a577edb80..75cbc998b 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,32 +1,26 @@
-# $Id: PKGBUILD 91466 2013-05-23 00:58:44Z faidoc $
+# $Id: PKGBUILD 98231 2013-10-07 17:24:18Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=1.8.2
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/muffin"
 license=('GPL')
 depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \
-		 'libcanberra' 'startup-notification' 'zenity' 'dconf')
+		 'libcanberra' 'startup-notification' 'zenity' 'dconf' 'cinnamon-desktop')
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
-        "switch-applications.patch")
-sha256sums=('903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049'
-            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
+sha256sums=('e16efc49d7629141d0d784ca855b9276c83deee0669b7053d457e9f7676dc028')
 
 build() {
   cd ${pkgname}-${pkgver}
 
-  # Fix windows switcher keybinding with default settings in GNOME 3.8
-  patch -Np1 -i ../switch-applications.patch
-
-
   PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
   				 			 --localstatedir=/var --disable-static --disable-schemas-compile
   make
diff --git a/community/muffin/switch-applications.patch b/community/muffin/switch-applications.patch
deleted file mode 100644
index 61b727b57..000000000
--- a/community/muffin/switch-applications.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c linuxmint-muffin-1ad6bd4/src/core/keybindings.c
---- linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c	2013-04-15 15:53:35.000000000 +0200
-+++ linuxmint-muffin-1ad6bd4/src/core/keybindings.c	2013-04-24 18:37:54.028549911 +0200
-@@ -3774,14 +3774,14 @@
-                           handle_switch, META_TAB_LIST_GROUP);
- 
-   add_builtin_keybinding (display,
--                          "switch-windows",
-+                          "switch-applications",
-                           SCHEMA_COMMON_KEYBINDINGS,
-                           META_KEY_BINDING_REVERSES,
-                           META_KEYBINDING_ACTION_SWITCH_WINDOWS,
-                           handle_switch, META_TAB_LIST_NORMAL);
- 
-   add_builtin_keybinding (display,
--                          "switch-windows-backward",
-+                          "switch-applications-backward",
-                           SCHEMA_COMMON_KEYBINDINGS,
-                           REVERSES_AND_REVERSED,
-                           META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD,
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index 766d5f445..3bf250712 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,38 +1,39 @@
-# $Id: PKGBUILD 96434 2013-08-28 19:54:26Z faidoc $
+# $Id: PKGBUILD 98197 2013-10-07 12:08:32Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=1.8.5
-pkgrel=1
+pkgver=2.0.0
+pkgrel=2
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/nemo"
 license=('GPL')
 depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
-         'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql')
+         'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' 'libxml2'
+         'cinnamon-translations')
 makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
 optdepends=('gksu: Open as Root')
 options=('!emptydirs' '!libtool')
 install=nemo.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
-        "tracker-0.16.patch"
-        "remove-desktop-background.patch")
-sha256sums=('ba43794293c66ebc31a9c4145d6e7a8326321a4f0e58b28fe4f3d56a8fe39874'
-            '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626'
-            '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
+sha256sums=('3848d55a20134826aa6512898c78b05a953f5d2f353817e7003c1a4f6286e31c')
 
-build() {
+prepare() {
   cd linuxmint-nemo-*
 
   # Python2 fix
   sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
 
-  # https://github.com/linuxmint/nemo/pull/258
-  patch -Np1 -i ../tracker-0.16.patch
+  # Fix build
+  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
+
+  # Rename 'Files' app name to avoid having the same as nautilus
+  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+}
 
-  # https://github.com/linuxmint/nemo/pull/263
-  patch -Np1 -i ../remove-desktop-background.patch
+build() {
+  cd linuxmint-nemo-*
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
@@ -49,9 +50,6 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 
-  # Rename 'Files' app name to avoid having the same as nautilus
-  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' "$pkgdir/usr/share/applications/nemo.desktop"
-
   # Autostart only in Cinnamon to avoid conflict with GNOME Classic session
   cp "$pkgdir/etc/xdg/autostart/nemo-autostart.desktop" \
     "$pkgdir/etc/xdg/autostart/nemo-autostart2d.desktop"
diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch
deleted file mode 100644
index 0301cc820..000000000
--- a/community/nemo/remove-desktop-background.patch
+++ /dev/null
@@ -1,1050 +0,0 @@
-From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 15 Apr 2013 18:44:35 -0400
-Subject: [PATCH 1/6] Don't render the background.  Need to fix selected icon
- style
-
----
- src/nemo-desktop-icon-view.c | 18 +++---------------
- src/nemo-desktop-window.c    | 15 ++++++++++++++-
- 2 files changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c
-index b903c5b..37cd8cb 100644
---- a/src/nemo-desktop-icon-view.c
-+++ b/src/nemo-desktop-icon-view.c
-@@ -243,16 +243,6 @@ struct NemoDesktopIconViewDetails
- static void
- real_begin_loading (NemoView *object)
- {
--	NemoIconContainer *icon_container;
--	NemoDesktopIconView *view;
--
--	view = NEMO_DESKTOP_ICON_VIEW (object);
--
--	icon_container = get_icon_container (view);
--	if (view->details->background == NULL) {
--		view->details->background = nemo_desktop_background_new (icon_container);
--	}
--
- 	NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object);
- }
- 
-@@ -298,11 +288,6 @@ struct NemoDesktopIconViewDetails
- 					      nemo_view_update_menus,
- 					      icon_view);
- 
--	if (icon_view->details->background != NULL) {
--		g_object_unref (icon_view->details->background);
--		icon_view->details->background = NULL;
--	}
--
- 	G_OBJECT_CLASS (nemo_desktop_icon_view_parent_class)->dispose (object);
- }
- 
-@@ -652,6 +637,9 @@ struct NemoDesktopIconViewDetails
- 				  G_CALLBACK (nemo_view_update_menus),
- 				  desktop_icon_view);
- 
-+    GdkRGBA transparent = { 0, 0, 0, 0 };
-+    gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent);
-+
-     have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL;
- }
- 
-diff --git a/src/nemo-desktop-window.c b/src/nemo-desktop-window.c
-index 9c80c62..2d5c4e8 100644
---- a/src/nemo-desktop-window.c
-+++ b/src/nemo-desktop-window.c
-@@ -97,6 +97,7 @@ struct NemoDesktopWindowDetails {
- 	g_signal_connect_swapped (nemo_preferences, "changed::" NEMO_PREFERENCES_DESKTOP_IS_HOME_DIR,
- 				  G_CALLBACK (nemo_desktop_window_update_directory),
- 				  window);
-+
- }
- 
- static void
-@@ -189,6 +190,12 @@ struct NemoDesktopWindowDetails {
- 	/* Chain up to realize our children */
- 	GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->map (widget);
- 	gdk_window_lower (gtk_widget_get_window (widget));
-+
-+    GdkWindow *window;
-+    GdkRGBA transparent = { 0, 0, 0, 0 };
-+
-+    window = gtk_widget_get_window (widget);
-+    gdk_window_set_background_rgba (window, &transparent);
- }
- 
- static void
-@@ -254,6 +261,7 @@ struct NemoDesktopWindowDetails {
- {
- 	NemoDesktopWindow *window;
- 	NemoDesktopWindowDetails *details;
-+    GdkVisual *visual;
- 
- 	window = NEMO_DESKTOP_WINDOW (widget);
- 	details = window->details;
-@@ -261,7 +269,12 @@ struct NemoDesktopWindowDetails {
- 	/* Make sure we get keyboard events */
- 	gtk_widget_set_events (widget, gtk_widget_get_events (widget) 
- 			      | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
--			      
-+
-+    visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
-+    if (visual) {
-+        gtk_widget_set_visual (widget, visual);
-+    }
-+
- 	/* Do the work of realizing. */
- 	GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->realize (widget);
- 
--- 
-1.8.1.6
-
-
-From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 15 Apr 2013 20:03:03 -0400
-Subject: [PATCH 2/6] Remove nemo-desktop-background, the desktop window makes
- a transparent background and just uses the existing rendered background from
- muffin/g-s-d
-
----
- libnemo-private/Makefile.am               |   2 -
- libnemo-private/nemo-desktop-background.c | 578 ------------------------------
- libnemo-private/nemo-desktop-background.h |  65 ----
- src/nemo-desktop-icon-view.c              |  26 +-
- 4 files changed, 13 insertions(+), 658 deletions(-)
- delete mode 100644 libnemo-private/nemo-desktop-background.c
- delete mode 100644 libnemo-private/nemo-desktop-background.h
-
-diff --git a/libnemo-private/Makefile.am b/libnemo-private/Makefile.am
-index 3b46318..5fd797c 100644
---- a/libnemo-private/Makefile.am
-+++ b/libnemo-private/Makefile.am
-@@ -81,8 +81,6 @@ libnemo_private_la_SOURCES = \
- 	nemo-debug.h \
- 	nemo-default-file-icon.c \
- 	nemo-default-file-icon.h \
--	nemo-desktop-background.c \
--	nemo-desktop-background.h \
- 	nemo-desktop-directory-file.c \
- 	nemo-desktop-directory-file.h \
- 	nemo-desktop-directory.c \
-diff --git a/libnemo-private/nemo-desktop-background.c b/libnemo-private/nemo-desktop-background.c
-deleted file mode 100644
-index f8dc979..0000000
---- a/libnemo-private/nemo-desktop-background.c
-+++ /dev/null
-@@ -1,578 +0,0 @@
--/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
--
--/*
-- * nemo-desktop-background.c: Helper object to handle desktop background
-- *                                changes.
-- *
-- * Copyright (C) 2000 Eazel, Inc.
-- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2 of the
-- * License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public
-- * License along with this program; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
-- * Boston, MA 02110-1335, USA.
-- *
-- * Authors: Darin Adler <darin@bentspoon.com>
-- *          Cosimo Cecchi <cosimoc@gnome.org>
-- */
--
--#include <config.h>
--
--#include "nemo-desktop-background.h"
--
--#include <eel/eel-gdk-extensions.h>
--#include <eel/eel-gtk-extensions.h>
--
--#include "nemo-global-preferences.h"
--
--#define GNOME_DESKTOP_USE_UNSTABLE_API
--#include <libgnome-desktop/gnome-bg.h>
--#include <gdesktop-enums.h>
--
--#include <gtk/gtk.h>
--#include <string.h>
--
--static void init_fade (NemoDesktopBackground *self);
--static void free_fade (NemoDesktopBackground *self);
--static void queue_background_change (NemoDesktopBackground *self);
--
--static NemoDesktopBackground *singleton = NULL;
--
--G_DEFINE_TYPE (NemoDesktopBackground, nemo_desktop_background, G_TYPE_OBJECT);
--
--enum {
--        PROP_WIDGET = 1,
--        NUM_PROPERTIES,
--};
--
--struct NemoDesktopBackgroundDetails {
--
--	GtkWidget *widget;
--        GnomeBG *bg;
--
--	/* Realized data: */
--	cairo_surface_t *background_surface;
--	GnomeBGCrossfade *fade;
--	int background_entire_width;
--	int background_entire_height;
--	GdkColor default_color;
--
--	/* Desktop screen size watcher */
--	gulong screen_size_handler;
--	/* Desktop monitors configuration watcher */
--	gulong screen_monitors_handler;
--	guint change_idle_id;
--};
--
--
--static gboolean
--background_settings_change_event_cb (GSettings *settings,
--                                     gpointer   keys,
--                                     gint       n_keys,
--                                     gpointer   user_data);
--
--
--static void
--free_fade (NemoDesktopBackground *self)
--{
--	if (self->details->fade != NULL) {
--		g_object_unref (self->details->fade);
--		self->details->fade = NULL;
--	}
--}
--
--static void
--free_background_surface (NemoDesktopBackground *self)
--{
--	cairo_surface_t *surface;
--
--	surface = self->details->background_surface;
--	if (surface != NULL) {
--		cairo_surface_destroy (surface);
--		self->details->background_surface = NULL;
--	}
--}
--
--static void
--nemo_desktop_background_finalize (GObject *object)
--{
--	NemoDesktopBackground *self;
--
--	self = NEMO_DESKTOP_BACKGROUND (object);
--
--	g_signal_handlers_disconnect_by_func (gnome_background_preferences,
--					      background_settings_change_event_cb,
--					      self);
--
--	free_background_surface (self);
--	free_fade (self);
--
--	g_clear_object (&self->details->bg);
--
--	G_OBJECT_CLASS (nemo_desktop_background_parent_class)->finalize (object);
--}
--
--static void
--nemo_desktop_background_unrealize (NemoDesktopBackground *self)
--{
--	free_background_surface (self);
--
--	self->details->background_entire_width = 0;
--	self->details->background_entire_height = 0;
--	self->details->default_color.red = 0xffff;
--	self->details->default_color.green = 0xffff;
--	self->details->default_color.blue = 0xffff;
--}
--
--static void
--nemo_desktop_background_set_image_uri (NemoDesktopBackground *self,
--                                           const char *image_uri)
--{
--	char *filename;
--
--	if (image_uri != NULL) {
--		filename = g_filename_from_uri (image_uri, NULL, NULL);
--	}
--	else {
--		filename = NULL;
--	}
--
--	gnome_bg_set_filename (self->details->bg, filename);
--
--	g_free (filename);
--}
--
--static void
--init_fade (NemoDesktopBackground *self)
--{
--	GtkWidget *widget;
--	gboolean do_fade;
--
--	widget = self->details->widget;
--
--	if (widget == NULL || !gtk_widget_get_realized (widget))
--		return;
--
--	do_fade = g_settings_get_boolean (nemo_desktop_preferences,
--					  NEMO_PREFERENCES_DESKTOP_BACKGROUND_FADE);
--
--	if (!do_fade) {
--		return;
--	}
--
--	if (self->details->fade == NULL) {
--		GdkWindow *window;
--		GdkScreen *screen;
--		int old_width, old_height, width, height;
--
--		/* If this was the result of a screen size change,
--		 * we don't want to crossfade
--		 */
--		window = gtk_widget_get_window (widget);
--		old_width = gdk_window_get_width (window);
--		old_height = gdk_window_get_height (window);
--
--		screen = gtk_widget_get_screen (widget);
--		width = gdk_screen_get_width (screen);
--		height = gdk_screen_get_height (screen);
--
--		if (old_width == width && old_height == height) {
--			self->details->fade = gnome_bg_crossfade_new (width, height);
--			g_signal_connect_swapped (self->details->fade,
--                                                  "finished",
--                                                  G_CALLBACK (free_fade),
--                                                  self);
--		}
--	}
--
--	if (self->details->fade != NULL && !gnome_bg_crossfade_is_started (self->details->fade)) {
--		cairo_surface_t *start_surface;
--
--		if (self->details->background_surface == NULL) {
--			start_surface = gnome_bg_get_surface_from_root (gtk_widget_get_screen (widget));
--		} else {
--			start_surface = cairo_surface_reference (self->details->background_surface);
--		}
--		gnome_bg_crossfade_set_start_surface (self->details->fade,
--						      start_surface);
--                cairo_surface_destroy (start_surface);
--	}
--}
--
--static void
--screen_size_changed (GdkScreen *screen,
--                     NemoDesktopBackground *self)
--{
--	queue_background_change (self);
--}
--
--static gboolean
--nemo_desktop_background_ensure_realized (NemoDesktopBackground *self)
--{
--	int entire_width;
--	int entire_height;
--	GdkScreen *screen;
--	GdkWindow *window;
--
--	screen = gtk_widget_get_screen (self->details->widget);
--	entire_height = gdk_screen_get_height (screen);
--	entire_width = gdk_screen_get_width (screen);
--
--	/* If the window size is the same as last time, don't update */
--	if (entire_width == self->details->background_entire_width &&
--	    entire_height == self->details->background_entire_height) {
--		return FALSE;
--	}
--
--	free_background_surface (self);
--
--	window = gtk_widget_get_window (self->details->widget);
--	self->details->background_surface = gnome_bg_create_surface (self->details->bg,
--                                                                     window,
--                                                                     entire_width, entire_height,
--                                                                     TRUE);
--
--	/* We got the surface and everything, so we don't care about a change
--	   that is pending (unless things actually change after this time) */
--	g_object_set_data (G_OBJECT (self),
--			   "ignore-pending-change", GINT_TO_POINTER (TRUE));
--
--	self->details->background_entire_width = entire_width;
--	self->details->background_entire_height = entire_height;
--
--	return TRUE;
--}
--
--static void
--on_fade_finished (GnomeBGCrossfade *fade,
--		  GdkWindow *window,
--		  gpointer user_data)
--{
--        NemoDesktopBackground *self = user_data;
--
--	nemo_desktop_background_ensure_realized (self);
--	gnome_bg_set_surface_as_root (gdk_window_get_screen (window),
--                                      self->details->background_surface);
--}
--
--static gboolean
--fade_to_surface (NemoDesktopBackground *self,
--		 GdkWindow     *window,
--		 cairo_surface_t *surface)
--{
--	if (self->details->fade == NULL) {
--		return FALSE;
--	}
--
--	if (!gnome_bg_crossfade_set_end_surface (self->details->fade,
--				                 surface)) {
--		return FALSE;
--	}
--
--	if (!gnome_bg_crossfade_is_started (self->details->fade)) {
--		gnome_bg_crossfade_start (self->details->fade, window);
--		g_signal_connect (self->details->fade,
--				  "finished",
--				  G_CALLBACK (on_fade_finished), self);
--	}
--
--	return gnome_bg_crossfade_is_started (self->details->fade);
--}
--
--static void
--nemo_desktop_background_set_up_widget (NemoDesktopBackground *self)
--{
--	GdkWindow *window;
--	gboolean in_fade = FALSE;
--        GtkWidget *widget;
--
--        widget = self->details->widget;
--
--	if (!gtk_widget_get_realized (widget)) {
--		return;
--	}
--
--	nemo_desktop_background_ensure_realized (self);
--        window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
--
--	in_fade = fade_to_surface (self, window,
--				   self->details->background_surface);
--
--	if (!in_fade) {
--		cairo_pattern_t *pattern;
--
--		pattern = cairo_pattern_create_for_surface (self->details->background_surface);
--		gdk_window_set_background_pattern (window, pattern);
--		cairo_pattern_destroy (pattern);
--
--                gnome_bg_set_surface_as_root (gtk_widget_get_screen (widget),
--                                              self->details->background_surface);
--	}
--}
--
--static gboolean
--background_changed_cb (NemoDesktopBackground *self)
--{
--	self->details->change_idle_id = 0;
--
--	nemo_desktop_background_unrealize (self);
--	nemo_desktop_background_set_up_widget (self);
--
--	gtk_widget_queue_draw (self->details->widget);
--
--	return FALSE;
--}
--
--static void
--queue_background_change (NemoDesktopBackground *self)
--{
--	if (self->details->change_idle_id != 0) {
--                g_source_remove (self->details->change_idle_id);
--	}
--
--	self->details->change_idle_id =
--                g_idle_add ((GSourceFunc) background_changed_cb, self);
--}
--
--static void
--nemo_desktop_background_changed (GnomeBG *bg,
--                                     gpointer user_data)
--{
--        NemoDesktopBackground *self;
--
--        self = user_data;
--	init_fade (self);
--	queue_background_change (self);
--}
--
--static void
--nemo_desktop_background_transitioned (GnomeBG *bg,
--                                          gpointer user_data)
--{
--        NemoDesktopBackground *self;
--
--        self = user_data;
--	free_fade (self);
--	queue_background_change (self);
--}
--
--static void
--widget_realize_cb (GtkWidget *widget,
--                   gpointer user_data)
--{
--	GdkScreen *screen;
--        NemoDesktopBackground *self = user_data;
--
--	screen = gtk_widget_get_screen (widget);
--
--	if (self->details->screen_size_handler > 0) {
--		g_signal_handler_disconnect (screen,
--					     self->details->screen_size_handler);
--	}
--	self->details->screen_size_handler = 
--		g_signal_connect (screen, "size_changed",
--				  G_CALLBACK (screen_size_changed), self);
--
--	if (self->details->screen_monitors_handler > 0) {
--		g_signal_handler_disconnect (screen,
--					     self->details->screen_monitors_handler);
--	}
--	self->details->screen_monitors_handler =
--		g_signal_connect (screen, "monitors-changed",
--				  G_CALLBACK (screen_size_changed), self);
--	nemo_desktop_background_set_up_widget (self);
--}
--
--static void
--widget_unrealize_cb (GtkWidget *widget,
--                     gpointer user_data)
--{
--        NemoDesktopBackground *self = user_data;
--
--	if (self->details->screen_size_handler > 0) {
--		        g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)),
--				                     self->details->screen_size_handler);
--			self->details->screen_size_handler = 0;
--	}
--	if (self->details->screen_monitors_handler > 0) {
--		        g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)),
--				                     self->details->screen_monitors_handler);
--			self->details->screen_monitors_handler = 0;
--	}
--}
--
--static void
--on_widget_destroyed (GtkWidget *widget,
--                     gpointer user_data)
--{
--        NemoDesktopBackground *self = user_data;
--
--	if (self->details->change_idle_id != 0) {
--		g_source_remove (self->details->change_idle_id);
--		self->details->change_idle_id = 0;
--	}
--
--	free_fade (self);
--	self->details->widget = NULL;
--}
--
--static gboolean
--background_change_event_idle_cb (NemoDesktopBackground *self)
--{
--	gnome_bg_load_from_preferences (self->details->bg,
--					gnome_background_preferences);
--
--	g_object_unref (self);
--
--	return FALSE;
--}
--
--static gboolean
--background_settings_change_event_cb (GSettings *settings,
--                                     gpointer   keys,
--                                     gint       n_keys,
--                                     gpointer   user_data)
--{
--	NemoDesktopBackground *self = user_data;
--
--	/* Need to defer signal processing otherwise
--	 * we would make the dconf backend deadlock.
--	 */
--	g_idle_add ((GSourceFunc) background_change_event_idle_cb,
--		    g_object_ref (self));
--
--	return FALSE;
--}
--
--static void
--nemo_desktop_background_constructed (GObject *obj)
--{
--        NemoDesktopBackground *self;
--        GtkWidget *widget;
--
--        self = NEMO_DESKTOP_BACKGROUND (obj);
--
--        if (G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed != NULL) {
--                G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed (obj);
--        }
--
--        widget = self->details->widget;
--
--        g_assert (widget != NULL);
--
-- 	g_signal_connect_object (widget, "destroy",
--                                 G_CALLBACK (on_widget_destroyed), self, 0);
--	g_signal_connect_object (widget, "realize",
--				 G_CALLBACK (widget_realize_cb), self, 0);
--	g_signal_connect_object (widget, "unrealize",
--				 G_CALLBACK (widget_unrealize_cb), self, 0);
--
--        gnome_bg_load_from_preferences (self->details->bg,
--                                        gnome_background_preferences);
--
--        /* Let's receive batch change events instead of every single one */
--        g_signal_connect (gnome_background_preferences,
--                          "change-event",
--                          G_CALLBACK (background_settings_change_event_cb),
--                          self);
--
--	queue_background_change (self);
--}
--
--static void
--nemo_desktop_background_set_property (GObject *object,
--                                          guint property_id,
--                                          const GValue *value,
--                                          GParamSpec *pspec)
--{
--        NemoDesktopBackground *self;
--
--        self = NEMO_DESKTOP_BACKGROUND (object);
--
--        switch (property_id) {
--        case PROP_WIDGET:
--                self->details->widget = g_value_get_object (value);
--                break;
--        default:
--                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
--                break;
--        }
--}
--
--static GObject *
--nemo_desktop_background_constructor (GType type,
--                                         guint n_construct_params,
--                                         GObjectConstructParam *construct_params)
--{
--        GObject *retval;
--
--        if (singleton != NULL) {
--                return g_object_ref (singleton);
--        }
--
--        retval = G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructor
--                (type, n_construct_params, construct_params);
--
--        singleton = NEMO_DESKTOP_BACKGROUND (retval);
--        g_object_add_weak_pointer (retval, (gpointer) &singleton);
--
--        return retval;
--}
--
--static void
--nemo_desktop_background_class_init (NemoDesktopBackgroundClass *klass)
--{
--	GObjectClass *object_class;
--        GParamSpec *pspec;
--
--	object_class = G_OBJECT_CLASS (klass);
--	object_class->finalize = nemo_desktop_background_finalize;
--        object_class->set_property = nemo_desktop_background_set_property;
--        object_class->constructor = nemo_desktop_background_constructor;
--        object_class->constructed = nemo_desktop_background_constructed;
--
--        pspec = g_param_spec_object ("widget", "The widget for this background",
--                                     "The widget that gets its background set",
--                                     NEMO_TYPE_ICON_CONTAINER,
--                                     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
--        g_object_class_install_property (object_class, PROP_WIDGET, pspec);
--
--	g_type_class_add_private (klass, sizeof (NemoDesktopBackgroundDetails));
--}
--
--static void
--nemo_desktop_background_init (NemoDesktopBackground *self)
--{
--	self->details =
--		G_TYPE_INSTANCE_GET_PRIVATE (self,
--					     NEMO_TYPE_DESKTOP_BACKGROUND,
--					     NemoDesktopBackgroundDetails);
--
--        self->details->bg = gnome_bg_new ();
--	self->details->default_color.red = 0xffff;
--	self->details->default_color.green = 0xffff;
--	self->details->default_color.blue = 0xffff;
--
--	g_signal_connect (self->details->bg, "changed",
--			  G_CALLBACK (nemo_desktop_background_changed), self);
--	g_signal_connect (self->details->bg, "transitioned",
--			  G_CALLBACK (nemo_desktop_background_transitioned), self);
--}
--
--NemoDesktopBackground *
--nemo_desktop_background_new (NemoIconContainer *container)
--{
--        return g_object_new (NEMO_TYPE_DESKTOP_BACKGROUND,
--                             "widget", container,
--                             NULL);
--}
-diff --git a/libnemo-private/nemo-desktop-background.h b/libnemo-private/nemo-desktop-background.h
-deleted file mode 100644
-index 8755cb1..0000000
---- a/libnemo-private/nemo-desktop-background.h
-+++ /dev/null
-@@ -1,65 +0,0 @@
--/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
--
--/*
-- * nemo-desktop-background.c: Helper object to handle desktop background
-- *                                changes.
-- *
-- * Copyright (C) 2000 Eazel, Inc.
-- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2 of the
-- * License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public
-- * License along with this program; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
-- * Boston, MA 02110-1335, USA.
-- *
-- * Authors: Darin Adler <darin@bentspoon.com>
-- *          Cosimo Cecchi <cosimoc@gnome.org>
-- */
--
--#ifndef __NAUTILIUS_DESKTOP_BACKGROUND_H__
--#define __NAUTILIUS_DESKTOP_BACKGROUND_H__
--
--#include <gtk/gtk.h>
--
--#include "nemo-icon-container.h"
--
--typedef struct NemoDesktopBackground NemoDesktopBackground;
--typedef struct NemoDesktopBackgroundClass NemoDesktopBackgroundClass;
--
--#define NEMO_TYPE_DESKTOP_BACKGROUND nemo_desktop_background_get_type()
--#define NEMO_DESKTOP_BACKGROUND(obj) \
--  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackground))
--#define NEMO_DESKTOP_BACKGROUND_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_CAST ((klass), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass))
--#define NEMO_IS_DESKTOP_BACKGROUND(obj) \
--  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NEMO_TYPE_DESKTOP_BACKGROUND))
--#define NEMO_IS_DESKTOP_BACKGROUND_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_TYPE ((klass), NEMO_TYPE_DESKTOP_BACKGROUND))
--#define NEMO_DESKTOP_BACKGROUND_GET_CLASS(obj) \
--  (G_TYPE_INSTANCE_GET_CLASS ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass))
--
--GType nemo_desktop_background_get_type (void);
--NemoDesktopBackground * nemo_desktop_background_new (NemoIconContainer *container);
--
--typedef struct NemoDesktopBackgroundDetails NemoDesktopBackgroundDetails;
--
--struct NemoDesktopBackground {
--	GObject parent;
--	NemoDesktopBackgroundDetails *details;
--};
--
--struct NemoDesktopBackgroundClass {
--	GObjectClass parent_class;
--};
--
--#endif /* __NAUTILIUS_DESKTOP_BACKGROUND_H__ */
-diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c
-index 37cd8cb..5dec8b5 100644
---- a/src/nemo-desktop-icon-view.c
-+++ b/src/nemo-desktop-icon-view.c
-@@ -41,7 +41,6 @@
- #include <fcntl.h>
- #include <gdk/gdkx.h>
- #include <glib/gi18n.h>
--#include <libnemo-private/nemo-desktop-background.h>
- #include <libnemo-private/nemo-desktop-icon-file.h>
- #include <libnemo-private/nemo-directory-notify.h>
- #include <libnemo-private/nemo-file-changes-queue.h>
-@@ -76,8 +75,6 @@ struct NemoDesktopIconViewDetails
- 	gulong delayed_init_signal;
- 	guint reload_desktop_timeout;
- 	gboolean pending_rescan;
--
--	NemoDesktopBackground *background;
- };
- 
- static void     default_zoom_level_changed                        (gpointer                user_data);
-@@ -240,12 +237,6 @@ struct NemoDesktopIconViewDetails
- 	return GDK_FILTER_CONTINUE;
- }
- 
--static void
--real_begin_loading (NemoView *object)
--{
--	NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object);
--}
--
- static const char *
- real_get_id (NemoView *view)
- {
-@@ -300,7 +291,6 @@ struct NemoDesktopIconViewDetails
- 
- 	G_OBJECT_CLASS (class)->dispose = nemo_desktop_icon_view_dispose;
- 
--	vclass->begin_loading = real_begin_loading;
- 	vclass->merge_menus = real_merge_menus;
- 	vclass->update_menus = real_update_menus;
- 	vclass->get_view_id = real_get_id;
-@@ -428,6 +418,17 @@ struct NemoDesktopIconViewDetails
- 			       desktop_icon_view);
- }
- 
-+static void
-+desktop_icon_container_realize (GtkWidget *widget,
-+                                NemoDesktopIconView *desktop_icon_view)
-+{
-+    GdkWindow *bin_window;
-+    GdkRGBA transparent = { 0, 0, 0, 0 };
-+
-+    bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
-+    gdk_window_set_background_rgba (bin_window, &transparent);
-+}
-+
- static NemoZoomLevel
- get_default_zoom_level (void)
- {
-@@ -614,6 +615,8 @@ struct NemoDesktopIconViewDetails
- 
- 	g_signal_connect_object (icon_container, "middle_click",
- 				 G_CALLBACK (nemo_desktop_icon_view_handle_middle_click), desktop_icon_view, 0);
-+    g_signal_connect_object (icon_container, "realize",
-+                 G_CALLBACK (desktop_icon_container_realize), desktop_icon_view, 0);
- 	g_signal_connect_object (desktop_icon_view, "realize",
- 				 G_CALLBACK (realized_callback), desktop_icon_view, 0);
- 	g_signal_connect_object (desktop_icon_view, "unrealize",
-@@ -637,9 +640,6 @@ struct NemoDesktopIconViewDetails
- 				  G_CALLBACK (nemo_view_update_menus),
- 				  desktop_icon_view);
- 
--    GdkRGBA transparent = { 0, 0, 0, 0 };
--    gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent);
--
-     have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL;
- }
- 
--- 
-1.8.1.6
-
-
-From b40990397b6fff55878481a806a1b5574e43951f Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 15 Apr 2013 20:14:40 -0400
-Subject: [PATCH 3/6] Forgot an include
-
----
- libnemo-private/nemo-icon-dnd.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/libnemo-private/nemo-icon-dnd.c b/libnemo-private/nemo-icon-dnd.c
-index 017c6a7..2ed073c 100644
---- a/libnemo-private/nemo-icon-dnd.c
-+++ b/libnemo-private/nemo-icon-dnd.c
-@@ -52,7 +52,6 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- 
--#include <libnemo-private/nemo-desktop-background.h>
- #include <libnemo-private/nemo-file-utilities.h>
- #include <libnemo-private/nemo-file-changes-queue.h>
- #include <stdio.h>
--- 
-1.8.1.6
-
-
-From 020d4dc15fa9c0e1303cef7795e45e688ede7726 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Tue, 16 Apr 2013 18:00:01 -0400
-Subject: [PATCH 4/6] Change to use cinnamon background keys
-
----
- libnemo-private/nemo-global-preferences.c | 2 +-
- libnemo-private/nemo-global-preferences.h | 2 +-
- src/nemo-places-sidebar.c                 | 2 +-
- src/nemo-view.c                           | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
-index d3ad20a..336afc3 100644
---- a/libnemo-private/nemo-global-preferences.c
-+++ b/libnemo-private/nemo-global-preferences.c
-@@ -76,7 +76,7 @@
- 	nemo_desktop_preferences = g_settings_new("org.nemo.desktop");
- 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
- 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
--	gnome_background_preferences = g_settings_new("org.gnome.desktop.background");
-+	cinnamon_background_preferences = g_settings_new("org.cinnamon.background");
- 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
- 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
- }
-diff --git a/libnemo-private/nemo-global-preferences.h b/libnemo-private/nemo-global-preferences.h
-index 2b9c56a..c1ec61a 100644
---- a/libnemo-private/nemo-global-preferences.h
-+++ b/libnemo-private/nemo-global-preferences.h
-@@ -226,7 +226,7 @@ enum
- GSettings *nemo_tree_sidebar_preferences;
- GSettings *nemo_window_state;
- GSettings *gnome_lockdown_preferences;
--GSettings *gnome_background_preferences;
-+GSettings *cinnamon_background_preferences;
- GSettings *gnome_media_handling_preferences;
- GSettings *gnome_terminal_preferences;
- 
-diff --git a/src/nemo-places-sidebar.c b/src/nemo-places-sidebar.c
-index a0bc4d4..ca32193 100644
---- a/src/nemo-places-sidebar.c
-+++ b/src/nemo-places-sidebar.c
-@@ -3825,7 +3825,7 @@ static void expand_or_collapse_category (NemoPlacesSidebar *sidebar,
- 					      bookmarks_popup_menu_detach_cb,
- 					      sidebar);
- 
--	g_signal_handlers_disconnect_by_func (gnome_background_preferences,
-+	g_signal_handlers_disconnect_by_func (cinnamon_background_preferences,
- 					      desktop_setting_changed_callback,
- 					      sidebar);
- 
-diff --git a/src/nemo-view.c b/src/nemo-view.c
-index ab03b44..3ece32a 100644
---- a/src/nemo-view.c
-+++ b/src/nemo-view.c
-@@ -6945,7 +6945,7 @@ static void slot_changed_pane (NemoWindowSlot *slot,
- 
-     uri = nemo_file_info_get_uri (file);
- 
--    g_settings_set_string (gnome_background_preferences,
-+    g_settings_set_string (cinnamon_background_preferences,
-                                     "picture-uri", uri);
-     g_free (uri);
- }
--- 
-1.8.1.6
-
-
-From f487954ebce3f564744e9c83b5dd40fa8f8fad6d Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 22 Apr 2013 08:33:41 -0400
-Subject: [PATCH 5/6] Fall back to org.gnome.desktop.background schema when
- cinnamon is not installed
-
----
- libnemo-private/nemo-global-preferences.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
-index 336afc3..7eb04ef 100644
---- a/libnemo-private/nemo-global-preferences.c
-+++ b/libnemo-private/nemo-global-preferences.c
-@@ -76,7 +76,25 @@
- 	nemo_desktop_preferences = g_settings_new("org.nemo.desktop");
- 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
- 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
--	cinnamon_background_preferences = g_settings_new("org.cinnamon.background");
- 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
- 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
-+
-+    const gchar * const *schema_list = g_settings_list_schemas ();
-+    int i = 0;
-+    gboolean has_cinnamon = FALSE;
-+    if (schema_list != NULL) {
-+        while (schema_list[i] != NULL) {
-+            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
-+                has_cinnamon = TRUE;
-+                break;
-+            }
-+            i++;
-+        }
-+    }
-+
-+    if (has_cinnamon) {
-+        cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
-+    } else {
-+        cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
-+    }
- }
--- 
-1.8.1.6
-
-
-From 9739a1b30603868ea6b8b12cf7aeb167be5aea22 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Mon, 22 Apr 2013 09:31:49 -0400
-Subject: [PATCH 6/6] simplify schema check
-
----
- libnemo-private/nemo-global-preferences.c | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
-
-diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
-index 7eb04ef..0470595 100644
---- a/libnemo-private/nemo-global-preferences.c
-+++ b/libnemo-private/nemo-global-preferences.c
-@@ -79,20 +79,9 @@
- 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
- 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
- 
--    const gchar * const *schema_list = g_settings_list_schemas ();
--    int i = 0;
--    gboolean has_cinnamon = FALSE;
--    if (schema_list != NULL) {
--        while (schema_list[i] != NULL) {
--            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
--                has_cinnamon = TRUE;
--                break;
--            }
--            i++;
--        }
--    }
--
--    if (has_cinnamon) {
-+    GSettingsSchemaSource *schema_source;
-+    schema_source = g_settings_schema_source_get_default();
-+    if (g_settings_schema_source_lookup (schema_source, "org.cinnamon.background", FALSE)) {
-         cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
-     } else {
-         cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
--- 
-1.8.1.6
-
diff --git a/community/nemo/tracker-0.16.patch b/community/nemo/tracker-0.16.patch
deleted file mode 100644
index 49964678d..000000000
--- a/community/nemo/tracker-0.16.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 88459a57ac2fcf06400ade5c6d0189bf1aa2334d Mon Sep 17 00:00:00 2001
-From: Nick Black <nick.black@sprezzatech.com>
-Date: Fri, 12 Apr 2013 17:10:46 -0400
-Subject: [PATCH] build with tracker 0.16
-
----
- configure.in | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index ec72f73..21afbe4 100644
---- a/configure.in
-+++ b/configure.in
-@@ -249,11 +249,13 @@ AC_ARG_ENABLE(tracker,
- 
- build_tracker=no
- if test "x$enable_tracker" != "xno"; then
--  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
-+  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16,
-                     [build_tracker=yes],
--                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
-+  		    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
-+                    	[build_tracker=yes],
-+                    	[PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
- 		                       [build_tracker=yes],
--                                       [build_tracker=no])])
-+                                       [build_tracker=no])])])
-   if test "x$build_tracker" = "xyes"; then
-     AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
-   fi
--- 
-1.8.1.5
-
diff --git a/community/openclonk/PKGBUILD b/community/openclonk/PKGBUILD
deleted file mode 100644
index 1157c0a30..000000000
--- a/community/openclonk/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 94898 2013-08-01 06:55:20Z bpiotrowski $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Wesley <rudirennsau at hotmail dot com>
-
-pkgname=openclonk
-pkgver=5.3.3
-pkgrel=2
-pkgdesc="A multiplayer-action-tactic-skill game"
-arch=('i686' 'x86_64')
-url="http://openclonk.org"
-license=('custom')
-depends=('gtk2' 'glew' 'sdl_mixer' 'libxpm'  'hicolor-icon-theme' 'libupnp')
-makedepends=('cmake' 'boost' 'imagemagick' 'mesa')
-install=$pkgname.install
-source=(http://hg.openclonk.org/$pkgname/archive/$pkgname-release-$pkgver-src.tar.gz)
-md5sums=('a61d8a7d7c41bcc8d85a647c25095658')
-
-build() {
-  [[ -d build ]] && rm -rf build
-  mkdir build && cd build
-
-  cmake ../ -DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR="$pkgdir"/ install
-
-  install -Dm644 clonk.png "$pkgdir"/usr/share/pixmaps/clonk.png
-  install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
-  install -m644 ../licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index 3bb48927d..bf7598853 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 70446 2012-05-07 08:29:18Z lfleischer $
+# $Id: PKGBUILD 98182 2013-10-07 12:06:30Z jgc $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 
 pkgname=quvi
-pkgver=0.4.2
-pkgrel=1
+pkgver=0.9.3.1
+pkgrel=2
 pkgdesc='Command-line tool for parsing video download links.'
 arch=('i686' 'x86_64')
 url='http://quvi.sourceforge.net/'
-license=('LGPL')
+license=('AGPL3')
 depends=('libquvi')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('05f1e2c711d1ca9d4bc68b8de553941d'
-         '523b17d5a9024c8b0a1636917d79e792')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+md5sums=('24b3173f8662a6bb33d9a8a58662764f'
+         'SKIP')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/raptor1/PKGBUILD b/community/raptor1/PKGBUILD
deleted file mode 100644
index 0401aee5a..000000000
--- a/community/raptor1/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 72968 2012-06-25 18:19:15Z andrea $
-# Maintainer:
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=raptor1
-pkgver=1.4.21
-pkgrel=4
-pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility"
-arch=('i686' 'x86_64')
-url="http://librdf.org/raptor"
-depends=('curl' 'libxslt')
-license=('LGPL')
-options=('!libtool' '!docs')
-source=("http://librdf.org/dist/source/raptor-$pkgver.tar.gz"
-        'curl.patch')
-md5sums=('992061488af7a9e2d933df6b694bb876'
-         '8fe28761645d6a6607b25c94f9ada964')
-
-build() {
-  cd "${srcdir}"/raptor-${pkgver}
-  patch -p1 -i "${srcdir}"/curl.patch
-
-  ./configure --prefix=/usr \
-    --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/raptor-${pkgver}"
-  make prefix="${pkgdir}"/usr install
-  
-  mv "${pkgdir}"/usr/bin/rapper "${pkgdir}"/usr/bin/rapperV1
-  rm -f "${pkgdir}"/usr/share/man/man1/rapper.1
-}
diff --git a/community/raptor1/curl.patch b/community/raptor1/curl.patch
deleted file mode 100644
index 590140536..000000000
--- a/community/raptor1/curl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h
---- raptor-1.4.21/src/raptor_internal.h.curl	2010-01-29 17:54:42.000000000 -0600
-+++ raptor-1.4.21/src/raptor_internal.h	2011-07-31 11:02:44.182465296 -0500
-@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch
- 
- #ifdef RAPTOR_WWW_LIBCURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- 
diff --git a/community/sensors-applet/PKGBUILD b/community/sensors-applet/PKGBUILD
deleted file mode 100644
index 1a62c5692..000000000
--- a/community/sensors-applet/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 89360 2013-04-28 20:21:26Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=sensors-applet
-pkgver=3.0.0
-pkgrel=3
-pkgdesc="Applet for GNOME Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings"
-arch=('i686' 'x86_64')
-url="http://sensors-applet.sourceforge.net/"
-license=('GPL')
-depends=('gnome-panel' 'libatasmart' 'lm_sensors' 'xdg-utils')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('hddtemp: get HDD temperatures'
-            'udisks: get HDD temperatures')
-options=('!libtool')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz
-        gtk38.patch)
-md5sums=('425078fc1ff5a98af1547e039002a73f'
-         '7289cb0acd5c05daf824df6a90967240')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Enable reprecations
-  sed -i '/CFLAGS+=/d' configure{,.ac}
-
-  # Fix compatibility with GTK+ 3.8
-  patch -Np1 -i "$srcdir/gtk38.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --disable-scrollkeeper --with-nvidia=no
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community/sensors-applet/gtk38.patch b/community/sensors-applet/gtk38.patch
deleted file mode 100644
index 530d756a3..000000000
--- a/community/sensors-applet/gtk38.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c sensors-applet-3.0.0/sensors-applet/sensors-applet.c
---- sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c	2011-11-03 12:33:36.000000000 +0100
-+++ sensors-applet-3.0.0/sensors-applet/sensors-applet.c	2013-04-28 20:08:31.002620583 +0200
-@@ -641,122 +641,8 @@
-         /* get the first active sensor */
-         first_sensor = (ActiveSensor *)sensors_applet->active_sensors->data;
- 
--        switch (display_mode) {
--        case DISPLAY_VALUE:
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
--                                        &req);
--                value_width = req.width + COLUMN_SPACING;
--                value_height = req.height + ROW_SPACING;
-+        num_sensors_per_group = 1;
- 
--                /* make sure all widths and heights are non zero,
--                 * otherwise will get a divide by zero exception below
--                 * - is a non critical error since can happen when
--                 * elements first added to list, so simply return - is
--                 * not a programming error */
--                if (value_width == 0 && value_height == 0) {
--                        return;
--                }
--
--                num_sensors_per_group = (sensors_applet->size / 
--                                         (horizontal ? value_height : 
--                                          value_width));
--                break;
--
--        case DISPLAY_LABEL_WITH_VALUE:
--                /* even though we end up packing the event boxes into the
--                 * panel, these dont give back request sizes, so need to ask
--                 * widgets directly */
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
--                                        &req);
--                value_width = req.width + COLUMN_SPACING;
--                value_height = req.height + ROW_SPACING;
--
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->label),
--                                        &req);
--                label_width = req.width + COLUMN_SPACING;
--                label_height = req.height + ROW_SPACING;
--        
--                /* make sure all widths and heights are non zero, otherwise
--                 * will get a divide by zero exception below 
--                 * - is a non critical error since can happen when
--                 * elements first added to list, so simply return - is
--                 * not a programming error */
--                if (!(label_width && label_height &&
--                      value_width && value_height)) {
--                        return;
--                }
--
--                switch (layout_mode) {
--                case VALUE_BESIDE_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? MAX(label_height, value_height) : 
--                                                  (label_width + value_width)));
--                        break;
--                case VALUE_BELOW_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? (label_height + value_height) : 
--                                                  MAX(label_width, value_width)));
--
--
--                        break;
--                }
--                break;
--
--        case DISPLAY_ICON_WITH_VALUE:
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
--                                        &req);
--                value_width = req.width + COLUMN_SPACING;
--                value_height = req.height + ROW_SPACING;
--
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
--                                        &req);
--                icon_width = req.width + COLUMN_SPACING;
--                icon_height = req.height + ROW_SPACING;
--                
--                //watch out if num_sensors_per_group is correctly computed
--		//while icon_height is 0
--                if (!(icon_width &&
--                      value_width && value_height)) {
--                        return;
--                }
--
--                
--                switch (layout_mode) {
--                case VALUE_BESIDE_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? MAX(icon_height, value_height) : 
--                                                  (icon_width + value_width)));
--                        break;
--                case VALUE_BELOW_LABEL:
--                        num_sensors_per_group = (sensors_applet->size / 
--                                                 (horizontal ? (icon_height + value_height) : 
--                                                  MAX(icon_width, value_width)));
--
--
--                        break;
--                }
--                break;
--
--        case DISPLAY_ICON:
--                gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
--                                        &req);
--                icon_width = req.width + COLUMN_SPACING;
--                icon_height = req.height + ROW_SPACING;
--                if (!(icon_width && icon_height)) {
--                        return;
--                }
--
--                num_sensors_per_group = (sensors_applet->size / 
--                                         (horizontal ? icon_height : 
--                                          icon_width));
--                break;
--
--        case DISPLAY_GRAPH:
--                /* only show graphs in a line like System Monitor
--                 * applet */
--                num_sensors_per_group = 1;
--                break;
--        }
-         /* ensure always atleast 1 sensor per group */
-         if (num_sensors_per_group < 1) {
-                 /* force a better layout */
diff --git a/community/sensors-applet/sensors-applet.install b/community/sensors-applet/sensors-applet.install
deleted file mode 100644
index a23a623cc..000000000
--- a/community/sensors-applet/sensors-applet.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/signon-keyring-extension/PKGBUILD b/community/signon-keyring-extension/PKGBUILD
deleted file mode 100644
index ea0d03b3e..000000000
--- a/community/signon-keyring-extension/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 79491 2012-11-06 04:11:27Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=signon-keyring-extension
-_pkgname=keyring
-pkgver=0.4
-pkgrel=1
-pkgdesc="GNOME keyring extension for signond"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/online-accounts-keyring-extension"
-license=('LGPL')
-depends=('signon' 'libgnome-keyring')
-source=(https://launchpad.net/online-accounts-keyring-extension/trunk/$pkgver/+download/$_pkgname-$pkgver.tar.bz2)
-md5sums=('4bbe5840cf0d5cfd142ba5ef262a38ed')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # Do not install tests
-  echo 'INSTALLS =' >>tests/tests.pro
-
-  qmake PREFIX=/usr LIBDIR=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-}
diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD
deleted file mode 100644
index f74d2b649..000000000
--- a/community/signon-plugin-oauth2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 93075 2013-06-23 22:20:48Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=signon-plugin-oauth2
-_pkgname=signon-oauth2
-pkgver=0.18
-pkgrel=1
-pkgdesc="OAuth 2 plugin for signon"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/accounts-sso/"
-license=('LGPL')
-depends=('signon-ui' 'qjson')
-makedepends=('signon')
-source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
-sha1sums=('4b7aabd69a67814b19447215b6466a93523d5dce')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  sed -i '/-Werror/d' common-project-config.pri
-
-  # Do not install tests and example
-  echo 'INSTALLS =' >>tests/tests.pro
-  echo 'INSTALLS =' >>example/example.pro
-
-  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-}
diff --git a/community/signon-ui/Makefile b/community/signon-ui/Makefile
deleted file mode 100644
index 3ede78507..000000000
--- a/community/signon-ui/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Add here the language codes for the translated .po files:
-LINGUAS =
-
-I18N_DOMAIN = signon-ui
-
-PO_FILES = $(addsuffix .po, $(LINGUAS))
-MO_FILES = $(addsuffix .mo, $(LINGUAS))
-
-DEL_FILE = rm -f
-INSTALL = /usr/bin/install -c -m 644
-MKDIR = mkdir -p
-
-all: $(MO_FILES)
-
-install: all
-	for lang in $(LINGUAS); do \
-		dir=$(INSTALL_ROOT)/usr/share/locale/$$lang/LC_MESSAGES; \
-		$(MKDIR) $$dir; \
-		$(INSTALL) $$lang.mo $$dir/$(I18N_DOMAIN).mo; \
-	done
-
-%.mo: %.po
-	msgfmt -o "$@" "$<"
-
-clean:
-	-$(DEL_FILE) $(MO_FILES)
-
-distclean: clean
-
-check: all
-
diff --git a/community/signon-ui/PKGBUILD b/community/signon-ui/PKGBUILD
deleted file mode 100644
index 453349cd5..000000000
--- a/community/signon-ui/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 92692 2013-06-12 05:09:15Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=signon-ui
-pkgver=0.15
-pkgrel=1
-pkgdesc="UI component that responsible for handling the user interactions which can happen during the login process of an online account"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/online-accounts-signon-ui"
-license=('GPL')
-depends=('libaccounts-qt' 'qtwebkit' 'signon' 'libnotify')
-source=(https://launchpad.net/online-accounts-signon-ui/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2)
-md5sums=('67ac8ce4cc85b69ec6ff67ae892fda90')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Do not install tests
-  echo 'INSTALLS =' >>tests/unit/tst_inactivity_timer.pro
-  echo 'INSTALLS =' >>tests/unit/tst_signon_ui.pro
-
-  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-}
diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD
deleted file mode 100644
index 91b84c9e5..000000000
--- a/community/tremulous/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: PKGBUILD 86782 2013-03-22 00:57:25Z eric $
-#Contributor: Daenyth <Daenyth+arch [AT] gmail [dot] com>
-
-pkgname=tremulous
-pkgver=1.1.0
-pkgrel=9
-pkgdesc="A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates."
-url="http://tremulous.net"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('sdl' 'openal>=1.7.411' 'libgl' "tremulous-data=$pkgver" "freetype2")
-makedepends=(mesa)
-provides=("tremulous-updated=$pkgver-$pkgrel")
-conflicts=('tremulous-updated')
-replaces=('trem-backport' 'tremulous-updated')
-source=(http://releases.mercenariesguild.net/client/mg-client-manual.txt
-        http://releases.mercenariesguild.net/client/mgclient_source_Release_1.011.tar.gz
-        http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz
-        http://projects.mercenariesguild.net/attachments/download/109/game.qvm
-        http://projects.mercenariesguild.net/attachments/download/111/lakitu7_qvm.txt
-        tremdedrc
-        tremulous.desktop
-        tremded.sh
-        tremulous.sh
-        tremulous.xpm
-        fix_fs26749.patch)
-
-backup=('etc/tremdedrc')
-noextract=(mg_tremded_source_1.01.tar.gz)
-
-md5sums=('e0e1b6e03e7596da00a77fe638560402'
-         '95e526b961f875ba66b6fdd4842c913b'
-         '938bdf944dff667b74e2132a87a49780'
-         '90343619d140557d0c481a61ffa5756c'
-         'a0b8970b33a27798c125f9152049013c'
-         'f0056120d0192a0d4d591d1114439c52'
-         'aef37632a2edcf74a53503a49530bad2'
-         'b755d7c022cddc449ca2de508dfeee30'
-         '8e89473f9fdb481ad44e5cea5f6f681e'
-         '7e3a881608f1c7c0ccece1e07fcf92d8'
-         'e85511d8a9e7309dc24fb90917463900')
-
-build() {
-  local _arch=${CARCH/i686/x86}
-
-  # Build the server
-  mkdir -p "$srcdir/tremded"
-  bsdtar -x -C "$srcdir/tremded" -f "$srcdir/mg_tremded_source_1.01.tar.gz"
-  cd "$srcdir/tremded"
-  make
-# Build the client
-  cd "$srcdir/Release_1.011"
-  patch -Np1 -i "$srcdir/fix_fs26749.patch"
-  make
-}
-
-package() {
-  cd "$srcdir/tremded"
-  install -D -m755 build/release-linux-$_arch/tremded.$_arch "$pkgdir/opt/tremulous/tremded.$_arch"
-  install -D -m644 "$srcdir/tremdedrc"                         "$pkgdir/etc/tremdedrc"
-  install -D -m644 "$srcdir/game.qvm"                          "$pkgdir/opt/tremulous/game.qvm"
-  install -D -m755 "$srcdir/tremded.sh"                        "$pkgdir/usr/bin/tremded"
-
-  cd "$srcdir/Release_1.011"
-  install -Dm755 build/release-linux-$_arch/tremulous.$_arch "$pkgdir/opt/tremulous/tremulous.$_arch"
-  install -D -m755 "$srcdir/tremulous.sh"                      "$pkgdir/usr/bin/tremulous"
-
-  # Install the documentation
-  install -Dm644 "$srcdir/mg-client-manual.txt" "$pkgdir/usr/share/tremulous/mg-client-manual.txt"
-  install -Dm644 "$srcdir/lakitu7_qvm.txt"      "$pkgdir/usr/share/tremulous/lakitu7_qvm.txt"
-
-  # Install the .desktop and icon files
-  install -D -m644 "$srcdir/tremulous.xpm"     "$pkgdir/usr/share/pixmaps/tremulous.xpm"
-  install -D -m644 "$srcdir/tremulous.desktop" "$pkgdir/usr/share/applications/tremulous.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/tremulous/fix_fs26749.patch b/community/tremulous/fix_fs26749.patch
deleted file mode 100644
index 12a73138c..000000000
--- a/community/tremulous/fix_fs26749.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c
---- Release_1.011-old/src/qcommon/parse.c	2011-12-02 19:11:49.307368651 -0500
-+++ Release_1.011/src/qcommon/parse.c	2011-12-02 19:13:27.556836387 -0500
-@@ -981,7 +981,7 @@
- {
-   if (*string == '\"')
-   {
--    strcpy(string, string+1);
-+    memmove(string, string+1, strlen(string));
-   }
-   if (string[strlen(string)-1] == '\"')
-   {
-@@ -1784,7 +1784,7 @@
-     if ((*ptr == '\\' || *ptr == '/') &&
-         (*(ptr+1) == '\\' || *(ptr+1) == '/'))
-     {
--      strcpy(ptr, ptr+1);
-+      memmove(ptr, ptr+1, strlen(ptr));
-     }
-     else
-     {
diff --git a/community/tremulous/tremded.sh b/community/tremulous/tremded.sh
deleted file mode 100644
index 339bdd501..000000000
--- a/community/tremulous/tremded.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-CARCH=`uname -m`
-ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64
-
-[ -f /etc/tremdedrc ] && . /etc/tremdedrc
-[ -f "$HOME/.tremdedrc" ] && . "$HOME/.tremdedrc"
-
-if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then
-	echo "Cannot find game.qvm -- linking to installed version."
-	if [ ! -d "$HOME/.tremulous/base/vm" ]; then
-		mkdir -p "$HOME/.tremulous/base/vm/" || exit 1
-	fi
-	ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1
-fi
-
-cd /opt/tremulous/
-./tremded.$ext "$TREM_ARGS" "$@"
diff --git a/community/tremulous/tremdedrc b/community/tremulous/tremdedrc
deleted file mode 100644
index 7fbe122f6..000000000
--- a/community/tremulous/tremdedrc
+++ /dev/null
@@ -1 +0,0 @@
-TREM_ARGS="+set dedicated 1 +exec server.cfg"
diff --git a/community/tremulous/tremulous.desktop b/community/tremulous/tremulous.desktop
deleted file mode 100644
index 357c357bd..000000000
--- a/community/tremulous/tremulous.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Tremulous
-Comment=A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates.
-Icon=/usr/share/pixmaps/tremulous.xpm
-Exec=tremulous
-Terminal=false
-Categories=Game;ActionGame;
diff --git a/community/tremulous/tremulous.sh b/community/tremulous/tremulous.sh
deleted file mode 100644
index 01575befc..000000000
--- a/community/tremulous/tremulous.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-CARCH=`uname -m`
-ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64
-
-if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then
-	echo "Cannot find game.qvm -- linking to installed version."
-	if [ ! -d "$HOME/.tremulous/base/vm" ]; then
-		mkdir -p "$HOME/.tremulous/base/vm/" || exit 1
-	fi
-	ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1
-fi
-
-cd /opt/tremulous/
-./tremulous.$ext "$@"
diff --git a/community/tremulous/tremulous.xpm b/community/tremulous/tremulous.xpm
deleted file mode 100644
index 5e070c862..000000000
--- a/community/tremulous/tremulous.xpm
+++ /dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * tremulous_xpm[] = {
-"48 48 39 1",
-" 	c None",
-".	c #0F0F0F",
-"+	c #181818",
-"@	c #000000",
-"#	c #282828",
-"$	c #212121",
-"%	c #060606",
-"&	c #1D1D1D",
-"*	c #252525",
-"=	c #080808",
-"-	c #0E0E0E",
-";	c #050505",
-">	c #0B0B0B",
-",	c #0C0C0C",
-"'	c #232323",
-")	c #1F1F1F",
-"!	c #030303",
-"~	c #0D0D0D",
-"{	c #040404",
-"]	c #020202",
-"^	c #141414",
-"/	c #1E1E1E",
-"(	c #131313",
-"_	c #111111",
-":	c #010101",
-"<	c #191919",
-"[	c #090909",
-"}	c #292929",
-"|	c #070707",
-"1	c #121212",
-"2	c #1B1B1B",
-"3	c #161616",
-"4	c #0A0A0A",
-"5	c #222222",
-"6	c #242424",
-"7	c #1A1A1A",
-"8	c #151515",
-"9	c #101010",
-"0	c #171717",
-"                                                ",
-"                         ...                    ",
-"                       +@@@@@#                  ",
-"                      $@@@@@@%                  ",
-"                     &@@@@@@@@               *  ",
-"  =-                 ;@@@@@@@@>             ,@- ",
-"  @@'                ;@@@@@@@@@            ,@@  ",
-"  )@!                ;@@@@@@@@@           ~@@;  ",
-"   ;@{               ]@@@@@@@@@~         ,@@;   ",
-"   ^@@]             /@@@@@@@@@@@(       -@@;    ",
-"    .@@;            /@@@@@@@@@@@       -@@@/    ",
-"     _@@]           /@@@@@@@@@@@     #:@@@_     ",
-"      @@@;          /@@@@@@@@@@<     :@@@-      ",
-"       :@@!          ]@@@@@@@@@     @@@@-       ",
-"       $@@@;         ;@@@@@@@@[   ~]@@@-        ",
-"        %@@@;       }!@@@@@@@@- }|@@@@,         ",
-"         !@@@;     1@@@@@@@@@@ 2@@@@@~          ",
-"          ;@@@%    [@@@@@@@@@@@@@@@@,           ",
-"           @@@@{|||:@@@@@@@@@@@@@@!-            ",
-"           -@@@@@@@@@@@@@@@@@@@@@]              ",
-"            .@@@@@@@@@@@@@@@@@@@{               ",
-"              ]@@@@@@@@@@@@@@@@@                ",
-"               .@@@@@@@@@@@@@@@@                ",
-"                +@@@@@@@@@@@@@@@@@@@@@@@@@@/    ",
-"                 =@@@@@@@@@@@@@@@@@@@@@@@@@/    ",
-"               .=@@@@@@@@@@@@@@@@@@%            ",
-"             ,@@@@@@@@@@@@@@@@@@@@@             ",
-"        2>]@@@@@@@@@@@@@@@@@@@@@@@3             ",
-"      *:@@@@@@@@@@@@@@@@@@@@@@@@@^              ",
-"      @@@|||  4]@@@@@@@@@@@@@@@@@               ",
-"      556       _@@@@@@@@@@@@@@@@3              ",
-"                 >@@@@@@@@@@@@@@@@+             ",
-"                 ;@@@@@@@@@@@@@@@@@7            ",
-"                &@@@@@@@@@@@@@@@@@@@+           ",
-"                @@@@@@@@@@@@@@@@@@@@@/          ",
-"               8@@@@@@@@@@@@@@@[  =@@|          ",
-"               ;@@:::@@@@@@@@@[    %@@[         ",
-"               @@9   (@@@@@@@4      =@@         ",
-"              ,@@      {:@@:         {@!        ",
-"              !@@        <<          3@@0       ",
-"              !@-                     3@@6      ",
-"              ]@(                      (@[      ",
-"             7@@                        ]@      ",
-"             7@@                         *      ",
-"             7@}                                ",
-"             7@                                 ",
-"              .                                 ",
-"                                                "};
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index aa519f85c..03bd912a6 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90538 2013-05-13 00:36:03Z seblu $
+# $Id: PKGBUILD 98179 2013-10-07 10:07:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,17 +6,18 @@
 
 pkgname=ulogd
 pkgver=2.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/ulogd/index.html'
 license=('GPL2')
-depends=('libmnl' 'libnfnetlink')
+depends=('libmnl'
+         'libnetfilter_acct'
+         'libnetfilter_conntrack'
+         'libnetfilter_log'
+         'libnfnetlink')
 backup=('etc/ulogd.conf')
 makedepends=('libmariadbclient'
-             'libnetfilter_acct'
-             'libnetfilter_conntrack'
-             'libnetfilter_log'
              'libpcap'
              'libdbi'
              'postgresql-libs'
@@ -24,15 +25,14 @@ makedepends=('libmariadbclient'
 optdepends=("${makedepends[@]}")
 options=('!libtool')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-	      "$pkgname.logrotate"
-	      "$pkgname.conf"
-	      "$pkgname.service")
+        "$pkgname.logrotate"
+        "$pkgname.conf"
+        "$pkgname.service")
 md5sums=('660516de4b5b1e110c12dae414619e0f'
-         'dd32eeee0949adff4188544419acd17e'
-         'c21531312f95e790ed19aa267a17d35a'
+         '95f05af0a0c8f5fdea5bd92ccb2fd465'
+         '7ccdb48cd152ff502334d3f6b2a4daab'
          '092d72209e30c132e0a08112e4062772')
 
-
 build() {
   cd $pkgname-$pkgver
   ./configure \
diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf
index 822575613..f96bd1d2c 100644
--- a/community/ulogd/ulogd.conf
+++ b/community/ulogd/ulogd.conf
@@ -1,20 +1,19 @@
 [global]
-nlgroup=1
 logfile="/var/log/ulogd.log"
 loglevel=5
 rmem=131071
 bufsize=150000
 
-plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so"
+plugin="/usr/lib/ulogd/ulogd_inppkt_NFLOG.so"
 plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so"
 plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so"
 plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so"
 plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so"
 
-stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=log1:NFLOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
-[ulog1]
-nlgroup=1
+[log1]
+group=1
 
 [emu1]
 file=/var/log/ulogd.syslogemu
diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate
index 312c71acb..299e93d02 100644
--- a/community/ulogd/ulogd.logrotate
+++ b/community/ulogd/ulogd.logrotate
@@ -5,6 +5,6 @@
   create 0640 root root
 
   postrotate
-    [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null
+    systemctl kill --signal=SIGHUP ulogd.service || true
   endscript
 }
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index f4229bc84..f848250f7 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 95443 2013-08-12 08:50:29Z spupykin $
+# $Id: PKGBUILD 98181 2013-10-07 10:07:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=1.2.7
+pkgver=2.0.1
 pkgrel=1
 _pkgdata=20130807
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64')
 url="http://www.draisberghof.de/usb_modeswitch/"
 license=('GPL')
-depends=('libusb-compat' 'tcl')
+depends=('libusb' 'tcl')
 makedepends=('gcc' 'make')
 backup=("etc/$pkgname.conf")
 source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
 	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
 	"usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('18d889d72195534ae9133a8181cad42b'
+md5sums=('e48d4419d0574d342bb183f7465556d0'
          '91feff51deba6e48e78506b8f4db2274'
          'dd14f254f6c3642ce16fd7c2f43ee112')
 
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 0f23b5b2a..eae92f3b6 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97960 2013-10-01 23:19:17Z seblu $
+# $Id: PKGBUILD 98211 2013-10-07 14:38:11Z andyrtr $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
@@ -6,7 +6,7 @@
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
 pkgver=4.2.18
-pkgrel=6
+pkgrel=8
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/vobcopy/PKGBUILD b/community/vobcopy/PKGBUILD
deleted file mode 100644
index f1446abd2..000000000
--- a/community/vobcopy/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 66897 2012-02-29 23:21:33Z giovanni $
-# Maintainer: Daenyth
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tino Reichardt <milky-archlinux@mcmilk.de>
-
-pkgname=vobcopy
-pkgver=1.2.0
-pkgrel=4
-pkgdesc="Copies DVD .vob files to harddisk, decrypting them on the way"
-arch=('i686' 'x86_64')
-url="http://www.vobcopy.org"
-license=('GPL2')
-depends=('libdvdread' 'libdvdcss')
-options=('!docs')
-source=(http://www.vobcopy.org/download/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('88f735ccd051093ff40dab4597bc586e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="$pkgdir" PREFIX=/usr/ MANDIR=/usr/share/man install
-}
diff --git a/community/xdelta/PKGBUILD b/community/xdelta/PKGBUILD
deleted file mode 100644
index c1fef78a1..000000000
--- a/community/xdelta/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 83064 2013-01-27 09:58:41Z andrea $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=xdelta
-pkgver=1.1.4
-pkgrel=4
-pkgdesc="binary file delta generator"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/xdelta/"
-license=('GPL')
-depends=('glib' 'zlib')
-options=('!libtool')
-source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        xdelta-1.1.4-aclocal.patch)
-md5sums=('1b896c01ebf0e353b7e3c3071b05f496'
-         '1d8ab5909bdf977a2783c164b66906fd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/xdelta-1.1.4-aclocal.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/community/xdelta/xdelta-1.1.4-aclocal.patch b/community/xdelta/xdelta-1.1.4-aclocal.patch
deleted file mode 100644
index ad8c99de5..000000000
--- a/community/xdelta/xdelta-1.1.4-aclocal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdelta-1.1.3/xdelta.m4.aclocal	2004-10-20 00:20:47.875648144 +0200
-+++ xdelta-1.1.3/xdelta.m4	2004-10-20 00:21:47.205628616 +0200
-@@ -4,7 +4,7 @@
- dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or
- dnl
--AC_DEFUN(AM_PATH_XDELTA,
-+AC_DEFUN([AM_PATH_XDELTA],
- [dnl
- dnl Get the cflags and libraries from the xdelta-config script
- dnl
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 70ebe648f..42f0c7853 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193184 2013-08-18 08:13:38Z heftig $
+# $Id: PKGBUILD 196009 2013-10-07 11:50:04Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.36.4
+pkgver=2.38.0
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
@@ -11,13 +11,12 @@ arch=(i686 x86_64)
 makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e'
+sha256sums=('7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 prepare() {
   cd glib-$pkgver
   patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
-  touch -r NEWS gtk-doc.make
 }
   
 build() {
diff --git a/core/libsasl/CVE-2013-4122.patch b/core/libsasl/CVE-2013-4122.patch
new file mode 100644
index 000000000..d6b9800e6
--- /dev/null
+++ b/core/libsasl/CVE-2013-4122.patch
@@ -0,0 +1,116 @@
+From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@hush.com>
+Date: Thu, 11 Jul 2013 09:08:07 +0000
+Subject: Handle NULL returns from glibc 2.17+ crypt()
+
+Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
+(w/ NULL return) if the salt violates specifications. Additionally,
+on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
+passed to crypt() fail with EPERM (w/ NULL return).
+
+When using glibc's crypt(), check return value to avoid a possible
+NULL pointer dereference.
+
+Patch by mancha1@hush.com.
+---
+diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c
+index 4b34222..400289c 100644
+--- a/pwcheck/pwcheck_getpwnam.c
++++ b/pwcheck/pwcheck_getpwnam.c
+@@ -32,6 +32,7 @@ char *userid;
+ char *password;
+ {
+     char* r;
++    char* crpt_passwd;
+     struct passwd *pwd;
+ 
+     pwd = getpwnam(userid);
+@@ -41,7 +42,7 @@ char *password;
+     else if (pwd->pw_passwd[0] == '*') {
+ 	r = "Account disabled";
+     }
+-    else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) {
++    else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) {
+ 	r = "Incorrect password";
+     }
+     else {
+diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c
+index 2b11286..6d607bb 100644
+--- a/pwcheck/pwcheck_getspnam.c
++++ b/pwcheck/pwcheck_getspnam.c
+@@ -32,13 +32,15 @@ char *userid;
+ char *password;
+ {
+     struct spwd *pwd;
++    char *crpt_passwd;
+ 
+     pwd = getspnam(userid);
+     if (!pwd) {
+ 	return "Userid not found";
+     }
+     
+-    if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) {
++    crpt_passwd = crypt(password, pwd->sp_pwdp);
++    if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) {
+ 	return "Incorrect password";
+     }
+     else {
+diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c
+index fc8029d..d4ebe54 100644
+--- a/saslauthd/auth_getpwent.c
++++ b/saslauthd/auth_getpwent.c
+@@ -77,6 +77,7 @@ auth_getpwent (
+ {
+     /* VARIABLES */
+     struct passwd *pw;			/* pointer to passwd file entry */
++    char *crpt_passwd;			/* encrypted password */
+     int errnum;
+     /* END VARIABLES */
+   
+@@ -105,7 +106,8 @@ auth_getpwent (
+ 	}
+     }
+ 
+-    if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) {
++    crpt_passwd = crypt(password, pw->pw_passwd);
++    if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) {
+ 	if (flags & VERBOSE) {
+ 	    syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login);
+ 	}
+diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c
+index 677131b..1988afd 100644
+--- a/saslauthd/auth_shadow.c
++++ b/saslauthd/auth_shadow.c
+@@ -210,8 +210,8 @@ auth_shadow (
+ 	RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)");
+     }
+ 
+-    cpw = strdup((const char *)crypt(password, sp->sp_pwdp));
+-    if (strcmp(sp->sp_pwdp, cpw)) {
++    cpw = crypt(password, sp->sp_pwdp);
++    if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) {
+ 	if (flags & VERBOSE) {
+ 	    /*
+ 	     * This _should_ reveal the SHADOW_PW_LOCKED prefix to an
+@@ -221,10 +221,8 @@ auth_shadow (
+ 	    syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'",
+ 		   sp->sp_pwdp, cpw);
+ 	}
+-	free(cpw);
+ 	RETURN("NO Incorrect password");
+     }
+-    free(cpw);
+ 
+     /*
+      * The following fields will be set to -1 if:
+@@ -286,7 +284,7 @@ auth_shadow (
+ 	RETURN("NO Invalid username");
+     }
+   
+-    if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) {
++    if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) {
+ 	if (flags & VERBOSE) {
+ 	    syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s",
+ 		   password, upw->upw_passwd);
+--
+cgit v0.9.2
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index df0e24d52..3a569fb6e 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187033 2013-06-03 11:15:22Z allan $
+# $Id: PKGBUILD 195994 2013-10-07 10:32:39Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=4
+pkgrel=6
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
@@ -25,7 +25,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         0030-dont_use_la_files_for_opening_plugins.patch
         saslauthd.service
         saslauthd.conf.d
-        tmpfiles.conf)
+        tmpfiles.conf
+        CVE-2013-4122.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
          'f45aa8c42b32e0569ab3d14a83485b37'
@@ -36,21 +37,27 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '8e7106f32e495e9ade69014fd1b3352a'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
-         '45bb0192d2f188066240b9a66ee6365f')
+         '45bb0192d2f188066240b9a66ee6365f'
+         'c5f0ec88c584a75c14d7f402eaeed7ef')
+
+prepare() {
+  cd cyrus-sasl-$pkgver
+  patch -Np1 -i ../cyrus-sasl-2.1.22-qa.patch
+  patch -Np1 -i ../cyrus-sasl-2.1.26-size_t.patch
+  patch -Np1 -i ../0010_maintainer_mode.patch
+  patch -Np1 -i ../0011_saslauthd_ac_prog_libtool.patch
+  patch -Np1 -i ../0025_ld_as_needed.patch
+  patch -Np1 -i ../0026_drop_krb5support_dependency.patch
+  patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
+  patch -Np1 -i ../CVE-2013-4122.patch
+
+  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
+}
 
 build() {
   export CFLAGS="$CFLAGS -fPIC"
+  cd cyrus-sasl-$pkgver
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch"
-  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
-  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
-  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
-  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
-  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
-
-  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
   rm -f config/config.guess config/config.sub 
   rm -f config/ltconfig config/ltmain.sh config/libtool.m4
   rm -fr autom4te.cache
@@ -109,7 +116,7 @@ package_libsasl() {
   depends=('openssl')
   conflicts=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  cd cyrus-sasl-$pkgver
   for dir in include lib sasldb plugins utils; do
     pushd ${dir}
     make DESTDIR="${pkgdir}" install
@@ -128,7 +135,7 @@ package_cyrus-sasl() {
   pkgdesc="Cyrus saslauthd SASL authentication daemon"
   backup=('etc/conf.d/saslauthd')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
+  cd cyrus-sasl-$pkgver/saslauthd
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
   install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
@@ -143,7 +150,7 @@ package_cyrus-sasl-gssapi() {
   depends=("libsasl=${pkgver}" 'krb5')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
   cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/"
@@ -157,7 +164,7 @@ package_cyrus-sasl-ldap() {
   depends=("libsasl=${pkgver}" 'libldap')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
 
@@ -170,7 +177,7 @@ package_cyrus-sasl-sql() {
   depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
 
diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD
index 03a867fcf..4970dba50 100644
--- a/core/tar/PKGBUILD
+++ b/core/tar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 187045 2013-06-03 11:15:39Z allan $
+# $Id: PKGBUILD 195996 2013-10-07 10:34:06Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tar
-pkgver=1.26
-pkgrel=4
+pkgver=1.27
+pkgrel=1
 pkgdesc="Utility used to store, backup, and transport files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/tar/tar.html"
@@ -13,18 +13,9 @@ groups=('base')
 depends=('glibc' 'sh')
 options=('!emptydirs')
 install=tar.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-        tar.1)
-md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1'
-         '6618d5fe7785e138c27d7d6a24e998b2'
-         'e97e7343f4e23724b4c48bca2f033e38')
-
-prepare() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  # fix build failure with glibc-2.16
-  sed -i -e '/gets is a/d' gnu/stdio.in.h
-}
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('3484fc42b7a82b82f2305b2971aa0e56'
+         'SKIP')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
@@ -40,6 +31,4 @@ check() {
 package() {
   cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install
-  
-  install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1
 }
diff --git a/core/tar/tar.1 b/core/tar/tar.1
deleted file mode 100644
index 75bbcd38c..000000000
--- a/core/tar/tar.1
+++ /dev/null
@@ -1,367 +0,0 @@
-.\" generated by script on Fri Aug 19 16:19:30 2011
-.Dd Aug 19, 2011
-.Dt TAR 1
-.Sh NAME
-.Nm tar
-.Nd The GNU version of the tar archiving utility
-.Sh SYNOPSIS
-.Nm tar
-.Oo Fl Oc Cm A Fl \-catenate \-concatenate Cm \||\| c Fl \-create Cm \||\| d Fl \-diff \-compare Cm \||\| Fl \-delete Cm \||\| r Fl \-append Cm \||\| t Fl \-list Cm \||\| Fl \-test\-label Cm \||\| u Fl \-update Cm \||\| x Fl \-extract \-get
-.Op Ar options
-.Op Ar pathname ...
-.Sh DESCRIPTION
-.Nm Tar
-stores and extracts files from a tape or disk archive.
-.Pp
-The first argument to
-tar
-should be a function; either one of the letters
-.Cm Acdrtux ,
-or one of the long function names.
-A function letter need not be prefixed with ``\-'', and may be combined
-with other single-letter options.
-A long function name must be prefixed with
-.Cm \\-\\- .
-Some options take a parameter; with the single-letter form
-these must be given as separate arguments.
-With the long form, they may be given by appending
-.Cm = Ns Ar value
-to the option.
-.Sh FUNCTION LETTERS
-Main operation mode:
-.Bl -tag -width flag
-.It Fl A , Fl \-catenate , Fl \-concatenate
-append tar files to an archive
-.It Fl c , Fl \-create
-create a new archive
-.It Fl d , Fl \-diff , Fl \-compare
-find differences between archive and file system
-.It Fl \-delete
-delete from the archive (not on mag tapes!)
-.It Fl r , Fl \-append
-append files to the end of an archive
-.It Fl t , Fl \-list
-list the contents of an archive
-.It Fl \-test\-label
-test the archive volume label and exit
-.It Fl u , Fl \-update
-only append files newer than copy in archive
-.It Fl x , Fl \-extract , Fl \-get
-extract files from an archive
-.El
-.Sh OTHER OPTIONS
-Operation modifiers:
-.Bl -tag -width flag
-.It \-[0\-7][lmh]
-specify drive and density
-.It Fl a , Fl \-auto\-compress
-use archive suffix to determine the compression program
-.It Fl \-add\-file Ns \= Ns Ar FILE
-add given FILE to the archive (useful if its name starts with a dash)
-.It Fl \-anchored
-patterns match file name start
-.It Fl \-no\-anchored
-patterns match after any `/' (default for exclusion)
-.It Fl \-atime\-preserve
-preserve access times on dumped files, either by restoring the times
-.It Fl \-no\-auto\-compress
-do not use archive suffix to determine the compression program
-.It Fl b , Fl \-blocking\-factor Ar BLOCKS
-BLOCKS x 512 bytes per record
-.It Fl B , Fl \-read\-full\-records
-reblock as we read (for 4.2BSD pipes)
-.It Fl \-backup
-backup before removal, choose version CONTROL
-.It Fl C , Fl \-directory Ar DIR
-change to directory DIR
-.It Fl \-check\-device
-check device numbers when creating incremental archives (default)
-.It Fl \-no\-check\-device
-do not check device numbers when creating incremental archives
-.It Fl \-checkpoint
-display progress messages every NUMBERth record (default 10)
-.It Fl \-checkpoint\-action Ns \= Ns Ar ACTION
-execute ACTION on each checkpoint
-.It Fl \-delay\-directory\-restore
-delay setting modification times and permissions of extracted
-.It Fl \-no\-delay\-directory\-restore
-cancel the effect of --delay-directory-restore option
-.It Fl \-exclude Ns \= Ns Ar PATTERN
-exclude files, given as a PATTERN
-.It Fl \-exclude\-backups
-exclude backup and lock files
-.It Fl \-exclude\-caches
-exclude contents of directories containing CACHEDIR.TAG, 
-.It Fl \-exclude\-caches\-all
-exclude directories containing CACHEDIR.TAG
-.It Fl \-exclude\-caches\-under
-exclude everything under directories containing CACHEDIR.TAG
-.It Fl \-exclude\-tag Ns \= Ns Ar FILE
-exclude contents of directories containing FILE, except
-.It Fl \-exclude\-tag\-all Ns \= Ns Ar FILE
-exclude directories containing FILE
-.It Fl \-exclude\-tag\-under Ns \= Ns Ar FILE
-exclude everything under directories containing FILE
-.It Fl \-exclude\-vcs
-exclude version control system directories
-.It Fl f , Fl \-file Ar ARCHIVE
-use archive file or device ARCHIVE
-.It Fl F , Fl \-info\-script , Fl \-new\-volume\-script Ar NAME
-run script at end of each tape (implies -M)
-.It Fl \-force\-local
-archive file is local even if it has a colon
-.It Fl \-full\-time
-print file time to its full resolution
-.It Fl g , Fl \-listed\-incremental Ar FILE
-handle new GNU-format incremental backup
-.It Fl G , Fl \-incremental
-handle old GNU-format incremental backup
-.It Fl \-group Ns \= Ns Ar NAME
-force NAME as group for added files
-.It Fl h , Fl \-dereference
-follow symlinks; archive and dump the files they point to
-.It Fl H , Fl \-format Ar FORMAT
-create archive of the given formatFORMAT is one of the following:
-.Bl -tag -width flag
-.It Fl \-format=gnu
-GNU tar 1.13.x format
-.It Fl \-format=oldgnu
-GNU format as per tar <= 1.12
-.It Fl \-format=pax
-POSIX 1003.1-2001 (pax) format
-.It Fl \-format=posix
-same as pax
-.It Fl \-format=ustar
-POSIX 1003.1-1988 (ustar) format
-.It Fl \-format=v7
-old V7 tar format
-.El
-.It Fl \-hard\-dereference
-follow hard links; archive and dump the files they refer to
-.It Fl i , Fl \-ignore\-zeros
-ignore zeroed blocks in archive (means EOF)
-.It Fl I , Fl \-use\-compress\-program Ar PROG
-filter through PROG (must accept -d)
-.It Fl \-ignore\-case
-ignore case
-.It Fl \-no\-ignore\-case
-case sensitive matching (default)
-.It Fl \-ignore\-command\-error
-ignore exit codes of children
-.It Fl \-no\-ignore\-command\-error
-treat non-zero exit codes of children as error
-.It Fl \-ignore\-failed\-read
-do not exit with nonzero on unreadable files
-.It Fl \-index\-file Ns \= Ns Ar FILE
-send verbose output to FILE
-.It Fl j , Fl \-bzip2
-
-.It Fl J , Fl \-xz
-
-.It Fl k , Fl \-keep\-old\-files
-don't replace existing files when extracting
-.It Fl K , Fl \-starting\-file Ar MEMBER-NAME
-begin at member MEMBER-NAME in the archive
-.It Fl \-keep\-newer\-files
-don't replace existing files that are newer than their archive copies
-.It Fl l , Fl \-check\-links
-print a message if not all links are dumped
-.It Fl L , Fl \-tape\-length Ar NUMBER
-change tape after writing NUMBER x 1024 bytes
-.It Fl \-level Ns \= Ns Ar NUMBER
-dump level for created listed-incremental archive
-.It Fl \-lzip
-
-.It Fl \-lzma
-
-.It Fl \-lzop
-
-.It Fl m , Fl \-touch
-don't extract file modified time
-.It Fl M , Fl \-multi\-volume
-create/list/extract multi-volume archive
-.It Fl \-mode Ns \= Ns Ar CHANGES
-force (symbolic) mode CHANGES for added files
-.It Fl \-mtime Ns \= Ns Ar DATE-OR-FILE
-set mtime for added files from DATE-OR-FILE
-.It Fl n , Fl \-seek
-archive is seekable
-.It Fl N , Fl \-newer , Fl \-after\-date Ar DATE-OR-FILE
-only store files newer than DATE-OR-FILE
-.It Fl \-newer\-mtime Ns \= Ns Ar DATE
-compare date and time when data changed only
-.It Fl \-null
--T reads null-terminated names, disable -C
-.It Fl \-no\-null
-disable the effect of the previous --null option
-.It Fl \-numeric\-owner
-always use numbers for user/group names
-.It Fl O , Fl \-to\-stdout
-extract files to standard output
-.It Fl \-occurrence
-process only the NUMBERth occurrence of each file in the archive;
-.It Fl \-old\-archive , Fl \-portability
-same as --format=v7
-.It Fl \-one\-file\-system
-stay in local file system when creating archive
-.It Fl \-overwrite
-overwrite existing files when extracting
-.It Fl \-overwrite\-dir
-overwrite metadata of existing directories when extracting (default)
-.It Fl \-no\-overwrite\-dir
-preserve metadata of existing directories
-.It Fl \-owner Ns \= Ns Ar NAME
-force NAME as owner for added files
-.It Fl p , Fl \-preserve\-permissions , Fl \-same\-permissions
-extract information about file permissions (default for superuser)
-.It Fl P , Fl \-absolute\-names
-don't strip leading `/'s from file names
-.It Fl \-pax\-option Ns \= Ns Ar keyword[[:]=value][,keyword[[:]=value]]...
-control pax keywords
-.It Fl \-posix
-same as --format=posix
-.It Fl \-preserve
-same as both -p and -s
-.It Fl \-quote\-chars Ns \= Ns Ar STRING
-additionally quote characters from STRING
-.It Fl \-no\-quote\-chars Ns \= Ns Ar STRING
-disable quoting for characters from STRING
-.It Fl \-quoting\-style Ns \= Ns Ar STYLE
-set name quoting style; see below for valid STYLE values
-.It Fl R , Fl \-block\-number
-show block number within archive with each message
-.It Fl \-record\-size Ns \= Ns Ar NUMBER
-NUMBER of bytes per record, multiple of 512
-.It Fl \-recursion
-recurse into directories (default)
-.It Fl \-no\-recursion
-avoid descending automatically in directories
-.It Fl \-recursive\-unlink
-empty hierarchies prior to extracting directory
-.It Fl \-remove\-files
-remove files after adding them to the archive
-.It Fl \-restrict
-disable use of some potentially harmful options
-.It Fl \-rmt\-command Ns \= Ns Ar COMMAND
-use given rmt COMMAND instead of rmt
-.It Fl \-rsh\-command Ns \= Ns Ar COMMAND
-use remote COMMAND instead of rsh
-.It Fl s , Fl \-preserve\-order , Fl \-same\-order
-sort names to extract to match archive
-.It Fl S , Fl \-sparse
-handle sparse files efficiently
-.It Fl \-same\-owner
-try extracting files with the same ownership as exists in the archive (default for superuser)
-.It Fl \-no\-same\-owner
-extract files as yourself (default for ordinary users)
-.It Fl \-no\-same\-permissions
-apply the user's umask when extracting permissions from the archive (default for ordinary users)
-.It Fl \-no\-seek
-archive is not seekable
-.It Fl \-show\-defaults
-show tar defaults
-.It Fl \-show\-omitted\-dirs
-when listing or extracting, list each directory that does not match search criteria
-.It Fl \-show\-transformed\-names , Fl \-show\-stored\-names
-show file or archive names after transformation
-.It Fl \-sparse\-version Ns \= Ns Ar MAJOR[.MINOR]
-set version of the sparse format to use (implies --sparse)
-.It Fl \-strip\-components Ns \= Ns Ar NUMBER
-strip NUMBER leading components from file names on extraction
-.It Fl \-suffix Ns \= Ns Ar STRING
-backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)
-.It Fl T , Fl \-files\-from Ar FILE
-get names to extract or create from FILE
-.It Fl \-to\-command Ns \= Ns Ar COMMAND
-pipe extracted files to another program
-.It Fl \-totals
-print total bytes after processing the archive; 
-.It Fl \-transform , Fl \-xform Ar EXPRESSION
-use sed replace EXPRESSION to transform file names
-.It Fl U , Fl \-unlink\-first
-remove each file prior to extracting over it
-.It Fl \-unquote
-unquote filenames read with -T (default)
-.It Fl \-no\-unquote
-do not unquote filenames read with -T
-.It Fl \-utc
-print file modification times in UTC
-.It Fl v , Fl \-verbose
-verbosely list files processed
-.It Fl V , Fl \-label Ar TEXT
-create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name
-.It Fl \-volno\-file Ns \= Ns Ar FILE
-use/update the volume number in FILE
-.It Fl w , Fl \-interactive , Fl \-confirmation
-ask for confirmation for every action
-.It Fl W , Fl \-verify
-attempt to verify the archive after writing it
-.It Fl \-warning Ns \= Ns Ar KEYWORD
-warning control
-.It Fl \-wildcards
-use wildcards (default for exclusion)
-.It Fl \-wildcards\-match\-slash
-wildcards match `/' (default for exclusion)
-.It Fl \-no\-wildcards\-match\-slash
-wildcards do not match `/'
-.It Fl \-no\-wildcards
-verbatim string matching
-.It Fl X , Fl \-exclude\-from Ar FILE
-exclude patterns listed in FILE
-.It Fl z , Fl \-gzip , Fl \-gunzip Fl \-ungzip
-
-.It Fl Z , Fl \-compress , Fl \-uncompress
-
-.El
-.Sh ENVIRONMENT
-The behavior of tar is controlled by the following environment variables,
-among others:
-.Bl -tag -width Ds
-.It Ev SIMPLE_BACKUP_SUFFIX
-Backup prefix to use when extracting, if
-.Fl \-suffix
-is not specified.
-The backup suffix defaults to `~' if neither is specified.
-.It Ev TAR_OPTIONS
-Options to prepend to those specified on the command line, separated by
-whitespace.  Embedded backslashes may be used to escape whitespace or
-backslashes within an option.
-.It Ev TAPE
-Device or file to use for the archive if 
-.Fl \-file
-is not specified.
-If this environment variable is unset, use stdin or stdout instead.
-.It Ev TAR_LONGLINK_100
-.El
-.Sh EXAMPLES
-Create archive.tar from files foo and bar.
-.Bd -literal -offset indent -compact
-tar \-cf archive.tar foo bar
-.Ed
-List all files in archive.tar verbosely.
-.Bd -literal -offset indent -compact
-tar \-tvf archive.tar
-.Ed
-Extract all files from archive.tar.
-.Bd -literal -offset indent -compact
-tar \-xf archive.tar
-.Ed
-.Sh SEE ALSO
-.\" libarchive
-.Xr tar 5 ,
-.\" man-pages
-.Xr symlink 7 ,
-.Xr rmt 8
-.Sh HISTORY
-The
-.Nm tar
-command appeared in
-.At v7 .
-.Sh BUGS
-The GNU folks, in general, abhor man pages, and create info documents instead.
-Unfortunately, the info document describing tar is licensed under the GFDL with
-invariant cover texts, which makes it impossible to include any text
-from that document in this man page.
-Most of the text in this document was automatically extracted from the usage
-text in the source.
-It may not completely describe all features of the program.
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD
index b46d66e79..c2de2098b 100644
--- a/extra/aisleriot/PKGBUILD
+++ b/extra/aisleriot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188075 2013-06-08 11:18:20Z bpiotrowski $
+# $Id: PKGBUILD 196010 2013-10-07 11:50:21Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=aisleriot
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A collection of patience games written in guile scheme"
 arch=(i686 x86_64)
@@ -16,8 +16,8 @@ optdepends=('libkdegames: KDE card sets'
             'pysolfc-cardsets: PySol card sets')
 options=('!emptydirs' '!libtool')
 install=aisleriot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('14954fe77fa953b20f5385292743857f79efd45e8b75fb06807e7cf17f9db004')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2b96e73fa2e3c75afc27b2a572c4175943fbaac015824a6f49c41bf479b26e02')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 08e717bd1..211dc2487 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191591 2013-07-26 06:33:36Z andrea $
+# $Id: PKGBUILD 196161 2013-10-07 12:32:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.10.2
+pkgver=1.10.3
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano')
 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=('35eb8f76588b1d111f75bc46e3ac784b')
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}-1.tar.bz2")
+md5sums=('3929b765baa3dc0d548a26893c64abcf')
 
 prepare() {
   mkdir build
diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD
index ebcdc4acd..aceedb6a6 100644
--- a/extra/anjuta-extras/PKGBUILD
+++ b/extra/anjuta-extras/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 183329 2013-04-21 22:08:26Z heftig $
+# $Id: PKGBUILD 196013 2013-10-07 11:50:25Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=anjuta-extras
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Anjuta Integrated Development Environment extra plugins"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('anjuta')
-makedepends=('intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'itstool')
 install=anjuta-extras.install
 url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('115c2f51017aa51edc6bfc7a2d2084e26b29d3df353ed2a92e40f9e3ae28a761')
+sha256sums=('92f92e3c530f5649edfe4d8645e8cfd3161383cbc486c636ebb24cf2d2642213')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index b5d0d6622..b1b552b57 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 188637 2013-06-17 09:36:56Z jgc $
+# $Id: PKGBUILD 196012 2013-10-07 11:50:24Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=(i686 x86_64)
 license=(GPL)
-makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf
+makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf
              gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs
              python)
 url="http://www.anjuta.org/"
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17')
+sha256sums=('72c8569fcd629f3ed1f248cfd452e1f0b473e890421679bd5bb4d6ab2ce3fedb')
 
 build() {
   cd "$pkgbase-$pkgver"
@@ -38,7 +38,7 @@ package_libanjuta(){
 
 package_anjuta(){
   pkgdesc="GNOME Integrated Development Environment (IDE)"
-  depends=(libanjuta vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf)
+  depends=(libanjuta vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf)
   groups=('gnome-extra')
 
   install=anjuta.install
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index 520ac9876..c912b011a 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183331 2013-04-21 22:08:29Z heftig $
+# $Id: PKGBUILD 196015 2013-10-07 11:50:27Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-atk
-pkgver=2.8.1
+pkgver=2.10.0
 pkgrel=1
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('at-spi2-core' 'libx11' 'atk')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eb659b94fde6dc0a2f584c9121a5e6d39a4c8aa297d21d8f9032f7a8a775fd06')
+sha256sums=('dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index dbbdd3d22..2274f74c5 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183332 2013-04-21 22:08:31Z heftig $
+# $Id: PKGBUILD 196016 2013-10-07 11:50:29Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.8.0
+pkgver=2.10.0
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('dbus' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458')
+sha256sums=('964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD
index 969a1cfb1..a7187ebf7 100644
--- a/extra/atk/PKGBUILD
+++ b/extra/atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183330 2013-04-21 22:08:28Z heftig $
+# $Id: PKGBUILD 196014 2013-10-07 11:50:26Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=atk
-pkgver=2.8.0
+pkgver=2.10.0
 pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 url='http://www.gtk.org/'
-sha256sums=('b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4')
+sha256sums=('636917a5036bc851d8491194645d284798ec118919a828be5e713b6ecc5b50b0')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD
index 6079616fd..c6faa8e06 100644
--- a/extra/baobab/PKGBUILD
+++ b/extra/baobab/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185372 2013-05-13 18:01:12Z heftig $
+# $Id: PKGBUILD 196017 2013-10-07 11:50:30Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=baobab
-pkgver=3.8.2
+pkgver=3.10
 pkgrel=1
 pkgdesc="A graphical directory tree analyzer"
 arch=(i686 x86_64)
@@ -12,8 +12,8 @@ depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'deskto
 makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
 groups=('gnome')
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('68ce73e34378909a384d17355d2b80c14423dc54ace6a363dc93653cf608614a')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6f4e309073c3834f957b957b03d388fd89900a1622a001d238ad6105c6e303ee')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD
index 2c889b6bb..1d4e62015 100644
--- a/extra/bijiben/PKGBUILD
+++ b/extra/bijiben/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 193200 2013-08-19 01:30:39Z heftig $
+# $Id: PKGBUILD 196018 2013-10-07 11:50:31Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=bijiben
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Write out notes, every detail matters"
 arch=(i686 x86_64)
 url="https://live.gnome.org/Bijiben"
 license=(GPL)
-depends=(tracker clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils)
+depends=(tracker clutter-gtk zeitgeist webkitgtk hicolor-icon-theme desktop-file-utils gnome-online-accounts)
 makedepends=(intltool itstool)
 options=(!emptydirs)
 install=bijiben.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5b8f6580fa726139dd707bea8ee581531c21b8470c04723b9b1046033cb999db')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('82817151d7a69190944447bcc7cd12306160c2edce2d0e2ddbfd15ae2d2a6d10')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib/$pkgname
+    --libexecdir=/usr/lib/$pkgname --disable-update-mimedb
   make
 }
 
diff --git a/extra/bijiben/bijiben.install b/extra/bijiben/bijiben.install
index 8b17fa3d4..8f9149ffc 100644
--- a/extra/bijiben/bijiben.install
+++ b/extra/bijiben/bijiben.install
@@ -2,6 +2,7 @@ post_install() {
     glib-compile-schemas /usr/share/glib-2.0/schemas
     update-desktop-database -q
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-mime-database /usr/share/mime
 }
 
 post_upgrade() {
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index b96d207bc..9401392ed 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 183335 2013-04-21 22:08:35Z heftig $
+# $Id: PKGBUILD 196019 2013-10-07 11:50:33Z jgc $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=brasero
 pkgver=3.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/brasero"
@@ -20,14 +20,23 @@ optdepends=('libburn: alternative back-end'
 replaces=('nautilus-cd-burner')
 install=brasero.install
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        bug655513.patch)
+sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4'
+            '3e774040c570881fe120af7c250a91e8a69331289490c823feed87c4d00f98fb')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
 
   # Update tracker dep
   sed -i '/tracker/s/0\.14/0.16/' configure.ac
+
+  # Fix infinite loop after cancelling the burn image dialog
+  patch -Np1 -i ../bug655513.patch
+}
+  
+build() {
+  cd "$pkgname-$pkgver"
   autoreconf -f -v -i
 
   ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/extra/brasero/bug655513.patch b/extra/brasero/bug655513.patch
new file mode 100644
index 000000000..c5841d3f7
--- /dev/null
+++ b/extra/brasero/bug655513.patch
@@ -0,0 +1,37 @@
+From f122ee0620380b7c21edce722cfe347f10c8c827 Mon Sep 17 00:00:00 2001
+From: Joshua Lock <joshua.lock@intel.com>
+Date: Tue, 03 Sep 2013 10:01:26 +0000
+Subject: brasero-app: don't try and show the main window if it hasn't been created
+
+It's possible to open brasero without creating the main window, such as
+when opening an image file directly triggering the image burning dialogue.
+In these cases trying to show the main window when the dialogue is
+dismissed is an error, brasero should just exit.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=655513
+---
+diff --git a/src/brasero-app.c b/src/brasero-app.c
+index d345941..8d10781 100644
+--- a/src/brasero-app.c
++++ b/src/brasero-app.c
+@@ -2013,6 +2013,9 @@ brasero_app_run_mainwin (BraseroApp *app)
+ 
+ 	priv = BRASERO_APP_PRIVATE (app);
+ 
++	if (!priv->mainwin)
++		return FALSE;
++
+ 	if (priv->mainwin_running)
+ 		return TRUE;
+ 
+@@ -2055,6 +2058,8 @@ brasero_app_init (BraseroApp *object)
+ 
+ 	priv = BRASERO_APP_PRIVATE (object);
+ 
++	priv->mainwin = NULL;
++
+ 	/* Load settings */
+ 	priv->setting = brasero_setting_get_default ();
+ 	brasero_setting_load (priv->setting);
+--
+cgit v0.9.2
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index e3508954b..53f1590ab 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191326 2013-07-23 16:47:58Z jgc $
+# $Id: PKGBUILD 196020 2013-10-07 11:50:34Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.8.3
+pkgver=3.10.0
 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)
@@ -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=('5f08079b6ccaa6ea8de9163ff0e43554347c12e13f0a60eb6ad06d291c116937')
+sha256sums=('eb0d8ba5211a4fe804d540e16a7fb61f16c467e23b106370723c32731b6e620b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 60cec1307..87a82c42e 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191304 2013-07-23 13:13:07Z heftig $
+# $Id: PKGBUILD 196022 2013-10-07 11:50:36Z jgc $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
-pkgver=2.0.6
+pkgver=2.0.8
 pkgrel=1
 pkgdesc="GStreamer bindings for clutter"
 arch=(i686 x86_64)
@@ -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=('0ecc5630b0578968201802b831a75904a26e6ffe38fb8b60209ef9da51f8b258')
+sha256sums=('cee6b0667c74a54fdf43f0ec7c1dc8ff0ffd1c594e0d43529de45048f8080a4d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index 07eab4588..247301f28 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189885 2013-07-10 14:58:18Z jgc $
+# $Id: PKGBUILD 196023 2013-10-07 11:50:36Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=clutter-gtk
 pkgver=1.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64')
 url="http://clutter-project.org/"
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index 3f7ddbd14..b01a25c32 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 190119 2013-07-15 21:53:44Z tomegun $
+# $Id: PKGBUILD 196021 2013-10-07 11:50:34Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.14.4
-pkgrel=3
+pkgver=1.16.0
+pkgrel=1
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
-depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon')
+depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev')
 makedepends=('gobject-introspection')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c')
+sha256sums=('a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae')
 
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --enable-introspection \
-    --enable-wayland-backend --enable-egl-backend --enable-evdev-input
+    --enable-wayland-backend --enable-egl-backend --enable-evdev-input \
+    --enable-wayland-compositor
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 72aa066c1..26fa8133b 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194508 2013-09-17 02:50:40Z heftig $
+# $Id: PKGBUILD 196024 2013-10-07 11:50:37Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.14.0
-pkgrel=5
+pkgver=1.16.0
+pkgrel=2
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=('i686' 'x86_64')
 url="http://www.clutter-project.org/"
@@ -11,23 +11,15 @@ license=('GPL2')
 depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
 options=(!libtool !emptydirs)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        git-fixes.patch)
-sha256sums=('276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8'
-            '5f9279122cabf5cce23c1e19cedd9e67231f63a4d35329924b256fc1adc1aab2')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  # Update to ba5e5410babf705f53b591579c104181dd752bec
-  # Removed version parts from configure.ac and .gitignore parts, removed conflicting it.po and eu.po commits
-  patch -Np1 -i ../git-fixes.patch
-}
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094')
 
 build() {
   cd "$pkgname-$pkgver"
-  autoreconf -fi
   ./configure --prefix=/usr \
-    --enable-wayland-egl-platform --enable-gles{1,2}
+    --enable-gles{1,2} \
+    --enable-{kms,wayland}-egl-platform \
+    --enable-wayland-egl-server
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/extra/cogl/git-fixes.patch b/extra/cogl/git-fixes.patch
deleted file mode 100644
index 2d16a1262..000000000
--- a/extra/cogl/git-fixes.patch
+++ /dev/null
@@ -1,1948 +0,0 @@
-diff --git a/cogl/Makefile.am b/cogl/Makefile.am
-index 33214ab..80d3b09 100644
---- a/cogl/Makefile.am
-+++ b/cogl/Makefile.am
-@@ -349,6 +349,8 @@ cogl_sources_c = \
- 	$(srcdir)/cogl-pipeline-snippet.c		\
- 	$(srcdir)/cogl-pipeline-cache.h			\
- 	$(srcdir)/cogl-pipeline-cache.c			\
-+	$(srcdir)/cogl-pipeline-hash-table.h		\
-+	$(srcdir)/cogl-pipeline-hash-table.c		\
- 	$(srcdir)/cogl-material-compat.c		\
- 	$(srcdir)/cogl-program.c			\
- 	$(srcdir)/cogl-program-private.h		\
-@@ -552,7 +554,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.enums
- 
- lib_LTLIBRARIES += libcogl.la
- 
--libcogl_la_LIBADD = -lm $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
-+libcogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
- if !USE_GLIB
- libcogl_la_LIBADD += $(top_builddir)/deps/glib/libglib.la
- libcogl_la_LIBADD += $(top_builddir)/deps/gmodule/libgmodule.la
-diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl-atlas-texture.c
-index 7f62efc..30dd319 100644
---- a/cogl/cogl-atlas-texture.c
-+++ b/cogl/cogl-atlas-texture.c
-@@ -276,7 +276,8 @@ _cogl_atlas_texture_free (CoglAtlasTexture *atlas_tex)
- {
-   _cogl_atlas_texture_remove_from_atlas (atlas_tex);
- 
--  cogl_object_unref (atlas_tex->sub_texture);
-+  if (atlas_tex->sub_texture)
-+    cogl_object_unref (atlas_tex->sub_texture);
- 
-   /* Chain up */
-   _cogl_texture_free (COGL_TEXTURE (atlas_tex));
-diff --git a/cogl/cogl-auto-texture.c b/cogl/cogl-auto-texture.c
-index 6de2e32..9a5819d 100644
---- a/cogl/cogl-auto-texture.c
-+++ b/cogl/cogl-auto-texture.c
-@@ -179,14 +179,6 @@ _cogl_texture_new_from_bitmap (CoglBitmap *bitmap,
-                                                         &internal_error)))
-     return COGL_TEXTURE (atlas_tex);
- 
--  if (cogl_error_matches (internal_error,
--                          COGL_SYSTEM_ERROR,
--                          COGL_SYSTEM_ERROR_NO_MEMORY))
--    {
--      _cogl_propagate_error (error, internal_error);
--      return NULL;
--    }
--
-   cogl_error_free (internal_error);
-   internal_error = NULL;
- 
-@@ -200,14 +192,6 @@ _cogl_texture_new_from_bitmap (CoglBitmap *bitmap,
-                                                            internal_format,
-                                                            &internal_error));
- 
--      if (cogl_error_matches (internal_error,
--                              COGL_SYSTEM_ERROR,
--                              COGL_SYSTEM_ERROR_NO_MEMORY))
--        {
--          _cogl_propagate_error (error, internal_error);
--          return NULL;
--        }
--
-       if (!tex)
-         {
-           cogl_error_free (internal_error);
-diff --git a/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl-bitmap-pixbuf.c
-index a02b253..ad34234 100644
---- a/cogl/cogl-bitmap-pixbuf.c
-+++ b/cogl/cogl-bitmap-pixbuf.c
-@@ -125,11 +125,24 @@ _cogl_bitmap_from_file (CoglContext *ctx,
-   /* allocate buffer big enough to hold pixel data */
-   bmp = _cogl_bitmap_new_with_malloc_buffer (ctx,
-                                              width, height,
--                                             COGL_PIXEL_FORMAT_ARGB_8888);
-+                                             COGL_PIXEL_FORMAT_ARGB_8888,
-+                                             error);
-+  if (bmp == NULL)
-+    {
-+      CFRelease (image);
-+      return NULL;
-+    }
-   rowstride = cogl_bitmap_get_rowstride (bmp);
-   out_data = _cogl_bitmap_map (bmp,
-                                COGL_BUFFER_ACCESS_WRITE,
--                               COGL_BUFFER_MAP_HINT_DISCARD);
-+                               COGL_BUFFER_MAP_HINT_DISCARD,
-+                               error);
-+  if (out_data == NULL)
-+    {
-+      cogl_object_unref (bmp);
-+      CFRelease (image);
-+      return NULL;
-+    }
- 
-   /* render to buffer */
-   color_space = CGColorSpaceCreateWithName (kCGColorSpaceGenericRGB);
-diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c
-index 175e69d..359e112 100644
---- a/cogl/cogl-context.c
-+++ b/cogl/cogl-context.c
-@@ -133,7 +133,7 @@ cogl_context_new (CoglDisplay *display,
-                   CoglError **error)
- {
-   CoglContext *context;
--  GLubyte default_texture_data[] = { 0xff, 0xff, 0xff, 0x0 };
-+  uint8_t default_texture_data[] = { 0xff, 0xff, 0xff, 0xff };
-   CoglBitmap *default_texture_bitmap;
-   const CoglWinsysVtable *winsys;
-   int i;
-diff --git a/cogl/cogl-error.c b/cogl/cogl-error.c
-index 753e4c8..f72415b 100644
---- a/cogl/cogl-error.c
-+++ b/cogl/cogl-error.c
-@@ -105,7 +105,10 @@ _cogl_propagate_error (CoglError **dest,
-   _COGL_RETURN_IF_FAIL (src != NULL);
- 
-   if (dest == NULL)
--    cogl_error_free (src);
-+    {
-+      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, "%s", src->message);
-+      cogl_error_free (src);
-+    }
-   else if (*dest)
-     g_warning (ERROR_OVERWRITTEN_WARNING, src->message);
-   else
-diff --git a/cogl/cogl-error.h b/cogl/cogl-error.h
-index 1b6a951..ef6ee7e 100644
---- a/cogl/cogl-error.h
-+++ b/cogl/cogl-error.h
-@@ -30,6 +30,8 @@
- 
- #include "cogl-types.h"
- 
-+COGL_BEGIN_DECLS
-+
- /**
-  * SECTION:cogl-error
-  * @short_description: A way for Cogl to throw exceptions
-@@ -173,4 +175,6 @@ cogl_error_matches (CoglError *error,
- #define COGL_GLIB_ERROR(COGL_ERROR) ((CoglError *)COGL_ERROR)
- #endif
- 
-+COGL_END_DECLS
-+
- #endif /* __COGL_ERROR_H__ */
-diff --git a/cogl/cogl-fixed.c b/cogl/cogl-fixed.c
-index e347605..4d92155 100644
---- a/cogl/cogl-fixed.c
-+++ b/cogl/cogl-fixed.c
-@@ -30,6 +30,10 @@
- #include <glib-object.h>
- #include <gobject/gvaluecollector.h>
- 
-+#ifdef HAVE_FLOAT_WORD_ORDER
-+#include <endian.h>
-+#endif
-+
- #include "cogl-fixed.h"
- 
- /* pre-computed sin table for 1st quadrant
-@@ -306,6 +310,7 @@ static const double _magic = 68719476736.0 * 1.5;
-  *
-  * FIXME - this should go inside the configure.ac
-  */
-+#ifdef HAVE_FLOAT_WORD_ORDER
- #if (__FLOAT_WORD_ORDER == 1234)
- #define _COGL_MAN			0
- #elif (__FLOAT_WORD_ORDER == 4321)
-@@ -313,6 +318,9 @@ static const double _magic = 68719476736.0 * 1.5;
- #else
- #define COGL_NO_FAST_CONVERSIONS
- #endif
-+#else /* HAVE_FLOAT_WORD_ORDER */
-+#define COGL_NO_FAST_CONVERSIONS
-+#endif /* HAVE_FLOAT_WORD_ORDER */
- 
- /*
-  * cogl_double_to_fixed :
-@@ -629,7 +637,7 @@ cogl_fixed_sqrt (CoglFixed x)
- 	/*
- 	 * Find the highest bit set
- 	 */
--#if defined (__arm__) && !defined(__ARM_ARCH_4T__)
-+#if defined (__arm__) && !defined(__ARM_ARCH_4T__) && !defined(__thumb__)
- 	/* This actually requires at least arm v5, but gcc does not seem
- 	 * to set the architecture defines correctly, and it is I think
- 	 * very unlikely that anyone will want to use clutter on anything
-@@ -807,7 +815,7 @@ CoglFixed
- cogl_fixed_mul (CoglFixed a,
-                 CoglFixed b)
- {
--#ifdef __arm__
-+#if defined(__arm__) && !defined(__thumb__)
-   /* This provides about 12% speedeup on the gcc -O2 optimised
-    * C version
-    *
-@@ -819,7 +827,7 @@ cogl_fixed_mul (CoglFixed a,
-   __asm__ ("smull %0, %1, %2, %3     \n"
-            "mov   %0, %0,     lsr %4 \n"
-            "add   %1, %0, %1, lsl %5 \n"
--           : "=r"(res_hi), "=r"(res_low) \
-+           : "=&r"(res_hi), "=&r"(res_low) \
-            : "r"(a), "r"(b), "i"(COGL_FIXED_Q), "i"(32 - COGL_FIXED_Q));
- 
-   return (CoglFixed) res_low;
-diff --git a/cogl/cogl-matrix.h b/cogl/cogl-matrix.h
-index 90f3ea9..a136ea0 100644
---- a/cogl/cogl-matrix.h
-+++ b/cogl/cogl-matrix.h
-@@ -27,6 +27,8 @@
- #ifndef __COGL_MATRIX_H
- #define __COGL_MATRIX_H
- 
-+#include <cogl/cogl-defines.h>
-+
- #ifdef COGL_HAS_GTYPE_SUPPORT
- #include <glib-object.h>
- #endif /* COGL_HAS_GTYPE_SUPPORT */
-diff --git a/cogl/cogl-pipeline-cache.c b/cogl/cogl-pipeline-cache.c
-index fab3614..df4c433 100644
---- a/cogl/cogl-pipeline-cache.c
-+++ b/cogl/cogl-pipeline-cache.c
-@@ -3,7 +3,7 @@
-  *
-  * An object oriented GL/GLES Abstraction/Utility Layer
-  *
-- * Copyright (C) 2011 Intel Corporation.
-+ * Copyright (C) 2011, 2013 Intel Corporation.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -32,133 +32,47 @@
- #include "cogl-context-private.h"
- #include "cogl-pipeline-private.h"
- #include "cogl-pipeline-cache.h"
-+#include "cogl-pipeline-hash-table.h"
- 
- struct _CoglPipelineCache
- {
--  GHashTable *fragment_hash;
--  GHashTable *vertex_hash;
--  GHashTable *combined_hash;
-+  CoglPipelineHashTable fragment_hash;
-+  CoglPipelineHashTable vertex_hash;
-+  CoglPipelineHashTable combined_hash;
- };
- 
--static unsigned int
--pipeline_fragment_hash (const void *data)
--{
--  unsigned int fragment_state;
--  unsigned int layer_fragment_state;
--
--  _COGL_GET_CONTEXT (ctx, 0);
--
--  fragment_state =
--    _cogl_pipeline_get_state_for_fragment_codegen (ctx);
--  layer_fragment_state =
--    _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx);
--
--  return _cogl_pipeline_hash ((CoglPipeline *)data,
--                              fragment_state, layer_fragment_state,
--                              0);
--}
--
--static CoglBool
--pipeline_fragment_equal (const void *a, const void *b)
-+CoglPipelineCache *
-+_cogl_pipeline_cache_new (void)
- {
-+  CoglPipelineCache *cache = g_new (CoglPipelineCache, 1);
-+  unsigned long vertex_state;
-+  unsigned long layer_vertex_state;
-   unsigned int fragment_state;
-   unsigned int layer_fragment_state;
- 
-   _COGL_GET_CONTEXT (ctx, 0);
- 
-+  vertex_state =
-+    COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN;
-+  layer_vertex_state =
-+    COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN;
-   fragment_state =
-     _cogl_pipeline_get_state_for_fragment_codegen (ctx);
-   layer_fragment_state =
-     _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx);
- 
--  return _cogl_pipeline_equal ((CoglPipeline *)a, (CoglPipeline *)b,
--                               fragment_state, layer_fragment_state,
--                               0);
--}
--
--static unsigned int
--pipeline_vertex_hash (const void *data)
--{
--  unsigned long vertex_state =
--    COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN;
--  unsigned long layer_vertex_state =
--    COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN;
--
--  return _cogl_pipeline_hash ((CoglPipeline *)data,
--                              vertex_state, layer_vertex_state,
--                              0);
--}
--
--static CoglBool
--pipeline_vertex_equal (const void *a, const void *b)
--{
--  unsigned long vertex_state =
--    COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN;
--  unsigned long layer_vertex_state =
--    COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN;
--
--  return _cogl_pipeline_equal ((CoglPipeline *)a, (CoglPipeline *)b,
--                               vertex_state, layer_vertex_state,
--                               0);
--}
--
--static unsigned int
--pipeline_combined_hash (const void *data)
--{
--  unsigned int combined_state;
--  unsigned int layer_combined_state;
--
--  _COGL_GET_CONTEXT (ctx, 0);
--
--  combined_state =
--    _cogl_pipeline_get_state_for_fragment_codegen (ctx) |
--    COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN;
--  layer_combined_state =
--    _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx) |
--    COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN;
--
--  return _cogl_pipeline_hash ((CoglPipeline *)data,
--                              combined_state, layer_combined_state,
--                              0);
--}
--
--static CoglBool
--pipeline_combined_equal (const void *a, const void *b)
--{
--  unsigned int combined_state;
--  unsigned int layer_combined_state;
--
--  _COGL_GET_CONTEXT (ctx, 0);
--
--  combined_state =
--    _cogl_pipeline_get_state_for_fragment_codegen (ctx) |
--    COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN;
--  layer_combined_state =
--    _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx) |
--    COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN;
--
--  return _cogl_pipeline_equal ((CoglPipeline *)a, (CoglPipeline *)b,
--                               combined_state, layer_combined_state,
--                               0);
--}
--
--CoglPipelineCache *
--_cogl_pipeline_cache_new (void)
--{
--  CoglPipelineCache *cache = g_new (CoglPipelineCache, 1);
--
--  cache->fragment_hash = g_hash_table_new_full (pipeline_fragment_hash,
--                                                pipeline_fragment_equal,
--                                                cogl_object_unref,
--                                                cogl_object_unref);
--  cache->vertex_hash = g_hash_table_new_full (pipeline_vertex_hash,
--                                              pipeline_vertex_equal,
--                                              cogl_object_unref,
--                                              cogl_object_unref);
--  cache->combined_hash = g_hash_table_new_full (pipeline_combined_hash,
--                                                pipeline_combined_equal,
--                                                cogl_object_unref,
--                                                cogl_object_unref);
-+  _cogl_pipeline_hash_table_init (&cache->vertex_hash,
-+                                  vertex_state,
-+                                  layer_vertex_state,
-+                                  "vertex shaders");
-+  _cogl_pipeline_hash_table_init (&cache->fragment_hash,
-+                                  fragment_state,
-+                                  layer_fragment_state,
-+                                  "fragment shaders");
-+  _cogl_pipeline_hash_table_init (&cache->combined_hash,
-+                                  vertex_state | fragment_state,
-+                                  layer_vertex_state | layer_fragment_state,
-+                                  "programs");
- 
-   return cache;
- }
-@@ -166,9 +80,9 @@ _cogl_pipeline_cache_new (void)
- void
- _cogl_pipeline_cache_free (CoglPipelineCache *cache)
- {
--  g_hash_table_destroy (cache->fragment_hash);
--  g_hash_table_destroy (cache->vertex_hash);
--  g_hash_table_destroy (cache->combined_hash);
-+  _cogl_pipeline_hash_table_destroy (&cache->fragment_hash);
-+  _cogl_pipeline_hash_table_destroy (&cache->vertex_hash);
-+  _cogl_pipeline_hash_table_destroy (&cache->combined_hash);
-   g_free (cache);
- }
- 
-@@ -176,107 +90,22 @@ CoglPipeline *
- _cogl_pipeline_cache_get_fragment_template (CoglPipelineCache *cache,
-                                             CoglPipeline *key_pipeline)
- {
--  CoglPipeline *template =
--    g_hash_table_lookup (cache->fragment_hash, key_pipeline);
--
--  if (template == NULL)
--    {
--      /* XXX: I wish there was a way to insert into a GHashTable with
--       * a pre-calculated hash value since there is a cost to
--       * calculating the hash of a CoglPipeline and in this case we
--       * know we have already called _cogl_pipeline_hash during the
--       * lookup so we could pass the value through to here to avoid
--       * hashing it again.
--       */
--
--      /* XXX: Any keys referenced by the hash table need to remain
--       * valid all the while that there are corresponding values,
--       * so for now we simply make a copy of the current authority
--       * pipeline.
--       *
--       * FIXME: A problem with this is that our key into the cache may
--       * hold references to some arbitrary user textures which will
--       * now be kept alive indefinitly which is a shame. A better
--       * solution will be to derive a special "key pipeline" from the
--       * authority which derives from the base Cogl pipeline (to avoid
--       * affecting the lifetime of any other pipelines) and only takes
--       * a copy of the state that relates to the fragment shader and
--       * references small dummy textures instead of potentially large
--       * user textures. */
--      template = cogl_pipeline_copy (key_pipeline);
--
--      g_hash_table_insert (cache->fragment_hash,
--                           template,
--                           cogl_object_ref (template));
--
--      if (G_UNLIKELY (g_hash_table_size (cache->fragment_hash) > 50))
--        {
--          static CoglBool seen = FALSE;
--          if (!seen)
--            g_warning ("Over 50 separate fragment shaders have been "
--                       "generated which is very unusual, so something "
--                       "is probably wrong!\n");
--          seen = TRUE;
--        }
--    }
--
--  return template;
-+  return _cogl_pipeline_hash_table_get (&cache->fragment_hash,
-+                                        key_pipeline);
- }
- 
- CoglPipeline *
- _cogl_pipeline_cache_get_vertex_template (CoglPipelineCache *cache,
-                                           CoglPipeline *key_pipeline)
- {
--  CoglPipeline *template =
--    g_hash_table_lookup (cache->vertex_hash, key_pipeline);
--
--  if (template == NULL)
--    {
--      template = cogl_pipeline_copy (key_pipeline);
--
--      g_hash_table_insert (cache->vertex_hash,
--                           template,
--                           cogl_object_ref (template));
--
--      if (G_UNLIKELY (g_hash_table_size (cache->vertex_hash) > 50))
--        {
--          static CoglBool seen = FALSE;
--          if (!seen)
--            g_warning ("Over 50 separate vertex shaders have been "
--                       "generated which is very unusual, so something "
--                       "is probably wrong!\n");
--          seen = TRUE;
--        }
--    }
--
--  return template;
-+  return _cogl_pipeline_hash_table_get (&cache->vertex_hash,
-+                                        key_pipeline);
- }
- 
- CoglPipeline *
- _cogl_pipeline_cache_get_combined_template (CoglPipelineCache *cache,
-                                             CoglPipeline *key_pipeline)
- {
--  CoglPipeline *template =
--    g_hash_table_lookup (cache->combined_hash, key_pipeline);
--
--  if (template == NULL)
--    {
--      template = cogl_pipeline_copy (key_pipeline);
--
--      g_hash_table_insert (cache->combined_hash,
--                           template,
--                           cogl_object_ref (template));
--
--      if (G_UNLIKELY (g_hash_table_size (cache->combined_hash) > 50))
--        {
--          static CoglBool seen = FALSE;
--          if (!seen)
--            g_warning ("Over 50 separate programs have been "
--                       "generated which is very unusual, so something "
--                       "is probably wrong!\n");
--          seen = TRUE;
--        }
--    }
--
--  return template;
-+  return _cogl_pipeline_hash_table_get (&cache->combined_hash,
-+                                        key_pipeline);
- }
-diff --git a/cogl/cogl-pipeline-hash-table.c b/cogl/cogl-pipeline-hash-table.c
-new file mode 100644
-index 0000000..8921efc
---- /dev/null
-+++ b/cogl/cogl-pipeline-hash-table.c
-@@ -0,0 +1,153 @@
-+/*
-+ * Cogl
-+ *
-+ * An object oriented GL/GLES Abstraction/Utility Layer
-+ *
-+ * Copyright (C) 2013 Intel Corporation.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library. If not, see
-+ * <http://www.gnu.org/licenses/>.
-+ *
-+ *
-+ * Authors:
-+ *   Neil Roberts <neil@linux.intel.com>
-+ *   Robert Bragg <robert@linux.intel.com>
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include "cogl-context-private.h"
-+#include "cogl-pipeline-private.h"
-+#include "cogl-pipeline-hash-table.h"
-+
-+typedef struct
-+{
-+  /* The template pipeline */
-+  CoglPipeline *pipeline;
-+
-+  /* Calculating the hash is a little bit expensive for pipelines so
-+   * we don't want to do it repeatedly for entries that are already in
-+   * the hash table. Instead we cache the value here and calculate it
-+   * outside of the GHashTable. */
-+  unsigned int hash_value;
-+
-+  /* GHashTable annoyingly doesn't let us pass a user data pointer to
-+   * the hash and equal functions so to work around it we have to
-+   * store the pointer in every hash table entry. We will use this
-+   * entry as both the key and the value */
-+  CoglPipelineHashTable *hash;
-+} CoglPipelineHashTableEntry;
-+
-+static void
-+value_destroy_cb (void *value)
-+{
-+  CoglPipelineHashTableEntry *entry = value;
-+
-+  cogl_object_unref (entry->pipeline);
-+
-+  g_slice_free (CoglPipelineHashTableEntry, entry);
-+}
-+
-+static unsigned int
-+entry_hash (const void *data)
-+{
-+  const CoglPipelineHashTableEntry *entry = data;
-+
-+  return entry->hash_value;
-+}
-+
-+static CoglBool
-+entry_equal (const void *a,
-+             const void *b)
-+{
-+  const CoglPipelineHashTableEntry *entry_a = a;
-+  const CoglPipelineHashTableEntry *entry_b = b;
-+  const CoglPipelineHashTable *hash = entry_a->hash;
-+
-+  return _cogl_pipeline_equal (entry_a->pipeline,
-+                               entry_b->pipeline,
-+                               hash->main_state,
-+                               hash->layer_state,
-+                               0);
-+}
-+
-+void
-+_cogl_pipeline_hash_table_init (CoglPipelineHashTable *hash,
-+                                unsigned int main_state,
-+                                unsigned int layer_state,
-+                                const char *debug_string)
-+{
-+  hash->n_unique_pipelines = 0;
-+  hash->debug_string = debug_string;
-+  hash->main_state = main_state;
-+  hash->layer_state = layer_state;
-+  hash->table = g_hash_table_new_full (entry_hash,
-+                                       entry_equal,
-+                                       NULL, /* key destroy */
-+                                       value_destroy_cb);
-+}
-+
-+void
-+_cogl_pipeline_hash_table_destroy (CoglPipelineHashTable *hash)
-+{
-+  g_hash_table_destroy (hash->table);
-+}
-+
-+CoglPipeline *
-+_cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash,
-+                               CoglPipeline *key_pipeline)
-+{
-+  CoglPipelineHashTableEntry dummy_entry;
-+  CoglPipelineHashTableEntry *entry;
-+  unsigned int copy_state;
-+
-+  dummy_entry.pipeline = key_pipeline;
-+  dummy_entry.hash = hash;
-+  dummy_entry.hash_value = _cogl_pipeline_hash (key_pipeline,
-+                                                hash->main_state,
-+                                                hash->layer_state,
-+                                                0);
-+  entry = g_hash_table_lookup (hash->table, &dummy_entry);
-+
-+  if (entry)
-+    return entry->pipeline;
-+
-+  if (hash->n_unique_pipelines == 50)
-+    g_warning ("Over 50 separate %s have been generated which is very "
-+               "unusual, so something is probably wrong!\n",
-+               hash->debug_string);
-+
-+  entry = g_slice_new (CoglPipelineHashTableEntry);
-+  entry->hash = hash;
-+  entry->hash_value = dummy_entry.hash_value;
-+
-+  copy_state = hash->main_state;
-+  if (hash->layer_state)
-+    copy_state |= COGL_PIPELINE_STATE_LAYERS;
-+
-+  /* Create a new pipeline that is a child of the root pipeline
-+   * instead of a normal copy so that the template pipeline won't hold
-+   * a reference to the original pipeline */
-+  entry->pipeline = _cogl_pipeline_deep_copy (key_pipeline,
-+                                              copy_state,
-+                                              hash->layer_state);
-+
-+  g_hash_table_insert (hash->table, entry, entry);
-+
-+  hash->n_unique_pipelines++;
-+
-+  return entry->pipeline;
-+}
-diff --git a/cogl/cogl-pipeline-hash-table.h b/cogl/cogl-pipeline-hash-table.h
-new file mode 100644
-index 0000000..1b0a0d9
---- /dev/null
-+++ b/cogl/cogl-pipeline-hash-table.h
-@@ -0,0 +1,69 @@
-+/*
-+ * Cogl
-+ *
-+ * An object oriented GL/GLES Abstraction/Utility Layer
-+ *
-+ * Copyright (C) 2013 Intel Corporation.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ *
-+ */
-+
-+#ifndef __COGL_PIPELINE_HASH_H__
-+#define __COGL_PIPELINE_HASH_H__
-+
-+#include "cogl-pipeline.h"
-+
-+typedef struct
-+{
-+  /* Total number of pipelines that were ever added to the hash. This
-+   * is not decremented when a pipeline is removed. It is only used to
-+   * generate a warning if an unusually high number of pipelines are
-+   * generated */
-+  int n_unique_pipelines;
-+
-+  /* String that will be used to describe the usage of this hash table
-+   * in the debug warning when too many pipelines are generated. This
-+   * must be a static string because it won't be copied or freed */
-+  const char *debug_string;
-+
-+  unsigned int main_state;
-+  unsigned int layer_state;
-+
-+  GHashTable *table;
-+} CoglPipelineHashTable;
-+
-+void
-+_cogl_pipeline_hash_table_init (CoglPipelineHashTable *hash,
-+                                unsigned int main_state,
-+                                unsigned int layer_state,
-+                                const char *debug_string);
-+
-+void
-+_cogl_pipeline_hash_table_destroy (CoglPipelineHashTable *hash);
-+
-+/*
-+ * Gets a pipeline from the hash that has the same state as
-+ * @key_pipeline according to the limited state bits passed to
-+ * _cogl_pipeline_hash_table_init(). If there is no matching pipelines
-+ * already then a copy of key_pipeline is stored in the hash so that
-+ * it will be used next time the function is called with a similar
-+ * pipeline. In that case the copy itself will be returned
-+ */
-+CoglPipeline *
-+_cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash,
-+                               CoglPipeline *key_pipeline);
-+
-+#endif /* __COGL_PIPELINE_HASH_H__ */
-diff --git a/cogl/cogl-pipeline-layer-private.h b/cogl/cogl-pipeline-layer-private.h
-index 125b967..7577559 100644
---- a/cogl/cogl-pipeline-layer-private.h
-+++ b/cogl/cogl-pipeline-layer-private.h
-@@ -358,6 +358,11 @@ _cogl_pipeline_layer_get_wrap_mode_t (CoglPipelineLayer *layer);
- CoglPipelineWrapMode
- _cogl_pipeline_layer_get_wrap_mode_p (CoglPipelineLayer *layer);
- 
-+void
-+_cogl_pipeline_layer_copy_differences (CoglPipelineLayer *dest,
-+                                       CoglPipelineLayer *src,
-+                                       unsigned long differences);
-+
- unsigned long
- _cogl_pipeline_layer_compare_differences (CoglPipelineLayer *layer0,
-                                           CoglPipelineLayer *layer1);
-diff --git a/cogl/cogl-pipeline-layer.c b/cogl/cogl-pipeline-layer.c
-index d9590c8..9bc26ef 100644
---- a/cogl/cogl-pipeline-layer.c
-+++ b/cogl/cogl-pipeline-layer.c
-@@ -42,6 +42,8 @@
- #include "cogl-context-private.h"
- #include "cogl-texture-private.h"
- 
-+#include <string.h>
-+
- static void
- _cogl_pipeline_layer_free (CoglPipelineLayer *layer);
- 
-@@ -146,6 +148,107 @@ _cogl_get_n_args_for_combine_func (CoglPipelineCombineFunc func)
-   return 0;
- }
- 
-+void
-+_cogl_pipeline_layer_copy_differences (CoglPipelineLayer *dest,
-+                                       CoglPipelineLayer *src,
-+                                       unsigned long differences)
-+{
-+  CoglPipelineLayerBigState *big_dest, *big_src;
-+
-+  if ((differences & COGL_PIPELINE_LAYER_STATE_NEEDS_BIG_STATE) &&
-+      !dest->has_big_state)
-+    {
-+      dest->big_state = g_slice_new (CoglPipelineLayerBigState);
-+      dest->has_big_state = TRUE;
-+    }
-+
-+  big_dest = dest->big_state;
-+  big_src = src->big_state;
-+
-+  dest->differences |= differences;
-+
-+  while (differences)
-+    {
-+      int index = _cogl_util_ffs (differences) - 1;
-+
-+      differences &= ~(1 << index);
-+
-+      /* This convoluted switch statement is just here so that we'll
-+       * get a warning if a new state is added without handling it
-+       * here */
-+      switch (index)
-+        {
-+        case COGL_PIPELINE_LAYER_STATE_COUNT:
-+        case COGL_PIPELINE_LAYER_STATE_UNIT_INDEX:
-+          g_warn_if_reached ();
-+          break;
-+
-+        case COGL_PIPELINE_LAYER_STATE_TEXTURE_TYPE_INDEX:
-+          dest->texture_type = src->texture_type;
-+          break;
-+
-+        case COGL_PIPELINE_LAYER_STATE_TEXTURE_DATA_INDEX:
-+          dest->texture = src->texture;
-+          if (dest->texture)
-+            cogl_object_ref (dest->texture);
-+          break;
-+
-+        case COGL_PIPELINE_LAYER_STATE_SAMPLER_INDEX:
-+          dest->sampler_cache_entry = src->sampler_cache_entry;
-+          break;
-+
-+        case COGL_PIPELINE_LAYER_STATE_COMBINE_INDEX:
-+          {
-+            CoglPipelineCombineFunc func;
-+            int n_args, i;
-+
-+            func = big_src->texture_combine_rgb_func;
-+            big_dest->texture_combine_rgb_func = func;
-+            n_args = _cogl_get_n_args_for_combine_func (func);
-+            for (i = 0; i < n_args; i++)
-+              {
-+                big_dest->texture_combine_rgb_src[i] =
-+                  big_src->texture_combine_rgb_src[i];
-+                big_dest->texture_combine_rgb_op[i] =
-+                  big_src->texture_combine_rgb_op[i];
-+              }
-+
-+            func = big_src->texture_combine_alpha_func;
-+            big_dest->texture_combine_alpha_func = func;
-+            n_args = _cogl_get_n_args_for_combine_func (func);
-+            for (i = 0; i < n_args; i++)
-+              {
-+                big_dest->texture_combine_alpha_src[i] =
-+                  big_src->texture_combine_alpha_src[i];
-+                big_dest->texture_combine_alpha_op[i] =
-+                  big_src->texture_combine_alpha_op[i];
-+              }
-+          }
-+          break;
-+
-+        case COGL_PIPELINE_LAYER_STATE_COMBINE_CONSTANT_INDEX:
-+          memcpy (big_dest->texture_combine_constant,
-+                  big_src->texture_combine_constant,
-+                  sizeof (big_dest->texture_combine_constant));
-+          break;
-+
-+        case COGL_PIPELINE_LAYER_STATE_POINT_SPRITE_COORDS_INDEX:
-+          big_dest->point_sprite_coords = big_src->point_sprite_coords;
-+          break;
-+
-+        case COGL_PIPELINE_LAYER_STATE_VERTEX_SNIPPETS_INDEX:
-+          _cogl_pipeline_snippet_list_copy (&big_dest->vertex_snippets,
-+                                            &big_src->vertex_snippets);
-+          break;
-+
-+        case COGL_PIPELINE_LAYER_STATE_FRAGMENT_SNIPPETS_INDEX:
-+          _cogl_pipeline_snippet_list_copy (&big_dest->fragment_snippets,
-+                                            &big_src->fragment_snippets);
-+          break;
-+        }
-+    }
-+}
-+
- static void
- _cogl_pipeline_layer_init_multi_property_sparse_state (
-                                                   CoglPipelineLayer *layer,
-diff --git a/cogl/cogl-pipeline-private.h b/cogl/cogl-pipeline-private.h
-index 56700b5..acb5653 100644
---- a/cogl/cogl-pipeline-private.h
-+++ b/cogl/cogl-pipeline-private.h
-@@ -845,6 +845,17 @@ _cogl_pipeline_hash (CoglPipeline *pipeline,
-                      unsigned long layer_differences,
-                      CoglPipelineEvalFlags flags);
- 
-+/* Makes a copy of the given pipeline that is a child of the root
-+ * pipeline rather than a child of the source pipeline. That way the
-+ * new pipeline won't hold a reference to the source pipeline. The
-+ * differences specified in @differences and @layer_differences are
-+ * copied across and all other state is left with the default
-+ * values. */
-+CoglPipeline *
-+_cogl_pipeline_deep_copy (CoglPipeline *pipeline,
-+                          unsigned long differences,
-+                          unsigned long layer_differences);
-+
- CoglPipeline *
- _cogl_pipeline_journal_ref (CoglPipeline *pipeline);
- 
-diff --git a/cogl/cogl-pipeline.c b/cogl/cogl-pipeline.c
-index c029f45..a91ad25 100644
---- a/cogl/cogl-pipeline.c
-+++ b/cogl/cogl-pipeline.c
-@@ -2771,6 +2771,97 @@ _cogl_pipeline_hash (CoglPipeline *pipeline,
- 
- typedef struct
- {
-+  CoglContext *context;
-+  CoglPipeline *src_pipeline;
-+  CoglPipeline *dst_pipeline;
-+  unsigned int layer_differences;
-+} DeepCopyData;
-+
-+static CoglBool
-+deep_copy_layer_cb (CoglPipelineLayer *src_layer,
-+                    void *user_data)
-+{
-+  DeepCopyData *data = user_data;
-+  CoglPipelineLayer *dst_layer;
-+  unsigned int differences = data->layer_differences;
-+
-+  dst_layer = _cogl_pipeline_get_layer (data->dst_pipeline, src_layer->index);
-+
-+  while (src_layer != data->context->default_layer_n &&
-+         src_layer != data->context->default_layer_0 &&
-+         differences)
-+    {
-+      unsigned long to_copy = differences & src_layer->differences;
-+
-+      if (to_copy)
-+        {
-+          _cogl_pipeline_layer_copy_differences (dst_layer, src_layer, to_copy);
-+          differences ^= to_copy;
-+        }
-+
-+      src_layer = COGL_PIPELINE_LAYER (COGL_NODE (src_layer)->parent);
-+    }
-+
-+  return TRUE;
-+}
-+
-+CoglPipeline *
-+_cogl_pipeline_deep_copy (CoglPipeline *pipeline,
-+                          unsigned long differences,
-+                          unsigned long layer_differences)
-+{
-+  CoglPipeline *new, *authority;
-+  CoglBool copy_layer_state;
-+
-+  _COGL_GET_CONTEXT (ctx, NULL);
-+
-+  if ((differences & COGL_PIPELINE_STATE_LAYERS))
-+    {
-+      copy_layer_state = TRUE;
-+      differences &= ~COGL_PIPELINE_STATE_LAYERS;
-+    }
-+  else
-+    copy_layer_state = FALSE;
-+
-+  new = cogl_pipeline_new (ctx);
-+
-+  for (authority = pipeline;
-+       authority != ctx->default_pipeline && differences;
-+       authority = COGL_PIPELINE (COGL_NODE (authority)->parent))
-+    {
-+      unsigned long to_copy = differences & authority->differences;
-+
-+      if (to_copy)
-+        {
-+          _cogl_pipeline_copy_differences (new, authority, to_copy);
-+          differences ^= to_copy;
-+        }
-+    }
-+
-+  if (copy_layer_state)
-+    {
-+      DeepCopyData data;
-+
-+      /* The unit index doesn't need to be copied because it should
-+       * end up with the same values anyway because the new pipeline
-+       * will have the same indices as the source pipeline */
-+      layer_differences &= ~COGL_PIPELINE_LAYER_STATE_UNIT;
-+
-+      data.context = ctx;
-+      data.src_pipeline = pipeline;
-+      data.dst_pipeline = new;
-+      data.layer_differences = layer_differences;
-+
-+      _cogl_pipeline_foreach_layer_internal (pipeline,
-+                                             deep_copy_layer_cb,
-+                                             &data);
-+    }
-+
-+  return new;
-+}
-+
-+typedef struct
-+{
-   int i;
-   CoglPipelineLayer **layers;
- } AddLayersToArrayState;
-diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl-xlib-renderer.c
-index 18c0fe6..eb1f51a 100644
---- a/cogl/cogl-xlib-renderer.c
-+++ b/cogl/cogl-xlib-renderer.c
-@@ -238,7 +238,7 @@ update_outputs (CoglRenderer *renderer,
- 
-   _cogl_xlib_renderer_trap_errors (renderer, &state);
- 
--  for (i = 0; i < resources->ncrtc && !error; i++)
-+  for (i = 0; resources && i < resources->ncrtc && !error; i++)
-     {
-       XRRCrtcInfo *crtc_info = NULL;
-       XRROutputInfo *output_info = NULL;
-diff --git a/cogl/cogl-xlib.h b/cogl/cogl-xlib.h
-index 7a6bc7e..5dab8ae 100644
---- a/cogl/cogl-xlib.h
-+++ b/cogl/cogl-xlib.h
-@@ -79,6 +79,8 @@ cogl_xlib_set_display (Display *display);
- CoglFilterReturn
- cogl_xlib_handle_event (XEvent *xevent);
- 
-+COGL_END_DECLS
-+
- #undef __COGL_XLIB_H_INSIDE__
- 
- #endif /* __COGL_XLIB_H__ */
-diff --git a/cogl/driver/gl/cogl-attribute-gl.c b/cogl/driver/gl/cogl-attribute-gl.c
-index ba7e627..bd9c351 100644
---- a/cogl/driver/gl/cogl-attribute-gl.c
-+++ b/cogl/driver/gl/cogl-attribute-gl.c
-@@ -251,17 +251,25 @@ setup_legacy_buffered_attribute (CoglContext *ctx,
-     case COGL_ATTRIBUTE_NAME_ID_TEXTURE_COORD_ARRAY:
-       {
-         int layer_number = attribute->name_state->layer_number;
-+        const CoglPipelineGetLayerFlags flags =
-+          COGL_PIPELINE_GET_LAYER_NO_CREATE;
-         CoglPipelineLayer *layer =
--          _cogl_pipeline_get_layer (pipeline, layer_number);
--        int unit = _cogl_pipeline_layer_get_unit_index (layer);
-+          _cogl_pipeline_get_layer_with_flags (pipeline, layer_number, flags);
- 
--        _cogl_bitmask_set (&ctx->enable_texcoord_attributes_tmp, unit, TRUE);
-+        if (layer)
-+          {
-+            int unit = _cogl_pipeline_layer_get_unit_index (layer);
- 
--        GE (ctx, glClientActiveTexture (GL_TEXTURE0 + unit));
--        GE (ctx, glTexCoordPointer (attribute->d.buffered.n_components,
--                                    attribute->d.buffered.type,
--                                    attribute->d.buffered.stride,
--                                    base + attribute->d.buffered.offset));
-+            _cogl_bitmask_set (&ctx->enable_texcoord_attributes_tmp,
-+                               unit,
-+                               TRUE);
-+
-+            GE (ctx, glClientActiveTexture (GL_TEXTURE0 + unit));
-+            GE (ctx, glTexCoordPointer (attribute->d.buffered.n_components,
-+                                        attribute->d.buffered.type,
-+                                        attribute->d.buffered.stride,
-+                                        base + attribute->d.buffered.offset));
-+          }
-         break;
-       }
-     case COGL_ATTRIBUTE_NAME_ID_POSITION_ARRAY:
-@@ -316,13 +324,24 @@ setup_legacy_const_attribute (CoglContext *ctx,
-         case COGL_ATTRIBUTE_NAME_ID_TEXTURE_COORD_ARRAY:
-           {
-             int layer_number = attribute->name_state->layer_number;
-+            const CoglPipelineGetLayerFlags flags =
-+              COGL_PIPELINE_GET_LAYER_NO_CREATE;
-             CoglPipelineLayer *layer =
--              _cogl_pipeline_get_layer (pipeline, layer_number);
--            int unit = _cogl_pipeline_layer_get_unit_index (layer);
-+              _cogl_pipeline_get_layer_with_flags (pipeline,
-+                                                   layer_number,
-+                                                   flags);
- 
--            GE (ctx, glClientActiveTexture (GL_TEXTURE0 + unit));
-+            if (layer)
-+              {
-+                int unit = _cogl_pipeline_layer_get_unit_index (layer);
-+
-+                GE (ctx, glClientActiveTexture (GL_TEXTURE0 + unit));
- 
--            GE (ctx, glMultiTexCoord4f (vector[0], vector[1], vector[2], vector[3]));
-+                GE (ctx, glMultiTexCoord4f (vector[0],
-+                                            vector[1],
-+                                            vector[2],
-+                                            vector[3]));
-+              }
-             break;
-           }
-         case COGL_ATTRIBUTE_NAME_ID_POSITION_ARRAY:
-diff --git a/cogl/winsys/cogl-winsys-egl-wayland.c b/cogl/winsys/cogl-winsys-egl-wayland.c
-index feeb529..156ecb9 100644
---- a/cogl/winsys/cogl-winsys-egl-wayland.c
-+++ b/cogl/winsys/cogl-winsys-egl-wayland.c
-@@ -370,12 +370,22 @@ _cogl_winsys_egl_onscreen_deinit (CoglOnscreen *onscreen)
-       wayland_onscreen->wayland_egl_native_window = NULL;
-     }
- 
-+  /* NB: The wayland protocol docs explicitly state that
-+   * "wl_shell_surface_destroy() must be called before destroying the
-+   * wl_surface object." ... */
-+  if (wayland_onscreen->wayland_shell_surface)
-+    {
-+      wl_shell_surface_destroy (wayland_onscreen->wayland_shell_surface);
-+      wayland_onscreen->wayland_shell_surface = NULL;
-+    }
-+
-   if (wayland_onscreen->wayland_surface)
-     {
-       wl_surface_destroy (wayland_onscreen->wayland_surface);
-       wayland_onscreen->wayland_surface = NULL;
-     }
- 
-+
-   g_slice_free (CoglOnscreenWayland, wayland_onscreen);
- }
- 
-diff --git a/configure.ac b/configure.ac
-index 43bf407..3d57980 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -178,6 +178,12 @@ dnl internal glib configure (as-glibconfig.m4)
- m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
- 
- dnl ================================================================
-+dnl Find an appropriate libm, for sin() etc.
-+dnl ================================================================
-+LT_LIB_M
-+AC_SUBST(LIBM)
-+
-+dnl ================================================================
- dnl See what platform we are building for
- dnl ================================================================
- AC_CANONICAL_HOST
-@@ -474,6 +480,7 @@ AS_IF(
-     EXPERIMENTAL_OPTIONS="$EXPERIMENTAL_OPTIONS Quartz Core Graphics,"
-     AC_DEFINE([USE_QUARTZ], 1,
- 	      [Use Core Graphics (Quartz) for loading image data])
-+    COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -framework ApplicationServices"
-     COGL_IMAGE_BACKEND="quartz"
-   ],
-   [
-@@ -950,7 +957,7 @@ AS_IF([test "x$enable_kms_egl_platform" = "xyes"],
-         GBM_VERSION=`$PKG_CONFIG --modversion gbm`
-         GBM_MAJOR=`echo $GBM_VERSION | cut -d'.' -f1`
-         GBM_MINOR=`echo $GBM_VERSION | cut -d'.' -f2`
--        GBM_MICRO=`echo $GBM_VERSION | cut -d'.' -f3`
-+        GBM_MICRO=`echo $GBM_VERSION | cut -d'.' -f3 | sed 's/-.*//'`
- 
-         AC_DEFINE_UNQUOTED([COGL_GBM_MAJOR], [$GBM_MAJOR], [The major version for libgbm])
-         AC_DEFINE_UNQUOTED([COGL_GBM_MINOR], [$GBM_MINOR], [The minor version for libgbm])
-@@ -1160,7 +1167,10 @@ dnl ================================================================
- AC_PATH_X
- AC_HEADER_STDC
- AC_CHECK_HEADERS(fcntl.h limits.h unistd.h)
--
-+AC_CHECK_HEADER([endian.h],
-+                [AC_CHECK_DECL([__FLOAT_WORD_ORDER],
-+                               AC_DEFINE([HAVE_FLOAT_WORD_ORDER], [1],
-+                                         [Has the __FLOAT_WORD_ORDER macro]))])
- 
- dnl ================================================================
- dnl Checks for library functions.
-@@ -1173,6 +1183,12 @@ AC_CHECK_FUNCS([ffs])
- dnl 'memmem' is a GNU extension but we have a simple fallback
- AC_CHECK_FUNCS([memmem])
- 
-+dnl This is used in the cogl-gles2-gears example but it is a GNU extension
-+save_libs="$LIBS"
-+LIBS="$LIBS $LIBM"
-+AC_CHECK_FUNCS([sincos])
-+LIBS="$save_libs"
-+
- dnl ================================================================
- dnl Platform values
- dnl ================================================================
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 86801c6..ae3e5f7 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -20,7 +20,8 @@ endif
- 
- common_ldadd = \
- 	$(COGL_DEP_LIBS) \
--	$(top_builddir)/cogl/libcogl.la
-+	$(top_builddir)/cogl/libcogl.la \
-+	$(LIBM)
- 
- if !USE_GLIB
- common_ldadd += $(top_builddir)/deps/glib/libglib.la
-diff --git a/examples/android/hello/jni/main.c b/examples/android/hello/jni/main.c
-index 2c5bd9b..c9a8401 100644
---- a/examples/android/hello/jni/main.c
-+++ b/examples/android/hello/jni/main.c
-@@ -42,7 +42,7 @@ static int test_init (TestData* data)
-   CoglOnscreen *onscreen;
-   CoglError *error = NULL;
-   CoglVertexP2C4 triangle_vertices[] = {
--        {0, 0.7, 0xff, 0x00, 0x00, 0x80},
-+        {0, 0.7, 0xff, 0x00, 0x00, 0xff},
-         {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
-         {0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
-   };
-diff --git a/examples/cogl-gles2-context.c b/examples/cogl-gles2-context.c
-index 1cf375f..de66c21 100644
---- a/examples/cogl-gles2-context.c
-+++ b/examples/cogl-gles2-context.c
-@@ -70,7 +70,7 @@ main (int argc, char **argv)
-     CoglOnscreen *onscreen;
-     CoglError *error = NULL;
-     CoglVertexP2C4 triangle_vertices[] = {
--        {0, 0.7, 0xff, 0x00, 0x00, 0x80},
-+        {0, 0.7, 0xff, 0x00, 0x00, 0xff},
-         {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
-         {0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
-     };
-diff --git a/examples/cogl-gles2-gears.c b/examples/cogl-gles2-gears.c
-index d7dd271..c7185b6 100644
---- a/examples/cogl-gles2-gears.c
-+++ b/examples/cogl-gles2-gears.c
-@@ -35,6 +35,10 @@
-  * Jul 13, 2010
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #define GL_GLEXT_PROTOTYPES
- 
- #include <math.h>
-@@ -110,6 +114,15 @@ static GLfloat ProjectionMatrix[16];
- /** The direction of the directional light for the scene */
- static const GLfloat LightSourcePosition[4] = { 5.0, 5.0, 10.0, 1.0};
- 
-+#ifndef HAVE_SINCOS
-+static void
-+sincos (double x, double *sinx, double *cosx)
-+{
-+  *sinx = sin (x);
-+  *cosx = cos (x);
-+}
-+#endif /* HAVE_SINCOS */
-+
- /**
-  * Fills a gear vertex.
-  *
-diff --git a/examples/cogl-hello.c b/examples/cogl-hello.c
-index 5bda9bf..3ba1e31 100644
---- a/examples/cogl-hello.c
-+++ b/examples/cogl-hello.c
-@@ -39,7 +39,7 @@ main (int argc, char **argv)
-     CoglOnscreen *onscreen;
-     CoglError *error = NULL;
-     CoglVertexP2C4 triangle_vertices[] = {
--        {0, 0.7, 0xff, 0x00, 0x00, 0x80},
-+        {0, 0.7, 0xff, 0x00, 0x00, 0xff},
-         {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
-         {0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
-     };
-diff --git a/examples/cogl-msaa.c b/examples/cogl-msaa.c
-index 73f9c4e..4a388bc 100644
---- a/examples/cogl-msaa.c
-+++ b/examples/cogl-msaa.c
-@@ -12,7 +12,7 @@ main (int argc, char **argv)
-     CoglFramebuffer *fb;
-     CoglError *error = NULL;
-     CoglVertexP2C4 triangle_vertices[] = {
--        {0, 0.7, 0xff, 0x00, 0x00, 0x80},
-+        {0, 0.7, 0xff, 0x00, 0x00, 0xff},
-         {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
-         {0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
-     };
-diff --git a/examples/cogl-sdl-hello.c b/examples/cogl-sdl-hello.c
-index 961137a..acb9125 100644
---- a/examples/cogl-sdl-hello.c
-+++ b/examples/cogl-sdl-hello.c
-@@ -80,7 +80,7 @@ main (int argc, char **argv)
-   CoglOnscreen *onscreen;
-   CoglError *error = NULL;
-   CoglVertexP2C4 triangle_vertices[] = {
--    {0, 0.7, 0xff, 0x00, 0x00, 0x80},
-+    {0, 0.7, 0xff, 0x00, 0x00, 0xff},
-     {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
-     {0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
-   };
-diff --git a/examples/cogl-sdl2-hello.c b/examples/cogl-sdl2-hello.c
-index 405cb92..12e6ced 100644
---- a/examples/cogl-sdl2-hello.c
-+++ b/examples/cogl-sdl2-hello.c
-@@ -89,7 +89,7 @@ main (int argc, char **argv)
-   CoglOnscreen *onscreen;
-   CoglError *error = NULL;
-   CoglVertexP2C4 triangle_vertices[] = {
--    {0, 0.7, 0xff, 0x00, 0x00, 0x80},
-+    {0, 0.7, 0xff, 0x00, 0x00, 0xff},
-     {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
-     {0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
-   };
-diff --git a/examples/cogl-x11-foreign.c b/examples/cogl-x11-foreign.c
-index ca9e3ed..a60397c 100644
---- a/examples/cogl-x11-foreign.c
-+++ b/examples/cogl-x11-foreign.c
-@@ -61,7 +61,7 @@ main (int argc, char **argv)
-   unsigned long mask;
-   Window xwin;
-   CoglVertexP2C4 triangle_vertices[] = {
--      {0, 0.7, 0xff, 0x00, 0x00, 0x80},
-+      {0, 0.7, 0xff, 0x00, 0x00, 0xff},
-       {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
-       {0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
-   };
-diff --git a/examples/cogland.c b/examples/cogland.c
-index c18850a..238f34c 100644
---- a/examples/cogland.c
-+++ b/examples/cogland.c
-@@ -8,6 +8,10 @@
- 
- #include <wayland-server.h>
- 
-+#ifdef COGL_HAS_XLIB_SUPPORT
-+#include <cogl/cogl-xlib.h>
-+#endif
-+
- typedef struct _CoglandCompositor CoglandCompositor;
- 
- typedef struct
-@@ -25,7 +29,7 @@ typedef struct
- {
-   CoglandCompositor *compositor;
- 
--  struct wl_surface wayland_surface;
-+  struct wl_resource resource;
-   int x;
-   int y;
-   struct wl_buffer *buffer;
-@@ -38,6 +42,7 @@ typedef struct
-   struct
-   {
-     /* wl_surface.attach */
-+    CoglBool newly_attached;
-     struct wl_buffer *buffer;
-     struct wl_listener buffer_destroy_listener;
-     int32_t sx;
-@@ -93,7 +98,6 @@ struct _CoglandCompositor
-   struct wl_display *wayland_display;
-   struct wl_event_loop *wayland_loop;
- 
--  CoglDisplay *cogl_display;
-   CoglContext *cogl_context;
- 
-   int virtual_width;
-@@ -336,15 +340,16 @@ cogland_queue_redraw (CoglandCompositor *compositor)
- }
- 
- static void
--shm_buffer_damaged (CoglandSurface *surface,
--                    int32_t x,
--                    int32_t y,
--                    int32_t width,
--                    int32_t height)
-+surface_damaged (CoglandSurface *surface,
-+                 int32_t x,
-+                 int32_t y,
-+                 int32_t width,
-+                 int32_t height)
- {
-   struct wl_buffer *wayland_buffer = surface->buffer;
- 
--  if (surface->texture)
-+  if (surface->texture &&
-+      wl_buffer_is_shm (surface->buffer))
-     {
-       CoglPixelFormat format;
-       int stride = wl_shm_buffer_get_stride (wayland_buffer);
-@@ -381,6 +386,8 @@ shm_buffer_damaged (CoglandSurface *surface,
-                                stride,
-                                data);
-     }
-+
-+  cogland_queue_redraw (surface->compositor);
- }
- 
- static void
-@@ -453,6 +460,7 @@ cogland_surface_attach (struct wl_client *wayland_client,
-   surface->pending.sx = sx;
-   surface->pending.sy = sy;
-   surface->pending.buffer = buffer;
-+  surface->pending.newly_attached = TRUE;
- 
-   if (buffer)
-     wl_signal_add (&buffer->resource.destroy_signal,
-@@ -522,7 +530,8 @@ cogland_surface_commit (struct wl_client *client,
-   CoglandCompositor *compositor = surface->compositor;
- 
-   /* wl_surface.attach */
--  if (surface->buffer != surface->pending.buffer)
-+  if (surface->pending.newly_attached &&
-+      surface->buffer != surface->pending.buffer)
-     {
-       CoglError *error = NULL;
- 
-@@ -546,16 +555,19 @@ cogland_surface_commit (struct wl_client *client,
- 
-           wl_signal_add (&surface->buffer->resource.destroy_signal,
-                          &surface->buffer_destroy_listener);
--          wl_list_remove (&surface->pending.buffer_destroy_listener.link);
-         }
-     }
--  surface->pending.buffer = NULL;
-+  if (surface->pending.buffer)
-+    {
-+      wl_list_remove (&surface->pending.buffer_destroy_listener.link);
-+      surface->pending.buffer = NULL;
-+    }
-   surface->pending.sx = 0;
-   surface->pending.sy = 0;
-+  surface->pending.newly_attached = FALSE;
- 
-   /* wl_surface.damage */
-   if (surface->buffer &&
--      wl_buffer_is_shm (surface->buffer) &&
-       surface->texture &&
-       !region_is_empty (&surface->pending.damage))
-     {
-@@ -571,11 +583,11 @@ cogland_surface_commit (struct wl_client *client,
-       if (region->y1 < 0)
-         region->y1 = 0;
- 
--      shm_buffer_damaged (surface,
--                          region->x1,
--                          region->y1,
--                          region->x2 - region->x1,
--                          region->y2 - region->y1);
-+      surface_damaged (surface,
-+                       region->x1,
-+                       region->y1,
-+                       region->x2 - region->x1,
-+                       region->y2 - region->y1);
-     }
-   region_init (&surface->pending.damage);
- 
-@@ -583,8 +595,6 @@ cogland_surface_commit (struct wl_client *client,
-   wl_list_insert_list (&compositor->frame_callbacks,
-                        &surface->pending.frame_callback_list);
-   wl_list_init (&surface->pending.frame_callback_list);
--
--  cogland_queue_redraw (compositor);
- }
- 
- static void
-@@ -614,6 +624,9 @@ cogland_surface_free (CoglandSurface *surface)
-   compositor->surfaces = g_list_remove (compositor->surfaces, surface);
-   cogland_surface_detach_buffer_and_notify (surface);
- 
-+  if (surface->pending.buffer)
-+    wl_list_remove (&surface->pending.buffer_destroy_listener.link);
-+
-   wl_list_for_each_safe (cb, next,
-                          &surface->pending.frame_callback_list, link)
-     wl_resource_destroy (&cb->resource);
-@@ -647,13 +660,13 @@ cogland_compositor_create_surface (struct wl_client *wayland_client,
- 
-   surface->compositor = compositor;
- 
--  surface->wayland_surface.resource.destroy =
-+  surface->resource.destroy =
-     cogland_surface_resource_destroy_cb;
--  surface->wayland_surface.resource.object.id = id;
--  surface->wayland_surface.resource.object.interface = &wl_surface_interface;
--  surface->wayland_surface.resource.object.implementation =
-+  surface->resource.object.id = id;
-+  surface->resource.object.interface = &wl_surface_interface;
-+  surface->resource.object.implementation =
-           (void (**)(void)) &cogland_surface_interface;
--  surface->wayland_surface.resource.data = surface;
-+  surface->resource.data = surface;
- 
-   surface->buffer_destroy_listener.notify =
-     surface_handle_buffer_destroy;
-@@ -663,7 +676,7 @@ cogland_compositor_create_surface (struct wl_client *wayland_client,
-   wl_list_init (&surface->pending.frame_callback_list);
-   region_init (&surface->pending.damage);
- 
--  wl_client_add_resource (wayland_client, &surface->wayland_surface.resource);
-+  wl_client_add_resource (wayland_client, &surface->resource);
- 
-   compositor->surfaces = g_list_prepend (compositor->surfaces,
-                                          surface);
-@@ -970,7 +983,7 @@ get_shell_surface (struct wl_client *client,
-                    struct wl_resource *surface_resource)
- {
-   CoglandSurface *surface = surface_resource->data;
--  CoglandShellSurface *shell_surface = g_new0 (CoglandShellSurface, 1);
-+  CoglandShellSurface *shell_surface;
- 
-   if (surface->has_shell_surface)
-     {
-@@ -980,6 +993,7 @@ get_shell_surface (struct wl_client *client,
-       return;
-     }
- 
-+  shell_surface = g_new0 (CoglandShellSurface, 1);
-   shell_surface->resource.destroy = destroy_shell_surface;
-   shell_surface->resource.object.id = id;
-   shell_surface->resource.object.interface = &wl_shell_surface_interface;
-@@ -989,7 +1003,7 @@ get_shell_surface (struct wl_client *client,
- 
-   shell_surface->surface = surface;
-   shell_surface->surface_destroy_listener.notify = shell_handle_surface_destroy;
--  wl_signal_add (&surface->wayland_surface.resource.destroy_signal,
-+  wl_signal_add (&surface->resource.destroy_signal,
-                  &shell_surface->surface_destroy_listener);
- 
-   surface->has_shell_surface = TRUE;
-@@ -1012,6 +1026,109 @@ bind_shell (struct wl_client *client,
-                         &cogland_shell_interface, id, data);
- }
- 
-+static CoglContext *
-+create_cogl_context (CoglandCompositor *compositor,
-+                     CoglBool use_egl_constraint,
-+                     CoglError **error)
-+{
-+  CoglRenderer *renderer = renderer = cogl_renderer_new ();
-+  CoglDisplay *display;
-+  CoglContext *context;
-+
-+  if (use_egl_constraint)
-+    cogl_renderer_add_constraint (renderer, COGL_RENDERER_CONSTRAINT_USES_EGL);
-+
-+  if (!cogl_renderer_connect (renderer, error))
-+    {
-+      cogl_object_unref (renderer);
-+      return NULL;
-+    }
-+
-+  display = cogl_display_new (renderer, NULL);
-+  cogl_wayland_display_set_compositor_display (display,
-+                                               compositor->wayland_display);
-+
-+  context = cogl_context_new (display, error);
-+
-+  cogl_object_unref (renderer);
-+  cogl_object_unref (display);
-+
-+  return context;
-+}
-+
-+#ifdef COGL_HAS_XLIB_SUPPORT
-+
-+static CoglFilterReturn
-+x_event_cb (XEvent *event,
-+            void *data)
-+{
-+  CoglandCompositor *compositor = data;
-+
-+  if (event->type == Expose)
-+    cogland_queue_redraw (compositor);
-+
-+  return COGL_FILTER_CONTINUE;
-+}
-+
-+#endif /* COGL_HAS_XLIB_SUPPORT */
-+
-+static gboolean
-+timeout_cb (void *data)
-+{
-+  cogland_queue_redraw (data);
-+
-+  return TRUE;
-+}
-+
-+static void
-+init_redraws (CoglandCompositor *compositor)
-+{
-+#ifdef COGL_HAS_XLIB_SUPPORT
-+  CoglDisplay *display = cogl_context_get_display (compositor->cogl_context);
-+  CoglRenderer *renderer = cogl_display_get_renderer (display);
-+  CoglWinsysID winsys = cogl_renderer_get_winsys_id (renderer);
-+
-+  /* If Cogl is using X then we can listen for Expose events to know
-+   * when to repaint the window. Otherwise we don't have any code to
-+   * know when the contents of the window is dirty so we'll just
-+   * redraw constantly */
-+  switch (winsys)
-+    {
-+    case COGL_WINSYS_ID_GLX:
-+    case COGL_WINSYS_ID_EGL_XLIB:
-+      {
-+        Display *display = cogl_xlib_renderer_get_display (renderer);
-+        GList *l;
-+
-+        for (l = compositor->outputs; l; l = l->next)
-+          {
-+            CoglandOutput *output = l->data;
-+            XWindowAttributes win_attribs;
-+            Window win;
-+
-+            win = cogl_x11_onscreen_get_window_xid (output->onscreen);
-+            if (XGetWindowAttributes (display, win, &win_attribs))
-+              {
-+                XSelectInput (display,
-+                              win,
-+                              win_attribs.your_event_mask | ExposureMask);
-+                cogl_xlib_renderer_add_filter (renderer,
-+                                               x_event_cb,
-+                                               compositor);
-+
-+              }
-+          }
-+      }
-+      return;
-+
-+    default:
-+      break;
-+    }
-+#endif /* COGL_HAS_XLIB_SUPPORT */
-+
-+  g_timeout_add (16, timeout_cb, compositor);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -1020,7 +1137,7 @@ main (int argc, char **argv)
-   CoglError *error = NULL;
-   GError *gerror = NULL;
-   CoglVertexP2C4 triangle_vertices[] = {
--      {0, 0.7, 0xff, 0x00, 0x00, 0x80},
-+      {0, 0.7, 0xff, 0x00, 0x00, 0xff},
-       {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
-       {0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
-   };
-@@ -1055,13 +1172,30 @@ main (int argc, char **argv)
-     wayland_event_source_new (compositor.wayland_display);
-   g_source_attach (compositor.wayland_event_source, NULL);
- 
--  compositor.cogl_display = cogl_display_new (NULL, NULL);
--  cogl_wayland_display_set_compositor_display (compositor.cogl_display,
--                                               compositor.wayland_display);
--
--  compositor.cogl_context = cogl_context_new (compositor.cogl_display, &error);
--  if (!compositor.cogl_context)
--    g_error ("Failed to create a Cogl context: %s\n", error->message);
-+  /* We want Cogl to use an EGL renderer because otherwise it won't
-+   * set up the wl_drm object and only SHM buffers will work. */
-+  compositor.cogl_context =
-+    create_cogl_context (&compositor,
-+                         TRUE /* use EGL constraint */,
-+                         &error);
-+  if (compositor.cogl_context == NULL)
-+    {
-+      /* If we couldn't get an EGL context then try any type of
-+       * context */
-+      cogl_error_free (error);
-+      error = NULL;
-+
-+      compositor.cogl_context =
-+        create_cogl_context (&compositor,
-+                             FALSE, /* don't set EGL constraint */
-+                             &error);
-+
-+      if (compositor.cogl_context)
-+        g_warning ("Failed to create context with EGL constraint, "
-+                   "falling back");
-+      else
-+        g_error ("Failed to create a Cogl context: %s\n", error->message);
-+    }
- 
-   compositor.virtual_width = 800;
-   compositor.virtual_height = 600;
-@@ -1101,7 +1235,7 @@ main (int argc, char **argv)
- 
-   g_source_attach (cogl_source, NULL);
- 
--  cogland_queue_redraw (&compositor);
-+  init_redraws (&compositor);
- 
-   g_main_loop_run (loop);
- 
-diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
-index 69a460d..d4062f2 100644
---- a/tests/conform/Makefile.am
-+++ b/tests/conform/Makefile.am
-@@ -65,6 +65,8 @@ test_sources = \
- 	test-framebuffer-get-bits.c \
- 	test-primitive-and-journal.c \
- 	test-copy-replace-texture.c \
-+	test-pipeline-cache-unrefs-texture.c \
-+	test-texture-no-allocate.c \
- 	$(NULL)
- 
- test_conformance_SOURCES = $(common_sources) $(test_sources)
-@@ -131,7 +133,10 @@ AM_CPPFLAGS += \
- 	-DCOGL_COMPILATION
- 
- test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
--test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la
-+test_conformance_LDADD = \
-+	$(COGL_DEP_LIBS) \
-+	$(top_builddir)/cogl/libcogl.la \
-+	$(LIBM)
- if !USE_GLIB
- test_conformance_LDADD += $(top_builddir)/deps/glib/libglib.la
- endif
-diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
-index 0b55db6..c5a5d4c 100644
---- a/tests/conform/test-conform-main.c
-+++ b/tests/conform/test-conform-main.c
-@@ -120,6 +120,8 @@ main (int argc, char **argv)
- 
-   ADD_TEST (test_copy_replace_texture, 0, 0);
- 
-+  ADD_TEST (test_pipeline_cache_unrefs_texture, 0, 0);
-+
-   UNPORTED_TEST (test_viewport);
- 
-   ADD_TEST (test_gles2_context, TEST_REQUIREMENT_GLES2_CONTEXT, 0);
-@@ -130,6 +132,8 @@ main (int argc, char **argv)
- 
-   ADD_TEST (test_euler_quaternion, 0, 0);
- 
-+  ADD_TEST (test_texture_no_allocate, 0, 0);
-+
-   g_printerr ("Unknown test name \"%s\"\n", argv[1]);
- 
-   return 1;
-diff --git a/tests/conform/test-pipeline-cache-unrefs-texture.c b/tests/conform/test-pipeline-cache-unrefs-texture.c
-new file mode 100644
-index 0000000..ccd02e7
---- /dev/null
-+++ b/tests/conform/test-pipeline-cache-unrefs-texture.c
-@@ -0,0 +1,92 @@
-+#include <cogl/cogl.h>
-+
-+#include "test-utils.h"
-+
-+/* Keep track of the number of textures that we've created and are
-+ * still alive */
-+static int destroyed_texture_count = 0;
-+
-+#define N_TEXTURES 3
-+
-+static void
-+free_texture_cb (void *user_data)
-+{
-+  destroyed_texture_count++;
-+}
-+
-+static CoglTexture *
-+create_texture (void)
-+{
-+  static const guint8 data[] =
-+    { 0xff, 0xff, 0xff, 0xff };
-+  static CoglUserDataKey texture_data_key;
-+  CoglTexture2D *tex_2d;
-+
-+  tex_2d = cogl_texture_2d_new_from_data (test_ctx,
-+                                          1, 1, /* width / height */
-+                                          COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-+                                          COGL_PIXEL_FORMAT_ANY,
-+                                          4, /* rowstride */
-+                                          data,
-+                                          NULL);
-+
-+  /* Set some user data on the texture so we can track when it has
-+   * been destroyed */
-+  cogl_object_set_user_data (COGL_OBJECT (tex_2d),
-+                             &texture_data_key,
-+                             GINT_TO_POINTER (1),
-+                             free_texture_cb);
-+
-+  return COGL_TEXTURE (tex_2d);
-+}
-+
-+void
-+test_pipeline_cache_unrefs_texture (void)
-+{
-+  CoglPipeline *pipeline = cogl_pipeline_new (test_ctx);
-+  CoglPipeline *simple_pipeline;
-+  int i;
-+
-+  /* Create a pipeline with three texture layers. That way we can be
-+   * pretty sure the pipeline will cause a unique shader to be
-+   * generated in the cache */
-+  for (i = 0; i < N_TEXTURES; i++)
-+    {
-+      CoglTexture *tex = create_texture ();
-+      cogl_pipeline_set_layer_texture (pipeline, i, tex);
-+      cogl_object_unref (tex);
-+    }
-+
-+  /* Draw something with the pipeline to ensure it gets into the
-+   * pipeline cache */
-+  cogl_framebuffer_draw_rectangle (test_fb,
-+                                   pipeline,
-+                                   0, 0, 10, 10);
-+  cogl_framebuffer_finish (test_fb);
-+
-+  /* Draw something else so that it is no longer the current flushed
-+   * pipeline, and the units have a different texture bound */
-+  simple_pipeline = cogl_pipeline_new (test_ctx);
-+  for (i = 0; i < N_TEXTURES; i++)
-+    {
-+      CoglColor combine_constant;
-+      cogl_color_init_from_4ub (&combine_constant, i, 0, 0, 255);
-+      cogl_pipeline_set_layer_combine_constant (simple_pipeline,
-+                                                i,
-+                                                &combine_constant);
-+    }
-+  cogl_framebuffer_draw_rectangle (test_fb, simple_pipeline, 0, 0, 10, 10);
-+  cogl_framebuffer_finish (test_fb);
-+  cogl_object_unref (simple_pipeline);
-+
-+  g_assert_cmpint (destroyed_texture_count, ==, 0);
-+
-+  /* Destroy the pipeline. This should immediately cause the textures
-+   * to be freed */
-+  cogl_object_unref (pipeline);
-+
-+  g_assert_cmpint (destroyed_texture_count, ==, N_TEXTURES);
-+
-+  if (cogl_test_verbose ())
-+    g_print ("OK\n");
-+}
-diff --git a/tests/conform/test-texture-no-allocate.c b/tests/conform/test-texture-no-allocate.c
-new file mode 100644
-index 0000000..fccb742
---- /dev/null
-+++ b/tests/conform/test-texture-no-allocate.c
-@@ -0,0 +1,80 @@
-+#include <cogl/cogl.h>
-+
-+#include "test-utils.h"
-+
-+/* Tests that the various texture types can be freed without being
-+ * allocated */
-+
-+/* Texture size that is probably to big to fit within the texture
-+ * limits */
-+#define BIG_TEX_WIDTH 16384
-+#define BIG_TEX_HEIGHT 128
-+
-+void
-+test_texture_no_allocate (void)
-+{
-+  uint8_t *tex_data;
-+  CoglTexture *texture;
-+  CoglTexture2D *texture_2d;
-+
-+  tex_data = g_malloc (BIG_TEX_WIDTH * BIG_TEX_HEIGHT * 4);
-+
-+  /* NB: if we make the atlas and sliced texture APIs public then this
-+   * could changed to explicitly use that instead of the magic texture
-+   * API */
-+
-+  /* Try to create an atlas texture that is too big so it will
-+   * internally be freed without allocating */
-+  texture = cogl_texture_new_from_data (BIG_TEX_WIDTH,
-+                                        BIG_TEX_HEIGHT,
-+                                        COGL_TEXTURE_NONE, /* flags */
-+                                        /* format */
-+                                        COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-+                                        /* internal format */
-+                                        COGL_PIXEL_FORMAT_ANY,
-+                                        /* rowstride */
-+                                        BIG_TEX_WIDTH * 4,
-+                                        tex_data);
-+
-+  g_free (tex_data);
-+
-+  /* It's ok if this causes an error, we just don't want it to
-+   * crash */
-+
-+  if (texture)
-+    cogl_object_unref (texture);
-+
-+  /* Try to create a sliced texture without allocating it */
-+  texture = cogl_texture_new_with_size (BIG_TEX_WIDTH,
-+                                        BIG_TEX_HEIGHT,
-+                                        COGL_TEXTURE_NO_ATLAS,
-+                                        COGL_PIXEL_FORMAT_RGBA_8888_PRE);
-+  cogl_object_unref (texture);
-+
-+  /* 2D texture */
-+  texture_2d = cogl_texture_2d_new_with_size (test_ctx,
-+                                              64, 64,
-+                                              COGL_PIXEL_FORMAT_RGBA_8888_PRE);
-+  cogl_object_unref (texture_2d);
-+
-+  /* 3D texture */
-+  if (cogl_has_feature (test_ctx, COGL_FEATURE_ID_TEXTURE_3D))
-+    {
-+      CoglTexture3D *texture_3d =
-+        cogl_texture_3d_new_with_size (test_ctx,
-+                                       64, 64, 64,
-+                                       COGL_PIXEL_FORMAT_RGBA_8888_PRE);
-+      cogl_object_unref (texture_3d);
-+    }
-+
-+  /* Rectangle texture */
-+  if (cogl_has_feature (test_ctx, COGL_FEATURE_ID_TEXTURE_RECTANGLE))
-+    {
-+      CoglTextureRectangle *texture_rect =
-+        cogl_texture_rectangle_new_with_size (test_ctx,
-+                                              64, 64,
-+                                              COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-+                                              NULL /* error */);
-+      cogl_object_unref (texture_rect);
-+    }
-+}
-diff --git a/tests/micro-perf/Makefile.am b/tests/micro-perf/Makefile.am
-index c221dd6..5c5f69d 100644
---- a/tests/micro-perf/Makefile.am
-+++ b/tests/micro-perf/Makefile.am
-@@ -19,5 +19,10 @@ endif
- 
- AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
- 
-+common_ldadd = \
-+	$(COGL_DEP_LIBS) \
-+	$(top_builddir)/cogl/libcogl.la \
-+	$(LIBM)
-+
- test_journal_SOURCES = test-journal.c
--test_journal_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la
-+test_journal_LDADD = $(common_ldadd)
diff --git a/extra/cyrus-sasl/CVE-2013-4122.patch b/extra/cyrus-sasl/CVE-2013-4122.patch
new file mode 100644
index 000000000..d6b9800e6
--- /dev/null
+++ b/extra/cyrus-sasl/CVE-2013-4122.patch
@@ -0,0 +1,116 @@
+From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@hush.com>
+Date: Thu, 11 Jul 2013 09:08:07 +0000
+Subject: Handle NULL returns from glibc 2.17+ crypt()
+
+Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
+(w/ NULL return) if the salt violates specifications. Additionally,
+on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
+passed to crypt() fail with EPERM (w/ NULL return).
+
+When using glibc's crypt(), check return value to avoid a possible
+NULL pointer dereference.
+
+Patch by mancha1@hush.com.
+---
+diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c
+index 4b34222..400289c 100644
+--- a/pwcheck/pwcheck_getpwnam.c
++++ b/pwcheck/pwcheck_getpwnam.c
+@@ -32,6 +32,7 @@ char *userid;
+ char *password;
+ {
+     char* r;
++    char* crpt_passwd;
+     struct passwd *pwd;
+ 
+     pwd = getpwnam(userid);
+@@ -41,7 +42,7 @@ char *password;
+     else if (pwd->pw_passwd[0] == '*') {
+ 	r = "Account disabled";
+     }
+-    else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) {
++    else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) {
+ 	r = "Incorrect password";
+     }
+     else {
+diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c
+index 2b11286..6d607bb 100644
+--- a/pwcheck/pwcheck_getspnam.c
++++ b/pwcheck/pwcheck_getspnam.c
+@@ -32,13 +32,15 @@ char *userid;
+ char *password;
+ {
+     struct spwd *pwd;
++    char *crpt_passwd;
+ 
+     pwd = getspnam(userid);
+     if (!pwd) {
+ 	return "Userid not found";
+     }
+     
+-    if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) {
++    crpt_passwd = crypt(password, pwd->sp_pwdp);
++    if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) {
+ 	return "Incorrect password";
+     }
+     else {
+diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c
+index fc8029d..d4ebe54 100644
+--- a/saslauthd/auth_getpwent.c
++++ b/saslauthd/auth_getpwent.c
+@@ -77,6 +77,7 @@ auth_getpwent (
+ {
+     /* VARIABLES */
+     struct passwd *pw;			/* pointer to passwd file entry */
++    char *crpt_passwd;			/* encrypted password */
+     int errnum;
+     /* END VARIABLES */
+   
+@@ -105,7 +106,8 @@ auth_getpwent (
+ 	}
+     }
+ 
+-    if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) {
++    crpt_passwd = crypt(password, pw->pw_passwd);
++    if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) {
+ 	if (flags & VERBOSE) {
+ 	    syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login);
+ 	}
+diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c
+index 677131b..1988afd 100644
+--- a/saslauthd/auth_shadow.c
++++ b/saslauthd/auth_shadow.c
+@@ -210,8 +210,8 @@ auth_shadow (
+ 	RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)");
+     }
+ 
+-    cpw = strdup((const char *)crypt(password, sp->sp_pwdp));
+-    if (strcmp(sp->sp_pwdp, cpw)) {
++    cpw = crypt(password, sp->sp_pwdp);
++    if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) {
+ 	if (flags & VERBOSE) {
+ 	    /*
+ 	     * This _should_ reveal the SHADOW_PW_LOCKED prefix to an
+@@ -221,10 +221,8 @@ auth_shadow (
+ 	    syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'",
+ 		   sp->sp_pwdp, cpw);
+ 	}
+-	free(cpw);
+ 	RETURN("NO Incorrect password");
+     }
+-    free(cpw);
+ 
+     /*
+      * The following fields will be set to -1 if:
+@@ -286,7 +284,7 @@ auth_shadow (
+ 	RETURN("NO Invalid username");
+     }
+   
+-    if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) {
++    if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) {
+ 	if (flags & VERBOSE) {
+ 	    syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s",
+ 		   password, upw->upw_passwd);
+--
+cgit v0.9.2
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index 49976813d..c00711749 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187053 2013-06-03 11:16:18Z allan $
+# $Id: PKGBUILD 195995 2013-10-07 10:32:45Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl')
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.26
-pkgrel=4
+pkgrel=6
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
@@ -25,7 +25,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         0030-dont_use_la_files_for_opening_plugins.patch
         saslauthd.service
         saslauthd.conf.d
-        tmpfiles.conf)
+        tmpfiles.conf
+        CVE-2013-4122.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
          'f45aa8c42b32e0569ab3d14a83485b37'
@@ -36,21 +37,27 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '8e7106f32e495e9ade69014fd1b3352a'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
-         '45bb0192d2f188066240b9a66ee6365f')
+         '45bb0192d2f188066240b9a66ee6365f'
+         'c5f0ec88c584a75c14d7f402eaeed7ef')
+
+prepare() {
+  cd cyrus-sasl-$pkgver
+  patch -Np1 -i ../cyrus-sasl-2.1.22-qa.patch
+  patch -Np1 -i ../cyrus-sasl-2.1.26-size_t.patch
+  patch -Np1 -i ../0010_maintainer_mode.patch
+  patch -Np1 -i ../0011_saslauthd_ac_prog_libtool.patch
+  patch -Np1 -i ../0025_ld_as_needed.patch
+  patch -Np1 -i ../0026_drop_krb5support_dependency.patch
+  patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
+  patch -Np1 -i ../CVE-2013-4122.patch
+
+  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
+}
 
 build() {
   export CFLAGS="$CFLAGS -fPIC"
+  cd cyrus-sasl-$pkgver
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch"
-  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
-  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
-  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
-  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
-  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
-
-  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
   rm -f config/config.guess config/config.sub 
   rm -f config/ltconfig config/ltmain.sh config/libtool.m4
   rm -fr autom4te.cache
@@ -109,7 +116,7 @@ package_libsasl() {
   depends=('openssl')
   conflicts=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  cd cyrus-sasl-$pkgver
   for dir in include lib sasldb plugins utils; do
     pushd ${dir}
     make DESTDIR="${pkgdir}" install
@@ -128,7 +135,7 @@ package_cyrus-sasl() {
   pkgdesc="Cyrus saslauthd SASL authentication daemon"
   backup=('etc/conf.d/saslauthd')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
+  cd cyrus-sasl-$pkgver/saslauthd
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
   install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
@@ -143,7 +150,7 @@ package_cyrus-sasl-gssapi() {
   depends=("libsasl=${pkgver}" 'krb5')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
   cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/"
@@ -157,7 +164,7 @@ package_cyrus-sasl-ldap() {
   depends=("libsasl=${pkgver}" 'libldap')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
 
@@ -170,7 +177,7 @@ package_cyrus-sasl-sql() {
   depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
 
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index bf4e5a2e9..639671156 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 190798 2013-07-16 21:17:38Z heftig $
+# $Id: PKGBUILD 196025 2013-10-07 11:50:38Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=dconf
-pkgver=0.16.1
+pkgver=0.18.0
 pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python' 'python2')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee')
+sha256sums=('109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/desktop-file-utils/ChangeLog b/extra/desktop-file-utils/ChangeLog
deleted file mode 100644
index 8941e4825..000000000
--- a/extra/desktop-file-utils/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-07-22  Alexander Fehr  <pizzapunk gmail com>
-
-  * desktop-file-utils-0.15-1:
-  New upstream release.
-  New maintainer.
-  Changed url.
-  Added ChangeLog.
diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD
index 748557122..84d05594d 100644
--- a/extra/desktop-file-utils/PKGBUILD
+++ b/extra/desktop-file-utils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174820 2013-01-07 18:41:05Z andyrtr $
+# $Id: PKGBUILD 196163 2013-10-07 12:38:06Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=desktop-file-utils
-pkgver=0.21
+pkgver=0.22
 pkgrel=1
 pkgdesc="Command line utilities for working with desktop entries"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
 license=('GPL')
 depends=('glib2')
 source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
-md5sums=('fda5c312c9fb3b8d818fb54f2c34db82')
+sha256sums=('843532672692f98e9b2d6ae6cc8658da562dfde1606c7f33d9d227a344de56c5')
 
 build() {
   cd "${srcdir}/desktop-file-utils-${pkgver}"
diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD
index 36b38a371..81c4056c0 100644
--- a/extra/devhelp/PKGBUILD
+++ b/extra/devhelp/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 191281 2013-07-23 09:52:37Z jgc $
+# $Id: PKGBUILD 196026 2013-10-07 11:50:39Z 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=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="API documentation browser for GNOME"
 arch=(i686 x86_64)
 license=(GPL)
 url="http://live.gnome.org/devhelp/"
-depends=(webkitgtk3 hicolor-icon-theme)
+depends=(webkitgtk 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')
+sha256sums=('4d28d21a0331c67086607b737147947b288416ab38c8a0b0264f7a63bd4fce9b')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-webkit2
+      --localstatedir=/var --disable-static
   make
 }
 
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 7a06c1c55..1f145e72b 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190037 2013-07-13 12:40:41Z svenstaro $
+# $Id: PKGBUILD 196027 2013-10-07 11:50:40Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=4.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 0e37fe39b..5c268a4b6 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 194416 2013-09-16 09:02:57Z jgc $
+# $Id: PKGBUILD 196028 2013-10-07 11:50:41Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=(i686 x86_64)
 url="http://live.gnome.org/Empathy"
 license=(GPL2)
-depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control)
+depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control geoclue2 geocode-glib cheese libchamplain)
 makedepends=(intltool itstool docbook-xsl python2)
 optdepends=('telepathy-gabble: XMPP/Jabber support'
             'telepathy-idle: IRC support'
@@ -18,8 +18,8 @@ optdepends=('telepathy-gabble: XMPP/Jabber support'
 options=('!libtool' '!makeflags')
 groups=(gnome)
 install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index 2b974e18f..0d6c8f1f4 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186992 2013-06-02 19:43:30Z heftig $
+# $Id: PKGBUILD 196030 2013-10-07 11:50:43Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=eog-plugins
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/"
@@ -13,7 +13,7 @@ makedepends=('intltool')
 install=eog-plugins.install
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9')
+sha256sums=('0e6699c45181264e87f34a6eb03deeadfd5d73e35995772b7afc803e8218906d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index eae0b6d88..d90093655 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185427 2013-05-14 09:33:41Z heftig $
+# $Id: PKGBUILD 196029 2013-10-07 11:50:42Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ groups=(gnome)
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('689251b6dd18ef191cbfd9431c0324c70707b60edd73d86fc014bd8ae0bd8336')
+sha256sums=('d449abfba8ac460b9d9af17778a0f2ffed5c983e74232596b807c3a99f11a1da')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index c3323c732..e6e4667c1 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189847 2013-07-09 13:12:40Z heftig $
+# $Id: PKGBUILD 196032 2013-10-07 11:50:46Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
-pkgver=3.8.3
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=(i686 x86_64)
@@ -11,12 +11,15 @@ license=(GPL)
 depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre gnome-icon-theme t1lib libsecret desktop-file-utils dconf gsettings-desktop-schemas)
 makedepends=(itstool libnautilus-extension texlive-bin intltool gobject-introspection docbook-xsl python)
 optdepends=('texlive-bin: DVI support'
-	    'gvfs: bookmark support and session saving')
+	    'gvfs: bookmark support and session saving'
+            'p7zip: cbz and cb7 compressed comic books'
+            'tar: cbt compressed comic books'
+            'unrar: cbr compressed comic books')
 groups=(gnome)
 install=evince.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1526921201fabe833733e7c2552dfbe62085fd18d325a27c2fffb332e5e418bd')
+sha256sums=('495e855af3f071277d79be97a36bf39938d13d09530e80412fed4b7c0b1bdd3e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index fd9407377..0a07a2a2e 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,45 +1,27 @@
-# $Id: PKGBUILD 192423 2013-08-11 13:38:21Z heftig $
+# $Id: PKGBUILD 196034 2013-10-07 11:50:48Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.8.5
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=(i686 x86_64)
 depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata)
-makedepends=(intltool gperf gobject-introspection vala python2 gnome-common)
+makedepends=(intltool gperf gobject-introspection vala python2)
 options=('!libtool')
 install=$pkgname.install
 url="http://www.gnome.org"
 license=(GPL)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-fix-google-2fa-1.patch
-fix-google-2fa-2.patch
-fix-google-2fa-3.patch
-fix-google-2fa-4.patch)
-sha256sums=('73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a'
-            'c1de9fe146f0512cf6c0219341c8409a9e4d955c3eb6a85f7d07183972b9328e'
-            '3e1c83dd00f01dfa0f9d67d2327de110b3e232a5f9a882ccce09a02392df7de6'
-            '9da8cccf504f40b8ee9e068b465cdf0a1a858999dd88d8e8e96f1e4cdffbf1e2'
-            '27022d00575ba1b9283d9420aa231c2770ff403b0b6c0442b6d679faefdbe00e')
-
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i ../fix-google-2fa-1.patch
-  patch -Np1 -i ../fix-google-2fa-2.patch
-  patch -Np1 -i ../fix-google-2fa-3.patch
-  patch -Np1 -i ../fix-google-2fa-4.patch
-}
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('1c47a0e138e9a5ed630d6e3ab30761e74e5f26ed7bbc31debfe76c2bac058b27')
 
 build() {
   cd "$pkgname-$pkgver"
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
       --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings --disable-uoa PYTHON=python2
+      --enable-vala-bindings --disable-uoa
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 }
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index f5dd3ea4a..0ffa9360f 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 192425 2013-08-11 13:43:43Z heftig $
+# $Id: PKGBUILD 196035 2013-10-07 11:50:49Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.8.5
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ 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=('74a0fdcc698797902ca107f3523e3d3b3e51b8ba01709d308b47ed31e99de877')
+sha256sums=('689ad1908d750a6004ee7ce997543a1b5481849aafeb923edebe3f766efa4b46')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index a84a929ff..26d266514 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192424 2013-08-11 13:43:05Z heftig $
+# $Id: PKGBUILD 196033 2013-10-07 11:50:47Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.8.5
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=(i686 x86_64)
@@ -18,8 +18,8 @@ groups=('gnome-extra')
 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=('26ef047425826a7672f0db7f3d4eef908e68bae47a9e0756883079c445e4326d')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('e64fabc07e1126b80ef8354411d8232aee6e45cfece040a99d494d77df040064')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD
index af1da96fe..c5164c562 100644
--- a/extra/facile/PKGBUILD
+++ b/extra/facile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177541 2013-02-07 05:32:46Z eric $
+# $Id: PKGBUILD 195985 2013-10-07 07:06:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=facile
 pkgver=1.1
-pkgrel=15
+pkgrel=16
 pkgdesc="A Functional Constraint Library"
 arch=(i686 x86_64)
 url="http://www.recherche.enac.fr/opti/facile/"
diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD
index 2f1fed450..72dfd1fba 100644
--- a/extra/five-or-more/PKGBUILD
+++ b/extra/five-or-more/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186970 2013-06-01 21:56:36Z heftig $
+# $Id: PKGBUILD 196037 2013-10-07 11:50:51Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=five-or-more
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Remove colored balls from the board by forming lines"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=five-or-more.install
 url="https://live.gnome.org/Five%20or%20more"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d63055c296a73762f68d900c753c5ecbec9b20cc1ed4595feb0b7bee9900c311')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('4198d713a2e29e4c1e5493cfb3880acee295d486e2f5b4d3c4780b154cad3a07')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index 2c01d9111..81c0009ba 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 188065 2013-06-08 08:06:46Z heftig $
+# $Id: PKGBUILD 196038 2013-10-07 11:50:52Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
-pkgver=0.9.2
+pkgver=0.9.5
 pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64)
 url="http://telepathy.freedesktop.org/wiki/Folks"
 license=(LGPL2.1)
-depends=(telepathy-glib libgee libxml2 evolution-data-server libzeitgeist libtracker-sparql)
-makedepends=(gobject-introspection intltool)
+depends=(telepathy-glib libgee libxml2 evolution-data-server zeitgeist libtracker-sparql)
+makedepends=(gobject-introspection intltool vala)
 install=folks.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4b034ffe83928acd8a7d607edab60f36eb13801a9d3fcc34ccc7c34a16747818')
+sha256sums=('924c440f16a8c9b0d0d832588fa77a1553fa2a5d2659c4c7d3178a7ef42222af')
 
 build() {
   cd "$pkgname-$pkgver"
+  export PKG_CONFIG_PATH="${srcdir}/${pkgname}-${pkgver}/folks"
   ./configure --prefix=/usr --disable-schemas-compile --enable-tracker-backend \
-    --disable-libsocialweb-backend
+    --disable-libsocialweb-backend --disable-fatal-warnings
   make
 }
 
diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD
index 5300d1e79..26001a554 100644
--- a/extra/four-in-a-row/PKGBUILD
+++ b/extra/four-in-a-row/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183358 2013-04-21 22:09:11Z heftig $
+# $Id: PKGBUILD 196039 2013-10-07 11:50:54Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=four-in-a-row
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Make lines of the same color to win"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=four-in-a-row.install
 url="https://live.gnome.org/Four-in-a-row"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eb44c8508a7d4281df1e52c75a4dc8b31a0de108b94c0f37c4e8d99ea380019d')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('4759dcc8483c5bbf89de8b10a5379539ec1df6392cf2f7b96e91ec9dd2897001')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD
index aad63a6e5..69a925079 100644
--- a/extra/gconf-editor/PKGBUILD
+++ b/extra/gconf-editor/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 183359 2013-04-21 22:09:12Z heftig $
+# $Id: PKGBUILD 195993 2013-10-07 08:23:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gconf-editor
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Graphical gconf registry editor"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gconf' 'hicolor-icon-theme')
+depends=('gconf' 'hicolor-icon-theme' 'gtk3')
 makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 options=(!emptydirs)
diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index fc1107a6b..3f91432c1 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 184241 2013-05-04 20:06:54Z heftig $
+# $Id: PKGBUILD 196040 2013-10-07 11:50:55Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gcr
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64)
@@ -12,9 +12,9 @@ depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
 makedepends=('intltool' 'gobject-introspection' 'python')
 options=(!libtool)
 install=gcr.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         10-gcr.conf)
-sha256sums=('a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1'
+sha256sums=('b689c679b244c1f47d773002c33dadc4111cddeb05bc2f3651826893fd43ff1b'
             '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
 
 build() {
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 8dc915fcd..397f5ce9a 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 187905 2013-06-07 22:45:04Z heftig $
+# $Id: PKGBUILD 196041 2013-10-07 11:50:57Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
-pkgver=2.28.2
+pkgver=2.30.0
 pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
 source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617')
+sha256sums=('4a73600525621283a14436c5f873c1126c4feafcb07d24a746f13215e2caa658')
 
 build() {
   cd gdk-pixbuf-$pkgver
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index 7c843b23c..67ffae29d 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183362 2013-04-21 22:09:18Z heftig $
+# $Id: PKGBUILD 196042 2013-10-07 11:50:58Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdl
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME Docking Library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('gtk3')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c9911e9eec5a62497fff7e044ca9eaae47354658238e6b9e9a0a744f05b4ebdb')
+sha256sums=('4e0d6f66115ba3b0f3cd2495d8a95c6714d701f89d556bb691bd0c0a62a1c760')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index aae217eaa..fa26b1d30 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191808 2013-07-30 23:19:36Z jgc $
+# $Id: PKGBUILD 196043 2013-10-07 11:50:59Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gdm
 pkgname=(gdm libgdm)
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Gnome Display Manager"
 arch=(i686 x86_64)
@@ -14,9 +14,9 @@ options=('!libtool')
 depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost)
 makedepends=(itstool intltool yelp-tools gobject-introspection)
 checkdepends=('check')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         fix_external_program_directories.patch arch-pam.patch)
-sha256sums=('db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447'
+sha256sums=('bb04600298f5be795f0d0bfea40bbd9bf78f95a44c5caeda4d0cc6a05207318c'
             'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2'
             'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003')
 
@@ -47,7 +47,7 @@ build() {
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
-  make
+  make -j1
 }
 
 check() {
@@ -69,7 +69,7 @@ package_gdm() {
   make DESTDIR="$pkgdir" install
 
   chmod 711 "$pkgdir/var/log/gdm"
-  rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
+  rm -r "$pkgdir/var/run"
 
 ### Split libgdm
   make -C gui/libgdm DESTDIR="$pkgdir" uninstall
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 4540abee8..a43d476b6 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 188910 2013-06-25 07:42:51Z heftig $
+# $Id: PKGBUILD 196044 2013-10-07 11:51:01Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=(i686 x86_64)
 license=(GPL)
 depends=(gtksourceview3 gsettings-desktop-schemas libpeas enchant iso-codes libsm desktop-file-utils python-gobject dconf)
-makedepends=(yelp-tools intltool 'zeitgeist>=0.9.12')
+makedepends=(yelp-tools intltool zeitgeist)
 optdepends=('zeitgeist: Zeitgeist plugin')
 groups=(gnome-extra)
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dfbc2d9cf975b247c6a6b8bd1ae1b72d8e8a1f862f5f3d084a404853092cf9d3')
+sha256sums=('4c20049ccee2198468edaf20fba9dbd44e3baf50bd304700b4f24257571cdca5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/geoclue2/PKGBUILD b/extra/geoclue2/PKGBUILD
new file mode 100644
index 000000000..70f7bfb9a
--- /dev/null
+++ b/extra/geoclue2/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 196002 2013-10-07 11:46:24Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=geoclue2
+pkgver=1.99.4
+pkgrel=1
+pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
+arch=(i686 x86_64)
+url="http://geoclue.freedesktop.org/"
+license=(LGPL)
+depends=(libsoup json-glib)
+makedepends=(intltool geoip)
+optdepends=('geoip: geoip-lookup server binary')
+options=('!libtool')
+install=geoclue.install
+source=(http://freedesktop.org/software/geoclue/releases/1.99/geoclue-$pkgver.tar.xz)
+md5sums=('b991f4a409b492996a38627ee18fa76e')
+
+build() {
+  cd geoclue-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static
+  make
+}
+
+package() {
+  cd geoclue-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/openclonk/openclonk.install b/extra/geoclue2/geoclue.install
index b9bbaf706..c25dff2d3 100644
--- a/community/openclonk/openclonk.install
+++ b/extra/geoclue2/geoclue.install
@@ -1,9 +1,9 @@
 post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
-  post_install
+    post_install
 }
 
 post_remove() {
diff --git a/extra/geocode-glib/PKGBUILD b/extra/geocode-glib/PKGBUILD
new file mode 100644
index 000000000..e3ec1a334
--- /dev/null
+++ b/extra/geocode-glib/PKGBUILD
@@ -0,0 +1,26 @@
+#Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=geocode-glib
+pkgver=3.10.0
+pkgrel=1
+pkgdesc="Geocode Helper library"
+arch=(i686 x86_64)
+license=('GPL')
+url="https://git.gnome.org/browse/geocode-glib/"
+depends=('glib2' 'json-glib' 'libsoup')
+makedepends=('intltool' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('0aedc198cf8a9b934a290d50aadaf4b48bb13c3b4783618c6753eb466cdaa637')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
+
diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD
index bc25641c5..002957172 100644
--- a/extra/ghex/PKGBUILD
+++ b/extra/ghex/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185359 2013-05-13 17:41:00Z heftig $
+# $Id: PKGBUILD 196153 2013-10-07 12:05:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=ghex
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('gtk3' 'hicolor-icon-theme')
 makedepends=('intltool' 'itstool' 'docbook-xsl')
 options=('!libtool' '!emptydirs')
 install=ghex.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('84ce220eed0dc9f640a87db68533e65a4dc06a1a6136b244270d8b2a1ae93534')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9c31383b1d32c8942ca0327c615336f5777309674c4fc090e8cceb1576c63255')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index c35d5566e..9d2375f31 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,33 +1,28 @@
-# $Id: PKGBUILD 191784 2013-07-30 19:02:00Z jgc $
+# $Id: PKGBUILD 196045 2013-10-07 11:51:04Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gjs
-pkgver=1.36.1
-pkgrel=2
+pkgver=1.38.1
+pkgrel=1
 pkgdesc="Javascript Bindings for GNOME"
 arch=(i686 x86_64)
 url="http://live.gnome.org/Gjs"
 license=(GPL)
 depends=(cairo gobject-introspection 'js>=17.0.0')
 options=('!libtool')
-source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2
-        gettext-typo.patch)
-sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27'
-            'c2c3ca377d9d69511d5784599ea33d754aed776d5ceefaf384b8e303b54fd038')
+source=(http://ftp.gnome.org/pub/gnome/sources/gjs/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../gettext-typo.patch
-}
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr --disable-static --libexecdir=/usr/lib
   make
 }
 
 check() {
   cd $pkgname-$pkgver
-  make check
+  # Needs a display
+  make -k check || :
 }
 
 package() {
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index e8a69f53d..306824f5c 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183366 2013-04-21 22:09:24Z heftig $
+# $Id: PKGBUILD 196046 2013-10-07 11:51:05Z jgc $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=glade
-pkgver=3.15.0
+pkgver=3.16.0
 pkgrel=1
 pkgdesc="User interface builder for GTK+ and GNOME."
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ options=('!libtool')
 url="http://glade.gnome.org/"
 install=glade.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4e64f33d8a5ad614279dc7024ed70fe57805526e82244001a33351b1cf13f95c')
+sha256sums=('b80773a294d3af07739d9d53bae12e11cf0bbf420bbc8931cc5e20b2647e3626')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index f6e4857f6..d95cd3dd8 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185433 2013-05-14 09:44:30Z heftig $
+# $Id: PKGBUILD 196048 2013-10-07 11:51:08Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.36.2
+pkgver=2.38.0
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=(intltool)
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9')
+sha256sums=('a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index cf87cfd3e..6b10de42d 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184169 2013-05-03 03:02:45Z heftig $
+# $Id: PKGBUILD 196047 2013-10-07 11:51:06Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.36.2
+pkgver=2.37.93
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 url="http://www.gtkmm.org/"
-sha256sums=('f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf')
+sha256sums=('a01031d7d05ba9df5915fc84867303c93341a8dd13a2aa5af78a71dfb46842f6')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index d21ac7547..bc1340279 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 188094 2013-06-09 11:29:56Z heftig $
+# $Id: PKGBUILD 196050 2013-10-07 11:51:10Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=(i686 x86_64)
 url="http://live.gnome.org/GnomeBluetooth"
 license=(GPL LGPL)
-depends=(gtk3 hicolor-icon-theme libnotify bluez4)
+depends=(gtk3 hicolor-icon-theme libnotify bluez)
 makedepends=(intltool gobject-introspection itstool docbook-xsl)
 options=(!libtool !emptydirs)
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('8095fcfa014931773e9d231dff76c6924f43abfbe4c5525cf07fd2d7f8e1f770'
+sha256sums=('7ee4ad464abfed59f04d1a471eb25cfb95fc34eeefbe4c47580dbb50df2ab712'
             '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
 
 build() {
diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index cdec3899c..a7b0d1b87 100644
--- a/extra/gnome-calculator/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185451 2013-05-14 10:16:40Z heftig $
+# $Id: PKGBUILD 196051 2013-10-07 11:51:12Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-calculator
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ conflicts=('gcalctool')
 options=(!emptydirs)
 url="http://www.gnome.org"
 install=gnome-calculator.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('13d67b6dfa2501b883add8adf5470c5fea5eb1f1fa87f84e8ceda069418f1e81')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d76ad21286ea20308bb6302833ce8e5846df7e8ccd2b7ac0a48619f0d6cf2cb1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
index 92b7d016e..0e61269fa 100644
--- a/extra/gnome-chess/PKGBUILD
+++ b/extra/gnome-chess/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193436 2013-08-20 07:10:18Z jgc $
+# $Id: PKGBUILD 196052 2013-10-07 11:51:13Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-chess
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Play the classic two-player boardgame of chess"
 arch=('i686' 'x86_64')
@@ -17,8 +17,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-chess.install
 url="https://live.gnome.org/Chess"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4b7f20d875585e1d36bc0e4dda8c66ccd2e014f8ef829c4a6ec87275c4418d6a')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9bbc0b2819a3f6d9d688ea0089a0d5f826d368100af7a0f3e8361e0d6f9e77ee')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD
index 1e0a538fa..bea06b214 100644
--- a/extra/gnome-clocks/PKGBUILD
+++ b/extra/gnome-clocks/PKGBUILD
@@ -1,39 +1,24 @@
-# $Id: PKGBUILD 185477 2013-05-14 11:11:41Z heftig $
+# $Id: PKGBUILD 196053 2013-10-07 11:51:15Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-clocks
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Clocks applications for GNOME"
 arch=(i686 x86_64)
 url="https://www.gnome.org/"
 license=(GPL)
 depends=(gtk3 libcanberra libgweather gnome-desktop libnotify
-         hicolor-icon-theme gnome-themes-standard)
-makedepends=(intltool vala gobject-introspection)
+         hicolor-icon-theme gnome-themes-standard geoclue2 geocode-glib)
+makedepends=(intltool vala gobject-introspection itstool)
 options=(!libtool)
 groups=(gnome-extra)
 install=gnome-clocks.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz
-        gnome-clocks.css::http://git.gnome.org/browse/gnome-clocks/plain/data/css/gnome-clocks.css?id=${pkgver}
-        button-border-go.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go.svg?id=${pkgver}
-        button-border-go-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go-active.svg?id=${pkgver}
-        button-border-stop.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop.svg?id=${pkgver}
-        button-border-stop-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop-active.svg?id=${pkgver})
-sha256sums=('afe8405e41d8d2ac570642c2d73a43a2a45f8c6e521640d0a266e0fe0a55410f'
-            '3ce4afb848ea2a2728c53a9f4bfca5f12d9719e3935d1acd2d90056cb1c464fc'
-            'a44df652c8034ccbbc87a62f92ab6efbf6dfabead44e3316b4b9e85d851a6b24'
-            'e12ac57acaa43b25a36d9fd9b6dbe906980a5e8429840d98c604bf28515749e0'
-            'e71fa928cf5812fb1cc4ea62e55176be14716b670c37c7899368b0f8f020876c'
-            '34916c190c259788bcb561f0b4cce73b47a39e50326e1a53a2a91c2725e9d8a3')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f6418272e8d3a9ad41fba49712917130b09db925b6caecd78653541aedee3e2d')
 
 build() {
   cd $pkgname-$pkgver
-
-  # Fix files missing from tarball
-  mkdir data/css
-  cp ../*.{css,svg} data/css
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 0d29c06de..7ba591dad 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194410 2013-09-16 08:14:01Z jgc $
+# $Id: PKGBUILD 196054 2013-10-07 11:51:16Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9125f438321c686c578b37f37a7bfab1ec8dbb519c06031a682b1eb49f474279')
+sha256sums=('95e27198fb6c7d45918d1a47a440ed5af0c65bbe2ec53fb8898d4c00c7dc8f00')
 
 build(){
   cd $pkgname-$pkgver
diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD
index 4a3938f3c..d6e4b58d6 100644
--- a/extra/gnome-contacts/PKGBUILD
+++ b/extra/gnome-contacts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 190124 2013-07-15 23:14:12Z heftig $
+# $Id: PKGBUILD 196056 2013-10-07 11:51:18Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-contacts
-pkgver=3.8.3
+pkgver=3.10
 pkgrel=1
 pkgdesc="Contacts Manager for GNOME"
 arch=(i686 x86_64)
@@ -12,8 +12,8 @@ groups=(gnome)
 depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese')
 makedepends=('intltool' 'vala' 'gobject-introspection')
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('48e179aa40ffdee4218565a22da31d8794fb47f21beda60a2e8b80483a2f80a3')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz)
+sha256sums=('1cb57d81455ee44e50745452bfefdf74f9ad4e393661199005c665284cda20cf')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 8abff2a2c..55f3a110a 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194412 2013-09-16 08:37:42Z jgc $
+# $Id: PKGBUILD 196057 2013-10-07 11:51:20Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.8.5
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
 license=(GPL)
@@ -22,20 +22,13 @@ groups=(gnome)
 url="http://www.gnome.org"
 install=gnome-control-center.install
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-        no-deprecated-upower.diff)
-sha256sums=('efb9fb47aaa9a308aed3064efc39356db05d71ddb0374561eeccc57c122212e2'
-            '4182fa082b071c840bc0a6e981dad3c070602cae473229227e81bdaa2b5f8c23')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../no-deprecated-upower.diff
-}
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ea74d87e255308f130039a9afab548ae0416e2c96e69adfc7c794d1775f1474f')
 
 build() {
   cd $pkgname-$pkgver
 
-  CFLAGS="$CFLAGS -Wall" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/$pkgname --disable-static --disable-silent-rules
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656229
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index 89303244b..411340229 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194422 2013-09-16 09:53:28Z jgc $
+# $Id: PKGBUILD 196058 2013-10-07 11:51:23Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.8.4
+pkgver=3.10.0
 pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
@@ -13,8 +13,8 @@ makedepends=(intltool gobject-introspection itstool)
 url="http://www.gnome.org"
 groups=(gnome)
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2aa1d4c5b78b018368e1cf9cd3568555dd6b04ad68536b9f338b28ac0f89df9f')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('3e87352ba30e9965199fb360c852e22ccb7c7e5c02965b6d63fb175f3737b75c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD
index 06234012a..dba419724 100644
--- a/extra/gnome-dictionary/PKGBUILD
+++ b/extra/gnome-dictionary/PKGBUILD
@@ -1,7 +1,8 @@
-# $Id: PKGBUILD 191351 2013-07-23 18:22:13Z jgc $
+# $Id: PKGBUILD 196059 2013-10-07 11:51:24Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=gnome-dictionary
-pkgver=3.8.0
+pkgver=3.9.0
 pkgrel=1
 pkgdesc="Look up words in dictionary sources"
 arch=(i686 x86_64)
@@ -13,16 +14,16 @@ install=$pkgname.install
 options=(!libtool)
 groups=('gnome')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('faebbca7684aeef5ff4111305bc8e0c1790b0551445df404b68f3d7cf2c50421')
+sha256sums=('4881096d5952ca39e19e4ecfb37f16634d5f5c1e41ee1e74fa8550f59f5bd455')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 76b52c8a7..66386b972 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,30 +1,21 @@
-# $Id: PKGBUILD 186559 2013-05-29 01:23:46Z heftig $
+# $Id: PKGBUILD 196060 2013-10-07 11:51:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Silvio Knizek (killermoehre)
 
 pkgname=gnome-disk-utility
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Disk Management Utility for GNOME"
 arch=(i686 x86_64)
 license=(GPL)
 url="http://www.gnome.org"
 groups=(gnome)
-depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hicolor-icon-theme desktop-file-utils)
+depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify desktop-file-utils gnome-icon-theme-symbolic)
 makedepends=(intltool docbook-xsl gnome-settings-daemon)
 options=('!libtool' '!emptydirs')
 install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        typefixes.patch)
-sha256sums=('6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3'
-            '0a1f2f80f1c741119639b3b2b8cf32d6261b126baa85189309d6473e171894d2')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Gets rid of warnings and compilation errors on i686
-  patch -Np1 -i ../typefixes.patch
-}
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('34e23a62e711ec543670550f9312a5ad6610ce807d57345146b6af989788b8aa')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index 0ff324441..76cc7709f 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 193767 2013-08-30 14:34:45Z heftig $
+# $Id: PKGBUILD 196061 2013-10-07 11:51:26Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
-pkgver=3.8.4
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="Documents Manager for GNOME"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
 license=(GPL)
 groups=(gnome-extra)
 depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata
-         tracker libzapojit webkitgtk3)
+         tracker libzapojit webkitgtk gnome-online-miners)
 makedepends=(intltool gobject-introspection itstool docbook-xsl)
 optdepends=('unoconv: Support for Libreoffice document types')
 options=('!libtool')
 install=gnome-documents.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('daebb07b2e0767677e5fbdc4f5b5ca6672089565f955e3a42505e3f784e02ed9')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('93365aee61c2777d1fe70fa8f55f6e3ce9e7e130dd2869d74eb85787825be9f6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD
index 82392d280..0d5097e42 100644
--- a/extra/gnome-font-viewer/PKGBUILD
+++ b/extra/gnome-font-viewer/PKGBUILD
@@ -1,8 +1,8 @@
-#  $Id: PKGBUILD 183381 2013-04-21 22:09:54Z heftig $
+#  $Id: PKGBUILD 196062 2013-10-07 11:51:28Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-font-viewer
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME font viewer and thumbnailer"
 arch=(i686 x86_64)
@@ -13,8 +13,8 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-font-viewer.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d34f17f026b7c41d8de5c255070c79c938ce69030b3429444e7fb8f2275ff819')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index a63dfba2c..f99ba4ce9 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 184243 2013-05-04 20:20:08Z heftig $
+#$Id: PKGBUILD 196066 2013-10-07 11:51:34Z jgc $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868')
+sha256sums=('1cc87260fa17b8e39071fdae0418cd9ca5f913d50e23d8f456f3e2c6d6d22213')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD
index 59da7d96c..01a0ba4e3 100644
--- a/extra/gnome-klotski/PKGBUILD
+++ b/extra/gnome-klotski/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185360 2013-05-13 17:42:01Z heftig $
+# $Id: PKGBUILD 196067 2013-10-07 11:51:35Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-klotski
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Slide blocks to solve the puzzle"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-klotski.install
 url="https://live.gnome.org/Klotski"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('757a531542272b8d2191facb034e5033ba3aa340d5303b8d939f78045d91910c')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ce29d136bc1c141dc92b0dc67d597f2b0eddefcee7d3de10d54ef80327c6f5d3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD
index c3d79b652..21fc000b4 100644
--- a/extra/gnome-mahjongg/PKGBUILD
+++ b/extra/gnome-mahjongg/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-mahjongg
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Disassemble a pile of tiles by removing matching pairs"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-mahjongg.install
 url="https://live.gnome.org/Mahjongg"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6995bfae4c145f07764a7825865804232e620bbdf57c0625d0a21d06561ad496')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bcbb67d0784e3e8c1772d83f559506c40b5ff2d38c8212db004b0d913f04e963')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 482a14cce..81497af6f 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183388 2013-04-21 22:10:05Z heftig $
+# $Id: PKGBUILD 196156 2013-10-07 12:17:09Z jgc $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64')
 depends=('glib2')
@@ -11,14 +11,11 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 license=('GPL' 'LGPL')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        calculator.patch)
-sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f'
-            'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('713a58ff9e3264be70dd233c2935cfce4ee76223c17044ecbf6cb53eba875192')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i ../calculator.patch
   ./configure \
       --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var  --disable-static
diff --git a/extra/gnome-menus/calculator.patch b/extra/gnome-menus/calculator.patch
deleted file mode 100644
index 9ff1ed261..000000000
--- a/extra/gnome-menus/calculator.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Thu, 28 Mar 2013 21:54:34 +0000
-Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
-
-gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
-very last minute before the 3.8.0 release.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696816
----
-diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
-index 84d13ed..503f9ca 100644
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -38,7 +38,6 @@
-         <Not><Filename>file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
--        <Not><Filename>gnome-calculator.desktop</Filename></Not>
-         <Not><Filename>gcalctool.desktop</Filename></Not>
-         <Not><Filename>gucharmap.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
-@@ -251,7 +250,7 @@
-     <Directory>X-GNOME-Utilities.directory</Directory>
-     <Include>
-       <Filename>file-roller.desktop</Filename>
--      <Filename>gnome-calculator.desktop</Filename>
-+      <Filename>gcalctool.desktop</Filename>
-       <Filename>gnome-font-viewer.desktop</Filename>
-       <Filename>gucharmap.desktop</Filename>
-       <Filename>seahorse.desktop</Filename>
-@@ -287,7 +286,6 @@
-         <Not><Filename>gnome-eog.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
--        <Not><Filename>gcalctool.desktop</Filename></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->
---
-cgit v0.9.1
diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD
index 1931c5630..be69d86fd 100644
--- a/extra/gnome-mines/PKGBUILD
+++ b/extra/gnome-mines/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193434 2013-08-20 07:06:23Z jgc $
+# $Id: PKGBUILD 196069 2013-10-07 11:51:38Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-mines
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Clear hidden mines from a minefield"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-mines.install
 url="https://live.gnome.org/Mines"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e70f13056183f8d9a8aa3721516545364e10e9fde0a4b703de7cba1fe3af531d')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('b0f71a58e864848f5dd1067488b7d1d31b7c8f30d6d9904411b755d29074826c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-music/PKGBUILD b/extra/gnome-music/PKGBUILD
new file mode 100644
index 000000000..409f8ebb0
--- /dev/null
+++ b/extra/gnome-music/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-music
+pkgver=3.10.0
+pkgrel=2
+pkgdesc="Music player and management application"
+arch=(i686 x86_64)
+license=('GPL')
+url="https://wiki.gnome.org/Apps/Music"
+depends=(grilo grilo-plugins tracker python gobject-introspection libdmapsharing python-dbus dbus-glib)
+makedepends=(intltool)
+options=('!libtool')
+groups=('gnome-extra')
+install=gnome-music.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('16ecbb93f4e69a7e85b86fc73413744073d69edaa09e71e135afe2c8de5b1d69')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make -j1 DESTDIR="${pkgdir}" install
+}
diff --git a/extra/gnome-music/gnome-music.install b/extra/gnome-music/gnome-music.install
new file mode 100644
index 000000000..2b172e29c
--- /dev/null
+++ b/extra/gnome-music/gnome-music.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-nibbles/PKGBUILD b/extra/gnome-nibbles/PKGBUILD
index d10cfdc7c..4ef8cfb89 100644
--- a/extra/gnome-nibbles/PKGBUILD
+++ b/extra/gnome-nibbles/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-nibbles
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Guide a worm around a maze"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-nibbles.install
 url="https://live.gnome.org/Nibbles"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bc1e4f687f1e794ef15a4162492154970300ac682378e59f9471327e5fd0d606')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6bf774cbd86e617c49f1740e79d52a7d26bf23656a673db1efb20bcc893e614a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index 29e966f2f..06c9e5c77 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,37 +1,23 @@
-# $Id: PKGBUILD 193766 2013-08-30 14:31:41Z heftig $
+# $Id: PKGBUILD 196071 2013-10-07 11:51:42Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
 license=('GPL')
-depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret')
+depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret' 'telepathy-glib')
 makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 options=(!libtool)
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
-        drop-google-password-interface-1.patch
-        drop-google-password-interface-2.patch
-        drop-google-password-interface-3.patch)
-sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b'
-            '33435c10aa1ba3fbb6fd633dc098cd1da50629f1d602521ca83be5379f2ebe48'
-            'c837f9be4e5e072a06ea44076e6b9a1519c66c95b16d7a55b1dba105fded317f'
-            '18dfad8ed978af1068fd057bbe323006c349ac4ea77c742aa06f1011dc92326e')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # Backport from Ubuntu
-  patch -Np1 -i ../drop-google-password-interface-1.patch
-  patch -Np1 -i ../drop-google-password-interface-2.patch
-  patch -Np1 -i ../drop-google-password-interface-3.patch
-}
- 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname
   make
 }
 
diff --git a/extra/gnome-online-accounts/drop-google-password-interface-1.patch b/extra/gnome-online-accounts/drop-google-password-interface-1.patch
deleted file mode 100644
index 1bd5c8c0f..000000000
--- a/extra/gnome-online-accounts/drop-google-password-interface-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9182fb378614abb2ff0245fe71a753f22eaaa906 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Tue, 11 Jun 2013 14:58:21 +0000
-Subject: google: Bump credentials generation
-
-Access to the following were turned on in the Google APIs Console:
- - Calendar API
- - Google Calendar CalDAV API
- - Google Contacts CardDAV API
-
-Of these, only the last two are new. We were already requesting the
-scope for Calendar API, but looks like the APIs Console is the way
-to go now. Interestingly the APIs Console does not list all the other
-services that we are interested in, or it is does but is not obvious
-to me.
-
-In any case we need access to their new CalDAV API which works with
-OAuth2 because that would let us work with 2-factor authenticated
-accounts again.
-
-See: https://bugzilla.gnome.org/show_bug.cgi?id=686804
-     https://bugzilla.gnome.org/show_bug.cgi?id=688364
----
-(limited to 'src/goabackend/goagoogleprovider.c')
-
-diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
-index 8271711..79f5f73 100644
---- a/src/goabackend/goagoogleprovider.c
-+++ b/src/goabackend/goagoogleprovider.c
-@@ -148,7 +148,7 @@ get_scope (GoaOAuth2Provider *provider)
- static guint
- get_credentials_generation (GoaProvider *provider)
- {
--  return 3;
-+  return 4;
- }
- 
- static const gchar *
-
diff --git a/extra/gnome-online-accounts/drop-google-password-interface-2.patch b/extra/gnome-online-accounts/drop-google-password-interface-2.patch
deleted file mode 100644
index 9aa1ce28e..000000000
--- a/extra/gnome-online-accounts/drop-google-password-interface-2.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From a0fd4cd595bd0fe6eb4015ea9050170319b16546 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Wed, 19 Jun 2013 15:04:38 +0000
-Subject: google: Export CalDAV and CardDAV endpoints
-
-According to:
-https://developers.google.com/google-apps/calendar/caldav/v2/guide/
-https://developers.google.com/google-apps/carddav/
-
-See: https://bugzilla.gnome.org/show_bug.cgi?id=686804
-     https://bugzilla.gnome.org/show_bug.cgi?id=688364
----
-(limited to 'src/goabackend/goagoogleprovider.c')
-
-diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
-index 79f5f73..740c08e 100644
---- a/src/goabackend/goagoogleprovider.c
-+++ b/src/goabackend/goagoogleprovider.c
-@@ -385,6 +385,7 @@ build_object (GoaProvider         *provider,
-   gboolean contacts_enabled;
-   gboolean chat_enabled;
-   gboolean documents_enabled;
-+  const gchar *email_address;
- 
-   account = NULL;
-   mail = NULL;
-@@ -419,6 +420,7 @@ build_object (GoaProvider         *provider,
-     }
- 
-   account = goa_object_get_account (GOA_OBJECT (object));
-+  email_address = goa_account_get_identity (account);
- 
-   /* Email */
-   mail = goa_object_get_mail (GOA_OBJECT (object));
-@@ -427,8 +429,6 @@ build_object (GoaProvider         *provider,
-     {
-       if (mail == NULL)
-         {
--          const gchar *email_address;
--          email_address = goa_account_get_identity (account);
-           mail = goa_mail_skeleton_new ();
-           g_object_set (G_OBJECT (mail),
-                         "email-address",   email_address,
-@@ -457,8 +457,19 @@ build_object (GoaProvider         *provider,
-     {
-       if (calendar == NULL)
-         {
-+          gchar *uri_caldav;
-+
-+          uri_caldav = g_strconcat ("https://apidata.googleusercontent.com/caldav/v2/",
-+                                    email_address,
-+                                    "/user",
-+                                    NULL);
-+
-           calendar = goa_calendar_skeleton_new ();
-+          g_object_set (G_OBJECT (calendar),
-+                        "uri", uri_caldav,
-+                        NULL);
-           goa_object_skeleton_set_calendar (object, calendar);
-+          g_free (uri_caldav);
-         }
-     }
-   else
-@@ -475,6 +486,9 @@ build_object (GoaProvider         *provider,
-       if (contacts == NULL)
-         {
-           contacts = goa_contacts_skeleton_new ();
-+          g_object_set (G_OBJECT (contacts),
-+                        "uri", "https://www.googleapis.com/.well-known/carddav",
-+                        NULL);
-           goa_object_skeleton_set_contacts (object, contacts);
-         }
-     }
-
diff --git a/extra/gnome-online-accounts/drop-google-password-interface-3.patch b/extra/gnome-online-accounts/drop-google-password-interface-3.patch
deleted file mode 100644
index 487132b32..000000000
--- a/extra/gnome-online-accounts/drop-google-password-interface-3.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From 365a5a92909fce8dcdd851b5a2b9caf34e0da926 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Fri, 28 Jun 2013 12:22:07 +0000
-Subject: google: Don't offer a PasswordBased interface
-
-This was a temporary measure back when Google did not support OAuth2
-for CalDAV. Now that they do, we can drop this.
-
-In any case, the workaround didn't work with accounts using 2-factor
-authentication. This will make those people happy.
-
-This reverts 89c335479c1bb8409af8296c99ffea602a28b71f
-
-See: https://bugzilla.gnome.org/show_bug.cgi?id=686804
-     https://bugzilla.gnome.org/show_bug.cgi?id=688364
----
-(limited to 'src/goabackend/goagoogleprovider.c')
-
-Index: gnome-online-accounts-3.8.2/src/goabackend/goagoogleprovider.c
-===================================================================
---- gnome-online-accounts-3.8.2.orig/src/goabackend/goagoogleprovider.c	2013-07-10 13:29:35.381448621 -0400
-+++ gnome-online-accounts-3.8.2/src/goabackend/goagoogleprovider.c	2013-07-10 13:29:35.377448621 -0400
-@@ -32,8 +32,6 @@
- #include "goaprovider-priv.h"
- #include "goaoauth2provider.h"
- #include "goagoogleprovider.h"
--#include "goahttpclient.h"
--#include "goautils.h"
- 
- /**
-  * GoaGoogleProvider:
-@@ -71,8 +69,6 @@
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
--static const gchar *CALDAV_ENDPOINT = "https://www.google.com/calendar/dav/%s/events/";
--
- static const gchar *
- get_provider_type (GoaProvider *_provider)
- {
-@@ -310,48 +306,8 @@
-   return ret;
- }
- 
--static gboolean
--is_password_node (GoaOAuth2Provider *provider, WebKitDOMHTMLInputElement *element)
--{
--  gboolean ret;
--  gchar *element_type;
--  gchar *id;
--  gchar *name;
--
--  element_type = NULL;
--  id = NULL;
--  name = NULL;
--
--  ret = FALSE;
--
--  g_object_get (element, "type", &element_type, NULL);
--  if (g_strcmp0 (element_type, "password") != 0)
--    goto out;
--
--  id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (element));
--  if (g_strcmp0 (id, "Passwd") != 0)
--    goto out;
--
--  name = webkit_dom_html_input_element_get_name (element);
--  if (g_strcmp0 (name, "Passwd") != 0)
--    goto out;
--
--  ret = TRUE;
--
-- out:
--  g_free (element_type);
--  g_free (id);
--  g_free (name);
--  return ret;
--}
--
- /* ---------------------------------------------------------------------------------------------------- */
- 
--static gboolean on_handle_get_password (GoaPasswordBased      *interface,
--                                        GDBusMethodInvocation *invocation,
--                                        const gchar           *id,
--                                        gpointer               user_data);
--
- static gboolean
- build_object (GoaProvider         *provider,
-               GoaObjectSkeleton   *object,
-@@ -367,7 +323,6 @@
-   GoaContacts *contacts;
-   GoaChat *chat;
-   GoaDocuments *documents;
--  GoaPasswordBased *password_based;
-   gboolean ret;
-   gboolean mail_enabled;
-   gboolean calendar_enabled;
-@@ -394,20 +349,6 @@
-                                                                             error))
-     goto out;
- 
--  password_based = goa_object_get_password_based (GOA_OBJECT (object));
--  if (password_based == NULL)
--    {
--      password_based = goa_password_based_skeleton_new ();
--      /* Ensure D-Bus method invocations run in their own thread */
--      g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (password_based),
--                                           G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD);
--      goa_object_skeleton_set_password_based (object, password_based);
--      g_signal_connect (password_based,
--                        "handle-get-password",
--                        G_CALLBACK (on_handle_get_password),
--                        NULL);
--    }
--
-   account = goa_object_get_account (GOA_OBJECT (object));
-   email_address = goa_account_get_identity (account);
- 
-@@ -567,103 +508,6 @@
- /* ---------------------------------------------------------------------------------------------------- */
- 
- static gboolean
--ensure_credentials_sync (GoaProvider   *provider,
--                         GoaObject     *object,
--                         gint          *out_expires_in,
--                         GCancellable  *cancellable,
--                         GError       **error)
--{
--  GVariant *credentials;
--  GoaAccount *account;
--  GoaHttpClient *http_client;
--  gboolean ret;
--  const gchar *username;
--  gchar *password;
--  gchar *uri_caldav;
--
--  credentials = NULL;
--  http_client = NULL;
--  password = NULL;
--  uri_caldav = NULL;
--
--  ret = FALSE;
--
--  /* Chain up */
--  if (!GOA_PROVIDER_CLASS (goa_google_provider_parent_class)->ensure_credentials_sync (provider,
--                                                                                       object,
--                                                                                       out_expires_in,
--                                                                                       cancellable,
--                                                                                       error))
--    goto out;
--
--  credentials = goa_utils_lookup_credentials_sync (provider,
--                                                   object,
--                                                   cancellable,
--                                                   error);
--  if (credentials == NULL)
--    {
--      if (error != NULL)
--        {
--          (*error)->domain = GOA_ERROR;
--          (*error)->code = GOA_ERROR_NOT_AUTHORIZED;
--        }
--      goto out;
--    }
--
--  account = goa_object_peek_account (object);
--  username = goa_account_get_presentation_identity (account);
--  uri_caldav = g_strdup_printf (CALDAV_ENDPOINT, username);
--
--  if (!g_variant_lookup (credentials, "password", "s", &password))
--    {
--      if (error != NULL)
--        {
--          *error = g_error_new (GOA_ERROR,
--                                GOA_ERROR_NOT_AUTHORIZED,
--                                _("Did not find password with identity `%s' in credentials"),
--                                username);
--        }
--      goto out;
--    }
--
--  http_client = goa_http_client_new ();
--  ret = goa_http_client_check_sync (http_client,
--                                    uri_caldav,
--                                    username,
--                                    password,
--                                    FALSE,
--                                    cancellable,
--                                    error);
--  if (!ret)
--    {
--      if (error != NULL)
--        {
--          g_prefix_error (error,
--                          /* Translators: the first %s is the username
--                           * (eg., debarshi.ray@gmail.com or rishi), and the
--                           * (%s, %d) is the error domain and code.
--                           */
--                          _("Invalid password with username `%s' (%s, %d): "),
--                          username,
--                          g_quark_to_string ((*error)->domain),
--                          (*error)->code);
--          (*error)->domain = GOA_ERROR;
--          (*error)->code = GOA_ERROR_NOT_AUTHORIZED;
--        }
--      goto out;
--    }
--
-- out:
--  g_clear_object (&http_client);
--  g_free (password);
--  g_free (uri_caldav);
--  g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
--  return ret;
--}
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--static gboolean
- get_use_mobile_browser (GoaOAuth2Provider *provider)
- {
-   return TRUE;
-@@ -744,7 +588,6 @@
-   provider_class->get_provider_name          = get_provider_name;
-   provider_class->get_provider_group         = get_provider_group;
-   provider_class->build_object               = build_object;
--  provider_class->ensure_credentials_sync    = ensure_credentials_sync;
-   provider_class->show_account               = show_account;
-   provider_class->get_credentials_generation = get_credentials_generation;
- 
-@@ -758,65 +601,7 @@
-   oauth2_class->get_scope                 = get_scope;
-   oauth2_class->is_deny_node              = is_deny_node;
-   oauth2_class->is_identity_node          = is_identity_node;
--  oauth2_class->is_password_node          = is_password_node;
-   oauth2_class->get_token_uri             = get_token_uri;
-   oauth2_class->get_use_mobile_browser    = get_use_mobile_browser;
-   oauth2_class->add_account_key_values    = add_account_key_values;
- }
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--/* runs in a thread dedicated to handling @invocation */
--static gboolean
--on_handle_get_password (GoaPasswordBased      *interface,
--                        GDBusMethodInvocation *invocation,
--                        const gchar           *id, /* unused */
--                        gpointer               user_data)
--{
--  GoaObject *object;
--  GoaAccount *account;
--  GoaProvider *provider;
--  GError *error;
--  GVariant *credentials;
--  const gchar *identity;
--  gchar *password;
--
--  /* TODO: maybe log what app is requesting access */
--
--  password = NULL;
--  credentials = NULL;
--
--  object = GOA_OBJECT (g_dbus_interface_get_object (G_DBUS_INTERFACE (interface)));
--  account = goa_object_peek_account (object);
--  identity = goa_account_get_identity (account);
--  provider = goa_provider_get_for_provider_type (goa_account_get_provider_type (account));
--
--  error = NULL;
--  credentials = goa_utils_lookup_credentials_sync (provider,
--                                                   object,
--                                                   NULL, /* GCancellable* */
--                                                   &error);
--  if (credentials == NULL)
--    {
--      g_dbus_method_invocation_take_error (invocation, error);
--      goto out;
--    }
--
--  if (!g_variant_lookup (credentials, "password", "s", &password))
--    {
--      g_dbus_method_invocation_return_error (invocation,
--                                             GOA_ERROR,
--                                             GOA_ERROR_FAILED, /* TODO: more specific */
--                                             _("Did not find password with identity `%s' in credentials"),
--                                             identity);
--      goto out;
--    }
--
--  goa_password_based_complete_get_password (interface, invocation, password);
--
-- out:
--  g_free (password);
--  g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
--  g_object_unref (provider);
--  return TRUE; /* invocation was handled */
--}
diff --git a/extra/gnome-online-miners/PKGBUILD b/extra/gnome-online-miners/PKGBUILD
new file mode 100644
index 000000000..9211d6522
--- /dev/null
+++ b/extra/gnome-online-miners/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 196006 2013-10-07 11:48:35Z jgc $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=gnome-online-miners
+pkgver=3.10.0
+pkgrel=1
+pkgdesc="Tracker miners for online accounts"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=(GPL)
+depends=(libgdata gnome-online-accounts grilo libzapojit tracker)
+options=(!libtool)
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a4ca0d78452f8d19ed4eedeb5164b93aead9566cb9e2cf9826d49e3bad02a504')
+ 
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD
index 486d49d3e..a2a51b53b 100644
--- a/extra/gnome-photos/PKGBUILD
+++ b/extra/gnome-photos/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 185464 2013-05-14 10:33:14Z heftig $
+# $Id: PKGBUILD 196072 2013-10-07 11:51:43Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-photos
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Access, organize, and share your photos on GNOME"
 arch=(i686 x86_64)
 url="https://www.gnome.org/"
 license=(GPL)
-depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme)
+depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme grilo)
 makedepends=(intltool)
 options=(!libtool)
 groups=(gnome-extra)
 install=gnome-photos.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c6e777cdc6a4b0ee24b4dbd1b971fe239198926a3057c27c08eeda0a53ba6d58')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('65cb5790ec5a282c8bc8b4902858a0b4b3cec2fe39709a580dc073a23a5fc210')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index 1ed4787d4..b24a9c7ee 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185314 2013-05-13 09:37:19Z heftig $
+# $Id: PKGBUILD 196073 2013-10-07 11:51:45Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="System power information and statistics"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=(intltool)
 options=(!emptydirs)
 install=gnome-power-manager.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6f4fee6cce2c0a58ae52a2cae1b8f0acca0a08d8154fe056ca3bfb5e537c5b61')
+sha256sums=('e193f7b6c813acab2d57eefec783d267b26d114c2185ffe41334000c65f76841')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index 569da8596..ab07d1d88 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169097 2012-10-17 22:51:16Z allan $
+# $Id: PKGBUILD 196074 2013-10-07 11:51:47Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,7 +6,7 @@
 pkgbase=gnome-python-desktop
 pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
 pkgver=2.32.0
-pkgrel=12
+pkgrel=13
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 options=('!libtool')
diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD
index 8f4c471d2..1fcbc05d0 100644
--- a/extra/gnome-robots/PKGBUILD
+++ b/extra/gnome-robots/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183394 2013-04-21 22:10:16Z heftig $
+# $Id: PKGBUILD 196075 2013-10-07 11:51:48Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-robots
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Avoid the robots and make them crash into each other"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-robots.install
 url="https://live.gnome.org/Robots"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6faeeef5ab9b5002c7ca3cf60ea67e7a66064654ae28c68c233b2ee40459a704')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('600a5b81bf0b47cbe942cd3902a947df2e9e2a2a72f4b2a7248e60b1621b987e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD
index 47f20a5bf..811927a6a 100644
--- a/extra/gnome-screenshot/PKGBUILD
+++ b/extra/gnome-screenshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 189890 2013-07-10 16:54:26Z heftig $
+# $Id: PKGBUILD 196076 2013-10-07 11:51:50Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-screenshot
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Take pictures of your screen"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool')
 groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('05d638d53da334aa8818e83ed3f91a17334c48c707d728426414033607582971')
+sha256sums=('709de9b9c66f569f4984152376479ca2c4aa47c9e5aa5e7385e417c9fe3465d9')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index e88d3369f..2478e24a6 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 191810 2013-07-30 23:24:20Z jgc $
+# $Id: PKGBUILD 196077 2013-10-07 11:51:51Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-session
-pkgver=3.8.4
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
 license=(GPL LGPL)
-depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop
+depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
          hicolor-icon-theme json-glib libgl libsm libxtst upower)
 makedepends=(intltool mesa gtk-doc xtrans)
 options=('!emptydirs')
 install=gnome-session.install
 url="http://www.gnome.org"
 groups=(gnome)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         timeout.patch)
-sha256sums=('e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1'
+sha256sums=('38d90c5d5a33ec8a3002f1e77e201c1554eeb8bbba8923d94fab81b3a8e0696e'
             '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
 
   # Increase timeout, for slow machines
   patch -Np1 -i ../timeout.patch
-
+}
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile --enable-systemd
+      --disable-schemas-compile --enable-systemd --disable-gconf
   make
 }
 
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 1f67adbc1..ab2fb0e77 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,28 +1,21 @@
-# $Id: PKGBUILD 194420 2013-09-16 09:19:10Z jgc $
+# $Id: PKGBUILD 196078 2013-10-07 11:51:53Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.8.5
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
-         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg')
+         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2')
 makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        0001-power-Use-logind-to-discover-critical-action-availab.patch)
-sha256sums=('19420c97296802162fd4e0e0a08e797f5038ec8bd98cffe222362e24c7405784'
-            '9825d3486665d87d4fc54355a6d318d68f5d3caeb286bdd659147920a85c56d9')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../0001-power-Use-logind-to-discover-critical-action-availab.patch
-}
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index bddb6c987..794d342dc 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191829 2013-07-31 09:01:10Z jgc $
+# $Id: PKGBUILD 196079 2013-10-07 11:51:54Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.8.4
+pkgver=3.10.0.1
 pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64)
@@ -11,16 +11,16 @@ url="http://live.gnome.org/GnomeShell"
 license=(GPL2)
 depends=(accountsservice caribou evolution-data-server gcr gjs gnome-bluetooth gnome-menus
          gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
-         libcanberra-pulse libcroco libgdm libsecret mutter network-manager-applet
+         libcanberra-pulse libcroco libgdm libsecret mutter mutter-wayland network-manager-applet
          telepathy-logger telepathy-mission-control unzip)
 makedepends=(intltool gtk-doc gnome-control-center)
 optdepends=('gnome-control-center: System settings')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
         nm-libexecdir.patch)
-sha256sums=('547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47'
+sha256sums=('eb98ca6274e82e446834221b2dfd9af0e12e5ebce651319435524fd6cd5f4ec9'
             'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
 
 prepare() {
@@ -28,6 +28,9 @@ prepare() {
 
   # FS#30747 FS#32730 Problems due to libexecdir different from NM
   patch -Np1 -i ../nm-libexecdir.patch
+
+  # Build against mutter-wayland 3.9.92
+  sed -ri 's/^(MUTTER_MIN_VERSION)=.*/\1=3.9.92/' configure
 }
 
 build() {
diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD
index 8b4c28ac9..4ee48eff7 100644
--- a/extra/gnome-system-log/PKGBUILD
+++ b/extra/gnome-system-log/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183402 2013-04-21 22:10:29Z heftig $
+# $Id: PKGBUILD 196082 2013-10-07 11:51:58Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-system-log
-pkgver=3.8.1
+pkgver=3.9.90
 pkgrel=1
 pkgdesc="View your system logs"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'docbook-xsl')
 groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2393d00e059212b5a1135589d11412c0639fe9e60958ccff1bac238139dd4967')
+sha256sums=('9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index 1bea034eb..140b18c2d 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 185539 2013-05-14 20:47:47Z heftig $
+# $Id: PKGBUILD 196083 2013-10-07 11:52:01Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.8.2.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'systemd')
+depends=('libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'systemd')
 makedepends=('itstool' 'docbook-xsl' 'intltool')
 options=(!emptydirs)
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('df4d2c4dbb4f3408b621140732efb3e38853658addd6aae73613027856f6bb44')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a6bd4e925b21db08e687f7b71a0363777e1dbdda143142232c1c78ecf14821ac')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index ac374672a..00cb6b89e 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 189824 2013-07-08 16:53:47Z heftig $
+# $Id: PKGBUILD 196084 2013-10-07 11:52:02Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.8.4
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="The GNOME Terminal Emulator"
 arch=(i686 x86_64)
 license=(GPL)
-depends=(vte3 gsettings-desktop-schemas libsm dconf)
-makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils python2 gconf)
+depends=(vte3 gsettings-desktop-schemas dconf)
+makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils gconf libnautilus-extension)
 optdepends=('gconf: settings migration when upgrading from older version')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2f7cc56d39e083eee0419c7d7e9ae43e00dca8bc55bdd31271fb193ec7f63796')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib/$pkgname --disable-static
+    --libexecdir=/usr/lib/$pkgname --disable-static --with-nautilus-extension
   make
 }
 
diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD
index b07cb7346..96d6a0090 100644
--- a/extra/gnome-tetravex/PKGBUILD
+++ b/extra/gnome-tetravex/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183405 2013-04-21 22:10:35Z heftig $
+# $Id: PKGBUILD 196085 2013-10-07 11:52:04Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-tetravex
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Complete the puzzle by matching numbered tiles"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-tetravex.install
 url="https://live.gnome.org/Tetravex"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('30491c1e9005d8f17f6f9655c3a9b553bcaa16e353719ce1de60630a71150ea3')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('12ae001325038cdf4bc5bd1bb8efe1807e560c55d63aa9dd21ac997d2f51dadf')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 425edfd92..bbcc70c27 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194418 2013-09-16 09:09:15Z jgc $
+# $Id: PKGBUILD 196086 2013-10-07 11:52:07Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
-pkgver=3.8.4
+pkgver=3.10.0
 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=('1252d719847cab54cc0dc510c3d3698462dcb1b45fabd9643473ac28e5cd7a20')
+sha256sums=('812c6cfc534fced921dc327b436e70020d8979529284bb59d72d6f37af1f4b38')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index 8b003c0b6..f48c48adb 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 190104 2013-07-15 17:59:27Z heftig $
+# $Id: PKGBUILD 196089 2013-10-07 11:52:13Z jgc $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-user-share
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
-depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'dbus-glib')
-makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl')
+depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
+makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl' 'dbus-glib')
 options=('!emptydirs' '!libtool')
 groups=('gnome')
 install=gnome-user-share.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e6f36eaf66fafad2f6ec959ba2cb143b60ff00eb9a94a65b181411b366f2a26f')
+sha256sums=('2dbeacab637eede5429521d7796abe40c3e9d3d842b9e5aa45453c54db08f500')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-user-share \
-      --localstatedir=/var
+      --localstatedir=/var --enable-bluetooth
   make
 }
 
diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD
index 472df3ad0..3774bc35c 100644
--- a/extra/gnome-weather/PKGBUILD
+++ b/extra/gnome-weather/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185432 2013-05-14 09:43:24Z heftig $
+# $Id: PKGBUILD 196090 2013-10-07 11:52:14Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-weather
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Access current weather conditions and forecasts"
 arch=(i686 x86_64)
@@ -13,8 +13,8 @@ makedepends=(intltool gobject-introspection)
 options=(!libtool)
 groups=(gnome-extra)
 install=gnome-weather.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('cf61afac1435dbdb87e8d9e4d86bca29cf1ff2c64cefc8db696cd27dad15adf4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('66d764a19ceebc512711a3b71c849e04021311fa12d617148bbf22c083121b69')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-weather/gnome-weather.install b/extra/gnome-weather/gnome-weather.install
index c25dff2d3..f7e8c46ac 100644
--- a/extra/gnome-weather/gnome-weather.install
+++ b/extra/gnome-weather/gnome-weather.install
@@ -1,11 +1,12 @@
 post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index 124f50f3a..ba26ea09e 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183411 2013-04-21 22:10:45Z heftig $
+# $Id: PKGBUILD 196091 2013-10-07 11:52:16Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gobject-introspection
-pkgver=1.36.0
+pkgver=1.38.0
 pkgrel=1
 pkgdesc="Introspection system for GObject-based libraries"
 url="https://live.gnome.org/GObjectIntrospection"
@@ -12,7 +12,7 @@ depends=('glib2' 'python2' 'python2-mako')
 makedepends=('cairo')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383')
+sha256sums=('3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index 559b9f8ce..fefb54ea1 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193611 2013-08-26 07:04:31Z heftig $
+# $Id: PKGBUILD 196093 2013-10-07 11:52:19Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
 pkgver=0.2.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index d6a43768d..9c8bacbbb 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185628 2013-05-16 14:06:42Z heftig $
+# $Id: PKGBUILD 196092 2013-10-07 11:52:18Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo
-pkgver=0.2.6
+pkgver=0.2.7
 pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
@@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala' 'intltool')
 optdepends=('grilo-plugins: Plugins for grilo')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('601421279753b26bee0b2b5952689f87f7c7836879f7326151a8f8139fa67036')
+sha256sums=('4a854ee6f9a220f05e696813949be94780c12a7fb281253f10a545f30ed596d8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index 03566c715..e73514cce 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193754 2013-08-30 08:16:24Z heftig $
+# $Id: PKGBUILD 196095 2013-10-07 11:52:22Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-libav
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Gstreamer libav Plugin"
 arch=('i686' 'x86_64')
@@ -13,14 +13,19 @@ makedepends=('yasm')
 options=(!libtool !emptydirs)
 provides=("gst-ffmpeg=$pkgver-$pkgrel")
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6d059d1a39967ef7e1d345009fe003afe14ab55006d68e895a64f4a36968c5e')
+sha256sums=('48721eb318ffffdd134edea754d0b65d76b08c8209a8d2c8a42bca1f799f9099')
 
 build() {
   cd $pkgname-$pkgver
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \
-    --with-package-name="GStreamer libav Plugin (Archlinux)" \
+    --with-package-name="GStreamer libav Plugin (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index fd0a1d79b..37440ac6f 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193750 2013-08-30 08:12:17Z heftig $
+# $Id: PKGBUILD 196097 2013-10-07 11:52:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gst-plugins-base
 pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins"
 arch=('i686' 'x86_64')
@@ -12,19 +12,21 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv
 options=(!libtool !emptydirs)
 url="http://gstreamer.freedesktop.org/"
 source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('9754e83b2a3ff61266112915bfc84c895c4d145519ad9a3381edceb216bc97e8')
+sha256sums=('8656e20bf4b675e5696fb4af193793351926d428ca02826c5667a6384729a45d')
 
 build() {
   cd $pkgbase-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  aclocal -I m4 -I common/m4
-  autoconf
-  automake --add-missing
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name="GStreamer Base Plugins (Archlinux)" \
+    --with-package-name="GStreamer Base Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
+
   sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
 }
 
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index 56721eef1..a31604df8 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,36 +1,38 @@
-# $Id: PKGBUILD 193751 2013-08-30 08:13:17Z heftig $
+# $Id: PKGBUILD 196098 2013-10-07 11:52:26Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo')
-makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
+makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('c60342d6080ac6f794c5c2427dfbdee9140a2f67b82e7e945e286a2d416428ae')
+sha256sums=('2256a6b2744ea18d8810642cf9061a2f12f4b7eba87d3fbc98004262b4f0fdfa')
 
 build() {
   cd $pkgname-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  aclocal -I m4 -I common/m4
-  autoconf
-  automake --add-missing
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
+    --with-package-name="GStreamer Good Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
+# Disable for now: fails with soup timeout
+#check() {
+#  cd $pkgname-$pkgver
+#  make check
+#}
 
 package() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index d91f98840..b846a62e7 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193753 2013-08-30 08:14:48Z heftig $
+# $Id: PKGBUILD 196099 2013-10-07 11:52:28Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-ugly
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
 arch=('i686' 'x86_64')
@@ -11,18 +11,19 @@ url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('bed3510e09f036e7609e8d291535c395d25109b1180324b16859f475eac3a3c0')
+sha256sums=('e4760af4b12bf97ba0a8001cfe733d9d52160a0ad81f6c6f0d0d3a9e798626de')
 
 build() {
   cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  aclocal -I m4 -I common/m4
-  autoconf
-  automake --add-missing
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
+    --with-package-name="GStreamer Ugly Plugins (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index 6f11d2eb2..6bf196e57 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193749 2013-08-30 08:11:09Z heftig $
+# $Id: PKGBUILD 196100 2013-10-07 11:52:29Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
 arch=('i686' 'x86_64')
@@ -13,14 +13,18 @@ optdepends=('sh: feedback script')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
 source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('8e0aa9f41370586171a2616326fbc508bc4b61ffc4d55b2a8c4c3459d0cc1130')
+sha256sums=('94af5274299f845adf41cc504e0209b269acab7721293f49850fea27b4099463')
 
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
-    --with-package-name="GStreamer (Archlinux)" \
+    --with-package-name="GStreamer (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/" \
     --enable-gtk-doc --disable-static
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 5f9b9ded9..49267ecbf 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 189883 2013-07-10 14:53:39Z heftig $
+# $Id: PKGBUILD 196101 2013-10-07 11:52:31Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
 pkgver=3.2.3
-pkgrel=1
+pkgrel=4
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64)
 license=(GPL)
 url="http://live.gnome.org/gthumb"
 depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
          gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret
-         libsoup webkitgtk3 json-glib)
+         libsoup webkitgtk json-glib)
 makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
 optdepends=('libopenraw: read RAW files'
             'exiv2: metadata support'
@@ -21,8 +21,15 @@ optdepends=('libopenraw: read RAW files'
             'liboauth: web albums')
 options=('!libtool' '!emptydirs')
 install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        gtk310.patch)
+sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a'
+            'dcbfad2eb7047c1ea4210dc0af1054dc2ec863331f12fcd59c05021570d38bfe')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../gtk310.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gthumb/gtk310.patch b/extra/gthumb/gtk310.patch
new file mode 100644
index 000000000..86f0e99e8
--- /dev/null
+++ b/extra/gthumb/gtk310.patch
@@ -0,0 +1,29 @@
+From 36ba0c99c1780ca9f23f220ced70a76b97ce8260 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Fri, 27 Sep 2013 15:40:33 +0000
+Subject: Fixed broken window layout with gtk+ 3.10
+
+[bug #708800]
+---
+diff --git a/gthumb/gth-window.c b/gthumb/gth-window.c
+index a2960bc..a2cce99 100644
+--- a/gthumb/gth-window.c
++++ b/gthumb/gth-window.c
+@@ -324,6 +324,7 @@ gth_window_attach (GthWindow     *window,
+ 		return;
+ 	}
+ 
++	gtk_widget_set_vexpand (child, FALSE);
+ 	gtk_grid_attach (GTK_GRID (window->priv->grid),
+ 			  child,
+ 			  0, position,
+@@ -362,6 +363,7 @@ gth_window_attach_content (GthWindow *window,
+ 
+ 	_gtk_container_remove_children (GTK_CONTAINER (window->priv->contents[page]), NULL, NULL);
+ 	gtk_widget_set_hexpand (child, TRUE);
++	gtk_widget_set_vexpand (child, TRUE);
+ 	gtk_container_add (GTK_CONTAINER (window->priv->contents[page]), child);
+ }
+ 
+--
+cgit v0.9.2
diff --git a/extra/gtk-sharp-2/PKGBUILD b/extra/gtk-sharp-2/PKGBUILD
index 7adbebf17..d1827c87c 100644
--- a/extra/gtk-sharp-2/PKGBUILD
+++ b/extra/gtk-sharp-2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142257 2011-11-07 12:49:15Z jgc $
+# $Id: PKGBUILD 196159 2013-10-07 12:30:37Z jgc $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgname=gtk-sharp-2
-pkgver=2.12.11
+pkgver=2.12.22
 pkgrel=1
 pkgdesc="gtk2 bindings for C#"
 arch=(i686 x86_64)
@@ -12,20 +12,19 @@ depends=('mono' 'libglade' 'gtk2')
 makedepends=('pkgconfig' 'monodoc')
 conflicts=('gtk#')
 options=('!libtool' '!makeflags')
-source=(http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${pkgver}.tar.bz2)
-md5sums=('c278da6a472c6c13b698af012f543c64')
+source=(https://github.com/mono/gtk-sharp/archive/${pkgver}.tar.gz)
+md5sums=('0cdaef41857e29c23942a148c83122ac')
 
 build() {
- # get rid of that .wapi errors; thanks to brice
   export MONO_SHARED_DIR="${srcdir}/wapi"
   mkdir -p "${MONO_SHARED_DIR}"
 
-  cd "${srcdir}/gtk-sharp-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+  cd gtk-sharp-${pkgver}
+  ./bootstrap-2.12 --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/gtk-sharp-${pkgver}"
+  cd gtk-sharp-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 61084467a..e35ebeaf5 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189695 2013-07-04 21:16:18Z heftig $
+# $Id: PKGBUILD 196102 2013-10-07 11:52:32Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.20
-pkgrel=1
+pkgver=2.24.21
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,13 +12,20 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 options=('!libtool')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        xid-collision-debug.patch)
-sha256sums=('cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+        gtkrc xid-collision-debug.patch gtkrc-fix.patch)
+sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3'
+            'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d')
 
-build() {
+prepare() {
     cd gtk+-$pkgver
     patch -Np1 -i ../xid-collision-debug.patch
+    patch -Np1 -i ../gtkrc-fix.patch
+}
+
+build() {
+    cd gtk+-$pkgver
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
@@ -34,23 +41,27 @@ build() {
 package_gtk2() {
     pkgdesc="GTK+ is a multi-platform toolkit (v2)"
     install=gtk2.install
-    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
-    backup=(etc/gtk-2.0/gtkrc)
+    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 
+             'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
+    optdepends=('gnome-themes-standard: Default widget theme'
+                'gnome-icon-theme: Default icon theme')
     replaces=('gtk2-docs')
 
     cd gtk+-$pkgver
-
     make DESTDIR="$pkgdir" install
+
     sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
-    echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
+
+    install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/gtk-2.0/gtkrc"
+
     #split this out to use with gtk3 too
     rm $pkgdir/usr/bin/gtk-update-icon-cache
 }
 package_gtk-update-icon-cache() {
     pkgdesc="The GTK+ update icon cache tool"
-    depends=('gdk-pixbuf2>=2.24.1-3')
+    depends=('gdk-pixbuf2>=2.24.1-3' 'hicolor-icon-theme')
+    install=gtk-update-icon-cache.install
 
     cd gtk+-$pkgver/gtk
-
-    install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
+    install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
 }
diff --git a/extra/gtk2/gtk-update-icon-cache.install b/extra/gtk2/gtk-update-icon-cache.install
new file mode 100644
index 000000000..1afcc72a7
--- /dev/null
+++ b/extra/gtk2/gtk-update-icon-cache.install
@@ -0,0 +1,3 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
diff --git a/extra/gtk2/gtkrc b/extra/gtk2/gtkrc
new file mode 100644
index 000000000..d2282ac36
--- /dev/null
+++ b/extra/gtk2/gtkrc
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "gnome"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
diff --git a/extra/gtk2/gtkrc-fix.patch b/extra/gtk2/gtkrc-fix.patch
new file mode 100644
index 000000000..09e350e98
--- /dev/null
+++ b/extra/gtk2/gtkrc-fix.patch
@@ -0,0 +1,22 @@
+From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 30 Sep 2013 16:50:34 +0000
+Subject: Actually look in /usr/share/gtk-2.0 for default rc files
+
+I managed to forget the 'share' component of the path.
+---
+diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
+index b1f68e2..50b2563 100644
+--- a/gtk/gtkrc.c
++++ b/gtk/gtkrc.c
+@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void)
+       const gchar * const *config_dirs;
+       const gchar *config_dir;
+ 
+-      str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL);
++      str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL);
+       gtk_rc_add_default_file (str);
+       g_free (str);
+ 
+--
+cgit v0.9.2
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index dd021fd13..e18b144ef 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 193768 2013-08-30 14:56:03Z heftig $
+# $Id: PKGBUILD 196103 2013-10-07 11:52:34Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.8.4
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk3.install
-depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
+depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi
+         libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
 makedepends=(gobject-introspection)
+optdepends=('gnome-themes-standard: Default widget theme'
+            'gnome-icon-theme: Default icon theme')
 options=('!libtool')
-backup=(etc/gtk-3.0/settings.ini)
 license=(LGPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini)
-sha256sums=('b08360167702299e91b3435a4ce6bae41dd26d2794e898632f12dd091b0692e2'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+sha256sums=('6559feb360cd935d341cd7a0b69a72f8f4346ed6ee9b7c4040c02b73b75c53fe'
+            '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
 
 build() {
     cd "gtk+-$pkgver"
@@ -39,6 +41,5 @@ build() {
 package() {
     cd "gtk+-$pkgver"
     make DESTDIR="$pkgdir" install
-
-    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
+    install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
 }
diff --git a/extra/gtk3/settings.ini b/extra/gtk3/settings.ini
index 039000d38..6a0643bfa 100644
--- a/extra/gtk3/settings.ini
+++ b/extra/gtk3/settings.ini
@@ -1,2 +1,4 @@
 [Settings]
-gtk-fallback-icon-theme = gnome
+gtk-icon-theme-name = gnome
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index 10880858a..679789bef 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184170 2013-05-03 03:05:29Z heftig $
+# $Id: PKGBUILD 196104 2013-10-07 11:52:35Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=gtkmm3
 _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.8.1
+pkgver=3.9.16
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
@@ -12,7 +12,7 @@ license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://www.gtkmm.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b')
+sha256sums=('3a07679530c0c58ddaf3b2bdc7859d8f7050a1057ae99e2d3857004e36e7c879')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index 4e4f8aeb7..2c90fad85 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189822 2013-07-08 16:51:30Z heftig $
+# $Id: PKGBUILD 196105 2013-10-07 11:52:37Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('1c2a01f1e04e3c8c9f09ff22f34f73f17b0e4e7ff0d83b2996c209bd02a6501b')
+sha256sums=('5208afa6edccf4d70a30ed1da399cefcceb8a8b879305d491be4be3e3d6ef776')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index f4cfa88b7..05fdac4a4 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191287 2013-07-23 10:08:45Z jgc $
+# $Id: PKGBUILD 196106 2013-10-07 11:52:39Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gucharmap
-pkgver=3.8.2
-pkgrel=2
+pkgver=3.9.99
+pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,8 +14,8 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 install=gucharmap.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('08272386155bc1a7d6a2d1a0ee8d2e5ea08a9512c40dbd76b3b4c3f105604901')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('7a9425f07f8e4053e0382e627d65ca428674f8c63f2c721877ae8c62c25ccb00')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 3cfaf9caf..b192db6c0 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,24 +1,17 @@
-# $Id: PKGBUILD 189282 2013-07-02 08:23:35Z jgc $
+# $Id: PKGBUILD 196107 2013-10-07 11:52:42Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp')
-pkgver=1.16.3
-pkgrel=2
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-goa' 'gvfs-mtp')
+pkgver=1.18.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
+makedepends=('avahi' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        imobiledevice-1.1.5.patch)
-sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49'
-            '3faf3027ef40c5cea3f01cb9d37e4cf848ed2ecfe6cde3b7bf86087da4a2d2e1')
-
-prepare() {
-  cd $pkgbase-$pkgver
-  patch -Np1 -i ../imobiledevice-1.1.5.patch
-}
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('a24ce342a3369f7ec34f19deadc5da46bf51070d39d8733f0848d9ba4bb55da7')
 
 build() {
   cd "$pkgbase-$pkgver"
@@ -26,17 +19,18 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/usr/share/bash-completion/completions
+      --with-bash-completion-dir=/usr/share/bash-completion/completions \
+      --disable-obexftp
   make
 }
 
 package_gvfs() {
   pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup>=2.24.0' 'udisks2' 'libsecret' 'libbluray')
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup' 'udisks2' 'libsecret' 'libbluray')
+  replaces=('gvfs-obexftp')
   optdepends=('gvfs-afc: AFC (mobile devices) support'
               'gvfs-smb: SMB/CIFS (Windows client) support'
               'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
-              'gvfs-obexftp: ObexFTP (bluetooth) support'
               'gvfs-afp: Apple Filing Protocol (AFP) support'
               'gvfs-mtp: MTP device support'
               'gvfs-goa: gnome-online-accounts support'
@@ -52,8 +46,8 @@ package_gvfs() {
   make DESTDIR="$pkgdir" install
 
   cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}.mount
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,mtp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,mtp}.mount
   rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
   rm usr/share/GConf/gsettings/gvfs-smb.convert
 }
@@ -102,16 +96,6 @@ package_gvfs-gphoto2() {
   make DESTDIR="$pkgdir" install
 }
 
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez4' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
-}
-
 package_gvfs-afp() {
   pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
   depends=("gvfs=$pkgver")
diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD
index 45abfd146..e20bf0288 100644
--- a/extra/iagno/PKGBUILD
+++ b/extra/iagno/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193512 2013-08-21 14:33:53Z jgc $
+# $Id: PKGBUILD 196108 2013-10-07 11:52:44Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=iagno
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Dominate the board in a classic version of Reversi"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=iagno.install
 url="https://live.gnome.org/Iagno"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c4687214262c9fd838e40ea27fac8ed7c23db32690ef2d0f569373a8eaeb1de7')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('23a041b54fd4df817c8d507e87d19495ddfc8a23bfe812a3e7d500f32f8a49d0')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD
index 974018af5..c7409b8cd 100644
--- a/extra/json-glib/PKGBUILD
+++ b/extra/json-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183001 2013-04-16 19:33:50Z heftig $
+# $Id: PKGBUILD 196109 2013-10-07 11:52:45Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=json-glib
-pkgver=0.16.0
+pkgver=0.16.2
 pkgrel=1
 pkgdesc="JSON library built on GLib"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37')
+sha256sums=('a95475364ec27ab1d2a69303cf579018558bfb6981e3498b3aaf1e6401f7422c')
 
 build(){
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index 8ce4cdb5c..50c31ca38 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195590 2013-10-01 15:20:43Z svenstaro $
+# $Id: PKGBUILD 195986 2013-10-07 07:06:21Z tpowa $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
 pkgver=4.11.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
 arch=('i686' 'x86_64')
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index ace0b2486..38f0a2dc6 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170201 2012-11-05 08:17:35Z tpowa $
+# $Id: PKGBUILD 195987 2013-10-07 07:06:22Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.16.0
-pkgrel=2
+pkgrel=3
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64)
 license=('LGPL')
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index dc4925c11..25191a25a 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186991 2013-06-02 19:42:55Z heftig $
+# $Id: PKGBUILD 196110 2013-10-07 11:52:47Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=libchamplain
-pkgver=0.12.4
+pkgver=0.12.5
 pkgrel=2
 pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
@@ -13,7 +13,7 @@ options=('!libtool')
 depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('631ce8e91b02c596e29778d3f7c1d28013e2e40d080a88f2d9a06f8b79f9e493')
+sha256sums=('9c937d3775053a7d6b542aad36b16bbb07e02be3adb683ae57d7dcbe89634236')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libcryptui/PKGBUILD b/extra/libcryptui/PKGBUILD
index f4d753985..b62c83322 100644
--- a/extra/libcryptui/PKGBUILD
+++ b/extra/libcryptui/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 194933 2013-09-24 09:51:27Z heftig $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 196111 2013-10-07 11:52:48Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libcryptui
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Library for OpenPGP prompts"
 arch=('i686' 'x86_64')
@@ -13,7 +14,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('10eed96e33b6d7286795a7c678a5655a86ae099fb98d1f7211aa28aa636c0837')
+sha256sums=('ceeba7ebdcda768d671e9df9332b18d4f25edd1f4d91e86a241c3c1f3ffc6332')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD
new file mode 100644
index 000000000..fe5d89618
--- /dev/null
+++ b/extra/libevdev/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: $
+# Maintainer: Jan de Groot
+
+pkgname=libevdev
+pkgver=0.4
+pkgrel=2
+pkgdesc="Wrapper library for evdev devices"
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/wiki/Software/libevdev/"
+license=(custom:X11)
+depends=('glibc')
+makedepends=('python')
+options=('!libtool')
+source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('ba6becd3f41430aa290ddf53694909fb46b9a65d5fe264e5fc2a4f5169484f42')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static --disable-gcov
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 4e9c0569b..bd2fb352d 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193394 2013-08-19 16:07:01Z heftig $
+# $Id: PKGBUILD 196112 2013-10-07 11:52:50Z jgc $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.10.4
+pkgver=0.12.0
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
@@ -13,7 +13,7 @@ depends=(glib2)
 makedepends=(gobject-introspection vala)
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bb18fbdd048a9fb474def98f8b038db62d391b658b6bdebd2504cb638798ef6b')
+sha256sums=('d106ed63fe0da5d5ee89aa8197a373cf9a2b96688cc3060144bfc0a022496ea5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index abf4e6902..b00db9b2e 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 183431 2013-04-21 22:11:18Z heftig $
+#$Id: PKGBUILD 196113 2013-10-07 11:52:52Z jgc $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ optdepends=('gnome-keyring: key storage service (or use any other service implem
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a8646f2bc62ef903be422946a6356b0718f7a4cbb29b5bdd35a84136f6b82f76')
+sha256sums=('3984e99338e6e610af320a637fa84fb9e795226cfd633d7c0db452c5ae43b560')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index 218663ea4..078d75902 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,40 +1,24 @@
-# $Id: PKGBUILD 185424 2013-05-14 09:29:29Z heftig $
+# $Id: PKGBUILD 196114 2013-10-07 11:52:53Z jgc $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('libsoup' 'gnome-icon-theme' 'gtk3')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
+makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/"
 install=libgweather.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gettext-not-xml.patch
-        no_external_gettext.patch)
-sha256sums=('b053c1328d756a6c653e44464b7a41bec451752fa9686ade32e2e4c6e2a6deb5'
-            '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533'
-            'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('4feab6e5c6eb4df85e7d134982a18a6196e63bc8179cfe5a25fc727482c52996')
 
 build() {
     cd "$pkgname-$pkgver"
-
-    patch -Np1 -i "$srcdir/gettext-not-xml.patch"
-    patch -Np1 -i "$srcdir/no_external_gettext.patch"
-    gtkdocize
-    autoreconf -fi
-
-    cd po
-     intltool-update --pot
-    cd ../po-locations
-    intltool-update --gettext-package libgweather-locations --pot
-    cd ..
     ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static \
-        --enable-locations-compression
+        --localstatedir=/var --disable-static
     make
 }
 
diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD
index b0af725ec..cf3049697 100644
--- a/extra/libnotify/PKGBUILD
+++ b/extra/libnotify/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154761 2012-03-30 16:37:09Z heftig $
+# $Id: PKGBUILD 196115 2013-10-07 11:52:55Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libnotify
-pkgver=0.7.5
+pkgver=0.7.6
 pkgrel=1
 pkgdesc="Desktop notification library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('gdk-pixbuf2')
 makedepends=('gtk3' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4378cb47874ba4d5f759b7890d8d28d086e81d3f0bd4f6e84e5ab66d82ffb652')
+sha256sums=('0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837')
 
 build() {
     cd ${pkgname}-${pkgver}
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index 6b2f5c07b..a097a1885 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188712 2013-06-18 13:46:20Z heftig $
+# $Id: PKGBUILD 196116 2013-10-07 11:52:58Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libpeas
-pkgver=1.8.1
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="A GObject-based plugins engine"
 arch=(i686 x86_64)
@@ -14,15 +14,9 @@ optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
             'seed: gobject-based plugin engine - seed runtime loader')
 options=('!libtool')
 install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz
-        js17.patch)
-sha256sums=('ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d'
-            '094f28f911de979167c870b3ed51df09dbe3cacc271b375d891d7601c51ad44f')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
+sha256sums=('008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../js17.patch
-}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD
index b50034812..228cc1514 100644
--- a/extra/libquvi/PKGBUILD
+++ b/extra/libquvi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 173175 2012-12-12 00:31:54Z eric $
+# $Id: PKGBUILD 196117 2013-10-07 11:52:59Z jgc $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=libquvi
-pkgver=0.4.1
-pkgrel=2
+pkgver=0.9.3
+pkgrel=1
 pkgdesc='Library for parsing video download links.'
 arch=('i686' 'x86_64')
 url='http://quvi.sourceforge.net/'
-license=('LGPL')
-depends=('libquvi-scripts' 'curl' 'lua')
-conflicts=('quvi<0.4.0')
+license=('AGPL3')
+depends=('libquvi-scripts' 'curl' 'lua51' 'libproxy' 'libgcrypt' 'glib2')
+conflicts=('quvi<0.9.0')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('a5fa8860c23655a529b3166f6e25c83a'
-         'cc7f15518f8ab2fc134bc64f0e9d584b')
+source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.xz"{,.sig})
+md5sums=('12a62c4fcde9b6109193191b7bd3d685'
+         'SKIP')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 0aec90273..36ebc53ff 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 193796 2013-09-01 09:04:01Z andyrtr $
+# $Id: PKGBUILD 196169 2013-10-07 14:33:01Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase="libreoffice"
 pkgname=('libreoffice-common'
@@ -18,15 +19,15 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.1.1.2
-pkgver=4.1.1
-pkgrel=2
+_LOver=4.1.2.3
+pkgver=4.1.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
-             'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit'
+             'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
              'clucene' 'bluez-libs' 'harfbuzz-icu'
@@ -78,7 +79,7 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
 	${_additional_source_url}/libcdr-0.0.14.tar.bz2
 	${_additional_source_url}/libmspub-0.0.6.tar.bz2
 	${_additional_source_url}/libmwaw-0.1.10.tar.bz2
-	${_additional_source_url}/libvisio-0.0.30.tar.bz2
+	${_additional_source_url}/libvisio-0.0.31.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
@@ -114,10 +115,10 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	libcdr-0.0.14.tar.bz2
 	libmspub-0.0.6.tar.bz2
 	libmwaw-0.1.10.tar.bz2
-	libvisio-0.0.30.tar.bz2	)
-md5sums=('4eb8fd2b0d1177d19b2f797faabc4ea2'
-         'f6b418a1ed94ef9d5ee30e9f5d7f305a'
-         'e8c69bdb55586531cc192904467f5e24'
+	libvisio-0.0.31.tar.bz2	)
+md5sums=('bb2fe0056ae92e70ee8816a36dd0696c'
+         '761323fae73ef156f5cf188d8bd983f1'
+         '54f36cf305ae018ad685c331587d83e3'
          'f02578f5218f217a9f20e9c30e119c6a'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -151,7 +152,7 @@ md5sums=('4eb8fd2b0d1177d19b2f797faabc4ea2'
          'd88f9b94df880d2c05be943b000ca112'
          '1120705cd0f0d9bd5506360bf57b6c2e'
          '2289bb137bbba9b473ce60168895c036'
-         '9d9eb3ae6bee763c161228b2b12e25f8'
+         '82628333418f101a20cd21f980cf9f40'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
@@ -450,7 +451,7 @@ package_libreoffice-draw() {
 
 package_libreoffice-gnome() {
  pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3
+ depends=('libreoffice-common' 'gconf' 'gtk3')
  groups=('libreoffice')
  
  # create directories from *list.txt file
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 60e1c547e..200df7513 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193630 2013-08-26 12:12:13Z jgc $
+# $Id: PKGBUILD 196119 2013-10-07 11:53:02Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
-pkgver=2.37.0
-pkgrel=1
+pkgver=2.39.0
+pkgrel=2
 epoch=1
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs')
 url="https://live.gnome.org/LibRsvg"
 install=librsvg.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('06c57dbcb29369d147b4e6ff4257c42ae5120c504c30fb567a27034ee30fd835')
+sha256sums=('aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index 1e1a449e0..8e0aca8ee 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 166488 2012-09-08 10:31:44Z jgc $
+# $Id: PKGBUILD 196120 2013-10-07 11:53:04Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsecret
-pkgver=0.15
-pkgrel=2
+pkgver=0.16
+pkgrel=1
 pkgdesc='library for storing and retrieving passwords and other secrets.'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="https://live.gnome.org/Libsecret"
 depends=('glib2' 'libgcrypt')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala')
-optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets')
+optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8')
+sha256sums=('b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index b20d6635e..606854716 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 183606 2013-04-24 20:33:35Z heftig $
+# $Id: PKGBUILD 196121 2013-10-07 11:53:05Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsoup
-pkgver=2.42.2
+pkgver=2.44.0
 pkgrel=1
 pkgdesc="GNOME HTTP Library"
 arch=(i686 x86_64)
 license=(LGPL)
 url="http://www.gnome.org"
 depends=(glib2 libxml2 glib-networking sqlite)
-makedepends=(intltool gobject-introspection python2)
+makedepends=(intltool gobject-introspection python)
+checkdepends=(apache php php-apache)
 provides=("libsoup-gnome=$pkgver-$pkgrel")
 conflicts=(libsoup-gnome)
 replaces=(libsoup-gnome)
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1f4f9cc55ba483dc8defea0c3f97cc507dc48384c5529179e29c1e6d05630dbf')
+sha256sums=('2ed9b200bda39c686d19eb4a0a5464e9166d09cbb3ced5a689c78214e83b5c27')
 
 build() {
   cd $pkgname-$pkgver
-
-  # Python3 has UnicodeDecodeErrors
-  sed -i -e '1s/python$/&2/' libsoup/tld-parser.py
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD
index 3e8780c64..114ddfc89 100644
--- a/extra/lightsoff/PKGBUILD
+++ b/extra/lightsoff/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=lightsoff
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Turn off all the lights"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=lightsoff.install
 url="https://live.gnome.org/Lightsoff"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('767f7876c6f360b0e3c18243c7e2201ea0a31523df890853a572d0325d91c24b')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('920a38ebe320d3882c6a98d073388e64ba9c8bea4414c05fc16a81771b0a64a4')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD
index 4b1dbce38..6cb77da6f 100644
--- a/extra/mash/PKGBUILD
+++ b/extra/mash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183442 2013-04-21 22:11:40Z heftig $
+# $Id: PKGBUILD 196123 2013-10-07 11:53:08Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=mash
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A small library for using 3D models within a Clutter scene"
 arch=('i686' 'x86_64')
 url="http://clutter-project.org/"
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 1507ce9c4..9dab6f140 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 194265 2013-09-12 09:44:15Z lcarlier $
+# $Id: PKGBUILD 196157 2013-10-07 12:17:10Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=9.2.0
-pkgrel=2
+pkgver=9.2.1
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/9.2/MesaLib-${pkgver}.tar.bz2
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('4185b6aae890bc62a964f4b24cc1aca8'
+md5sums=('dd4c82667d9c19c28a553b12eba3f8a0'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index c1f24c59a..a75241392 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mousetweaks
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
 arch=(i686 x86_64)
 license=('GPL3' 'FDL')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=mousetweaks.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('daa9b16e98675f414d3dcf63a0222a37d6c3e518718d92155bba8781510f2e4f')
+sha256sums=('12fa50eca2e442057a1b816b4aa78d0b8a17f854cf01f4d339d82ff0172b57dd')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mutter-wayland/PKGBUILD b/extra/mutter-wayland/PKGBUILD
new file mode 100644
index 000000000..004ece9dd
--- /dev/null
+++ b/extra/mutter-wayland/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 196008 2013-10-07 11:49:47Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=mutter-wayland
+pkgver=3.10.0.1
+pkgrel=2
+pkgdesc="A Wayland compositor for GNOME"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(mutter)
+makedepends=(intltool gnome-doc-utils)
+url="http://www.gnome.org"
+options=('!libtool' '!emptydirs')
+install=mutter-wayland.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        mutter-wayland-3.10.0.1-logfile.patch)
+sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560'
+            'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644')
+
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # From Fedora: Don't try to redirect the logfile. It won't work.
+  patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/$pkgname \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile --enable-compile-warnings=minimum
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Already in "mutter"
+  rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
+  rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
+}
diff --git a/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch b/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch
new file mode 100644
index 000000000..922e0ae33
--- /dev/null
+++ b/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch
@@ -0,0 +1,17 @@
+--- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx	2013-09-16 16:40:46.000000000 -0400
++++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c	2013-10-02 13:37:57.027318760 -0400
+@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
+   args[3] = "-rootless";
+   args[4] = "-retro";
+   args[5] = "-noreset";
+-  args[6] = "-logfile";
+-  args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
+-  args[8] = "-nolisten";
+-  args[9] = "all";
+-  args[10] = NULL;
++  args[6] = "-nolisten";
++  args[7] = "all";
++  args[8] = NULL;
+ 
+   error = NULL;
+   if (g_spawn_async (NULL, /* cwd */
diff --git a/extra/mutter-wayland/mutter-wayland.install b/extra/mutter-wayland/mutter-wayland.install
new file mode 100644
index 000000000..c25dff2d3
--- /dev/null
+++ b/extra/mutter-wayland/mutter-wayland.install
@@ -0,0 +1,11 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index d80581bac..57c710ec5 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 191806 2013-07-30 22:50:38Z jgc $
+# $Id: PKGBUILD 196125 2013-10-07 11:53:12Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.8.4
+pkgver=3.10.0.1
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm')
+depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm' 'gnome-desktop' 'upower')
 makedepends=('intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('efe28bb665fd43d97b20c57bb1d1dc0a7e98919b6ad4b770bfd7ec5576e29454')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2d1288727d60b45c4d902101b805c89fa93f7a6b147bb4a7d3d99f990680b203')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD
index 17806e5f0..6a9745c6e 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191279 2013-07-23 09:48:38Z jgc $
+# $Id: PKGBUILD 196127 2013-10-07 11:53:15Z 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=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="Nautilus context menu for sending files."
 arch=(i686 x86_64)
 url="http://download.gnome.org/sources/nautilus-sendto/"
@@ -16,7 +16,7 @@ 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')
+sha256sums=('03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index c7932fe24..ee92f77a6 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188611 2013-06-16 23:57:46Z heftig $
+# $Id: PKGBUILD 196126 2013-10-07 11:53:13Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=nautilus
 pkgname=(nautilus libnautilus-extension)
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=(i686 x86_64)
@@ -13,8 +13,8 @@ depends=(libexif gnome-desktop exempi gvfs desktop-file-utils gnome-icon-theme d
 makedepends=(intltool gobject-introspection python)
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75')
+source=(http://download.gnome.org/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('9b15ccf1c9313631c8cf2ed337e697cd2b32630d2ae36072aa389d64af16d88c')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index 614bd4014..02ffccb14 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194795 2013-09-23 17:22:29Z heftig $
+# $Id: PKGBUILD 196128 2013-10-07 11:53:16Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -7,12 +7,12 @@
 
 pkgname=network-manager-applet
 pkgver=0.9.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=(i686 x86_64)
 license=(GPL)
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" libsecret gtk3 libnotify
+depends=("networkmanager>=${pkgver%.*}" libsecret gtk3 libnotify
          gnome-icon-theme mobile-broadband-provider-info iso-codes)
 makedepends=(intltool gnome-bluetooth gobject-introspection)
 optdepends=('gnome-bluetooth: for PAN/DUN support')
@@ -30,6 +30,10 @@ build() {
       --disable-maintainer-mode \
       --disable-migration \
       --with-modem-manager-1
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index b93a02674..fd11b12ec 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194794 2013-09-23 17:21:36Z heftig $
+# $Id: PKGBUILD 196155 2013-10-07 12:16:03Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -8,7 +8,7 @@
 
 pkgname=networkmanager
 _pkgname=NetworkManager
-pkgver=0.9.8.4
+pkgver=0.9.8.6
 pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
 makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git)
 optdepends=('dhclient: DHCPv6 support'
             'dnsmasq: Connection sharing'
-            'bluez4: Bluetooth support'
+            'bluez: Bluetooth support'
             'openresolv: resolvconf support'
             'ppp: Dialup connection support')
 options=('!libtool')
@@ -28,7 +28,7 @@ install=networkmanager.install
 #source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
         NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('4c9ff0aaf52bee8df9a73290ec2b3f4441ff504420d0b0dfd729b00a92d80d99'
+sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index b12c6868a..e7dc2ef53 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191781 2013-07-30 17:31:51Z jgc $
+# $Id: PKGBUILD 196165 2013-10-07 12:54:42Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=nspr
-pkgver=4.10
-pkgrel=2
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/nspr/"
@@ -13,12 +13,13 @@ depends=('glibc')
 makedepends=('zip')
 options=('!emptydirs')
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f5466def95726b3c900d8a0227bdd034')
+sha1sums=('bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7')
+md5sums=('2e354084ca2bc5fbbb820762597f3890')
 
 build() {
   cd $pkgname-$pkgver
 
-  if [[ $CARCH = x86_64 ]]; then
+  if [ "$CARCH" = "x86_64" ]; then
     _confflags="--enable-64bit"
   else
     _confflags=""
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 17b28978e..3fc05134c 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191782 2013-07-30 17:31:52Z jgc $
+# $Id: PKGBUILD 196167 2013-10-07 13:20:22Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.15.1
+pkgver=3.15.2
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s
         nss-config.in
         ssl-renegotiate-transitional.patch
         add_spi+cacert_ca_certs.patch)
-sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0'
+sha1sums=('2d900c296bf11deabbf833ebd6ecdea549c97a5f'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
           '8a964a744ba098711b80c0d279a2993524e8eb92'
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index 71c124d1e..49f852159 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,31 +1,28 @@
-# $Id: PKGBUILD 175505 2013-01-17 15:01:31Z tpowa $
+# $Id: PKGBUILD 195984 2013-10-07 07:06:19Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase='ocaml'
 pkgname=('ocaml' 'ocaml-compiler-libs')
-pkgver=4.00.1
-pkgrel=3
+pkgver=4.01.0
+pkgrel=1
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64')
-license=('LGPL2' 'custom: QPL-1.0')
+license=('LGPL2.1' 'custom: QPL-1.0')
 url="http://caml.inria.fr/"
 depends=('gdbm')
 makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz
-        tk8.6-build.patch)
+source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz)
 options=('!makeflags' '!emptydirs')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure -prefix /usr 
+  ./configure -prefix /usr -x11include /usr/include 
   make world.opt
 }
 
 package_ocaml() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  # fix https://bugs.archlinux.org/task/33302
-  patch -Np2 -i ../tk8.6-build.patch
   make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
    
   # Save >10MB with this one, makepkg only strips debug symbols.
@@ -57,6 +54,4 @@ optdepends=()
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7')
-md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7'
-         '67b0a8a8885fc1221181b171541cb1b0')
+md5sums=('04dfdd7da189462a4f10ec6530359cef')
diff --git a/extra/ocaml/tk8.6-build.patch b/extra/ocaml/tk8.6-build.patch
deleted file mode 100644
index 439a930f0..000000000
--- a/extra/ocaml/tk8.6-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/ocaml-4.00.1/configure	2012-06-26 08:33:50.000000000 -0700
-+++ p/src/ocaml-4.00.1/configure	2013-01-05 17:06:54.877900143 -0800
-@@ -804,6 +804,9 @@
- echo "ARCMD=ar" >> Makefile
- 
- 
-+bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT"
-+nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT"
-+
- # Do #! scripts work?
- 
- if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then
-@@ -1450,6 +1453,7 @@
-   if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then
-     echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"."
-     case $tcl_version in
-+    8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;;
-     8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
-     8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
-     8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index 2480f6010..0d72a6dc8 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 189939 2013-07-11 19:54:40Z ioni $
+# $Id: PKGBUILD 196130 2013-10-07 11:53:19Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=p11-kit
-pkgver=0.18.4
+pkgver=0.20.1
 pkgrel=1
 pkgdesc="Library to work with PKCS#11 modules"
 arch=(i686 x86_64)
 url="http://p11-glue.freedesktop.org"
 license=('BSD')
-depends=('glibc' 'libtasn1')
+depends=('glibc' 'libtasn1' 'libffi')
 options=(!libtool)
 source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('9535c4e5b9c2ef5f5cd0755115ba098b'
+md5sums=('88c651137f76a167336639371eafd8cc'
          'SKIP')
 
 build() {
@@ -21,6 +21,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd  $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index d152bdae9..88f25bc4d 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185364 2013-05-13 17:48:00Z heftig $ 
+# $Id: PKGBUILD 196131 2013-10-07 11:53:20Z jgc $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.34.1
+pkgver=1.36.0
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ options=('!libtool')
 install=pango.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('1aea30df34a8ae4fcce71afd22aa5b57224b52916d46e3ea81ff9f1eb130e64c')
+sha256sums=('bb41d1b26ee7450e5430a7d2765f38c51ebe72db9fce616a9ee52611b55906a0')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/pango/pango.install b/extra/pango/pango.install
index 73b0f5bf1..4aa7c4d31 100644
--- a/extra/pango/pango.install
+++ b/extra/pango/pango.install
@@ -1,21 +1,14 @@
-# arg 1:  the new package version
 post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
 	usr/bin/pango-querymodules >etc/pango/pango.modules
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
 	if [ -f usr/etc/pango/pango.modules ]; then
 		rm usr/etc/pango/pango.modules
 	fi
-	post_install $1
+	post_install
 }
 
-# arg 1:  the old package version
 pre_remove() {
 	rm etc/pango/pango.modules
 }
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index f5997ff4c..03e32ca1a 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193705 2013-08-28 15:19:09Z andyrtr $
+# $Id: PKGBUILD 196154 2013-10-07 12:15:39Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
-pkgver=0.24.1
+pkgver=0.24.2
 pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('b11cc0408b4ad3809fa455d7b3d5ade9'
+md5sums=('ca5c6e35859db5cd578ce4a351dd589d'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
 prepare() {
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 14a48e8cb..2ef3a22e8 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 189725 2013-07-06 02:03:20Z heftig $
+# $Id: PKGBUILD 196150 2013-10-07 11:53:48Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.8.3
+pkgver=3.10.0
 pkgrel=1
 arch=(i686 x86_64)
 url="https://live.gnome.org/PyGObject"
 license=(LGPL)
 makedepends=(python python2 python-cairo python2-cairo gobject-introspection)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('384b3e1b8d1e7c8796d7eb955380d62946dd0ed9c54ecf0817af2d6b254e082c')
+sha256sums=('8aaa1f83fdb2e30bae77405a63a8be600b311a04a4cdc952b2ab62ee81aad077')
 
 prepare() {
   mkdir build-py2 build-py3 devel
diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD
index c7b95fbdd..734e2d5b7 100644
--- a/extra/quadrapassel/PKGBUILD
+++ b/extra/quadrapassel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191635 2013-07-28 18:12:42Z heftig $
+# $Id: PKGBUILD 196132 2013-10-07 11:53:21Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=quadrapassel
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=quadrapassel.install
 url="https://live.gnome.org/Quadrapassel"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a2e861f65560345f697665434698e86a3df874ba2721ba1674dce26dcb0a6229')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('02e035d5486f023b2fee410dc909034163fd61369ee77cdfb0f07ac3069c46fa')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 592e5f3e2..2da968474 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194424 2013-09-16 10:09:01Z jgc $
+# $Id: PKGBUILD 196133 2013-10-07 11:53:23Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
 pkgver=3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An iTunes-like music playback and management application"
 arch=(i686 x86_64)
 license=(GPL)
diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD
index 9ca1803ff..435b40215 100644
--- a/extra/rygel/PKGBUILD
+++ b/extra/rygel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192270 2013-08-09 12:52:33Z heftig $
+# $Id: PKGBUILD 196134 2013-10-07 11:53:25Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=rygel
-pkgver=0.18.4
+pkgver=0.20.0
 pkgrel=1
 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
 arch=(i686 x86_64)
@@ -22,7 +22,7 @@ options=('!libtool')
 install=rygel.install
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f63f3f1cd1456b7e3b9232ec81ad481d220530a734ed8a09eb046d30c34d3ebe')
+sha256sums=('f695bae2c20b911393f7abf265c18f3c5a5c42fe4223fc9150ab9007558363fe')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/seahorse-nautilus/PKGBUILD b/extra/seahorse-nautilus/PKGBUILD
index 8b3765ac9..c296729ca 100644
--- a/extra/seahorse-nautilus/PKGBUILD
+++ b/extra/seahorse-nautilus/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 194930 2013-09-24 09:45:38Z heftig $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 196136 2013-10-07 11:53:28Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=seahorse-nautilus
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="PGP encryption and signing for nautilus"
 arch=('i686' 'x86_64')
 url="http://git.gnome.org/browse/seahorse-nautilus/"
@@ -12,17 +13,12 @@ depends=('libcryptui' 'gcr' 'nautilus')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        glib236.patch)
-sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863'
-            '0cefa14a45784c82871815e9bdcebbb96dea50a8e43316475e6a36d5dc47ade5')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d54c5fbc2bade03296d39999f8412708cfa87e82bda3c5af8e0b8ad86b2fadf3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix compatibility with glib 2.36
-  patch -Np1 -i "$srcdir/glib236.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make
diff --git a/extra/seahorse-nautilus/glib236.patch b/extra/seahorse-nautilus/glib236.patch
deleted file mode 100644
index d0ab03046..000000000
--- a/extra/seahorse-nautilus/glib236.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c
---- seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c	2011-10-24 09:25:37.000000000 +0200
-+++ seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c	2013-04-28 22:26:54.483276592 +0200
-@@ -226,8 +226,6 @@
-         progress_fd = -1;
-         return;
-     }
--
--    g_child_watch_add (progress_pid, progress_cancel, NULL);
- }
- 
- void
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index cdb00dd9f..63d3c045f 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185473 2013-05-14 11:01:28Z heftig $
+# $Id: PKGBUILD 196135 2013-10-07 11:53:27Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
@@ -17,9 +17,9 @@ provides=(x11-ssh-askpass)
 options=('!libtool' '!emptydirs')
 groups=(gnome-extra)
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         seahorse-ssh-askpass.sh)
-sha256sums=('b3837d088b7e3f7ebc41cb3f11c5c85e2df7e06bdc538a3e85bb1a13c34c9a12'
+sha256sums=('98023cb8805cf778163833ddba783ba1505c0595683e1ac92109d27e8556fbde'
             '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
 
 build() {
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index e3da50207..f27cd2d0c 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183459 2013-04-21 22:12:10Z heftig $
+# $Id: PKGBUILD 196137 2013-10-07 11:53:29Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A quick previewer for Nautilus"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ install=sushi.install
 makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c4f24d0961ce8fc5ef3a4fe9af178e368c7117459df2c0be12c8f953646c82dd')
+sha256sums=('cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD
index 69a01e38a..aceaf8261 100644
--- a/extra/swell-foop/PKGBUILD
+++ b/extra/swell-foop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193432 2013-08-20 07:00:28Z jgc $
+# $Id: PKGBUILD 196138 2013-10-07 11:53:31Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=swell-foop
-pkgver=3.8.2
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Clear the screen by removing groups of colored and shaped tiles"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=swell-foop.install
 url="https://live.gnome.org/Swell%20Foop"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('33b72da1f5378801ae41cb13f3bc35ce44368c104327f68dd51f45653ca62cb9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('d96c5cbd071a97038cc281d6a85902721ab5fc50d27981dc2c37b003126a43a6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD
index e28399444..c4c3fed10 100644
--- a/extra/tali/PKGBUILD
+++ b/extra/tali/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=tali
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Beat the odds in a poker-style dice game"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool')
 install=tali.install
 url="https://live.gnome.org/Tali"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('33a7a67a9ba2034cba916a033ee70285a334438a460fccd24373c7edcfc592c8')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2e276e6965057fe3136fe831809b2cedab3e8f59346b0fbe37f3f383a25c68c6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 541676a3e..400895cab 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 185506 2013-05-14 12:10:02Z heftig $
+# $Id: PKGBUILD 196141 2013-10-07 11:53:36Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem-plparser
-pkgver=3.4.5
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 url="http://www.gnome.org"
 pkgdesc="Totem playlist parser library"
 license=('LGPL')
 arch=(i686 x86_64)
-depends=('gmime' 'libsoup' 'libarchive' 'libquvi')
-makedepends=('intltool' 'gobject-introspection')
+depends=('gmime' 'libsoup' 'libarchive')
+makedepends=('intltool' 'gobject-introspection' 'libquvi')
+optdepends=('libquvi: video site handling (Youtube etc.)')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('a573e078692b48895cb5b041385b2760d63e2ee496c8d499eccfa942e7c79f89')
+sha256sums=('87eac3fdf2b632dfac0edda07906a3e84f1ce4442b8127394414020dafe41aa9')
 
 build() {
   cd totem-pl-parser-$pkgver
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
   make
 }
 
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index a06bb53b7..9fe893a2f 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186680 2013-05-30 12:54:23Z heftig $
+# $Id: PKGBUILD 196140 2013-10-07 11:53:34Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.8.2
-pkgrel=2
+pkgver=3.10.1
+pkgrel=1
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
@@ -13,12 +13,12 @@ license=(GPL2 custom)
 depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
          hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
          clutter-gtk python-gobject python-xdg gst-plugins-bad)
-makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib libzeitgeist
+makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist
              itstool docbook-xsl python-pylint)
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         browser-plugins.ini bugreport.patch)
-sha256sums=('eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba6558f65c64514e5d2583e01'
+sha256sums=('b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e'
             '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167')
 
@@ -53,7 +53,7 @@ package_totem() {
               'gst-libav: Extra media codecs'
               'lirc-utils: Infrared Remote Control plugin'
               'grilo-plugins: Browse sidebar (remote media)'
-              'libzeitgeist: Zeitgeist plugin')
+              'zeitgeist: Zeitgeist plugin')
 
   cd "$pkgbase-$pkgver"
   make DESTDIR="${pkgdir}" install
@@ -65,6 +65,7 @@ package_totem() {
 }
 
 package_totem-plugin() {
+  groups=(gnome)
   pkgdesc="Totem plugin for web browsers"
   depends=("totem=$pkgver" dbus-glib)
   backup=(etc/totem/browser-plugins.ini)
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index d1a998390..50bb03962 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191946 2013-08-01 16:10:52Z heftig $
+# $Id: PKGBUILD 196142 2013-10-07 11:53:37Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -7,7 +7,7 @@ pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
 pkgver=0.16.2
 _tver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=(i686 x86_64)
 license=(GPL)
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index 7cc608b87..2218fb9bf 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183465 2013-04-21 22:12:18Z heftig $
+# $Id: PKGBUILD 196143 2013-10-07 11:53:39Z jgc $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 
 pkgname=vala
-pkgver=0.20.1
+pkgver=0.22.0
 pkgrel=1
 pkgdesc="Compiler for the GObject type system"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glib2')
 makedepends=('libxslt')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481')
+sha256sums=('2f60a7ff887fcb16ed70fa84bb5872c2c54099a0732ce3f9e2c56e51a9208037')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index 11eaafa62..f3f45fbc9 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,30 +1,31 @@
-# $Id: PKGBUILD 191757 2013-07-30 09:24:26Z heftig $
+# $Id: PKGBUILD 196144 2013-10-07 11:53:40Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.8.3
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 pkgdesc="A VNC Client for the GNOME Desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
+arch=(i686 x86_64)
+license=(GPL)
 url="http://www.gnome.org/projects/vinagre/"
 install=vinagre.install
-depends=('libsecret' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
+depends=(libsecret gtk-vnc vte3 telepathy-glib avahi desktop-file-utils dconf shared-mime-info
+         gnome-icon-theme spice-gtk3)
 optdepends=('openssh: SSH plugin'
-            'rdesktop: RDP plugin')
-makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool')
-groups=('gnome-extra')
+            'freerdp: RDP plugin')
+makedepends=(docbook-xsl intltool freerdp openssh itstool)
+groups=(gnome-extra)
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0d862429307d28333f17afa40cf81f6006903e1aa134a8bc430079a9db40b1c6')
+sha256sums=('d90ca19d1075149d044a58274016bb3976b2201774ae079d661fd7c3859a1900')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
+      --libexecdir=/usr/lib/$pkgname --enable-rdp
   make
 }
 
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index 40c35c45b..f88ebec9c 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 183467 2013-04-21 22:12:21Z heftig $
+# $Id: PKGBUILD 196145 2013-10-07 11:53:41Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager' 'gnome-common')
-groups=('gnome')
+arch=(i686 x86_64)
+license=(GPL)
+depends=(libnotify libxtst libsm telepathy-glib gtk3 libsecret avahi desktop-file-utils)
+makedepends=(intltool networkmanager gnome-common)
+groups=(gnome)
 url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a82392aa479d5a4be38020ac64b3c4f0227917af6175938919dbe741995929c')
+sha256sums=('927b71eaafc5ac4c6e098fb9ff0164899eae3ca599a32f5d18897a02b4be1fdd')
 
 build() {
   cd $pkgname-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/vino \
       --localstatedir=/var \
       --disable-http-server --with-secret
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index ab0e1e16e..fc48f7867 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191357 2013-07-23 21:01:37Z jgc $
+# $Id: PKGBUILD 196146 2013-10-07 11:53:43Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk
-pkgver=2.0.4
+pkgver=2.2.0
 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=('bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f')
+sha256sums=('84902e3255dcc6efa1298c8a1f2d2a49674126dcacea383f309aeed9e734d538')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index 3ef0ae144..0807391ea 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189922 2013-07-11 14:37:25Z andyrtr $
+# $Id: PKGBUILD 195989 2013-10-07 07:38:43Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
-pkgver=2.8.1
+pkgver=2.8.2
 pkgrel=1
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>
 options=('!libtool' '!makeflags')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('09f887e1ce6cdb92154035db9044e0795a5c80f1ffb9efc599aed9a9dc1ff539')
+sha256sums=('750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 80d7640c3..c03aed726 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 185459 2013-05-14 10:26:22Z heftig $
+# $Id: PKGBUILD 196147 2013-10-07 11:53:44Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.8.1
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64')
-depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
+depends=('webkitgtk' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
          'desktop-file-utils' 'dconf')
 makedepends=('intltool' 'gtk-doc' 'itstool')
 groups=('gnome')
@@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('73b3941316194dea8ea7d1d2b1f6612424c5d80ee1871ef627455893ad15606e')
+sha256sums=('146f64a9b69409bedc5a0af9376ff2a38e5a4adcfa93c52c95d4ea4dc868cbd2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD
index d6a1c77b2..0fcc1a491 100644
--- a/libre/epiphany-libre/PKGBUILD
+++ b/libre/epiphany-libre/PKGBUILD
@@ -1,36 +1,32 @@
-# $Id: PKGBUILD 186904 2013-05-31 18:08:27Z heftig $
+# $Id: PKGBUILD 195129 2013-09-25 11:58:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=epiphany
 pkgname=epiphany-libre
-pkgver=3.8.2
-pkgrel=1
+pkgver=3.10.0
+pkgrel=2
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils'
-         'hicolor-icon-theme' 'gcr' 'gnome-desktop' 'libwnck3')
-makedepends=('intltool' 'gnome-doc-utils' 'startup-notification' 'gobject-introspection')
+depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils' 'gnome-icon-theme-symbolic' 'gcr' 'gnome-desktop' 'libwnck3' 'gnome-themes-standard')
+makedepends=('intltool' 'itstool' 'docbook-xml' 'startup-notification' 'gobject-introspection')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('7bd2c3b21464a83909d75befe2f9501c1ab2f00e2371f26023f79818faec351e')
 
 prepare() {
   cd $_pkgname-$pkgver
 
   # Replace Google support to DuckDuckGo HTML
-  sed -i 's|http://www[.]google[.]com/search?q=search[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search&ie=UTF-8&oe=UTF-8')
-  sed -i 's|http://www[.]google[.]com/search?q=lala%2Elala[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=lala.lala|g' $(grep -rlI 'http://www[.]google[.]com/search?q=lala%2Elala&ie=UTF-8&oe=UTF-8')
-  sed -i 's|http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=totalgarbage0xdeadbeef|g' $(grep -rlI 'http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef&ie=UTF-8&oe=UTF-8')
-  sed -i 's|http://www[.]google[.]com/search?q=search+separated+words+please[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search+separated+words+please|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search+separated+words+please&ie=UTF-8&oe=UTF-8')
+  sed -i 's|http://www[.]google[.]com/search?q=%s[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=%s&ie=UTF-8&oe=UTF-8')
   sed -i '\|a quoted string should be searched|d' $(grep -rlI 'a quoted string should be searched')
   sed -i 's|http://www[.]google[.]com/search?q=%s[&]amp;ie=UTF-8[&]amp;oe=UTF-8|https://duckduckgo.com/html/?q=%s|g' $(grep -rlI 'http://www[.]google[.]com/search')
   sed -i 's|http://www[.]google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index 5c6865833..8289eb471 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,20 +1,17 @@
-# $Id: PKGBUILD 193443 2013-08-20 09:36:30Z jgc $
+# $Id: PKGBUILD 195293 2013-09-30 08:01:47Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgname=file-roller
 pkgname=file-roller-libre
-pkgver=3.8.4
-pkgrel=1
-pkgdesc="Create and modify archives, with unar recommendation included and nonfree unace recommendation removed"
+pkgver=3.10.0
+pkgrel=2
+pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify')
+depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' 'unar')
 makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl')
-optdepends=('unar: the free RAR uncompression utility'
-            'zip: creates PKZIP-compatible .zip files'
-            'p7zip: 7zip compression utility'
-            'arj: ARJ archiver')
+optdepends=('lrzip: lrzip archive support')
 groups=('gnome-extra')
 provides=("$_pkgname=$pkgver")
 replaces=("$_pkgname")
@@ -22,8 +19,18 @@ conflicts=("$_pkgname")
 options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('3615bc41bbe28030d16ee414a8f5f9a3e37f745733c39032ef1559a06be3eea8')
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
+        bug708854.patch
+        bug709035.patch)
+sha256sums=('d889bb9904146e5715c082aa9a6d96b0606a066ba2bf05fbfb7030f2bf274f13'
+            'a8f4e856924b6b78e47cc134c723d1d93119f90ec9ab69dd0b59ec8a934688ba'
+            '59f07968b720ccd9c70e6232b2bfcaa3cf9298d6ce48be4882154d69cbe7a909')
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../bug708854.patch
+  patch -Np1 -i ../bug709035.patch
+}
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/libre/file-roller-libre/bug708854.patch b/libre/file-roller-libre/bug708854.patch
new file mode 100644
index 000000000..6a5591a59
--- /dev/null
+++ b/libre/file-roller-libre/bug708854.patch
@@ -0,0 +1,92 @@
+From d3ce6fe6964857c89212ab1a5a7aaa052d93c584 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@lanedo.com>
+Date: Thu, 26 Sep 2013 16:06:21 +0000
+Subject: 7z: allow extracting/opening/adding files prefixed with '@'
+
+7z uses '@' to specify a listfile; i.e. a file with a list of files to add or
+extract. Therefore, if working with single files (e.g. open, add or extract a
+single file from the archive), the filenames need to be escaped with '!' and
+specified with '-i'. It is ok to mix files specified with '-i' and the ones
+given after the archive filename.
+
+E.g. instead of:
+  7z x -bd -y -o/tmp/.fr-2z9FXz -- HS04603.ZIP @HS04603.PDF
+
+it should be:
+  7z x -bd -y -o/tmp/.fr-2z9FXz -i!@HS04603.PDF -- HS04603.ZIP
+
+https://bugzilla.gnome.org/show_bug.cgi?id=708854
+---
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
+index f2e70a6..a9d15fd 100644
+--- a/src/fr-command-7z.c
++++ b/src/fr-command-7z.c
+@@ -375,11 +375,20 @@ fr_command_7z_add (FrCommand  *command,
+ 	if (from_file != NULL)
+ 		fr_process_add_arg_concat (command->process, "-i@", from_file, NULL);
+ 
++	if (from_file == NULL)
++		for (scan = file_list; scan; scan = scan->next)
++			/* Files prefixed with '@' need to be handled specially */
++			if (g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL);
++
+ 	fr_process_add_arg (command->process, "--");
+ 	fr_process_add_arg (command->process, command->filename);
++
+ 	if (from_file == NULL)
+ 		for (scan = file_list; scan; scan = scan->next)
+-			fr_process_add_arg (command->process, scan->data);
++			/* Skip files prefixed with '@', already added */
++			if (!g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg (command->process, scan->data);
+ 
+ 	fr_process_end_command (command->process);
+ }
+@@ -409,11 +418,20 @@ fr_command_7z_delete (FrCommand  *command,
+ 	if (from_file != NULL)
+ 		fr_process_add_arg_concat (command->process, "-i@", from_file, NULL);
+ 
++	if (from_file == NULL)
++		for (scan = file_list; scan; scan = scan->next)
++			/* Files prefixed with '@' need to be handled specially */
++			if (g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL);
++
+ 	fr_process_add_arg (command->process, "--");
+ 	fr_process_add_arg (command->process, command->filename);
++
+ 	if (from_file == NULL)
+ 		for (scan = file_list; scan; scan = scan->next)
+-			fr_process_add_arg (command->process, scan->data);
++			/* Skip files prefixed with '@', already added */
++			if (!g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg (command->process, scan->data);
+ 
+ 	fr_process_end_command (command->process);
+ }
+@@ -463,11 +481,21 @@ fr_command_7z_extract (FrCommand  *command,
+ 	if (from_file != NULL)
+ 		fr_process_add_arg_concat (command->process, "-i@", from_file, NULL);
+ 
++	if (from_file == NULL)
++		for (scan = file_list; scan; scan = scan->next)
++			/* Files prefixed with '@' need to be handled specially */
++			if (g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL);
++
++
+ 	fr_process_add_arg (command->process, "--");
+ 	fr_process_add_arg (command->process, command->filename);
++
+ 	if (from_file == NULL)
+ 		for (scan = file_list; scan; scan = scan->next)
+-			fr_process_add_arg (command->process, scan->data);
++			/* Skip files prefixed with '@', already added */
++			if (!g_str_has_prefix (scan->data, "@"))
++				fr_process_add_arg (command->process, scan->data);
+ 
+ 	fr_process_end_command (command->process);
+ }
+--
+cgit v0.9.2
diff --git a/libre/file-roller-libre/bug709035.patch b/libre/file-roller-libre/bug709035.patch
new file mode 100644
index 000000000..f82e33f30
--- /dev/null
+++ b/libre/file-roller-libre/bug709035.patch
@@ -0,0 +1,43 @@
+From d05bdc3b60d928f1f40338208419f0ffa41195f6 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Sun, 29 Sep 2013 16:30:29 +0000
+Subject: libarchive: fixed failure when extracting some tar archives
+
+do not try to restore the creation time;
+do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute
+
+[bug #709035]
+---
+diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
+index 42673df..44aaad2 100644
+--- a/src/fr-archive-libarchive.c
++++ b/src/fr-archive-libarchive.c
+@@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry,
+ 
+ 	/* times */
+ 
+-	if (archive_entry_ctime_is_set (entry)) {
+-		g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry));
+-		g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry));
+-	}
+-
+-	if (archive_entry_mtime_is_set (entry)) {
++	if (archive_entry_mtime_is_set (entry))
+ 		g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry));
+-		g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry));
+-	}
+ 
+ 	/* username */
+ 
+@@ -529,7 +522,8 @@ restore_modification_time (GHashTable    *created_folders,
+ 
+ 		info = g_file_info_new ();
+ 		g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED));
+-		g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
++		if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET)
++			g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
+ 		result = _g_file_set_attributes_from_info (file, info, cancellable, error);
+ 
+ 		g_object_unref (info);
+--
+cgit v0.9.2
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 0eef753de..17d1105e3 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD 193745 2013-08-30 07:49:47Z heftig $
+# $Id: PKGBUILD 195012 2013-09-24 14:12:15Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=gst-plugins-bad
 pkgname=$_pkgname-libre
-pkgver=1.0.10
+pkgver=1.2.0
 pkgrel=1
-pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
+pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
-depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg')
-makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2')
+depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls')
+makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi')
 provides=($_pkgname=$pkgver)
 conflicts=$_pkgname
 replaces=$_pkgname
 options=(!libtool !emptydirs)
 source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
-sha256sums=('91da60ba2ee5c681f11188a4a456894e7f989435c2102c15eff97bbd4fc4c726')
+sha256sums=('a12fac6c106a7e4ae8bb2c7da508688d7db532b818319df2202f497cbd930afa')
 
 build() {
   cd $_pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  aclocal -I m4 -I common/m4
-  autoconf
-  automake --add-missing
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
-    --with-package-name='GStreamer Bad Plugins (Parabola GNU/Linux-libre)' \
-    --with-package-origin='https://parabolagnulinux.org/' \
+    --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/" \
     --with-gtk=3.0
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 9228e28a5..1c9d0251c 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,15 +9,15 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130930
-_libretools_commit=1e16e59a861c8359dffe0af5b8dd4d2922f4018e
+pkgver=20131007
+_libretools_commit=75bef554ce82c3c086cc04a4c12ccd2e9644290f
 _devtools_commit=f566ebf8345cf39f1d50eaa6a679b3ca7088f4eb
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
 	$_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
 
-pkgrel=2
+pkgrel=1
 arch=('any')
 makedepends=(emacs ronn) # emacs --batch is used during the build to process text
 checkdepends=(sh-roundup)
@@ -83,5 +83,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('134ad4f9d4d8bad135e28c62b9856cda'
+md5sums=('938d9909ed3ed3af9f31f82bbc54e788'
          'a3cc8d8fc2daa370799249a4ea5caafc')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 349350033..29e2366e1 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195192 2013-09-27 08:07:21Z bpiotrowski $
+# $Id: PKGBUILD 195951 2013-10-06 10:39:36Z bpiotrowski $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_sublevel=13
+_sublevel=15
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.13 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.15 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '3.10.6-logitech-dj.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         'eb4cce22fe3290eb98660b2c5a737279'
+         '9d85508aaa75442ec6e480a248102c5a'
          '678afb6322e0b0caad6b08bdb2b23dc8'
          '13e5a0aa3faf60f791403d0b367dca86'
          'c072b17032e80debc6a8626299245d46'
@@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
          '3ff40ca684cfe719723e627e2cef7cea'
-         '2813378d34cd28226e3955100ce3e537')
+         '8aab6ab727f49dffcae5fd1c3c7c5bdb')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 784071a26..8283b6b66 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
 pkgver=0.41
-pkgrel=14
+pkgrel=16
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
index 6f7eab297..5344a65c2 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 193449 2013-08-20 10:13:15Z tpowa $
+# $Id: PKGBUILD 195999 2013-10-07 10:42:06Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=usermin
-pkgver=1.560
+pkgver=1.570
 pkgrel=1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
@@ -124,6 +124,6 @@ package() {
   #install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
 }
-md5sums=('155af20dc957aca8a05bfd69d7ccf23a'
+md5sums=('4cfb713bb2fa2582cfe9a62802d588ab'
          'a5bd5e5ee779f8a3cf3d776ca77ee36e'
          'ec37a79f948f778224550930d2a7ca07')
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index cd16179bc..17d02e437 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 193451 2013-08-20 10:13:52Z tpowa $
+# $Id: PKGBUILD 195997 2013-10-07 10:38:56Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.650
+pkgver=1.660
 pkgrel=1
 pkgdesc="a web-based interface for system administration (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
@@ -210,7 +210,7 @@ package() {
   # install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('b4d6370698fdd5e9ba930583ba0d10a3'
+md5sums=('56a685a665b864470eeb7ce6b97961d8'
          'b0b3e3fb231a12e60165b6b4d604dcfa'
          'c86518037449e0fc0c60fc24537ea038'
          'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index ebe83a34c..3d2d5c90f 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.10.06
+pkgver=2013.10.07
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -27,5 +27,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('b2a6d586f15e82e80a9efd64ace56e67'
+md5sums=('8fcf8c27dc2444f78c0413f9ddee383a'
          'SKIP')