Tue Apr 15 03:22:01 UTC 2014

author: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-04-15 03:26:32 +0000
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-04-15 03:26:32 +0000
commit: ad45d1982b97faa9372d99e51daa687c7c09de7d (patch)
tree: af490221f2b733b8f0cf68f3898566d5049c3ab4 /community
parent: 7c266ff5a9e1f533fd8bd8c2fbbcc05df350dcd3 (diff)
49 files changed, 761 insertions, 1507 deletions
diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD
index 46fd3d43e..4c9809f48 100644
--- a/community/apcupsd/PKGBUILD
+++ b/community/apcupsd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 108539 2014-03-28 07:08:24Z spupykin $
+# $Id: PKGBUILD 109373 2014-04-14 09:42:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Todd Musall <tmusall@comcast.net>
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=apcupsd
-pkgver=3.14.11
+pkgver=3.14.12
 pkgrel=1
 pkgdesc="Power mangement and controlling most of APC's UPS models"
 arch=(i686 x86_64)
@@ -26,6 +26,9 @@ sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
 sha256sums=('adc72de89a704881d7c7454f7f98de7d0318102b2b08fe400f4e1cc4da462b73'
             '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
             'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
+sha256sums=('1b4f703cb19cfdf44daf173dc8394cafd30fee0b30a0c75a7d19db622454a440'
+            '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
+            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
deleted file mode 100644
index e733366c5..000000000
--- a/community/audit/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 102540 2013-12-13 11:46:14Z mtorromeo $
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Contributor: Connor Behan <connor.behan@gmail.com>
-# Contributor: henning mueller <henning@orgizm.net>
-
-pkgname=audit
-pkgver=2.3.2
-pkgrel=3
-pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
-url="http://people.redhat.com/sgrubb/audit"
-arch=(i686 x86_64)
-depends=(krb5 libcap-ng)
-makedepends=(libldap swig linux-headers python2)
-license=(GPL)
-options=(emptydirs)
-backup=(
-	etc/libaudit.conf
-	etc/audit/audit.rules
-	etc/audit/auditd.conf
-	etc/audisp/audispd.conf
-	etc/audisp/audisp-remote.conf
-	etc/audisp/zos-remote.conf
-	etc/audisp/plugins.d/af_unix.conf
-	etc/audisp/plugins.d/audispd-zos-remote.conf
-	etc/audisp/plugins.d/au-remote.conf
-	etc/audisp/plugins.d/syslog.conf
-)
-source=("$url/$pkgname-$pkgver.tar.gz")
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	export PYTHON=/usr/bin/python2
-	./configure \
-		--prefix=/usr \
-		--sbindir=/usr/bin \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/audit \
-		--with-python=yes \
-		--enable-gssapi-krb5=yes \
-		--enable-systemd=yes \
-		--with-libcap-ng=yes
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-
-	cd "$pkgdir"
-	install -d var/log/audit
-	rm -rf etc/rc.d etc/sysconfig usr/lib/audit
-
-	sed -ri 's|/sbin|/usr/bin|' \
-		etc/audit/*.conf \
-		etc/audisp/plugins.d/*.conf \
-		usr/lib/systemd/system/auditd.service
-
-	chmod 644 usr/lib/systemd/system/auditd.service
-	mv "$pkgdir"/etc/audit/{rules.d/,}audit.rules
-}
-
-sha256sums=('8872e0b5392888789061db8034164305ef0e1b34543e1e7004d275f039081d29')
diff --git a/community/belle-sip/PKGBUILD b/community/belle-sip/PKGBUILD
index 6b1c6d8fc..1ed50b120 100644
--- a/community/belle-sip/PKGBUILD
+++ b/community/belle-sip/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=belle-sip
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Voice-over-IP phone"
 arch=('i686' 'x86_64')
 url="http://www.linphone.org/index.php/eng"
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index 42930aea2..ee83f4efd 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108886 2014-04-06 21:09:47Z seblu $
+# $Id: PKGBUILD 109446 2014-04-14 20:39:09Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=bird
 pkgname=('bird' 'bird6')
-pkgver=1.4.2
+pkgver=1.4.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://bird.network.cz/'
@@ -12,7 +12,7 @@ depends=('readline' 'ncurses')
 source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
         'bird.service'
         'bird6.service')
-md5sums=('127c154a5a000fa5658ee1c53c44ab68'
+md5sums=('eb7e00b9c1d102ddfcbc19d9cb168511'
          '69221e063a3f07dcad519d5eeacaae75'
          '5b172bd052b523efd95ee018e891e181')
 
diff --git a/community/chuck/PKGBUILD b/community/chuck/PKGBUILD
index 3bd620b5e..5410f58d4 100644
--- a/community/chuck/PKGBUILD
+++ b/community/chuck/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101520 2013-11-26 22:50:13Z arodseth $
+# $Id: PKGBUILD 109394 2014-04-14 11:34:22Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -7,15 +7,15 @@
 # Contributor: tardo <tardo@nagi-fanboi.net>
 
 pkgname=chuck
-pkgver=1.3.2.0
-pkgrel=2
+pkgver=1.3.4.0
+pkgrel=1
 pkgdesc='Concurrent, on-the-fly audio programming language'
 arch=('x86_64' 'i686')
 url='http://chuck.cs.princeton.edu/'
 license=('GPL')
   depends=('gcc-libs' 'libsndfile' 'jack')
 source=("http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz")
-sha256sums=('ee0c7d94cd4053f9683f84007350992b7e7552fcc190eeba21a66de8deaf3948')
+sha256sums=('b65ee7c512192c732d638777fa1e1d885b95f315f3f36e059c168518169a8b33')
 
 build() {
   # Other build alternatives are: linux-alsa linux-oss osx win32
diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD
index a7f25a2ea..ece34c661 100644
--- a/community/cinnamon-desktop/PKGBUILD
+++ b/community/cinnamon-desktop/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor:  Jan de Groot <jan@archlinux.org>
 
 pkgname=cinnamon-desktop
-pkgver=2.0.4
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Library with common API for various Cinnamon modules"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=(intltool gobject-introspection gnome-common)
 url="https://github.com/linuxmint/cinnamon-desktop"
 install=cinnamon-desktop.install
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz")
-sha256sums=('039a789fc8fca52cf1ceaeec8b7ad9ccc122ea38990186cabea814118e8ddcb3')
+sha256sums=('4f833a3914b7e822c1dd6a495b688d614c4ae6663faa3d0b74d948dae3bcf33b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/cinnamon-menus/PKGBUILD b/community/cinnamon-menus/PKGBUILD
new file mode 100644
index 000000000..cceb556ac
--- /dev/null
+++ b/community/cinnamon-menus/PKGBUILD
@@ -0,0 +1,27 @@
+#Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
+
+pkgname=cinnamon-menus
+pkgver=2.2.0
+pkgrel=1
+pkgdesc="Cinnamon menu specifications"
+arch=('i686' 'x86_64')
+depends=('glib2')
+makedepends=('intltool' 'gobject-introspection')
+license=('GPL' 'LGPL')
+url="http://www.linuxmint.com"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-menus/archive/${pkgver}.tar.gz")
+sha256sums=('e354273c29bc610925d81263c90c9e67137a39fb8d241e125d530842a60ec286')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure \
+      --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var  --disable-static \
+      --sbindir=/usr/bin
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index a89b7ce9c..c200f601e 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -4,8 +4,8 @@
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-screensaver
-pkgver=2.0.3
-pkgrel=4
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,23 +14,9 @@ backup=(etc/pam.d/cinnamon-screensaver)
 depends=('cinnamon-desktop' 'cinnamon-translations' 'dbus-glib' 'libgnomekbd')
 makedepends=('intltool' 'gnome-common')
 source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
-       cinnamon-screensaver.pam
-       away-message-fixes.patch
-       fix-systemd-lock.patch)
-sha256sums=('00c866e98994afc8939d1d347de631cebaa6ec34ad59646a7ccd223bd757cc7d'
-            'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
-            'f9f3d555b0c325322469be765b488da599fc850f8ff5a74f72fdf69f68e04c96'
-            '14d3301a03883330bf044a40ea4dce74a829b03174833d21efe66ebeb940dc0c')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Various fixes for away message handling
-  patch -Np1 -i ../away-message-fixes.patch
-
-  # Use the session path instead of the session id
-  patch -Np1 -i ../fix-systemd-lock.patch
-}
+       cinnamon-screensaver.pam)
+sha256sums=('2ba075f8bceb5ff853d76b0426e0d3fedcfd503016c4752f1e5b3813b0d8aef9'
+            'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/cinnamon-screensaver/away-message-fixes.patch b/community/cinnamon-screensaver/away-message-fixes.patch
deleted file mode 100644
index 1828c5beb..000000000
--- a/community/cinnamon-screensaver/away-message-fixes.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -Naur cinnamon-screensaver-2.0.3.orig/doc/dbus-interface.html cinnamon-screensaver-2.0.3/doc/dbus-interface.html
---- cinnamon-screensaver-2.0.3.orig/doc/dbus-interface.html	2013-10-26 19:34:39.000000000 +0200
-+++ cinnamon-screensaver-2.0.3/doc/dbus-interface.html	2013-10-29 10:08:06.568038245 +0100
-@@ -70,7 +70,7 @@
-         <code class="literal">Lock</code>
-       </h3></div></div></div><p>
-         Request that the screen be locked.
--      </p></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
-+      </p><div class="informaltable"><table border="1"><colgroup><col><col></colgroup><thead><tr><th>Direction</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>in</td><td>string</td><td>the away message</td></tr></tbody></table></div></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
-         <code class="literal">Cycle</code>
-       </h3></div></div></div><p>
-         Request that the screen saver theme be restarted and, if applicable,
-diff -Naur cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-command.c cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-command.c
---- cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-command.c	2013-10-26 19:34:39.000000000 +0200
-+++ cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-command.c	2013-10-29 22:32:13.127650887 +0100
-@@ -41,7 +41,7 @@
- static gboolean do_query      = FALSE;
- static gboolean do_time       = FALSE;
- 
--static gchar   *away_message  = "DEFAULT";
-+static gchar   *away_message  = "";
- 
- static GOptionEntry entries [] = {
-         { "exit", 0, 0, G_OPTION_ARG_NONE, &do_quit,
-@@ -114,7 +114,7 @@
- static GDBusMessage *
- screensaver_send_message_string (GDBusConnection *connection,
-                                  const char      *name,
--                                 gboolean         value)
-+                                 gchar           *value)
- {
-         GDBusMessage *message, *reply;
-         GError       *error;
-@@ -310,14 +310,7 @@
-         }
- 
-         if (do_lock) {
--				if (g_strcmp0 (away_message, "DEFAULT") == 0) {
--					reply = screensaver_send_message_string (connection, "Lock", away_message);
--				}
--				else {
--					gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message);
--					reply = screensaver_send_message_string (connection, "Lock", custom_message);
--					g_free (custom_message);
--				}
-+                reply = screensaver_send_message_string (connection, "Lock", away_message);
-                 if (reply == NULL) {
-                         g_message ("Did not receive a reply from the screensaver.");
-                         goto done;
-diff -Naur cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-dialog.c cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-dialog.c
---- cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-dialog.c	2013-10-26 19:34:39.000000000 +0200
-+++ cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-dialog.c	2013-10-29 18:34:38.042752214 +0100
-@@ -49,7 +49,6 @@
- static gboolean enable_logout  = FALSE;
- static gboolean enable_switch  = FALSE;
- static char    *logout_command = NULL;
--static char    *away_message     = NULL;
- 
- static GOptionEntry entries [] = {
-         { "verbose", 0, 0, G_OPTION_ARG_NONE, &verbose,
-diff -Naur cinnamon-screensaver-2.0.3.orig/src/gs-listener-dbus.c cinnamon-screensaver-2.0.3/src/gs-listener-dbus.c
---- cinnamon-screensaver-2.0.3.orig/src/gs-listener-dbus.c	2013-10-26 19:34:39.000000000 +0200
-+++ cinnamon-screensaver-2.0.3/src/gs-listener-dbus.c	2013-10-30 03:04:42.134732524 +0100
-@@ -570,7 +570,7 @@
-         if (! dbus_message_get_args (message, &error,
-                                      DBUS_TYPE_STRING, &body,
-                                      DBUS_TYPE_INVALID)) {
--                raise_syntax (connection, message, "ShowMessage");
-+                raise_syntax (connection, message, "Lock");
-                 return DBUS_HANDLER_RESULT_HANDLED;
-         }
-         
-@@ -584,6 +584,7 @@
- 
-         return DBUS_HANDLER_RESULT_HANDLED;
- }
-+
- static DBusHandlerResult
- listener_show_message (GSListener     *listener,
-                        DBusConnection *connection,
-@@ -906,7 +907,7 @@
-                 } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {
-                         if (_listener_message_path_is_our_session (listener, message)) {
-                                 gs_debug ("systemd requested session lock");
--                                return listener_lock (listener, connection, message);
-+                                g_signal_emit (listener, signals [LOCK], 0, "");
-                         }
- 
-                         return DBUS_HANDLER_RESULT_HANDLED;
-@@ -948,7 +949,7 @@
-         } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) {
-                 if (_listener_message_path_is_our_session (listener, message)) {
-                         gs_debug ("ConsoleKit requested session lock");
--                        return listener_lock (listener, connection, message);
-+                        g_signal_emit (listener, signals [LOCK], 0, "");
-                 }
- 
-                 return DBUS_HANDLER_RESULT_HANDLED;
-diff -Naur cinnamon-screensaver-2.0.3.orig/src/gs-manager.c cinnamon-screensaver-2.0.3/src/gs-manager.c
---- cinnamon-screensaver-2.0.3.orig/src/gs-manager.c	2013-10-26 19:34:39.000000000 +0200
-+++ cinnamon-screensaver-2.0.3/src/gs-manager.c	2013-10-29 20:27:40.394604570 +0100
-@@ -1097,6 +1097,7 @@
-                 g_object_unref (manager->priv->settings);
-         }
- 
-+        g_free (manager->priv->away_message);
-         g_free (manager->priv->logout_command);
-         g_free (manager->priv->keyboard_command);
- 
-@@ -1261,6 +1262,8 @@
- 
-         gs_manager_destroy_windows (manager);
- 
-+        gs_manager_set_away_message (manager, NULL);
-+
-         /* reset state */
-         manager->priv->active = FALSE;
-         manager->priv->activate_time = 0;
-@@ -1275,10 +1278,18 @@
- gs_manager_set_away_message (GSManager   *manager,
-                              const char  *message)
- {
--        g_free (manager->priv->logout_command);
--
--        manager->priv->away_message = g_strdup(message);
-         GSList *l;
-+
-+        g_return_if_fail (GS_IS_MANAGER (manager));
-+
-+        g_free (manager->priv->away_message);
-+
-+        if (message) {
-+                manager->priv->away_message = g_strdup (message);
-+        } else {
-+                manager->priv->away_message = NULL;
-+        }
-+
-         for (l = manager->priv->windows; l; l = l->next) {
-                 gs_window_set_away_message (l->data, manager->priv->away_message);
-         }
-@@ -1293,7 +1304,6 @@
-         if (active) {
-                 res = gs_manager_activate (manager);
-         } else {
--                gs_manager_set_away_message(manager, "");
-                 res = gs_manager_deactivate (manager);
-         }
- 
-diff -Naur cinnamon-screensaver-2.0.3.orig/src/gs-window-x11.c cinnamon-screensaver-2.0.3/src/gs-window-x11.c
---- cinnamon-screensaver-2.0.3.orig/src/gs-window-x11.c	2013-10-26 19:34:39.000000000 +0200
-+++ cinnamon-screensaver-2.0.3/src/gs-window-x11.c	2013-10-29 23:11:15.240828725 +0100
-@@ -2132,38 +2132,19 @@
-         return utf8_name;
- }
- 
--static gchar * 
--str_replace(const char *string, const char *delimiter, const char *replacement)
--{
--	gchar **split;
--	gchar *ret;
--	g_return_val_if_fail(string      != NULL, NULL);
--	g_return_val_if_fail(delimiter   != NULL, NULL);
--	g_return_val_if_fail(replacement != NULL, NULL);
--	split = g_strsplit(string, delimiter, 0);
--	ret = g_strjoinv(replacement, split);
--	g_strfreev(split);
--	return ret;
--}
--
- static void
- update_clock (GSWindow *window)
- {	
--	char *markup;
--	char *away_message;
--			
--	if (window->priv->away_message != NULL && g_str_has_prefix (window->priv->away_message, "CUSTOM###") && g_strcmp0(window->priv->away_message, "") != 0) {		
--		away_message = str_replace(window->priv->away_message, "CUSTOM###", "");		
--        markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\"> %s</span></b>\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#ACACAC\">  ~ %s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message, get_user_display_name());
--	}
--	else {
--		away_message = g_strdup_printf (_("%s"), window->priv->default_message);
--        markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message);
--	}
--			
--	gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
--	g_free (markup);
--	g_free (away_message);
-+        char *markup;
-+
-+        if (window->priv->away_message != NULL && g_strcmp0(window->priv->away_message, "") != 0) {
-+                markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\"> %s</span></b>\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#ACACAC\">  ~ %s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), g_markup_escape_text(window->priv->away_message, -1), get_user_display_name());
-+        } else {
-+                markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), g_markup_escape_text(window->priv->default_message, -1));
-+        }
-+
-+        gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
-+        g_free (markup);
- }
- 
- static void
-@@ -2197,7 +2178,16 @@
- gs_window_set_away_message (GSWindow   *window,
-                             const char *message)
- {
--        window->priv->away_message = message;
-+        g_return_if_fail (GS_IS_WINDOW (window));
-+
-+        g_free (window->priv->away_message);
-+
-+        if (message) {
-+                window->priv->away_message = g_strdup (message);
-+        } else {
-+                window->priv->away_message = NULL;
-+        }
-+
-         update_clock (window);
- }
- 
-@@ -2320,6 +2310,7 @@
- 
-         g_return_if_fail (window->priv != NULL);
- 
-+        g_free (window->priv->away_message);
-         g_free (window->priv->logout_command);
-         g_free (window->priv->keyboard_command);
- 
diff --git a/community/cinnamon-screensaver/fix-systemd-lock.patch b/community/cinnamon-screensaver/fix-systemd-lock.patch
deleted file mode 100644
index 7ce3e2394..000000000
--- a/community/cinnamon-screensaver/fix-systemd-lock.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From cac2c0ad8f4f40b6b175b9fbcde06935859f1bbc Mon Sep 17 00:00:00 2001
-From: Peter de Ridder <peter@xfce.org>
-Date: Wed, 20 Mar 2013 20:44:51 +0100
-Subject: [PATCH] Use the session path instead of the session id.
-
----
- src/gs-listener-dbus.c | 47 +++++++++++++++++++++++++++--------------------
- 1 file changed, 27 insertions(+), 20 deletions(-)
-
-diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
-index 703d9e1..11fb95e 100644
---- a/src/gs-listener-dbus.c
-+++ b/src/gs-listener-dbus.c
-@@ -116,19 +117,8 @@ enum {
-         if (listener->priv->session_id == NULL)
-                 return FALSE;
- 
--#ifdef WITH_SYSTEMD
--        /* The bus object path is simply the actual session ID
--         * prefixed to make it a bus path */
--        if (listener->priv->have_systemd)
--                return g_str_has_prefix (ssid, SYSTEMD_LOGIND_SESSION_PATH "/")
--                        && strcmp (ssid + sizeof (SYSTEMD_LOGIND_SESSION_PATH),
--                                   listener->priv->session_id) == 0;
--#endif
--
--#ifdef WITH_CONSOLE_KIT
-         if (strcmp (ssid, listener->priv->session_id) == 0)
-                 return TRUE;
--#endif
- 
-         return FALSE;
- }
-@@ -416,20 +406,37 @@ enum {
- 
- #ifdef WITH_SYSTEMD
-         if (listener->priv->have_systemd) {
--                char *t;
--                int r;
-+                dbus_uint32_t pid = getpid();
- 
--                r = sd_pid_get_session (0, &t);
--                if (r < 0) {
--                        gs_debug ("Couldn't determine our own session id: %s", strerror (-r));
-+                message = dbus_message_new_method_call (SYSTEMD_LOGIND_SERVICE, SYSTEMD_LOGIND_PATH, SYSTEMD_LOGIND_INTERFACE, "GetSessionByPID");
-+                if (message == NULL) {
-+                        gs_debug ("Couldn't allocate the dbus message");
-                         return NULL;
-                 }
- 
--                /* t is allocated with malloc(), we need it with g_malloc() */
--                ssid = g_strdup(t);
--                free (t);
-+                if (dbus_message_append_args (message, DBUS_TYPE_UINT32, &pid, DBUS_TYPE_INVALID) == FALSE) {
-+                        gs_debug ("Couldn't add args to the dbus message");
-+                        return NULL;
-+                }
-+
-+                /* FIXME: use async? */
-+                reply = dbus_connection_send_with_reply_and_block (listener->priv->system_connection,
-+                                                                   message,
-+                                                                   -1, &error);
-+                dbus_message_unref (message);
-+
-+                if (dbus_error_is_set (&error)) {
-+                        gs_debug ("%s raised:\n %s\n\n", error.name, error.message);
-+                        dbus_error_free (&error);
-+                        return NULL;
-+                }
-+
-+                dbus_message_iter_init (reply, &reply_iter);
-+                dbus_message_iter_get_basic (&reply_iter, &ssid);
-+
-+                dbus_message_unref (reply);
- 
--                return ssid;
-+                return g_strdup (ssid);
-         }
- #endif
- 
--- 
-1.8.4
-
diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD
index 4ad740de7..ba3d9a8cd 100644
--- a/community/cinnamon-session/PKGBUILD
+++ b/community/cinnamon-session/PKGBUILD
@@ -3,29 +3,24 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=cinnamon-session
-pkgver=2.0.6
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="The Cinnamon Session Handler"
 arch=(i686 x86_64)
 license=(GPL LGPL)
-depends=(cinnamon-desktop libsm upower)
+depends=(cinnamon-desktop libsm upower libcanberra)
 makedepends=(intltool mesa json-glib 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
-        remove_sessionmigration.patch
         timeout.patch)
-sha256sums=('831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567'
-            'f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736'
+sha256sums=('b6ce4672a9b4fcd241c21a6b1921ff461e0c6e9fbeef4d4e9b1185785374ffae'
             'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  # Do not try to execute session-migration script (it's specific to Ubuntu)
-  patch -Np1 -i ../remove_sessionmigration.patch
-
   # Increase timeout, for slow machines
   patch -Np1 -i ../timeout.patch
 }
diff --git a/community/cinnamon-session/remove_sessionmigration.patch b/community/cinnamon-session/remove_sessionmigration.patch
deleted file mode 100644
index 0016080dd..000000000
--- a/community/cinnamon-session/remove_sessionmigration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/cinnamon-session/csm-session-fill.c
-+++ b/cinnamon-session/csm-session-fill.c
-@@ -228,15 +228,6 @@
- load_standard_apps (CsmManager *manager,
-                     GKeyFile   *keyfile)
- {
--        GError *error;
--
--        g_debug ("fill: *** Executing user migration");
--        error = NULL;
--        if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
--                 g_warning ("Error while executing session-migration: %s", error->message);
--                 g_error_free (error);
--        }
--
-         g_debug ("fill: *** Adding required components");
-         handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
-                                     append_required_components_helper, manager);
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
index 4dbfb4e75..d9e808e4b 100644
--- a/community/cinnamon-settings-daemon/PKGBUILD
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 107735 2014-03-19 00:56:51Z bgyorgy $
+# $Id: PKGBUILD 109437 2014-04-14 20:20:10Z jgc $
 # Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=cinnamon-settings-daemon
 pkgver=2.0.8
-pkgrel=4
+pkgrel=6
 pkgdesc="The Cinnamon Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,11 +16,17 @@ url="https://github.com/linuxmint/cinnamon-settings-daemon"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
         keyboard.patch
         systemd-support.patch
+        upower_deprecated.patch
+        remove_obsolete_battery_recall_code.patch
+        fix-lock-on-suspend.patch
         automount-plugin.patch
         dpms.patch)
 sha256sums=('6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd'
             '3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c'
             '28c002628bc97e8b4a2aa7e8a8141bcc8388b250a6c3ebc09a640e110ae815a9'
+            'cde7cdfe5222796d651df542526fcad2cbf0bb3a6001b31084586d1232ee6771'
+            '4c1d917a7a70e16a5307f767c1494fa59cbc5168d9293ad66b56e17a74e8baf1'
+            '1292c5c6a5fbf7f3db462bb8b71a75e651ea165cbd6adfd334776ccb76bdcdba'
             '4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837'
             '194cc704320a2d6be636191e96f62514f2b5f97655c200991b5690fbf3006026')
 
@@ -33,6 +39,13 @@ prepare() {
   # Add systemd support for power and media-keys plugins
   patch -Np1 -i ../systemd-support.patch
 
+  # Port to upower 0.99
+  patch -Np1 -i ../upower_deprecated.patch
+  patch -Np1 -i ../remove_obsolete_battery_recall_code.patch
+
+  # Fix regressions in the previous patches
+  patch -Np1 -i ../fix-lock-on-suspend.patch
+
   # Turn automount helper into a plugin
   patch -Np1 -i ../automount-plugin.patch
 
diff --git a/community/cinnamon-settings-daemon/fix-lock-on-suspend.patch b/community/cinnamon-settings-daemon/fix-lock-on-suspend.patch
new file mode 100644
index 000000000..46b1b1a57
--- /dev/null
+++ b/community/cinnamon-settings-daemon/fix-lock-on-suspend.patch
@@ -0,0 +1,109 @@
+From 45ba88f2798dd66a289953d76cee7ea1c28fa088 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Fri, 11 Apr 2014 16:09:05 +0200
+Subject: [PATCH 1/3] Make lock-on-suspend independent form lock-enabled
+
+This was a regression in my logind support patch.
+---
+ plugins/power/csd-power-manager.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index 8db93b5..ea626a5 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -3678,7 +3678,15 @@ handle_suspend_actions (CsdPowerManager *manager)
+         do_lock = g_settings_get_boolean (manager->priv->settings,
+                                           "lock-on-suspend");
+         if (do_lock)
+-                lock_screensaver (manager);
++                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
++                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
++                                          NULL,
++                                          GS_DBUS_NAME,
++                                          GS_DBUS_PATH,
++                                          GS_DBUS_INTERFACE,
++                                          NULL,
++                                          sleep_cb_screensaver_proxy_ready_cb,
++                                          manager);
+ 
+         /* lift the delay inhibit, so logind can proceed */
+         uninhibit_suspend (manager);
+-- 
+1.9.1
+
+
+From 898f866fed431f27b2203566b240ea2280260e83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Fri, 11 Apr 2014 16:29:59 +0200
+Subject: [PATCH 2/3] Lock screen when lid closed
+
+This was a regression in the upower-1.0 patch.
+---
+ plugins/power/csd-power-manager.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index ea626a5..e28faae 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -2146,10 +2146,10 @@ suspend_with_lid_closed (CsdPowerManager *manager)
+                                                    "lid-close-ac-action");
+         }
+ 
+-#if ! UP_CHECK_VERSION(0,99,0)
+         /* check we won't melt when the lid is closed */
+         if (action_type != CSD_POWER_ACTION_SUSPEND &&
+             action_type != CSD_POWER_ACTION_HIBERNATE) {
++#if ! UP_CHECK_VERSION(0,99,0)
+                 if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
+                         g_warning ("to prevent damage, now forcing suspend");
+                         do_power_action_type (manager, CSD_POWER_ACTION_SUSPEND);
+@@ -2158,8 +2158,10 @@ suspend_with_lid_closed (CsdPowerManager *manager)
+                         /* maybe lock the screen if the lid is closed */
+                         lock_screensaver (manager);
+                 }
+-        }
++#else
++                lock_screensaver (manager);
+ #endif
++        }
+ 
+         /* ensure we turn the panel back on after resume */
+         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+-- 
+1.9.1
+
+
+From 5dfc5f50b762c431ed7f9da2d07d08e1fd4f1376 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Fri, 11 Apr 2014 16:46:52 +0200
+Subject: [PATCH 3/3] Really fix the error with merge
+
+---
+ plugins/power/csd-power-manager.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index e28faae..a72f645 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -3730,6 +3730,7 @@ handle_resume_actions (CsdPowerManager *manager)
+         inhibit_suspend (manager);
+ }
+ 
++#if ! UP_CHECK_VERSION(0,99,0)
+ static void
+ upower_notify_sleep_cb (UpClient *client,
+                         UpSleepKind sleep_kind,
+@@ -3745,6 +3746,7 @@ upower_notify_resume_cb (UpClient *client,
+ {
+         handle_resume_actions (manager);
+ }
++#endif
+ 
+ static void
+ logind_proxy_signal_cb (GDBusProxy  *proxy,
+-- 
+1.9.1
+
diff --git a/community/cinnamon-settings-daemon/remove_obsolete_battery_recall_code.patch b/community/cinnamon-settings-daemon/remove_obsolete_battery_recall_code.patch
new file mode 100644
index 000000000..fca763689
--- /dev/null
+++ b/community/cinnamon-settings-daemon/remove_obsolete_battery_recall_code.patch
@@ -0,0 +1,242 @@
+diff -uNrp a/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in b/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in
+--- a/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in	2013-11-03 15:50:04.000000000 +0000
++++ b/data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in	2013-11-09 12:39:50.907354689 +0000
+@@ -141,11 +141,6 @@
+       <_summary>Whether to use time-based notifications</_summary>
+       <_description>If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS.</_description>
+     </key>
+-    <key name="notify-perhaps-recall" type="b">
+-      <default>true</default>
+-      <_summary>If we should show the recalled battery warning for a broken battery</_summary>
+-      <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description>
+-    </key>
+     <key name="lock-on-suspend" type="b">
+       <default>false</default>
+       <_summary>If the computer should lock when entering suspend mode</_summary>
+diff -uNrp a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+--- a/plugins/power/csd-power-manager.c	2013-11-03 15:50:04.000000000 +0000
++++ b/plugins/power/csd-power-manager.c	2013-11-09 12:38:55.358363329 +0000
+@@ -75,7 +75,6 @@
+ #define CSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG           30 * 1000 /* ms */
+ 
+ #define CSD_POWER_MANAGER_CRITICAL_ALERT_TIMEOUT        5 /* seconds */
+-#define CSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
+ #define CSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
+ 
+ /* Keep this in sync with gnome-shell */
+@@ -930,146 +929,9 @@ out:
+         return device;
+ }
+ 
+-typedef struct {
+-        CsdPowerManager *manager;
+-        UpDevice        *device;
+-} CsdPowerManagerRecallData;
+-
+-static void
+-device_perhaps_recall_response_cb (GtkDialog *dialog,
+-                                   gint response_id,
+-                                   CsdPowerManagerRecallData *recall_data)
+-{
+-        GdkScreen *screen;
+-        GtkWidget *dialog_error;
+-        GError *error = NULL;
+-        gboolean ret;
+-        gchar *website = NULL;
+-
+-        /* don't show this again */
+-        if (response_id == GTK_RESPONSE_CANCEL) {
+-                g_settings_set_boolean (recall_data->manager->priv->settings,
+-                                        "notify-perhaps-recall",
+-                                        FALSE);
+-                goto out;
+-        }
+-
+-        /* visit recall website */
+-        if (response_id == GTK_RESPONSE_OK) {
+-
+-                g_object_get (recall_data->device,
+-                              "recall-url", &website,
+-                              NULL);
+-
+-                screen = gdk_screen_get_default();
+-                ret = gtk_show_uri (screen,
+-                                    website,
+-                                    gtk_get_current_event_time (),
+-                                    &error);
+-                if (!ret) {
+-                        dialog_error = gtk_message_dialog_new (NULL,
+-                                                               GTK_DIALOG_MODAL,
+-                                                               GTK_MESSAGE_INFO,
+-                                                               GTK_BUTTONS_OK,
+-                                                               "Failed to show url %s",
+-                                                               error->message);
+-                        gtk_dialog_run (GTK_DIALOG (dialog_error));
+-                        g_error_free (error);
+-                }
+-        }
+-out:
+-        gtk_widget_destroy (GTK_WIDGET (dialog));
+-        g_object_unref (recall_data->device);
+-        g_object_unref (recall_data->manager);
+-        g_free (recall_data);
+-        g_free (website);
+-        return;
+-}
+-
+-static gboolean
+-device_perhaps_recall_delay_cb (gpointer user_data)
+-{
+-        gchar *vendor;
+-        const gchar *title = NULL;
+-        GString *message = NULL;
+-        GtkWidget *dialog;
+-        CsdPowerManagerRecallData *recall_data = (CsdPowerManagerRecallData *) user_data;
+-
+-        g_object_get (recall_data->device,
+-                      "recall-vendor", &vendor,
+-                      NULL);
+-
+-        /* TRANSLATORS: the battery may be recalled by its vendor */
+-        title = _("Battery may be recalled");
+-        message = g_string_new ("");
+-        g_string_append_printf (message,
+-                                _("A battery in your computer may have been "
+-                                  "recalled by %s and you may be at risk."), vendor);
+-        g_string_append (message, "\n\n");
+-        g_string_append (message, _("For more information visit the battery recall website."));
+-        dialog = gtk_message_dialog_new_with_markup (NULL,
+-                                                     GTK_DIALOG_DESTROY_WITH_PARENT,
+-                                                     GTK_MESSAGE_INFO,
+-                                                     GTK_BUTTONS_CLOSE,
+-                                                     "<span size='larger'><b>%s</b></span>",
+-                                                     title);
+-        gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
+-                                                    "%s", message->str);
+-
+-        /* TRANSLATORS: button text, visit the manufacturers recall website */
+-        gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"),
+-                               GTK_RESPONSE_OK);
+-
+-        /* TRANSLATORS: button text, do not show this bubble again */
+-        gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this again"),
+-                               GTK_RESPONSE_CANCEL);
+-
+-        gtk_widget_show (dialog);
+-        g_signal_connect (dialog, "response",
+-                          G_CALLBACK (device_perhaps_recall_response_cb),
+-                          recall_data);
+-
+-        g_string_free (message, TRUE);
+-        g_free (vendor);
+-        return FALSE;
+-}
+-
+-static void
+-device_perhaps_recall (CsdPowerManager *manager, UpDevice *device)
+-{
+-        gboolean ret;
+-        guint timer_id;
+-        CsdPowerManagerRecallData *recall_data;
+-
+-        /* don't show when running under GDM */
+-        if (g_getenv ("RUNNING_UNDER_GDM") != NULL) {
+-                g_debug ("running under gdm, so no notification");
+-                return;
+-        }
+-
+-        /* already shown, and dismissed */
+-        ret = g_settings_get_boolean (manager->priv->settings,
+-                                      "notify-perhaps-recall");
+-        if (!ret) {
+-                g_debug ("settings prevents recall notification");
+-                return;
+-        }
+-
+-        recall_data = g_new0 (CsdPowerManagerRecallData, 1);
+-        recall_data->manager = g_object_ref (manager);
+-        recall_data->device = g_object_ref (device);
+-
+-        /* delay by a few seconds so the session can load */
+-        timer_id = g_timeout_add_seconds (CSD_POWER_MANAGER_RECALL_DELAY,
+-                                          device_perhaps_recall_delay_cb,
+-                                          recall_data);
+-        g_source_set_name_by_id (timer_id, "[CsdPowerManager] perhaps-recall");
+-}
+-
+ static void
+ engine_device_add (CsdPowerManager *manager, UpDevice *device)
+ {
+-        gboolean recall_notice;
+         CsdPowerManagerWarning warning;
+         UpDeviceState state;
+         UpDeviceKind kind;
+@@ -1085,7 +947,6 @@ engine_device_add (CsdPowerManager *mana
+         g_object_get (device,
+                       "kind", &kind,
+                       "state", &state,
+-                      "recall-notice", &recall_notice,
+                       NULL);
+ 
+         /* add old state for transitions */
+@@ -1109,43 +970,6 @@ engine_device_add (CsdPowerManager *mana
+                                    "engine-state-old",
+                                    GUINT_TO_POINTER(state));
+         }
+-
+-        /* the device is recalled */
+-        if (recall_notice)
+-                device_perhaps_recall (manager, device);
+-}
+-
+-static gboolean
+-engine_check_recall (CsdPowerManager *manager, UpDevice *device)
+-{
+-        UpDeviceKind kind;
+-        gboolean recall_notice = FALSE;
+-        gchar *recall_vendor = NULL;
+-        gchar *recall_url = NULL;
+-
+-        /* get device properties */
+-        g_object_get (device,
+-                      "kind", &kind,
+-                      "recall-notice", &recall_notice,
+-                      "recall-vendor", &recall_vendor,
+-                      "recall-url", &recall_url,
+-                      NULL);
+-
+-        /* not battery */
+-        if (kind != UP_DEVICE_KIND_BATTERY)
+-                goto out;
+-
+-        /* no recall data */
+-        if (!recall_notice)
+-                goto out;
+-
+-        /* emit signal for manager */
+-        g_debug ("** EMIT: perhaps-recall");
+-        g_debug ("%s-%s", recall_vendor, recall_url);
+-out:
+-        g_free (recall_vendor);
+-        g_free (recall_url);
+-        return recall_notice;
+ }
+ 
+ static gboolean
+@@ -1177,7 +1001,6 @@ engine_coldplug (CsdPowerManager *manage
+         for (i = 0; array != NULL && i < array->len; i++) {
+                 device = g_ptr_array_index (array, i);
+                 engine_device_add (manager, device);
+-                engine_check_recall (manager, device);
+         }
+ out:
+         if (array != NULL)
+@@ -1191,8 +1014,6 @@ engine_device_added_cb (UpClient *client
+ {
+         /* add to list */
+         g_ptr_array_add (manager->priv->devices_array, g_object_ref (device));
+-        engine_check_recall (manager, device);
+-
+         engine_recalculate_state (manager);
+ }
+ 
diff --git a/community/cinnamon-settings-daemon/upower_deprecated.patch b/community/cinnamon-settings-daemon/upower_deprecated.patch
new file mode 100644
index 000000000..3719c849c
--- /dev/null
+++ b/community/cinnamon-settings-daemon/upower_deprecated.patch
@@ -0,0 +1,81 @@
+From 44d6bf66141b8cf772d8299106e9fd7fda6a21e3 Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux@googlemail.com>
+Date: Fri, 8 Nov 2013 09:04:44 +0000
+Subject: [PATCH] upower-1.0 changes
+
+---
+ plugins/power/csd-power-manager.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index a8efe08..bae3298 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -1157,6 +1157,7 @@ engine_coldplug (CsdPowerManager *manager)
+         gboolean ret;
+         GError *error = NULL;
+ 
++#if ! UP_CHECK_VERSION(0,99,0) 
+         /* get devices from UPower */
+         ret = up_client_enumerate_devices_sync (manager->priv->up_client, NULL, &error);
+         if (!ret) {
+@@ -1164,6 +1165,7 @@ engine_coldplug (CsdPowerManager *manager)
+                 g_error_free (error);
+                 goto out;
+         }
++#endif
+ 
+         /* connected mobile phones */
+         gpm_phone_coldplug (manager->priv->phone);
+@@ -1306,12 +1308,17 @@ manager_critical_action_get (CsdPowerManager *manager,
+ 
+         policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action");
+         if (policy == CSD_POWER_ACTION_SUSPEND) {
+-                if (is_ups == FALSE &&
+-                    up_client_get_can_suspend (manager->priv->up_client))
++                if (is_ups == FALSE
++#if ! UP_CHECK_VERSION(0,99,0)
++                    && up_client_get_can_suspend (manager->priv->up_client)
++#endif
++                )
+                         return policy;
+                 return CSD_POWER_ACTION_SHUTDOWN;
+         } else if (policy == CSD_POWER_ACTION_HIBERNATE) {
++#if ! UP_CHECK_VERSION(0,99,0)
+                 if (up_client_get_can_hibernate (manager->priv->up_client))
++#endif
+                         return policy;
+                 return CSD_POWER_ACTION_SHUTDOWN;
+         }
+@@ -2300,6 +2307,7 @@ suspend_with_lid_closed (CsdPowerManager *manager)
+                                                    "lid-close-ac-action");
+         }
+ 
++#if ! UP_CHECK_VERSION(0,99,0)
+         /* check we won't melt when the lid is closed */
+         if (action_type != CSD_POWER_ACTION_SUSPEND &&
+             action_type != CSD_POWER_ACTION_HIBERNATE) {
+@@ -2312,6 +2320,7 @@ suspend_with_lid_closed (CsdPowerManager *manager)
+                         lock_screensaver (manager);
+                 }
+         }
++#endif
+ 
+         /* ensure we turn the panel back on after resume */
+         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+@@ -3838,10 +3849,12 @@ csd_power_manager_start (CsdPowerManager *manager,
+                           G_CALLBACK (engine_settings_key_changed_cb), manager);
+         manager->priv->settings_screensaver = g_settings_new ("org.cinnamon.desktop.screensaver");
+         manager->priv->up_client = up_client_new ();
++#if ! UP_CHECK_VERSION(0,99,0)
+         g_signal_connect (manager->priv->up_client, "notify-sleep",
+                           G_CALLBACK (upower_notify_sleep_cb), manager);
+         g_signal_connect (manager->priv->up_client, "notify-resume",
+                           G_CALLBACK (upower_notify_resume_cb), manager);
++#endif
+         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
+         g_signal_connect (manager->priv->up_client, "device-added",
+                           G_CALLBACK (engine_device_added_cb), manager);
+-- 
+1.9.1
+
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 4dcb7dff1..1ed94ac4f 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 107038 2014-03-11 15:48:30Z andyrtr $
+# $Id: PKGBUILD 109424 2014-04-14 20:15:29Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=2.0.14
-pkgrel=3
+pkgver=2.2.1
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -16,24 +16,25 @@ depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-sessio
          'gnome-menus' 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
          'librsvg' 'networkmanager' 'muffin' 'python2-dbus' 'python2-pillow'
          'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
-         'cinnamon-control-center' 'cinnamon-screensaver' 'libgnomekbd'
+         'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
          'network-manager-applet' 'nemo' 'polkit-gnome')
 makedepends=('gnome-common' 'intltool')
 options=('!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
-        "cinnamon-gstreamer1.patch"
+        "upower_calender_fix.patch"
         "keyboard_applet.patch"
         "input_keybindings.patch"
-        "gtk3-lock-dialog.patch"
+        "set_wheel.patch"
         "org.archlinux.pkexec.cinnamon-settings-users.policy")
-sha256sums=('447f65ceb22a40717656d3d708d16ad450802298d783b23004b6e8d3c8d7da85'
-            '2e10ba71fd9ba40afd7e9492b2fc0d5bcc27874bcde543cfd8a47ad20c52354a'
+sha256sums=('34ad53f81cf57e8dca06fbd76b0be761b16d9f46a1b5aa22596cd07725703478'
+            'babfe88a3773f5369b05c7b61d0318cf969b482b9e0c3f281afaf488b0051e53'
             '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3'
             'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6'
-            'e10dd01201b9274b45a6c94319d4eb1e9ff800e63f10a3d5e42fc9f3a87e337c'
+            'd5d5634b24e56837cb677e62669450c25f79005ed1388584760a131f461180ec'
             '371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23')
 
+
 prepare() {
   cd ${srcdir}/Cinnamon*
 
@@ -41,17 +42,18 @@ prepare() {
   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 calendar applet with upower 0.99
+  patch -Np1 -i ../upower_calender_fix.patch
+
   # Fix keyboard applet
   patch -Np1 -i ../keyboard_applet.patch
 
   # Add input keybindings
   patch -Np1 -i ../input_keybindings.patch
 
-  # Port to GStreamer 1.0. Also backports some recorder bugfixes
-  patch -Np1 -i ../cinnamon-gstreamer1.patch
-
-  # Port Lock screen dialog to GTK+ 3
-  patch -Np1 -i ../gtk3-lock-dialog.patch
+  # Use wheel group instread of sudo
+  patch -Np1 -i ../set_wheel.patch
 
   # Fix required components
   sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
diff --git a/community/cinnamon/cinnamon-gstreamer1.patch b/community/cinnamon/cinnamon-gstreamer1.patch
deleted file mode 100644
index 6c27c1620..000000000
--- a/community/cinnamon/cinnamon-gstreamer1.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-diff -ruN a/configure.ac b/configure.ac
---- a/configure.ac	2013-10-16 15:10:22.237511846 +0000
-+++ b/configure.ac	2013-10-16 15:00:45.501321091 +0000
-@@ -44,15 +44,15 @@
- 
- # We need at least this, since gst_plugin_register_static() was added
- # in 0.10.16, but nothing older than 0.10.21 has been tested.
--GSTREAMER_MIN_VERSION=0.10.16
-+GSTREAMER_MIN_VERSION=0.11.92
- 
- recorder_modules=
- build_recorder=false
- AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
--if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
-+if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
-    AC_MSG_RESULT(yes)
-    build_recorder=true
--   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
-+   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11"
-    PKG_CHECK_MODULES(TEST_CINNAMON_RECORDER, $recorder_modules clutter-1.0 xfixes)
- else
-    AC_MSG_RESULT(no)
-diff -ruN a/src/cinnamon-recorder.c b/src/cinnamon-recorder.c
---- a/src/cinnamon-recorder.c	2013-10-16 15:10:22.344177808 +0000
-+++ b/src/cinnamon-recorder.c	2013-10-16 15:26:42.801040167 +0000
-@@ -8,6 +8,7 @@
- #include <string.h>
- #include <unistd.h>
- 
-+#define GST_USE_UNSTABLE_API
- #include <gst/gst.h>
- 
- #include "cinnamon-recorder-src.h"
-@@ -147,7 +148,7 @@
-  * (Theora does have some support for frames at non-uniform times, but
-  * things seem to break down if there are large gaps.)
-  */
--#define DEFAULT_PIPELINE "videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux"
-+#define DEFAULT_PIPELINE "vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux"
- 
- /* The default filename pattern. Example cinnamon-20090311b-2.webm
-  */
-@@ -446,6 +447,7 @@
- recorder_draw_cursor (CinnamonRecorder *recorder,
-                       GstBuffer     *buffer)
- {
-+  GstMapInfo info;
-   cairo_surface_t *surface;
-   cairo_t *cr;
- 
-@@ -464,7 +466,8 @@
-   if (!recorder->cursor_image)
-     return;
- 
--  surface = cairo_image_surface_create_for_data (GST_BUFFER_DATA(buffer),
-+  gst_buffer_map (buffer, &info, GST_MAP_WRITE);
-+  surface = cairo_image_surface_create_for_data (info.data,
-                                                  CAIRO_FORMAT_ARGB32,
-                                                  recorder->stage_width,
-                                                  recorder->stage_height,
-@@ -479,6 +482,7 @@
- 
-   cairo_destroy (cr);
-   cairo_surface_destroy (surface);
-+  gst_buffer_unmap (buffer, &info);
- }
- 
- /* Draw an overlay indicating how much of the target memory is used
-@@ -541,10 +545,11 @@
-   data = g_malloc (size);
- 
-   buffer = gst_buffer_new();
--  GST_BUFFER_SIZE(buffer) = size;
--  GST_BUFFER_MALLOCDATA(buffer) = GST_BUFFER_DATA(buffer) = data;
-+  gst_buffer_insert_memory (buffer, -1,
-+                            gst_memory_new_wrapped (0, data, size, 0,
-+                                                    size, data, g_free));
- 
--  GST_BUFFER_TIMESTAMP(buffer) = get_wall_time() - recorder->start_time;
-+  GST_BUFFER_PTS(buffer) = get_wall_time() - recorder->start_time;
- 
-   cogl_read_pixels (0, 0,
-                     recorder->stage_width, recorder->stage_height,
-@@ -1042,23 +1047,18 @@
- {
-   GstCaps *caps;
- 
--  /* The data is always native-endian xRGB; ffmpegcolorspace
-+  /* The data is always native-endian xRGB; videoconvert
-    * doesn't support little-endian xRGB, but does support
-    * big-endian BGRx.
-    */
--  caps = gst_caps_new_simple ("video/x-raw-rgb",
--                              "bpp", G_TYPE_INT, 32,
--                              "depth", G_TYPE_INT, 24,
-+  caps = gst_caps_new_simple ("video/x-raw",
- #if G_BYTE_ORDER == G_LITTLE_ENDIAN
--                              "red_mask",   G_TYPE_INT, 0x0000ff00,
--                              "green_mask", G_TYPE_INT, 0x00ff0000,
--                              "blue_mask",  G_TYPE_INT, 0xff000000,
-+                              "format", G_TYPE_STRING, "BGRx",
- #else
--                              "red_mask",   G_TYPE_INT, 0xff0000,
--                              "green_mask", G_TYPE_INT, 0x00ff00,
--                              "blue_mask",  G_TYPE_INT, 0x0000ff,
-+                              "format", G_TYPE_STRING, "xRGB",
- #endif
--                              "endianness", G_TYPE_INT, G_BIG_ENDIAN,
-+                              "bpp", G_TYPE_INT, 32,
-+                              "depth", G_TYPE_INT, 24,
-                               "framerate", GST_TYPE_FRACTION, pipeline->recorder->framerate, 1,
-                               "width", G_TYPE_INT, pipeline->recorder->stage_width,
-                               "height", G_TYPE_INT, pipeline->recorder->stage_height,
-@@ -1076,7 +1076,7 @@
- {
-   GstPad *sink_pad = NULL, *src_pad = NULL;
-   gboolean result = FALSE;
--  GstElement *ffmpegcolorspace;
-+  GstElement *videoconvert;
- 
-   sink_pad = gst_bin_find_unlinked_pad (GST_BIN (pipeline->pipeline), GST_PAD_SINK);
-   if (sink_pad == NULL)
-@@ -1095,19 +1095,19 @@
- 
-   recorder_pipeline_set_caps (pipeline);
- 
--  /* The ffmpegcolorspace element is a generic converter; it will convert
-+  /* The videoconvert element is a generic converter; it will convert
-    * our supplied fixed format data into whatever the encoder wants
-    */
--  ffmpegcolorspace = gst_element_factory_make ("ffmpegcolorspace", NULL);
--  if (!ffmpegcolorspace)
-+  videoconvert = gst_element_factory_make ("videoconvert", NULL);
-+  if (!videoconvert)
-     {
--      g_warning("Can't create ffmpegcolorspace element");
-+      g_warning("Can't create videoconvert element");
-       goto out;
-     }
--  gst_bin_add (GST_BIN (pipeline->pipeline), ffmpegcolorspace);
-+  gst_bin_add (GST_BIN (pipeline->pipeline), videoconvert);
- 
--  gst_element_link_many (pipeline->src, ffmpegcolorspace, NULL);
--  src_pad = gst_element_get_static_pad (ffmpegcolorspace, "src");
-+  gst_element_link_many (pipeline->src, videoconvert, NULL);
-+  src_pad = gst_element_get_static_pad (videoconvert, "src");
- 
-   if (!src_pad)
-     {
-@@ -1637,7 +1637,7 @@
-  * might be used to send the output to an icecast server
-  * via shout2send or similar.
-  *
-- * The default value is 'videorate ! theoraenc ! oggmux'
-+ * The default value is 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux'
-  */
- void
- cinnamon_recorder_set_pipeline (CinnamonRecorder *recorder,
-diff -ruN a/src/cinnamon-recorder-src.c b/src/cinnamon-recorder-src.c
---- a/src/cinnamon-recorder-src.c	2013-10-16 15:10:22.347511119 +0000
-+++ b/src/cinnamon-recorder-src.c	2013-10-16 15:33:41.581609206 +0000
-@@ -2,6 +2,7 @@
- 
- #include "config.h"
- 
-+#define GST_USE_UNSTABLE_API
- #include <gst/base/gstpushsrc.h>
- 
- #include "cinnamon-recorder-src.h"
-@@ -12,6 +13,9 @@
- 
-   GMutex *mutex;
- 
-+  GstClock *clock;
-+  GstClockTime last_frame_time;
-+
-   GstCaps *caps;
-   GAsyncQueue *queue;
-   gboolean closed;
-@@ -33,21 +37,21 @@
- /* Special marker value once the source is closed */
- #define RECORDER_QUEUE_END ((GstBuffer *)1)
- 
--GST_BOILERPLATE(CinnamonRecorderSrc, cinnamon_recorder_src, GstPushSrc, GST_TYPE_PUSH_SRC);
-+G_DEFINE_TYPE(CinnamonRecorderSrc, cinnamon_recorder_src, GST_TYPE_PUSH_SRC);
- 
- static void
--cinnamon_recorder_src_init (CinnamonRecorderSrc      *src,
--			 CinnamonRecorderSrcClass *klass)
-+cinnamon_recorder_src_init (CinnamonRecorderSrc      *src)
- {
-+  gst_base_src_set_format (GST_BASE_SRC (src), GST_FORMAT_TIME);
-+  gst_base_src_set_live (GST_BASE_SRC (src), TRUE);
-+
-+  src->clock = gst_system_clock_obtain ();
-+  src->last_frame_time = 0;
-+
-   src->queue = g_async_queue_new ();
-   src->mutex = g_mutex_new ();
- }
- 
--static void
--cinnamon_recorder_src_base_init (gpointer klass)
--{
--}
--
- static gboolean
- cinnamon_recorder_src_memory_used_update_idle (gpointer data)
- {
-@@ -87,21 +91,28 @@
-   GstBuffer *buffer;
- 
-   if (src->closed)
--    return GST_FLOW_UNEXPECTED;
-+    return GST_FLOW_EOS;
- 
-   buffer = g_async_queue_pop (src->queue);
-+  if (src->last_frame_time == 0)
-+    src->last_frame_time = gst_clock_get_time (GST_CLOCK (src->clock));
-+
-   if (buffer == RECORDER_QUEUE_END)
-     {
-       /* Returning UNEXPECTED here will cause a EOS message to be sent */
-       src->closed = TRUE;
--      return GST_FLOW_UNEXPECTED;
-+      return GST_FLOW_EOS;
-     }
- 
-   cinnamon_recorder_src_update_memory_used (src,
--					 - (int)(GST_BUFFER_SIZE(buffer) / 1024));
-+					 - (int)(gst_buffer_get_size(buffer) / 1024));
- 
-   *buffer_out = buffer;
- 
-+  GST_BUFFER_DURATION(*buffer_out) = GST_CLOCK_DIFF (src->last_frame_time, gst_clock_get_time (GST_CLOCK (src->clock)));
-+
-+  src->last_frame_time = gst_clock_get_time (GST_CLOCK (src->clock));
-+
-   return GST_FLOW_OK;
- }
- 
-@@ -142,7 +153,9 @@
- 
-   g_mutex_free (src->mutex);
- 
--  G_OBJECT_CLASS (parent_class)->finalize (object);
-+  gst_object_unref (src->clock);
-+
-+  G_OBJECT_CLASS (cinnamon_recorder_src_parent_class)->finalize (object);
- }
- 
- static void
-@@ -246,9 +259,9 @@
-   g_return_if_fail (CINNAMON_IS_RECORDER_SRC (src));
-   g_return_if_fail (src->caps != NULL);
- 
--  gst_buffer_set_caps (buffer, src->caps);
-+  gst_base_src_set_caps (GST_BASE_SRC (src), src->caps);
-   cinnamon_recorder_src_update_memory_used (src,
--					 (int) (GST_BUFFER_SIZE(buffer) / 1024));
-+					 (int)(gst_buffer_get_size(buffer) / 1024));
- 
-   g_async_queue_push (src->queue, gst_buffer_ref (buffer));
- }
-diff -ruN a/src/test-recorder.c b/src/test-recorder.c
---- a/src/test-recorder.c	2013-10-16 15:10:22.240845159 +0000
-+++ b/src/test-recorder.c	2013-10-16 15:48:03.685915756 +0000
-@@ -1,5 +1,6 @@
- /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
- 
-+#define GST_USE_UNSTABLE_API
- #include "cinnamon-recorder.h"
- #include <clutter/clutter.h>
- #include <gst/gst.h>
-@@ -29,7 +30,6 @@
-   ClutterAnimation *animation;
-   ClutterColor red, green, blue;
- 
--  g_thread_init (NULL);
-   gst_init (&argc, &argv);
-   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
-     return 1;
diff --git a/community/cinnamon/gtk3-lock-dialog.patch b/community/cinnamon/gtk3-lock-dialog.patch
deleted file mode 100644
index 36f0d4469..000000000
--- a/community/cinnamon/gtk3-lock-dialog.patch
+++ /dev/null
@@ -1,418 +0,0 @@
-commit 7bb5af86b404d3e89f92019dba224e6fe258f7ea
-Author: Balló György <ballogyor@gmail.com>
-Date:   Sun Jan 5 16:54:41 2014 +0100
-
-    Port Lock screen dialog to GTK+ 3
-
-diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade
-deleted file mode 100644
-index a4200f9..0000000
---- a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade
-+++ /dev/null
-@@ -1,165 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<glade-interface>
--  <!-- interface-requires gtk+ 2.24 -->
--  <!-- interface-naming-policy project-wide -->
--  <widget class="GtkDialog" id="main_dialog">
--    <property name="can_focus">False</property>
--    <property name="border_width">6</property>
--    <property name="type_hint">dialog</property>
--    <child internal-child="vbox">
--      <widget class="GtkVBox" id="dialog-vbox1">
--        <property name="visible">True</property>
--        <property name="can_focus">False</property>
--        <property name="spacing">6</property>
--        <child internal-child="action_area">
--          <widget class="GtkHButtonBox" id="dialog-action_area1">
--            <property name="visible">True</property>
--            <property name="can_focus">False</property>
--            <property name="layout_style">end</property>
--            <child>
--              <widget class="GtkButton" id="button_cancel">
--                <property name="label">gtk-cancel</property>
--                <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="receives_default">True</property>
--                <property name="use_action_appearance">False</property>
--                <property name="use_stock">True</property>
--              </widget>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--                <property name="position">0</property>
--              </packing>
--            </child>
--            <child>
--              <widget class="GtkButton" id="button_ok">
--                <property name="label">gtk-ok</property>
--                <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="receives_default">True</property>
--                <property name="use_action_appearance">False</property>
--                <property name="use_stock">True</property>
--              </widget>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--                <property name="position">1</property>
--              </packing>
--            </child>
--          </widget>
--          <packing>
--            <property name="expand">False</property>
--            <property name="fill">True</property>
--            <property name="padding">3</property>
--            <property name="pack_type">end</property>
--            <property name="position">0</property>
--          </packing>
--        </child>
--        <child>
--          <widget class="GtkImage" id="image_face">
--            <property name="visible">True</property>
--            <property name="can_focus">False</property>
--            <property name="stock">gtk-missing-image</property>
--          </widget>
--          <packing>
--            <property name="expand">False</property>
--            <property name="fill">True</property>
--            <property name="padding">3</property>
--            <property name="position">1</property>
--          </packing>
--        </child>
--        <child>
--          <widget class="GtkLabel" id="label_description">
--            <property name="visible">True</property>
--            <property name="can_focus">False</property>
--            <property name="label" translatable="yes">label</property>
--          </widget>
--          <packing>
--            <property name="expand">False</property>
--            <property name="fill">True</property>
--            <property name="padding">3</property>
--            <property name="position">2</property>
--          </packing>
--        </child>
--        <child>
--          <widget class="GtkHBox" id="hbox1">
--            <property name="visible">True</property>
--            <property name="can_focus">False</property>
--            <child>
--              <widget class="GtkLabel" id="label_away_message">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="label" translatable="yes">label</property>
--              </widget>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">True</property>
--                <property name="position">0</property>
--              </packing>
--            </child>
--            <child>
--              <widget class="GtkHBox" id="hbox3">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <child>
--                  <widget class="GtkLabel" id="label1">
--                    <property name="visible">True</property>
--                    <property name="can_focus">False</property>
--                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
--                    <property name="use_markup">True</property>
--                  </widget>
--                  <packing>
--                    <property name="expand">False</property>
--                    <property name="fill">True</property>
--                    <property name="position">0</property>
--                  </packing>
--                </child>
--                <child>
--                  <widget class="GtkEntry" id="entry_away_message">
--                    <property name="visible">True</property>
--                    <property name="can_focus">True</property>
--                    <property name="invisible_char">●</property>
--                    <property name="invisible_char_set">True</property>
--                    <property name="primary_icon_activatable">False</property>
--                    <property name="secondary_icon_activatable">False</property>
--                    <property name="primary_icon_sensitive">True</property>
--                    <property name="secondary_icon_sensitive">True</property>
--                  </widget>
--                  <packing>
--                    <property name="expand">True</property>
--                    <property name="fill">True</property>
--                    <property name="position">1</property>
--                  </packing>
--                </child>
--                <child>
--                  <widget class="GtkLabel" id="label2">
--                    <property name="visible">True</property>
--                    <property name="can_focus">False</property>
--                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
--                    <property name="use_markup">True</property>
--                  </widget>
--                  <packing>
--                    <property name="expand">False</property>
--                    <property name="fill">True</property>
--                    <property name="position">2</property>
--                  </packing>
--                </child>
--              </widget>
--              <packing>
--                <property name="expand">True</property>
--                <property name="fill">True</property>
--                <property name="position">1</property>
--              </packing>
--            </child>
--          </widget>
--          <packing>
--            <property name="expand">True</property>
--            <property name="fill">True</property>
--            <property name="padding">3</property>
--            <property name="position">3</property>
--          </packing>
--        </child>
--      </widget>
--    </child>
--  </widget>
--</glade-interface>
-diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
-index f6f3ad1..72cdf4f 100755
---- a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
-+++ b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
-@@ -3,8 +3,7 @@
- import sys
- import os
- import gettext
--import gtk
--import gtk.glade   
-+from gi.repository import Gtk
- import pwd
- import socket
- 
-@@ -25,32 +24,32 @@ class MainWindow:
-         if real_name == "":
-             real_name = username        
- 
--        gladefile = "/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade"
--        self.wTree = gtk.glade.XML(gladefile, "main_dialog")        
-+        self.builder = Gtk.Builder()
-+        self.builder.add_from_file("/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui")
-         
--        self.window = self.wTree.get_widget("main_dialog")        
--        self.button_cancel = self.wTree.get_widget("button_cancel")
--        self.button_ok = self.wTree.get_widget("button_ok")                        
--        self.entry = self.wTree.get_widget("entry_away_message")
--        self.image = self.wTree.get_widget("image_face")
-+        self.window = self.builder.get_object("main_dialog")
-+        self.button_cancel = self.builder.get_object("button_cancel")
-+        self.button_ok = self.builder.get_object("button_ok")
-+        self.entry = self.builder.get_object("entry_away_message")
-+        self.image = self.builder.get_object("image_face")
-                     
-         self.window.set_title(_("Lock screen"))
-         self.window.set_icon_from_file("/usr/lib/cinnamon-settings/data/icons/screensaver.svg")
-                 
--        self.wTree.get_widget("label_description").set_markup("<i>%s</i>" % _("Please type an away message for the lock screen"))
--        self.wTree.get_widget("label_away_message").set_markup("<b>%s: </b>" % real_name)        
-+        self.builder.get_object("label_description").set_markup("<i>%s</i>" % _("Please type an away message for the lock screen"))
-+        self.builder.get_object("label_away_message").set_markup("<b>%s: </b>" % real_name)
-         
-         if os.path.exists("%s/.face" % home_dir):
-             self.image.set_from_file("%s/.face" % home_dir)
-         else:
-             self.image.set_from_file("/usr/share/pixmaps/nobody.png")
-         
--        self.window.connect("destroy", gtk.main_quit)
--        self.button_cancel.connect("clicked", gtk.main_quit)
-+        self.window.connect("destroy", Gtk.main_quit)
-+        self.button_cancel.connect("clicked", Gtk.main_quit)
-         self.button_ok.connect('clicked', self.lock_screen)
-         self.entry.connect('activate', self.lock_screen)
-         
--        self.wTree.get_widget("dialog-action_area1").set_focus_chain((self.button_ok, self.button_cancel))
-+        self.builder.get_object("dialog-action_area1").set_focus_chain((self.button_ok, self.button_cancel))
-           
-         self.window.show()                    
-         
-@@ -60,8 +59,8 @@ class MainWindow:
-             os.system("cinnamon-screensaver-command --lock --away-message \"%s\" &" % self.entry.get_text())
-         else:
-             os.system("cinnamon-screensaver-command --lock &")
--        gtk.main_quit()
-+        Gtk.main_quit()
-    
- if __name__ == "__main__":    
-     MainWindow()
--    gtk.main()
-+    Gtk.main()
-diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
-new file mode 100644
-index 0000000..30700b9
---- /dev/null
-+++ b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
-@@ -0,0 +1,165 @@
-+<?xml version="1.0"?>
-+<interface>
-+  <!-- interface-requires gtk+ 2.24 -->
-+  <!-- interface-naming-policy project-wide -->
-+  <object class="GtkDialog" id="main_dialog">
-+    <property name="can_focus">False</property>
-+    <property name="border_width">6</property>
-+    <property name="type_hint">dialog</property>
-+    <child internal-child="vbox">
-+      <object class="GtkVBox" id="dialog-vbox1">
-+        <property name="visible">True</property>
-+        <property name="can_focus">False</property>
-+        <property name="spacing">6</property>
-+        <child internal-child="action_area">
-+          <object class="GtkHButtonBox" id="dialog-action_area1">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="layout_style">end</property>
-+            <child>
-+              <object class="GtkButton" id="button_cancel">
-+                <property name="label">gtk-cancel</property>
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="receives_default">True</property>
-+                <property name="use_action_appearance">False</property>
-+                <property name="use_stock">True</property>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="position">0</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkButton" id="button_ok">
-+                <property name="label">gtk-ok</property>
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="receives_default">True</property>
-+                <property name="use_action_appearance">False</property>
-+                <property name="use_stock">True</property>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">True</property>
-+            <property name="padding">3</property>
-+            <property name="pack_type">end</property>
-+            <property name="position">0</property>
-+          </packing>
-+        </child>
-+        <child>
-+          <object class="GtkImage" id="image_face">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="stock">gtk-missing-image</property>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">True</property>
-+            <property name="padding">3</property>
-+            <property name="position">1</property>
-+          </packing>
-+        </child>
-+        <child>
-+          <object class="GtkLabel" id="label_description">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="label" translatable="yes">label</property>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">True</property>
-+            <property name="padding">3</property>
-+            <property name="position">2</property>
-+          </packing>
-+        </child>
-+        <child>
-+          <object class="GtkHBox" id="hbox1">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <child>
-+              <object class="GtkLabel" id="label_away_message">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="label" translatable="yes">label</property>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">True</property>
-+                <property name="position">0</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkHBox" id="hbox3">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <child>
-+                  <object class="GtkLabel" id="label1">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">False</property>
-+                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
-+                    <property name="use_markup">True</property>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="fill">True</property>
-+                    <property name="position">0</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkEntry" id="entry_away_message">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="invisible_char">&#x25CF;</property>
-+                    <property name="invisible_char_set">True</property>
-+                    <property name="primary_icon_activatable">False</property>
-+                    <property name="secondary_icon_activatable">False</property>
-+                    <property name="primary_icon_sensitive">True</property>
-+                    <property name="secondary_icon_sensitive">True</property>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">True</property>
-+                    <property name="fill">True</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkLabel" id="label2">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">False</property>
-+                    <property name="label" translatable="yes">&lt;b&gt;"&lt;/b&gt;</property>
-+                    <property name="use_markup">True</property>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="fill">True</property>
-+                    <property name="position">2</property>
-+                  </packing>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="expand">True</property>
-+                <property name="fill">True</property>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="expand">True</property>
-+            <property name="fill">True</property>
-+            <property name="padding">3</property>
-+            <property name="position">3</property>
-+          </packing>
-+        </child>
-+      </object>
-+    </child>
-+  </object>
-+</interface>
diff --git a/community/cinnamon/set_wheel.patch b/community/cinnamon/set_wheel.patch
new file mode 100644
index 000000000..372308342
--- /dev/null
+++ b/community/cinnamon/set_wheel.patch
@@ -0,0 +1,14 @@
+--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -734,9 +734,9 @@ class Module:
+             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
+             description = "<b>%s</b>\n%s" % (fullname, username)
+             piter = self.users.append(None, [new_user, pixbuf, description])
+-            # Add the user to his/her own group and sudo if Administrator was selected
++            # Add the user to his/her own group and wheel if Administrator was selected
+             if dialog.account_type_combo.get_active() == 1:
+-                os.system("usermod %s -G %s,sudo" % (username, username)) 
++                os.system("usermod %s -G %s,wheel" % (username, username)) 
+             else:
+                 os.system("usermod %s -G %s" % (username, username))
+             self.load_groups()               
diff --git a/community/cinnamon/upower_calender_fix.patch b/community/cinnamon/upower_calender_fix.patch
new file mode 100644
index 000000000..9515736c8
--- /dev/null
+++ b/community/cinnamon/upower_calender_fix.patch
@@ -0,0 +1,22 @@
+diff -Naur Cinnamon-2.0.14.orig/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js Cinnamon-2.0.14/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js
+--- Cinnamon-2.0.14.orig/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js	2013-11-25 19:41:30.000000000 +0100
++++ Cinnamon-2.0.14/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js	2014-04-11 08:10:28.785899903 +0200
+@@ -6,7 +6,6 @@
+ const St = imports.gi.St;
+ const Util = imports.misc.util;
+ const PopupMenu = imports.ui.popupMenu;
+-const UPowerGlib = imports.gi.UPowerGlib;
+ const Settings = imports.ui.settings;
+ const AppletDir = imports.ui.appletManager.applets['calendar@cinnamon.org'];
+ const Calendar = AppletDir.calendar;
+@@ -88,10 +87,6 @@
+             this.settings.bindProperty(Settings.BindingDirection.IN, "use-custom-format", "use_custom_format", this.on_settings_changed, null);
+             this.settings.bindProperty(Settings.BindingDirection.IN, "custom-format", "custom_format", this.on_settings_changed, null);        
+ 
+-            // https://bugzilla.gnome.org/show_bug.cgi?id=655129
+-            this._upClient = new UPowerGlib.Client();
+-            this._upClient.connect('notify-resume', this._updateClockAndDate);
+-
+             // Start the clock
+             this.on_settings_changed();
+             this._updateClockAndDatePeriodic();
diff --git a/community/cjs/PKGBUILD b/community/cjs/PKGBUILD
index eb3b5b709..ae9a00e7a 100644
--- a/community/cjs/PKGBUILD
+++ b/community/cjs/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cjs
-pkgver=2.0.0
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Javascript Bindings for Cinnamon"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ license=(GPL)
 depends=(cairo gobject-introspection js185 dbus-glib)
 makedepends=(gnome-common)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cjs/archive/${pkgver}.tar.gz")
-sha256sums=('2fea6c491e6ce8567201f14c0e926181154d798d4811dd65da477c014bfb2a9a')
+sha256sums=('47b707bdb334305a5aa8104233e8e2679209f5b95fb7f9e153d3a66c5e6917dc')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD
index 979a501a5..ea2d450d9 100644
--- a/community/emerillon/PKGBUILD
+++ b/community/emerillon/PKGBUILD
@@ -2,10 +2,10 @@
 
 pkgname=emerillon
 pkgver=0.1.90
-pkgrel=5
+pkgrel=6
 pkgdesc="Map viewer for OpenStreetMap"
 arch=('i686' 'x86_64')
-url="http://projects.gnome.org/emerillon/"
+url="https://wiki.gnome.org/Apps/Emerillon"
 license=('GPL')
 depends=('libchamplain' 'geoclue' 'libpeas' 'rest')
 makedepends=('gobject-introspection' 'gnome-doc-utils' 'intltool' 'vala')
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index f4a24191e..b9873f805 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 102874 2013-12-23 07:07:51Z bgyorgy $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
+# $Id: PKGBUILD 109430 2014-04-14 20:16:51Z jgc $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.10.1
+pkgver=3.12.1
 pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64')
@@ -10,41 +11,33 @@ url='http://www.packagekit.org/'
 license=('GPL')
 depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify'
          'packagekit')
-makedepends=('gconf' 'gtk-doc' 'intltool' 'itstool' 'libcanberra' 'upower')
+makedepends=('intltool' 'itstool' 'docbook-xsl' 'libcanberra')
 optdepends=('gnome-settings-daemon-updates: update and message notifications')
-options=('!emptydirs')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
         "packagekit-0.8.patch")
-sha256sums=('40f11968e6a40606486f232fd6f61348eb75dc465f25deb2f157f6546bbe4e26'
+sha256sums=('fec804f75d178bf2984828873491733338ed6f549e287afe16d7302da26c5ead'
             '717ba4d281adbafc9409202538ad1c8ce9a2bb41a6a0bc127e8dd5c4c1da1d65')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -RNp1 -i "$srcdir/packagekit-0.8.patch"
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
 
   _mime='application/x-xz-compressed-tar;application/x-servicepack;'
   sed -i "s@MimeType=.*@MimeType=$_mime@" data/gpk-install-local-file.desktop.in
+}
 
-  sed -i 's@python@python2@' python/enum-convertor.py
-  sed -i 's@python enum-convertor.py@python2 enum-convertor.py@' python/packagekit/Makefile.{am,in}
-
-  export PYTHON=/usr/bin/python2
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr \
 	      --sysconfdir=/etc \
-	      --disable-gtk-doc \
 	      --disable-schemas-compile \
-	      --disable-scrollkeeper
-  make -s
+              PYTHON=/usr/bin/python2
+  make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  make -s DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/gnome-packagekit/gnome-packagekit.install b/community/gnome-packagekit/gnome-packagekit.install
index 620670d57..5e4abe5d8 100644
--- a/community/gnome-packagekit/gnome-packagekit.install
+++ b/community/gnome-packagekit/gnome-packagekit.install
@@ -1,15 +1,9 @@
 post_install() {
-  usr/bin/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
   update-desktop-database -q
 }
 
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.90) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-packagekit
-  fi
-}
-
 post_upgrade() {
   post_install
 }
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index 2f42c8398..ba4a52ebc 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102872 2013-12-23 06:37:43Z bgyorgy $
+# $Id: PKGBUILD 109431 2014-04-14 20:16:52Z jgc $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.10.2
+pkgver=3.12.0.1
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64')
@@ -13,10 +13,10 @@ makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wac
 options=('!emptydirs')
 install=$_pkgname.install
 url="http://www.gnome.org"
-source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
+source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz"
 	'packagekit-0.8.patch'
 	'arch.patch')
-sha256sums=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264'
+sha256sums=('c21cfcee008da6935ed7f7e814a788a951ba67cc728e43f888b174701cd96847'
             '2fd5ee457f5d57bfd9edef049719f55ab1cab5fe6d0fb422f91fe363c02e6efd'
             '217004c112b18cf136c535ef3d6cc90f0cecc495573cfb8653ff089230d248bb')
 
diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD
index 5c2c89896..e55650f14 100644
--- a/community/grace/PKGBUILD
+++ b/community/grace/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 100168 2013-11-01 20:47:57Z spupykin $
+# $Id: PKGBUILD 109392 2014-04-14 11:24:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=grace
 pkgver=5.1.23
-pkgrel=3
+pkgrel=4
 pkgdesc="2D plotting tool"
 arch=(i686 x86_64)
 url="http://plasma-gate.weizmann.ac.il/Grace/"
 depends=('libjpeg' 'libpng' 'lesstif' 't1lib' 'netcdf')
 makedepends=('netcdf' 'fftw')
 license=('GPL')
+options=('staticlibs')
 source=(ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/$pkgname-$pkgver.tar.gz)
 md5sums=('e2b28ebe31288952d899fbb5c97858ae')
 
@@ -29,5 +30,5 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-  cd $pkgdir/usr/share/grace && mv bin lib include ../../
+  (cd $pkgdir/usr/share/grace && mv bin lib include ../../)
 }
diff --git a/community/gtkpod/PKGBUILD b/community/gtkpod/PKGBUILD
index b02292408..3c17b2713 100644
--- a/community/gtkpod/PKGBUILD
+++ b/community/gtkpod/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99800 2013-10-30 23:47:43Z allan $
+# $Id: PKGBUILD 109429 2014-04-14 20:15:35Z jgc $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=gtkpod
 pkgver=2.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
 arch=('i686' 'x86_64')
 url="http://gtkpod.sourceforge.net"
@@ -18,15 +18,12 @@ optdepends=('libmp4v2: MP4/h264 support'
             'id3v2: mp3 conversion support'
             'faad2: m4a conversion support')
 install=gtkpod.install
-source=("http://downloads.sourceforge.net/gtkpod/$pkgname-$pkgver.tar.gz"
-	gtkpod-2.1.3-gdl-3.6.patch)
-md5sums=('66c12ccb529c0f7de9a48a7f0d277c80'
-         '94a4cc0b47ba8895c0a51e53e94da517')
+source=("http://downloads.sourceforge.net/gtkpod/$pkgname-$pkgver.tar.gz")
+md5sums=('66c12ccb529c0f7de9a48a7f0d277c80')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-# patch -p1 -i "$srcdir/gtkpod-2.1.3-gdl-3.6.patch"
   sed -i 's#python#python2#' scripts/sync-palm-jppy.py
 
   ./configure --prefix=/usr
diff --git a/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch b/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch
deleted file mode 100644
index 109ec08a9..000000000
--- a/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: gtkpod-2.1.3/src/anjuta-action-callbacks.c
-===================================================================
---- gtkpod-2.1.3.orig/src/anjuta-action-callbacks.c
-+++ gtkpod-2.1.3/src/anjuta-action-callbacks.c
-@@ -65,7 +65,7 @@ void
- on_layout_lock_toggle (GtkAction *action, AnjutaApp *app)
- {
- 	if (app->layout_manager)
--		g_object_set (app->layout_manager->master, "locked",
-+		g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked",
- 					  gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)),
- 					  NULL);
- }
-Index: gtkpod-2.1.3/src/anjuta-app.c
-===================================================================
---- gtkpod-2.1.3.orig/src/anjuta-app.c
-+++ gtkpod-2.1.3/src/anjuta-app.c
-@@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin
-     else if (g_strcmp0(pr_style, "Tabs") == 0)
-         style = GDL_SWITCHER_STYLE_TABS;
- 
--    g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL);
-+    g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL);
-     g_free(pr_style);
- }
- 
-@@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj
-     gtk_widget_show(app->dock);
-     gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0);
- 
--    dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock));
-+    dockbar = gdl_dock_bar_new(G_OBJECT(app->dock));
-     gtk_widget_show(dockbar);
-     gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
- 
--    app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock));
-+    app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock));
-     g_signal_connect (app->layout_manager, "notify::dirty",
-             G_CALLBACK (on_layout_dirty_notify), app);
--    g_signal_connect (app->layout_manager->master, "notify::locked",
-+    g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked",
-             G_CALLBACK (on_layout_locked_notify), app);
- 
-     /* UI engine */
-Index: gtkpod-2.1.3/src/gtkpod.c
-===================================================================
---- gtkpod-2.1.3.orig/src/gtkpod.c
-+++ gtkpod.2.1.3/src/gtkpod.c
-@@ -235,8 +235,8 @@ void
-     session_dir = get_user_session_dir();
-     anjuta_shell_session_save(ANJUTA_SHELL(app), session_dir, NULL);
-     g_free(session_dir);
--
--    anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL);
-+    
-+    /* anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL); */
- 
-     if (!gtkpod_cleanup_quit()) {
-         // Dont want to quit so avoid signalling any destroy event
diff --git a/community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch b/community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch
deleted file mode 100644
index fdb9bbb39..000000000
--- a/community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 9ac32aa3cb2ed5242c0fe3c58ef5f571bf2b95d7 Mon Sep 17 00:00:00 2001
-From: Nikias Bassen <nikias@gmx.li>
-Date: Sun, 24 Mar 2013 02:45:23 +0100
-Subject: [PATCH 1/1] Updated for libimobiledevice >= 1.1.5
-
----
- configure.ac |  4 ++++
- src/ifuse.c  | 20 +++++++++++++++++++-
- 2 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 85d131a..ca518ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,6 +17,10 @@ PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.0, libimobiled
- if test x"$libimobiledevice_1_1" = xyes; then
-   AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1], 1, [Define if libimobiledevice is using 1.1.0 API])
- fi
-+PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.5, libimobiledevice_1_1_5=yes, libimobiledevice_1_1_5=no)
-+if test x"$libimobiledevice_1_1_5" = xyes; then
-+  AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1_5], 1, [Define if libimobiledevice is using 1.1.5 API])
-+fi
- libimobiledevice_VERSION=`$PKG_CONFIG --modversion "libimobiledevice-1.0" 2>&1`
- PKG_CHECK_MODULES(libfuse, fuse >= 2.7.0)
- PKG_CHECK_MODULES(libplist, libplist)
-diff --git a/src/ifuse.c b/src/ifuse.c
-index b5735ee..9fafb47 100644
---- a/src/ifuse.c
-+++ b/src/ifuse.c
-@@ -71,7 +71,11 @@ static struct {
- 	char *appid;
- #endif
- 	char *service_name;
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
-+	lockdownd_service_descriptor_t service;
-+#else
- 	uint16_t port;
-+#endif
- } opts;
- 
- enum {
-@@ -402,7 +406,11 @@ void *ifuse_init(struct fuse_conn_info *conn)
- 		afc_client_new_from_house_arrest_client(house_arrest, &afc);
- 	} else { 
- #endif
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
-+		afc_client_new(phone, opts.service, &afc);
-+#else
- 		afc_client_new(phone, opts.port, &afc);
-+#endif
- #ifdef HAVE_LIBIMOBILEDEVICE_1_1
- 	}
- #endif
-@@ -744,7 +752,13 @@ int main(int argc, char *argv[])
- 		return EXIT_FAILURE;
- 	}
- 
--	if ((lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port) {
-+	if (
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
-+	(lockdownd_start_service(control, opts.service_name, &opts.service) != LOCKDOWN_E_SUCCESS) || !opts.service
-+#else
-+	(lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port
-+#endif
-+ 	) {
- 		lockdownd_client_free(control);
- 		idevice_free(phone);
- 		fprintf(stderr, "Failed to start AFC service '%s' on the device.\n", opts.service_name);
-@@ -757,7 +771,11 @@ int main(int argc, char *argv[])
- 
- #ifdef HAVE_LIBIMOBILEDEVICE_1_1
- 	if (!strcmp(opts.service_name, HOUSE_ARREST_SERVICE_NAME)) {
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
-+		house_arrest_client_new(phone, opts.service, &house_arrest);
-+#else
- 		house_arrest_client_new(phone, opts.port, &house_arrest);
-+#endif
- 		if (!house_arrest) {
- 			fprintf(stderr, "Could not start document sharing service!\n");
- 			return EXIT_FAILURE;
--- 
-1.8.4.2
-
diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD
index b6075319b..e8c45eb6b 100644
--- a/community/ifuse/PKGBUILD
+++ b/community/ifuse/PKGBUILD
@@ -1,25 +1,18 @@
-# $Id: PKGBUILD 100637 2013-11-06 19:54:56Z cinelli $
+# $Id: PKGBUILD 109428 2014-04-14 20:15:34Z jgc $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Thomas Dziedzic  < gostrc at gmail >
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=ifuse
-pkgver=1.1.2
-pkgrel=5
+pkgver=1.1.3
+pkgrel=1
 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
 url='http://libimobiledevice.org/'
 arch=('i686' 'x86_64')
 license=('LGPL2.1')
 depends=('libimobiledevice' 'fuse')
-source=("http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2"
-        '0001-Updated-for-libimobiledevice-1.1.5.patch')
-md5sums=('4152526b2ac3c505cb41797d997be14d'
-	 'ca4d4af7f830c10645b605f1572c0ba6')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/0001-Updated-for-libimobiledevice-1.1.5.patch"
-}
+source=("http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2")
+md5sums=('83478c7b531b26db286c293bb25bd917')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index a7b4718d8..cba7eb63c 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109138 2014-04-10 17:34:53Z spupykin $
+# $Id: PKGBUILD 109400 2014-04-14 14:53:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=1.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -12,7 +12,8 @@ license=('LGPL')
 depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
 	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
 	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
-	 'iproute2' 'libnl' 'libx11' 'audit' 'numactl')
+	 'iproute2' 'libnl' 'libx11' 'numactl')
+	# 'audit'
 makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'lxc')
 optdepends=('bridge-utils: for briged networking (default)'
 	    'dnsmasq: for NAT/DHCP for guests'
@@ -90,9 +91,10 @@ build() {
   export RADVD=/usr/bin/radvd
   [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" --sbindir=/usr/bin \
 	--with-storage-lvm --without-xen --with-udev --without-hal --disable-static \
-	--with-init-script=systemd --with-audit \
+	--with-init-script=systemd \
 	--with-qemu-user=nobody --with-qemu-group=nobody \
 	--without-netcf --with-interface --with-lxc
+	# --with-audit
   make
 }
 
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index 9900bd5ca..569061e50 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109032 2014-04-09 17:07:57Z spupykin $
+# $Id: PKGBUILD 109402 2014-04-14 14:53:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -8,7 +8,7 @@
 pkgname=lxc
 pkgver=1.0.3
 epoch=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64')
 url="http://linuxcontainers.org"
@@ -18,9 +18,10 @@ optdepends=('arch-install-scripts: for archlinux template')
 license=('LGPL')
 install=lxc.install
 options=('emptydirs')
+backup=('etc/lxc/default.conf')
 source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"
 	"lxc.tmpfiles.d"
-	"lxc@.service")
+	"lxc.service")
 md5sums=('55873b1411a606397309aa6c4c4263b3'
          'df94c9fb8a753011c86ee664e9f521ff'
          '32db4ef06b27f36e15ff4b67c049dfeb')
@@ -51,7 +52,7 @@ package() {
   make DESTDIR="$pkgdir" install
   install -d -m755 "$pkgdir/var/lib/lxc"
   install -d -m755 "$pkgdir/usr/lib/lxc/rootfs/dev"
-  install -D -m644 ${srcdir}/lxc@.service ${pkgdir}/usr/lib/systemd/system/lxc@.service
+  install -D -m644 ${srcdir}/lxc.service ${pkgdir}/usr/lib/systemd/system/lxc@.service
   install -D -m644 ${srcdir}/lxc.tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/lxc.conf
 
   cd doc
diff --git a/community/lxc/lxc@.service b/community/lxc/lxc.service
index 4c0c34e3e..4c0c34e3e 100644
--- a/community/lxc/lxc@.service
+++ b/community/lxc/lxc.service
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index 9c411b3a0..ba0af8d4b 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,28 +1,38 @@
-# $Id: PKGBUILD 107039 2014-03-11 15:48:31Z andyrtr $
+# $Id: PKGBUILD 109427 2014-04-14 20:15:33Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=2.0.5
-pkgrel=2
+pkgver=2.2.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' 'cinnamon-desktop' 'libcanberra'
          'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') 
 options=('!emptydirs')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
-sha256sums=('81a57d452ea88ea926b284248033f021960400b3b9d13f5a334a77cf3bd4c7ee')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
+        cogl_ABI.patch)
+sha256sums=('85332899ff4f441624b145af6ee9689dbab1d4b824517a35d01cc563bede9737'
+            'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # Port to cogl 1.18
+  patch -Np1 -i ../cogl_ABI.patch
+}
 
 build() {
   cd ${pkgname}-${pkgver}
 
   PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
-  				 			 --localstatedir=/var --disable-static --disable-schemas-compile
+  				 			 --localstatedir=/var --disable-static --disable-schemas-compile \
+                 --enable-compile-warnings=minimum
   make
 }
 
diff --git a/community/muffin/cogl_ABI.patch b/community/muffin/cogl_ABI.patch
new file mode 100644
index 000000000..408b1d9dd
--- /dev/null
+++ b/community/muffin/cogl_ABI.patch
@@ -0,0 +1,86 @@
+From d2a1db8834bf0a9007bf6924b006a6f2c94ce88d Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre@mecheye.net>
+Date: Mon, 13 Jan 2014 18:03:19 +0000
+Subject: Update for Cogl API breaks
+
+---
+(limited to 'src/compositor')
+
+diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
+index 3fc9430..450155d 100644
+--- a/src/compositor/meta-texture-rectangle.c
++++ b/src/compositor/meta-texture-rectangle.c
+@@ -35,10 +35,8 @@ CoglTexture *
+ meta_texture_rectangle_new (unsigned int width,
+                             unsigned int height,
+                             CoglPixelFormat format,
+-                            CoglPixelFormat internal_format,
+                             unsigned int rowstride,
+-                            const guint8 *data,
+-                            GError **error)
++                            const guint8 *data)
+ {
+   ClutterBackend *backend =
+     clutter_get_default_backend ();
+@@ -46,10 +44,7 @@ meta_texture_rectangle_new (unsigned int width,
+     clutter_backend_get_cogl_context (backend);
+   CoglTextureRectangle *tex_rect;
+ 
+-  tex_rect = cogl_texture_rectangle_new_with_size (context,
+-                                                   width, height,
+-                                                   internal_format,
+-                                                   error);
++  tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
+   if (tex_rect == NULL)
+     return NULL;
+ 
+diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h
+index 30f60d3..7b84229 100644
+--- a/src/compositor/meta-texture-rectangle.h
++++ b/src/compositor/meta-texture-rectangle.h
+@@ -34,10 +34,8 @@ CoglTexture *
+ meta_texture_rectangle_new (unsigned int width,
+                             unsigned int height,
+                             CoglPixelFormat format,
+-                            CoglPixelFormat internal_format,
+                             unsigned int rowstride,
+-                            const guint8 *data,
+-                            GError **error);
++                            const guint8 *data);
+ 
+ gboolean
+ meta_texture_rectangle_check (CoglTexture *texture);
+diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
+index 9a30de0..019aaf4 100644
+--- a/src/compositor/meta-texture-tower.c
++++ b/src/compositor/meta-texture-tower.c
+@@ -365,13 +365,9 @@ texture_tower_create_texture (MetaTextureTower *tower,
+         meta_texture_rectangle_new (width, height,
+                                     /* data format */
+                                     TEXTURE_FORMAT,
+-                                    /* internal cogl format */
+-                                    TEXTURE_FORMAT,
+                                     /* rowstride */
+                                     width * 4,
+                                     /* data */
+-                                    NULL,
+-                                    /* error */
+                                     NULL);
+     }
+   else
+--- a/src/compositor/meta-shaped-texture.c
++++ b/src/compositor/meta-shaped-texture.c
+@@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha
+       if (meta_texture_rectangle_check (paint_tex))
+         priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
+                                                          COGL_PIXEL_FORMAT_A_8,
+-                                                         COGL_PIXEL_FORMAT_A_8,
+-                                                         stride,
+-                                                         mask_data,
+-                                                         NULL /* error */);
++                                                         stride, mask_data);
+       else
+         priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
+                                                          COGL_TEXTURE_NONE,
+--
+cgit v0.9.2
diff --git a/community/mx/PKGBUILD b/community/mx/PKGBUILD
deleted file mode 100644
index 66b99a6bb..000000000
--- a/community/mx/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 107203 2014-03-14 13:54:54Z flexiondotorg $
-#Maintainer : Martin Wimpress <code@flexion.org>
-#Contributor: GGR <gaby.greboval at yahoo dot com>
-
-pkgname=mx
-pkgver=1.4.7
-pkgrel=2
-pkgdesc="A widget toolkit using Clutter"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org"
-license=('LGPL')
-depends=('clutter' 'dbus-glib' 'gtk2' 'startup-notification')
-makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'libtool' 'vala')
-source=("https://github.com/clutter-project/${pkgname}/archive/${pkgver}.tar.gz")
-sha256sums=('8a7514ea33c1dec7251d0141e24a702e7701dc9f00348cbcf1816925b7f74dbc')
-
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    NOCONFIGURE=1 ./autogen.sh
-    # patch to resolv GL errors
-    # source : https://github.com/clutter-project/mx/pull/62
-    sed -i 's/GLushort/gushort/g' mx/mx-deform-texture.c
-    sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c
-}
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/nemo-extensions/PKGBUILD b/community/nemo-extensions/PKGBUILD
index 11ca0e100..204e0624c 100644
--- a/community/nemo-extensions/PKGBUILD
+++ b/community/nemo-extensions/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 107040 2014-03-11 15:48:32Z andyrtr $
+# $Id: PKGBUILD 109432 2014-04-14 20:17:43Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
 
 pkgbase=nemo-extensions
@@ -11,9 +11,9 @@ pkgname=('nemo-fileroller'
 	#'nemo-pastebin'
 	#'nemo-compare'
 	#'nemo-rabbitvcs'
-pkgver=2.0.0
-_gitver=adeeeb12ea
-pkgrel=3
+pkgver=2.2.0
+_pkgver=2.2.x
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="https://github.com/linuxmint/nemo-extensions"
@@ -21,11 +21,11 @@ depends=(nemo file-roller cjs clutter-gtk clutter-gst gst-plugins-good libmusicb
          evince gtksourceview3 webkitgtk python2-gobject seahorse-nautilus samba)
 makedepends=(gconf gnome-common gtk-doc intltool) # python2-distutils-extra
 options=('!emptydirs')
-source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/${_gitver}.tar.gz")
-md5sums=('de6a36ee77265f2a1528b29526fd6afb')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/${_pkgver}.tar.gz")
+sha256sums=('2456c9f6e7bae31ced18ef8c16505b3ff8cd47d8f8869769caa4f7b0a4aa4882')
 
 prepare() {
-  cd ${pkgbase}-${_gitver}*
+  cd ${pkgbase}-${_pkgver}
 
   # Python2 fix
   find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
@@ -35,7 +35,7 @@ prepare() {
 }
 
 build() {
-  cd ${pkgbase}-${_gitver}*
+  cd ${pkgbase}-${_pkgver}
 
   _configure_pkgs="nemo-fileroller nemo-seahorse nemo-share"
   for dir in ${_configure_pkgs}
@@ -79,15 +79,15 @@ package_nemo-fileroller(){
   pkgdesc="File archiver extension for Nemo"
   depends=(nemo file-roller)
 
-  cd ${pkgbase}-${_gitver}*/nemo-fileroller
+  cd ${pkgbase}-${_pkgver}/nemo-fileroller
   make DESTDIR="${pkgdir}" install
 }
 
 package_nemo-preview(){
   pkgdesc=("GtkClutter and Javascript-based quick previewer for Nemo")
-  depends=(nemo cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5 evince gtksourceview3 webkitgtk)
+  depends=(nemo cjs clutter-gtk clutter-gst libmusicbrainz5 evince gtksourceview3 webkitgtk)
 
-  cd ${pkgbase}-${_gitver}*/nemo-preview
+  cd ${pkgbase}-${_pkgver}/nemo-preview
   make DESTDIR="${pkgdir}" install
 }
 
@@ -95,7 +95,7 @@ package_nemo-python() {
   pkgdesc="Python2 binding for Nemo components"
   depends=(nemo python2-gobject)
 
-  cd ${pkgbase}-${_gitver}*/nemo-python
+  cd ${pkgbase}-${_pkgver}/nemo-python
   make DESTDIR="${pkgdir}" install
 }
 
@@ -103,7 +103,7 @@ package_nemo-seahorse(){
   pkgdesc="PGP encryption and signing extension for Nemo"
   depends=(nemo seahorse-nautilus)
 
-  cd ${pkgbase}-${_gitver}*/nemo-seahorse
+  cd ${pkgbase}-${_pkgver}/nemo-seahorse
   make DESTDIR="${pkgdir}" install
 
   # seahorse-tool is already in seahorse-nautilus package
@@ -114,12 +114,12 @@ package_nemo-share(){
   pkgdesc="Samba extension for Nemo"
   depends=(nemo samba)
 
-  cd ${pkgbase}-${_gitver}*/nemo-share
+  cd ${pkgbase}-${_pkgver}/nemo-share
   make DESTDIR="${pkgdir}" install
 }
 
 # package_nemo-media-columns(){
-# 	cd ${pkgbase}-${_gitver}*/nemo-media-columns
+# 	cd ${pkgbase}-${_pkgver}/nemo-media-columns
 
 # 	pkgdesc=("A Nemo extension to display music/EXIF and PDF metadata info in the Nemo List View")
 # 	arch=(any)
@@ -130,7 +130,7 @@ package_nemo-share(){
 # }
 
 # package_nemo-pastebin(){
-# 	cd ${pkgbase}-${_gitver}*/nemo-pastebin
+# 	cd ${pkgbase}-${_pkgver}/nemo-pastebin
 
 # 	pkgdesc="Nemo extension to send files to a pastebin"
 # 	arch=(any)
@@ -142,7 +142,7 @@ package_nemo-share(){
 # }
 
 # package_nemo-compare() {
-#   cd ${pkgbase}-${_gitver}*/nemo-compare
+#   cd ${pkgbase}-${_pkgver}/nemo-compare
 
 #   pkgdesc="Context menu comparison extension for Nemo file manager"
 #   depends=(python2 python2-xdg meld nemo-python)
@@ -164,7 +164,7 @@ package_nemo-share(){
 # }
 
 # package_nemo-rabbitvcs(){
-# 	cd ${pkgbase}-${_gitver}*/nemo-rabbitvcs
+# 	cd ${pkgbase}-${_pkgver}/nemo-rabbitvcs
 
 #   depends=(nemo-python python2-dbus)
 
diff --git a/community/nemo/Fix_rename_entry_position.patch b/community/nemo/Fix_rename_entry_position.patch
deleted file mode 100644
index 615f58d7d..000000000
--- a/community/nemo/Fix_rename_entry_position.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/eel/eel-canvas.c
-+++ b/eel/eel-canvas.c
-@@ -3213,11 +3213,19 @@ eel_canvas_draw (GtkWidget *widget, cair
-                 return FALSE;
- 
-         bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
-+
-+	if (!gtk_cairo_should_draw_window (cr, bin_window))
-+		return FALSE;
-+
-+	cairo_save (cr);
-+
-         gtk_cairo_transform_to_window (cr, widget, bin_window);
- 
-         region = eel_cairo_get_clip_region (cr);
--        if (region == NULL)
-+        if (region == NULL) {
-+		cairo_restore (cr);
-                 return FALSE;
-+	}
- 
- #ifdef VERBOSE
- 	g_print ("Draw\n");
-@@ -3249,6 +3257,8 @@ eel_canvas_draw (GtkWidget *widget, cair
- 	if (canvas->root->flags & EEL_CANVAS_ITEM_MAPPED)
- 		EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->draw (canvas->root, cr, region);
- 
-+	cairo_restore (cr);
-+
- 	/* Chain up to get exposes on child widgets */
-         if (GTK_WIDGET_CLASS (canvas_parent_class)->draw)
-                 GTK_WIDGET_CLASS (canvas_parent_class)->draw (widget, cr);
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index 3a53c8698..d1ff3f3a1 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109170 2014-04-11 03:01:08Z bgyorgy $
+# $Id: PKGBUILD 109425 2014-04-14 20:15:30Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=2.0.8
-pkgrel=3
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/nemo"
@@ -12,27 +12,18 @@ license=('GPL')
 depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
          'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libxml2'
          'cinnamon-translations')
-makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
+makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common' 'python2-gobject' 'python2-polib')
 options=('!emptydirs')
 install=nemo.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
-        "Fix_rename_entry_position.patch"
-        "adwaita_style.patch")
-sha256sums=('6a40868e46fd2ed6c27e694e76c160996d16e2d27681bf5126e6b0e647c24033'
-            '07e81aaeeff9ae8c6de76fe2b87b28b89323577ef425596241b96e94b4e04750'
-            '6faa6a5a7042832fb1230a5d21ebe8572c100798e724fcd72fee86dc01d69290')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
+sha256sums=('d909354fb5378804eb9abcfe04e3f4b4e482e7afbec018cacc35b3e845cce466')
 
 prepare() {
   cd linuxmint-nemo-*
 
-  # Rename files and directory : invisible field: https://bugzilla.redhat.com/show_bug.cgi?id=1045181
-  patch -Np1 -i ../Fix_rename_entry_position.patch
-
-  # Fix white text on breadcrumb with Adwaita
-  patch -Np1 -i ../adwaita_style.patch
-
   # Python2 fix
   sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
   # Fix build
   sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
diff --git a/community/nemo/adwaita_style.patch b/community/nemo/adwaita_style.patch
deleted file mode 100644
index 1c9e814c5..000000000
--- a/community/nemo/adwaita_style.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/nemo-style-fallback.css
-+++ b/src/nemo-style-fallback.css
-@@ -8,7 +8,6 @@ NemoPathbarButton {
-                                      color-stop (.7, shade(alpha(@bg_color, 0.8), 0.90)),
-                                      color-stop (1, shade(alpha(@bg_color, 0.8), 0.80)));
-     border-color: #808080;
--    color: @fg_color;
-     -NemoPathbarButton-border-radius: 3px;
- }
- 
diff --git a/community/pbzip2/PKGBUILD b/community/pbzip2/PKGBUILD
index 24dff6a50..a8ae35121 100644
--- a/community/pbzip2/PKGBUILD
+++ b/community/pbzip2/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 74829 2012-08-06 16:53:08Z foutrelis $
+# $Id: PKGBUILD 109398 2014-04-14 14:00:16Z foutrelis $
 # Contributor: Vasco Costa <vasco dot costa at geekslot dot com>
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=pbzip2
-pkgver=1.1.8
+pkgver=1.1.9
 pkgrel=1
 pkgdesc="Parallel implementation of the bzip2 block-sorting file compressor"
 arch=('i686' 'x86_64')
 url="http://compression.ca/pbzip2/"
 license=('BSD')
 depends=('bzip2' 'gcc-libs')
-source=(https://launchpad.net/$pkgname/1.1/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('d2da7e65d2a2ba5426d6d9bcd15d86cc5f90038efabd5dbc1ef9bded21371f53')
+source=(https://launchpad.net/$pkgname/1.1/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc})
+sha256sums=('bd421be03e6e24a24a121ba2355bfd11571356a25ee64fcfa76330750ec5f9c4'
+            'SKIP')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD
index 9b1ebc1d6..1feb6aedd 100644
--- a/community/polipo/PKGBUILD
+++ b/community/polipo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109185 2014-04-11 06:07:08Z thestinger $
+# $Id: PKGBUILD 109419 2014-04-14 18:46:41Z jelle $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -7,8 +7,8 @@
 # Contributor: Alex Griffin <griffin.aj(a)gmail.com>
 
 pkgname=polipo
-pkgver=1.0.4.1
-pkgrel=12
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="A small and fast caching web proxy."
 arch=('i686' 'x86_64')
 url="http://www.pps.jussieu.fr/~jch/software/polipo/"
@@ -16,9 +16,9 @@ license=('GPL')
 depends=('bash')
 makedepends=('texinfo')
 install=polipo.install
-source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz"
-        polipo.service)
-md5sums=('bfc5c85289519658280e093a270d6703'
+source=("http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/polipo-$pkgver.tar.gz"
+        "polipo.service")
+md5sums=('55c6fc19e8d484997f223a56f0bd26ca'
          '3861a067f6cdd2b8afcee1de97678902')
 
 build() {
diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD
index fa0210aba..b20a13e2a 100644
--- a/community/redshift/PKGBUILD
+++ b/community/redshift/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109308 2014-04-13 08:35:54Z lfleischer $
+# $Id: PKGBUILD 109421 2014-04-14 19:00:06Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Geoffrey Teale <tealeg@stop-squark>
 # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com>
@@ -7,13 +7,13 @@
 
 pkgname=redshift
 pkgver=1.9
-pkgrel=2
+pkgrel=3
 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.'
 arch=('i686' 'x86_64')
 url='http://jonls.dk/redshift/'
 license=('GPL3')
 depends=('geoclue' 'libdrm' 'libxcb' 'libxxf86vm')
-optdepends=('pygtk: for redshift-gtk'
+optdepends=('python-gobject: for redshift-gtk'
             'python-xdg: for redshift-gtk'
             'librsvg: for redshift-gtk')
 makedepends=('python')
@@ -24,7 +24,8 @@ md5sums=('9640218cd9ba88f6d10b347b2277c415')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --enable-drm --enable-randr --enable-vidmode --enable-geoclue
+  ./configure --prefix=/usr --enable-drm --enable-randr --enable-vidmode --enable-geoclue \
+    --with-systemduserunitdir=/usr/lib/systemd/user
   make
 }
 
diff --git a/community/rocksndiamonds/PKGBUILD b/community/rocksndiamonds/PKGBUILD
index ab4ed1842..03353bd64 100644
--- a/community/rocksndiamonds/PKGBUILD
+++ b/community/rocksndiamonds/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101193 2013-11-19 11:01:48Z spupykin $
+# $Id: PKGBUILD 109377 2014-04-14 09:42:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com>
 
 pkgname=rocksndiamonds
-pkgver=3.3.1.1
-pkgrel=2
+pkgver=3.3.1.2
+pkgrel=1
 pkgdesc="game similiar to Boulderdash with lots of levels"
 arch=(i686 x86_64)
 url="http://www.artsoft.org/rocksndiamonds/"
@@ -13,7 +13,7 @@ depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg')
 makedepends=('unzip' 'p7zip')
 source=(http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-$pkgver.tar.gz
 	rocksndiamonds.desktop)
-md5sums=('d897ddfb1b14123240a6dbc207ca27ee'
+md5sums=('9fb7d125a314f55c5148c0e47f9ebb42'
          '18a3541db4d71feb0ad3b50ea4006738')
 
 build() {
diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD
index 5efa9daa1..5b8a12c0b 100644
--- a/community/sdcc/PKGBUILD
+++ b/community/sdcc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94049 2013-07-13 12:37:05Z svenstaro $
+# $Id: PKGBUILD 109379 2014-04-14 09:42:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jose Negron <josenj.arch@mailnull.net>
 
 pkgname=sdcc
-pkgver=3.3.0
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,9 +12,9 @@ depends=('bash' 'gcc-libs' 'boost-libs')
 makedepends=('gputils' 'flex' 'bison' 'patch' 'boost')
 optdepends=('python')
 url="http://sdcc.sourceforge.net/"
-options=(!strip)
+options=(!strip  staticlibs)
 source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2)
-md5sums=('c7c6aa75415580795ecc4fd31948e5ba')
+md5sums=('92db2ea2526f6cef412547bb1e759a48')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD
index ef73ab376..101449e39 100644
--- a/community/spice-gtk3/PKGBUILD
+++ b/community/spice-gtk3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109197 2014-04-11 09:23:59Z spupykin $
+# $Id: PKGBUILD 109381 2014-04-14 09:43:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Facchini <stefano.facchini@gmail.com>
 # Contributor: Jonathan Lestrelin <zanko@daemontux.org>
@@ -6,7 +6,7 @@
 
 pkgname=spice-gtk3
 pkgver=0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="Gtk client and libraries for SPICE remote desktop servers (gtk3 version)"
 arch=('i686' 'x86_64')
 url="http://spice-space.org"
@@ -14,22 +14,20 @@ license=('LGPL2.1')
 depends=('celt0.5.1' 'dbus-glib' 'gtk3' 'libcacard' 'libpulse' 'usbredir' 'libsoup')
 makedepends=('gobject-introspection' 'intltool' 'python2-pyparsing' 'spice-protocol' 'usbutils' 'vala')
 source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2")
-sha256sums=('05e9e5d915a99005a812846f733bba177ef3b1a9de9356690047250fb1b1fa3a')
-sha256sums=('bfdfa6cb12c40327b63167fe7191ce94e7f2a272473c87df31790c25d60cc81d')
 sha256sums=('6efe500845f910945670f11664f584fd13b9db494075c41137eb7bacd60d1ed1')
 
 prepare() {
   cd "$srcdir/spice-gtk-$pkgver"
   sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py
   # Disable broken tests
-  sed -i 's/ tests//' Makefile.{am,in}
+#  sed -i 's/ tests//' Makefile.{am,in}
 }
 
 build() {
   cd "$srcdir/spice-gtk-$pkgver"
   PYTHON=python2 ./configure --prefix=/usr \
     --disable-static --enable-vala --with-gtk=3.0 \
-    --with-coroutine=gthread
+    --with-coroutine=gthread --sbindir=/usr/bin
   make
 }
 
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index 45277b142..d929ec124 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 101740 2013-11-30 16:23:34Z seblu $
+# $Id: PKGBUILD 109350 2014-04-13 22:19:51Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Sergej Pupykin <ps@lx-ltd.ru>
 
 pkgname=ulogd
-pkgver=2.0.3
+pkgver=2.0.4
 pkgrel=1
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64')
@@ -23,11 +23,12 @@ makedepends=('libmariadbclient'
              'postgresql-libs'
              'sqlite')
 optdepends=("${makedepends[@]}")
-source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
+source=("http://www.netfilter.org/projects/ulogd/files/$pkgname-$pkgver.tar.bz2"{,.sig}
         "$pkgname.logrotate"
         "$pkgname.conf"
         "$pkgname.service")
-md5sums=('4dcd7e7a68022318759b8d3b9fff7519'
+md5sums=('7c71ec460dfea5287eba27472c521ebc'
+         'SKIP'
          '95f05af0a0c8f5fdea5bd92ccb2fd465'
          '2c8cbedb2fb455cba220ca35186ad846'
          '092d72209e30c132e0a08112e4062772')
diff --git a/community/vagrant/PKGBUILD b/community/vagrant/PKGBUILD
index 8013c81b5..8ac110856 100644
--- a/community/vagrant/PKGBUILD
+++ b/community/vagrant/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108871 2014-04-06 09:08:17Z jsteel $
+# $Id: PKGBUILD 109450 2014-04-14 21:47:09Z jsteel $
 # Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
 # Contributor: Ido Rosen <ido@kernel.org>
 # Contributor: Brett Hoerner <brett@bretthoerner.com>
@@ -10,8 +10,8 @@
 # Contributor: Steven Nance <steven@devtrw.com>
 
 pkgname=vagrant
-pkgver=1.5.2
-pkgrel=2
+pkgver=1.5.3
+pkgrel=1
 pkgdesc="Build and distribute virtualized development environments"
 arch=('i686' 'x86_64')
 url="http://vagrantup.com"
@@ -20,7 +20,7 @@ options=('!emptydirs')
 depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump')
 source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
         http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip)
-md5sums=('217e62eb15e5ba9c4aaea394c75ad272')
+md5sums=('2abdab78c7c27e6bf7d9f89862b4d357')
 [[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4'
 [[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b'
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-04-15 03:26:32 +0000
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-04-15 03:26:32 +0000
commit	ad45d1982b97faa9372d99e51daa687c7c09de7d (patch)
tree	af490221f2b733b8f0cf68f3898566d5049c3ab4 /community
parent	7c266ff5a9e1f533fd8bd8c2fbbcc05df350dcd3 (diff)