Fri Apr 26 00:59:18 PDT 2013

36 files changed, 299 insertions, 358 deletions

diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index a16839508..cf5e13723 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88709 2013-04-22 00:29:56Z bgyorgy $
+# $Id: PKGBUILD 88934 2013-04-25 02:04:16Z bgyorgy $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon
 pkgver=1.7.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -15,7 +15,7 @@ depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth'
          'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session'
          'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg'
          'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging'
-         'python2-pyinotify' 'python2-lxml' 'webkitgtk3')
+         'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat')
 makedepends=('gnome-common' 'intltool')
 optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
             'cinnamon-screensaver: lock screen'
@@ -27,11 +27,15 @@ install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
         "keyboard_applet.patch"
         "fix-control-center-check.patch"
-        "gnome-3.8.patch")
+        "gnome-3.8.patch"
+        "switch-applications.patch"
+        "fallback-helpers.patch")
 md5sums=('95260dc968ca9be32c265b35df2dd49d'
          '2b1ece84416c3e4de030be15f1774d82'
          'c3f25b06d345d9d36c197cd96e08f496'
-         'cf2efbe1a5c48e1be53a0e8e4b7c3181')
+         'cf2efbe1a5c48e1be53a0e8e4b7c3181'
+         '16258907bf51cd8c1569263791ffa620'
+         'f7aa8ace9c9543ba2fd66bd530244fed')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
@@ -44,13 +48,19 @@ build() {
 
   # Fix Keyboard applet
   # https://github.com/linuxmint/Cinnamon/issues/1337
-  patch -Np1 -i ${srcdir}/keyboard_applet.patch
+  patch -Np1 -i ../keyboard_applet.patch
 
   # Check for the cc-panel path, not for the unneeded binary
-  patch -Np1 -i ${srcdir}/fix-control-center-check.patch
+  patch -Np1 -i ../fix-control-center-check.patch
 
   # https://github.com/linuxmint/Cinnamon/pull/1888
-  patch -Np1 -i ${srcdir}/gnome-3.8.patch
+  patch -Np1 -i ../gnome-3.8.patch
+
+  # Fix windows switcher keybinding with default settings in GNOME 3.8
+  patch -Np1 -i ../switch-applications.patch
+
+  # Start media keys and mount helpers with the session
+  patch -Np1 -i ../fallback-helpers.patch
 
   ./autogen.sh --prefix=/usr \
                --sysconfdir=/etc \
diff --git a/community/cinnamon/fallback-helpers.patch b/community/cinnamon/fallback-helpers.patch
new file mode 100644
index 000000000..6fe318bd9
--- /dev/null
+++ b/community/cinnamon/fallback-helpers.patch
@@ -0,0 +1,21 @@
+diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session
+--- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-15 15:55:01.000000000 +0200
++++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-25 01:30:35.435650613 +0200
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Cinnamon 2D
+-RequiredComponents=cinnamon2d;gnome-settings-daemon;
++RequiredComponents=cinnamon2d;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
+ DesktopName=GNOME
+ 
+diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session
+--- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-15 15:55:01.000000000 +0200
++++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-25 01:30:33.645607769 +0200
+@@ -1,6 +1,6 @@
+ [GNOME Session]
+ Name=Cinnamon
+-RequiredComponents=cinnamon;gnome-settings-daemon;
++RequiredComponents=cinnamon;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
+ IsRunnableHelper=/usr/lib/gnome-session/gnome-session-check-accelerated
+ FallbackSession=cinnamon2d
+ DesktopName=GNOME
diff --git a/community/cinnamon/switch-applications.patch b/community/cinnamon/switch-applications.patch
new file mode 100644
index 000000000..ce2e31825
--- /dev/null
+++ b/community/cinnamon/switch-applications.patch
@@ -0,0 +1,55 @@
+diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
+--- linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-15 15:55:01.000000000 +0200
++++ linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-24 21:19:49.262020614 +0200
+@@ -43,8 +43,8 @@
+     # Cinnamon stuff
+     [_("Toggle Scale"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-down", True, "cinnamon"],
+     [_("Toggle Expo"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-up", True, "cinnamon"],
+-    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows", True, "cinnamon"],
+-    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows-backward", True, "cinnamon"],
++    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications", True, "cinnamon"],
++    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications-backward", True, "cinnamon"],
+     [_("Run dialog (must restart Cinnamon)"), "org.gnome.desktop.wm.keybindings", "panel-run-dialog", True, "cinnamon"],
+     [_("Menu button (must restart Cinnamon)"), "org.cinnamon.muffin", "overlay-key", False, "cinnamon"],
+ 
+diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/altTab.js linuxmint-Cinnamon-b41bad0/js/ui/altTab.js
+--- linuxmint-Cinnamon-b41bad0.orig/js/ui/altTab.js	2013-04-15 15:55:01.000000000 +0200
++++ linuxmint-Cinnamon-b41bad0/js/ui/altTab.js	2013-04-24 21:22:38.309568355 +0200
+@@ -203,9 +203,9 @@
+                 }
+             } else if (binding == 'switch-group-backward') {
+                 this._select(0, this._appIcons[0].cachedWindows.length - 1);
+-            } else if (binding == 'switch-windows-backward') {
++            } else if (binding == 'switch-applications-backward') {
+                 this._select(this._appIcons.length - 1);
+-            } else if (binding == 'no-switch-windows') {
++            } else if (binding == 'no-switch-applications') {
+                 this._select(0);
+             } else if (this._appIcons.length == 1) {
+                 this._select(0);
+@@ -296,7 +296,7 @@
+                 return false;
+             }
+             Main.wm.showWorkspaceOSD();
+-            that.refresh('no-switch-windows');
++            that.refresh('no-switch-applications');
+             return true;
+         };
+         let keysym = event.get_key_symbol();
+diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js
+--- linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js	2013-04-15 15:55:01.000000000 +0200
++++ linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js	2013-04-24 21:21:22.447677094 +0200
+@@ -131,11 +131,11 @@
+                                             Lang.bind(this, this._showWorkspaceSwitcher));
+         Meta.keybindings_set_custom_handler('switch-to-workspace-down',
+                                             Lang.bind(this, this._showWorkspaceSwitcher));
+-        Meta.keybindings_set_custom_handler('switch-windows',
++        Meta.keybindings_set_custom_handler('switch-applications',
+                                             Lang.bind(this, this._startAppSwitcher));
+         Meta.keybindings_set_custom_handler('switch-group',
+                                             Lang.bind(this, this._startAppSwitcher));
+-        Meta.keybindings_set_custom_handler('switch-windows-backward',
++        Meta.keybindings_set_custom_handler('switch-applications-backward',
+                                             Lang.bind(this, this._startAppSwitcher));
+         Meta.keybindings_set_custom_handler('switch-group-backward',
+                                             Lang.bind(this, this._startAppSwitcher));
diff --git a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch
index 2c90a9fe2..92f317cea 100644
--- a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch
+++ b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch
@@ -76,7 +76,7 @@ index 0000000..c012c58
 @@ -0,0 +1,3 @@
 +[GNOME Session]
 +_Name=GNOME Flashback
-+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;notification-daemon;
++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;notification-daemon;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
 diff --git a/po/POTFILES.in b/po/POTFILES.in
 index bc65c4c..a6aa6c7 100644
 --- a/po/POTFILES.in
diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
index a287972a4..e173e3492 100644
--- a/community/gnome-panel/PKGBUILD
+++ b/community/gnome-panel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88822 2013-04-23 02:28:34Z bgyorgy $
+# $Id: PKGBUILD 88932 2013-04-24 22:25:52Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-panel
 pkgname=('gnome-panel' 'gnome-flashback-session')
 pkgver=3.6.2
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="Legacy GNOME panel"
@@ -25,7 +25,7 @@ sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079'
             '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c'
             'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305'
             '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775'
-            'f313791d246749f18764ad4af13c4efe54483bc327fab371c47f9fbfc25b20a9'
+            '9db0d1dadd2183777ed39e84caca1096a857897bbcf0e18ad599996dd397f1e0'
             '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71')
 
 build() {
diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD
index 108f1ab5a..8c2ae9f43 100644
--- a/community/gnome-settings-daemon-compat/PKGBUILD
+++ b/community/gnome-settings-daemon-compat/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 88858 2013-04-24 12:55:15Z bgyorgy $
+# $Id: PKGBUILD 88930 2013-04-24 22:24:31Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon-compat
 _pkgname=gnome-settings-daemon
 pkgver=3.6.4
-pkgrel=2
-pkgdesc="Compatibility package that provides background and mount helpers for the Gnome Flashback session"
+pkgrel=3
+pkgdesc="Compatibility package that provides background, media keys and mount helpers for the Gnome Flashback session"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gnome-settings-daemon')
-makedepends=('docbook-xsl' 'ibus' 'intltool' 'libcanberra' 'libnotify' 'libpulse' 'libwacom' 'nss' 'upower' 'xf86-input-wacom')
+makedepends=('docbook-xsl' 'intltool' 'xf86-input-wacom')
 url="https://live.gnome.org/GnomeFlashback"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
         standalone-background-helper.patch
@@ -19,17 +19,17 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-
         sessionisactive-port.patch
         revert-input-sources.patch
         xinput.patch 
-        flashback-rename.patch
-        remove-libgsd-dependency.patch)
+        remove-libgsd-dependency.patch
+        move-desktop-file.patch)
 sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
-            'f9781a17d7baa2777b16fa2c71fb6053612131cffcfffcc635d49f9dacb1e637'
-            '4776de33b1517976b308a9ce23661cd0ac68ddd2bcf41465c73f8a2e2d09d20c'
+            '2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9'
+            'ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162'
             '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a'
             '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915'
             '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a'
             'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d'
-            '1edabf1a5a56d4b797ccdb7d5003bad396eebe98541d5aa330c9851340b68dfe'
-            '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c')
+            '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c'
+            'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4')
 
 build() {
   cd $_pkgname-$pkgver
@@ -51,8 +51,8 @@ build() {
   # Remove libgsd dependency
   patch -Np1 -i ../remove-libgsd-dependency.patch
 
-  # GNOME Fallback renamed to Flashback
-  patch -Np1 -i ../flashback-rename.patch
+  # Move desktop files out of autostart, so they can be easily reusable in custom sessions
+  patch -Np1 -i ../move-desktop-file.patch
 
   autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \
diff --git a/community/gnome-settings-daemon-compat/flashback-rename.patch b/community/gnome-settings-daemon-compat/flashback-rename.patch
deleted file mode 100644
index 8f3816bef..000000000
--- a/community/gnome-settings-daemon-compat/flashback-rename.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-01-10 14:37:58.000000000 +0100
-+++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 14:34:43.743878119 +0200
-@@ -9,4 +9,4 @@
- NoDisplay=true
- OnlyShowIn=GNOME;Unity;
- X-GNOME-Autostart-Notify=true
--AutostartCondition=GNOME3 if-session gnome-fallback
-+AutostartCondition=GNOME3 if-session gnome-flashback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 14:32:47.290988000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 14:34:43.743878119 +0200
-@@ -9,4 +9,4 @@
- NoDisplay=true
- OnlyShowIn=GNOME;Unity;
- X-GNOME-Autostart-Notify=true
--AutostartCondition=GNOME3 if-session gnome-fallback
-+AutostartCondition=GNOME3 if-session gnome-flashback
-diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 14:32:52.807791000 +0200
-+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 14:35:16.714696636 +0200
-@@ -9,4 +9,4 @@
- NoDisplay=true
- OnlyShowIn=GNOME;Unity;
- X-GNOME-Autostart-Notify=true
--AutostartCondition=GNOME3 if-session gnome-fallback
-+AutostartCondition=GNOME3 if-session gnome-flashback
diff --git a/community/gnome-settings-daemon-compat/move-desktop-file.patch b/community/gnome-settings-daemon-compat/move-desktop-file.patch
new file mode 100644
index 000000000..fe9272767
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/move-desktop-file.patch
@@ -0,0 +1,60 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 23:13:10.169941000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 23:13:41.064001562 +0200
+@@ -9,4 +9,3 @@
+ NoDisplay=true
+ OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Notify=true
+-AutostartCondition=GNOME3 if-session gnome-fallback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am	2013-04-24 23:13:12.830004000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am	2013-04-24 23:13:36.613896914 +0200
+@@ -21,7 +21,7 @@
+ 	$(SYSTEMD_LIBS)			\
+ 	$(AUTOMOUNT_LIBS)
+ 
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(datadir)/applications
+ autostart_in_files = gnome-fallback-mount-helper.desktop.in
+ autostart_in_in_files = gnome-fallback-mount-helper.desktop.in.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 23:13:07.229872000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 23:13:43.670729520 +0200
+@@ -9,4 +9,3 @@
+ NoDisplay=true
+ OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Notify=true
+-AutostartCondition=GNOME3 if-session gnome-fallback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-04-24 23:13:04.913151000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-24 23:13:47.907495798 +0200
+@@ -17,7 +17,7 @@
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+ 	$(BACKGROUND_LIBS)
+ 
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(datadir)/applications
+ autostart_in_files = gnome-fallback-background-helper.desktop.in
+ autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:12:58.579668000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:13:51.747586073 +0200
+@@ -9,4 +9,3 @@
+ NoDisplay=true
+ OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Notify=true
+-AutostartCondition=GNOME3 if-session gnome-fallback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am	2013-04-24 23:13:02.026416000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am	2013-04-24 23:13:54.570985777 +0200
+@@ -75,7 +75,7 @@
+ 	$(MEDIA_KEYS_LIBS)			\
+ 	-lm
+ 
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(datadir)/applications
+ autostart_in_files = gnome-fallback-media-keys-helper.desktop.in
+ autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch
index 884f3031e..b52de042f 100644
--- a/community/gnome-settings-daemon-compat/standalone-background-helper.patch
+++ b/community/gnome-settings-daemon-compat/standalone-background-helper.patch
@@ -114,8 +114,8 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-ba
 +++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-10 17:39:36.450215685 +0200
 @@ -0,0 +1,12 @@
 +[Desktop Entry]
-+_Name=Background Helper
-+_Comment=Draw desktop background
++_Name=Background
++_Comment=Background plugin
 +Exec=@LIBEXECDIR@/gnome-fallback-background-helper
 +Icon=desktop
 +Terminal=false
diff --git a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
index dec5ff3e8..61be1737e 100644
--- a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
+++ b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
@@ -84,9 +84,9 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-me
 @@ -0,0 +1,12 @@
 +[Desktop Entry]
 +_Name=Media keys
-+_Comment=Handle media keys
++_Comment=Media keys plugin
 +Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper
-+Icon=drive-optical
++Icon=multimedia
 +Terminal=false
 +Type=Application
 +Categories=
diff --git a/community/haskell-pcre-light/PKGBUILD b/community/haskell-pcre-light/PKGBUILD
index 56ccb9c8c..9e6b83de1 100644
--- a/community/haskell-pcre-light/PKGBUILD
+++ b/community/haskell-pcre-light/PKGBUILD
@@ -3,7 +3,7 @@
 _hkgname=pcre-light
 pkgname=haskell-pcre-light
 pkgver=0.4
-pkgrel=20
+pkgrel=21
 pkgdesc="A small, efficient and portable regex library for Perl 5 compatible regular expressions"
 url="http://code.haskell.org/~dons/code/pcre-light"
 license=(custom:BSD3)
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index fca931cac..ec7ab49e5 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88886 2013-04-24 15:32:13Z bpiotrowski $
+# $Id: PKGBUILD 88940 2013-04-25 04:37:43Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
@@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx
 
 pkgname=nginx
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
@@ -55,8 +55,10 @@ build() {
         --with-file-aio \
         --with-http_dav_module \
         --with-http_geoip_module \
+        --with-http_gunzip_module \
         --with-http_gzip_static_module \
         --with-http_realip_module \
+        --with-http_spdy_module \
         --with-http_ssl_module \
         --with-http_stub_status_module \
         --add-module=/usr/lib/passenger/ext/nginx \
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 661a3099e..b73b5eedc 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183538 2013-04-22 17:24:27Z andyrtr $
+# $Id: PKGBUILD 183615 2013-04-25 15:56:01Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -7,7 +7,7 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
          'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_updatever=u17
+_updatever=u21
 _icedtea_ver=2.3.9
 
 # check "${srcdir}/icedtea7"/Makefile.am
diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD
index 7671edddf..98c2e71ed 100644
--- a/extra/js/PKGBUILD
+++ b/extra/js/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183424 2013-04-21 22:11:07Z heftig $
+# $Id: PKGBUILD 183636 2013-04-25 18:14:18Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=js
@@ -15,6 +15,7 @@ source=(http://ftp.mozilla.org/pub/mozilla.org/js/mozjs$pkgver.tar.gz)
 md5sums=('20b6f8f1140ef6e47daa3b16965c9202')
 
 build() {
+  unset CPPFLAGS
   cd mozjs$pkgver/js/src
   ./configure --prefix=/usr --with-system-nspr --with-system-ffi \
      --enable-readline --enable-threadsafe
diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD
index b3a23ab6c..3e5f2ecf8 100644
--- a/extra/libdmapsharing/PKGBUILD
+++ b/extra/libdmapsharing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 175982 2013-01-25 15:12:09Z ioni $
+# $Id: PKGBUILD 183628 2013-04-25 17:51:21Z ioni $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libdmapsharing
-pkgver=2.9.16
+pkgver=2.9.17
 pkgrel=1
 pkgdesc="A library that implements the DMAP family of protocols"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 depends=('libsoup' 'avahi' 'gst-plugins-base-libs' 'gdk-pixbuf2')
 options=('!libtool')
 source=(http://www.flyn.org/projects/libdmapsharing/$pkgname-$pkgver.tar.gz)
-md5sums=('5b2fbf46efc95a503ed95094c72b34d2')
+md5sums=('089e70ed4fb3b92dcd956b80dbf3ffc9')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 60579b81f..f44b8e380 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183277 2013-04-20 14:43:33Z andyrtr $
+# $Id: PKGBUILD 183612 2013-04-25 11:57:24Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
 pkgver=2.4.44
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
 license=('custom')
@@ -25,11 +25,7 @@ build() {
 
   #libtoolize --force
   autoreconf --force --install
-  ./configure --prefix=/usr \
-      --enable-udev \
-      --enable-omap-experimental-api \
-      --enable-exynos-experimental-api \
-      --enable-freedreno-experimental-api 
+  ./configure --prefix=/usr --enable-udev
   make
 }
 
diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff
deleted file mode 100644
index fe0bb5649..000000000
--- a/extra/libdrm/git_fixes.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-From 99105e765c31b598746b849e66e7a9106dcefa24 Mon Sep 17 00:00:00 2001
-From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Date: Wed, 27 Mar 2013 13:06:43 +0000
-Subject: makefiles: Add missing headers.
-
-I even compile time tested this on a panda with make dist!
-
-Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
----
-diff --git a/exynos/Makefile.am b/exynos/Makefile.am
-index 539aea0..0a2663a 100644
---- a/exynos/Makefile.am
-+++ b/exynos/Makefile.am
-@@ -10,7 +10,11 @@ libdrm_exynos_ladir = $(libdir)
- libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
- 
--libdrm_exynos_la_SOURCES = exynos_drm.c exynos_fimg2d.c
-+libdrm_exynos_la_SOURCES = \
-+	exynos_drm.c \
-+	exynos_fimg2d.c \
-+	fimg2d.h \
-+	fimg2d_reg.h
- 
- libdrm_exynoscommonincludedir = ${includedir}/exynos
- libdrm_exynoscommoninclude_HEADERS = exynos_drm.h
-diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
-index f46a780..ba9bd68 100644
---- a/freedreno/Makefile.am
-+++ b/freedreno/Makefile.am
-@@ -10,7 +10,15 @@ libdrm_freedreno_ladir = $(libdir)
- libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
- 
--libdrm_freedreno_la_SOURCES = freedreno_device.c freedreno_pipe.c freedreno_ringbuffer.c freedreno_bo.c
-+libdrm_freedreno_la_SOURCES = \
-+	freedreno_device.c \
-+	freedreno_pipe.c \
-+	freedreno_priv.h \
-+	freedreno_ringbuffer.c \
-+	freedreno_bo.c \
-+	kgsl_drm.h \
-+	list.h \
-+	msm_kgsl.h
- 
- libdrm_freedrenocommonincludedir = ${includedir}/freedreno
- libdrm_freedrenocommoninclude_HEADERS = freedreno_drmif.h freedreno_ringbuffer.h
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/libgusb/PKGBUILD b/extra/libgusb/PKGBUILD
index 0cf8084de..e7441b516 100644
--- a/extra/libgusb/PKGBUILD
+++ b/extra/libgusb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170681 2012-11-09 12:30:03Z jgc $
+# $Id: PKGBUILD 183627 2013-04-25 17:50:55Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgusb
-pkgver=0.1.4
+pkgver=0.1.6
 pkgrel=1
 pkgdesc="GLib wrapper around libusb1"
 arch=('i686' 'x86_64')
@@ -12,16 +12,16 @@ depends=('udev' 'libusbx')
 makedepends=('gobject-introspection')
 source=(http://people.freedesktop.org/~hughsient/releases/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('64294a649e54df2009545f47577f41438ec50c2fc571dd7b08cf32cb14de37b9')
+sha256sums=('900103ff24a851ef8395b992236ced0aedb4c265ef2264f6ad8349300095198b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/libnice/PKGBUILD b/extra/libnice/PKGBUILD
index 05890543b..ba09e3f27 100644
--- a/extra/libnice/PKGBUILD
+++ b/extra/libnice/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: William Díaz <wdiaz@archlinux.us>
 
 pkgname=libnice
-pkgver=0.1.3
+pkgver=0.1.4
 pkgrel=1
 pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)"
 arch=('i686' 'x86_64')
@@ -14,15 +14,15 @@ makedepends=('gstreamer' 'gstreamer0.10')
 optdepends=('gstreamer' 'gstreamer0.10')
 options=('!libtool')
 source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('315c457b092980a4a9a0bea9f0723cce')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
-md5sums=('1a0907605f852dcda32a3b3daf38d36c')
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index d47b9bff3..95c48d2c7 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 183443 2013-04-21 22:11:41Z heftig $
+# $Id: PKGBUILD 183639 2013-04-25 18:36:08Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=modemmanager
 _realname=ModemManager
 pkgver=0.7.990
-pkgrel=3
+pkgrel=4
 pkgdesc="Mobile broadband modem management service"
 arch=(i686 x86_64)
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
@@ -16,7 +16,7 @@ optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
 options=('!libtool')
 install=modemmanager.install
 #source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz)
-source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=95274bf")
+source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=135bec6")
 sha256sums=('SKIP')
 
 build() {
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
deleted file mode 100644
index 9ea78cd32..000000000
--- a/extra/mysql/PKGBUILD
+++ /dev/null
@@ -1,137 +0,0 @@
-# $Id: PKGBUILD 180684 2013-03-25 19:15:35Z bpiotrowski $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=mysql
-pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.30
-pkgrel=7
-arch=('i686' 'x86_64')
-license=('GPL')
-url="https://www.mysql.com/products/community/"
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz{,.asc}
-        mysqld-post.sh
-        mysqld-tmpfile.conf
-        mysqld.service)
-sha256sums=('909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053'
-            '27d3bba7b7f54f9f77cddba81a3fe124aeef918cc09eb28860338e9a4359e6f7'
-            '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
-            '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
-            '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556')
-
-build() {
-  mkdir build
-  cd build
-
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/mysql \
-    -DMYSQL_DATADIR=/var/lib/mysql \
-    -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
-    -DDEFAULT_CHARSET=utf8 \
-    -DDEFAULT_COLLATION=utf8_general_ci \
-    -DENABLED_LOCAL_INFILE=ON \
-    -DINSTALL_INFODIR=share/mysql/docs \
-    -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
-    -DINSTALL_SCRIPTDIR=bin \
-    -DINSTALL_INCLUDEDIR=include/mysql \
-    -DINSTALL_DOCREADMEDIR=share/mysql \
-    -DINSTALL_SUPPORTFILESDIR=share/mysql \
-    -DINSTALL_MYSQLSHAREDIR=share/mysql \
-    -DINSTALL_DOCDIR=share/mysql/docs \
-    -DINSTALL_SHAREDIR=share/mysql \
-    -DWITH_READLINE=ON \
-    -DWITH_ZLIB=system \
-    -DWITH_SSL=system \
-    -DWITH_LIBWRAP=OFF \
-    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
-    -DWITH_EXTRA_CHARSETS=complex \
-    -DWITH_EMBEDDED_SERVER=ON \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-    -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
-
-  make
-}
-
-package_libmysqlclient(){
-  pkgdesc="MySQL client libraries"
-  depends=('openssl')
-  conflicts=('libmariadbclient')
-  provides=("libmariadbclient=$pkgver")
-  
-  cd build
-  for dir in include libmysql libmysqld libservices; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-
-  install -d "${pkgdir}"/usr/bin
-  install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-}
-
-package_mysql-clients(){
-  pkgdesc="MySQL client tools"
-  depends=('libmysqlclient')
-  conflicts=('mariadb-clients')
-  provides=("mariadb-clients=$pkgver")
-  
-  cd build
-  make -C client DESTDIR="${pkgdir}" install
-
-  # install man pages
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-
-  # provided by mysql
-  rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
-}
-
-package_mysql(){
-  pkgdesc="A fast SQL database server"
-  backup=('etc/mysql/my.cnf')
-  install=mysql.install
-  depends=('mysql-clients' 'systemd-tools')
-  conflicts=('mariadb')
-  provides=("mariadb=$pkgver")
-  options=('emptydirs')
-
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
-  install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post
-  install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf
-  install -d "${pkgdir}"/usr/lib/systemd/system
-  install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/
-
-  # provided by libmysqlclient
-  rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm "${pkgdir}"/usr/lib/libmysql*
-  rm -r "${pkgdir}"/usr/include/
-  rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-  
-  # provided by mysql-clients
-  rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-  # not needed
-  rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
-  rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
-
-  #install -dm700 "${pkgdir}"/var/lib/mysql
-}
diff --git a/extra/mysql/mysql.install b/extra/mysql/mysql.install
deleted file mode 100644
index 907e98656..000000000
--- a/extra/mysql/mysql.install
+++ /dev/null
@@ -1,37 +0,0 @@
-if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
-  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
-fi
-[[ -z $datadir ]] && datadir=/var/lib/mysql 
-
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
-
-  if [[ ! -e $datadir ]]; then
-    install -dm700 $datadir
-    usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
-    chown -R mysql:mysql var/lib/mysql &>/dev/null
-  fi
-
-  usr/bin/systemd-tmpfiles --create mysqld.conf
-}
-
-post_upgrade(){
-  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
-
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
-    echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
-    echo " >> "
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/extra/mysql/mysqld-post.sh b/extra/mysql/mysqld-post.sh
deleted file mode 100755
index c4ac18171..000000000
--- a/extra/mysql/mysqld-post.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-while true; do
-    response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
-    echo "$response" | grep -q "mysqld is alive" && break
-    echo "$response" | grep -q "Access denied for user" && break 
-    sleep 1
-done
diff --git a/extra/mysql/mysqld-tmpfile.conf b/extra/mysql/mysqld-tmpfile.conf
deleted file mode 100644
index 6883dc798..000000000
--- a/extra/mysql/mysqld-tmpfile.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -
diff --git a/extra/mysql/mysqld.service b/extra/mysql/mysqld.service
deleted file mode 100644
index a6fc8cf88..000000000
--- a/extra/mysql/mysqld.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=MySQL database server
-After=syslog.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
-ExecStartPost=/usr/bin/mysqld-post
-
-Restart=always
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 49b381193..51121e855 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170731 2012-11-10 15:25:09Z ibiru $
+# $Id: PKGBUILD 183617 2013-04-25 16:40:37Z ioni $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 
 pkgname=telepathy-glib
-pkgver=0.20.1
+pkgver=0.20.2
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('780034ff7433f33e6577b02fd7a2cb0a')
+md5sums=('bfc8a1b94c7a268f15d4d92b83460987')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/telepathy-haze/PKGBUILD b/extra/telepathy-haze/PKGBUILD
index beffbe5da..c7d5b09b9 100644
--- a/extra/telepathy-haze/PKGBUILD
+++ b/extra/telepathy-haze/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157068 2012-04-23 12:17:39Z ibiru $
+# $Id: PKGBUILD 183633 2013-04-25 18:08:02Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 pkgname=telepathy-haze
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols."
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org"
@@ -14,7 +14,7 @@ replaces=('telepathy-butterfly')
 install=telepathy-haze.install
 groups=('telepathy')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('622e0b2f7ff4050a29f907f2ef0f039c')
+md5sums=('85ae58b06a3a94ccfab7080a834bc684')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index 5df4e5930..a2b625131 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 171097 2012-11-16 17:07:10Z ibiru $
+# $Id: PKGBUILD 183634 2013-04-25 18:08:44Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Samuel Mendes <heka.lok@gmail.com>
 
 pkgname=telepathy-idle
-pkgver=0.1.14
+pkgver=0.1.15
 pkgrel=1
 pkgdesc="An IRC connection manager for Telepathy"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('LGPL')
-depends=('telepathy-glib' 'openssl')
+depends=('telepathy-glib')
 makedepends=('libxslt' 'python2')
 install=telepathy-idle.install
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('c292c54aa08f61544ab53fda880d861c')
+md5sums=('56f960ed1d9ed0c01e0b9f7eb68dbebe')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
index 8805ff9d1..d07cb1c64 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=bumblebee
 pkgname=bumblebee-libre
-pkgver=3.1
-pkgrel=6.2
+pkgver=3.2
+pkgrel=1
 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
 arch=('i686' 'x86_64')
 depends=('virtualgl' 'glib2' 'mesa-libgl')
@@ -27,10 +27,10 @@ backup=('etc/bumblebee/bumblebee.conf'
         'etc/bumblebee/xorg.conf.nouveau')
 source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz"
         'libre.patch')
-md5sums=('de515ef51b1e0714c2f1b2a95f83e77e'
+md5sums=('690d0b3aea4ae1fc2a72fe2719ecfd74'
          'f8b6044310039911236f53a625c611a6')
 
-build() {
+prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
 
     # Remove nonfree references to nonfree nvidia driver and unnecessaries files
@@ -40,6 +40,9 @@ build() {
     rm -rv "scripts/bumblebee-bugreport.in"
     patch -Np1 -i "${srcdir}/libre.patch"
 
+build() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+
     ./configure \
         CONF_DRIVER=nouveau \
         --prefix=/usr \
diff --git a/pcr/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD
index 855c7ff38..074205e79 100644
--- a/pcr/ruby-headers/PKGBUILD
+++ b/pcr/ruby-headers/PKGBUILD
@@ -3,29 +3,24 @@
 
 pkgname=ruby-headers
 _pkgname=ruby
-pkgver=1.9.3_p385
-_pkgver=1.9.3-p385
+pkgver=2.0.0_p0
+_pkgver=2.0.0-p0
 pkgrel=1
 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug."
 arch=('any')
 url="http://www.ruby-lang.org/en/"
 license=('GPL2' 'custom:Ruby')
 depends=("ruby=$pkgver")
-source=("http://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2")
-
-build() {
-  /bin/true
-}
+source=("http://ftp.ruby-lang.org/pub/ruby/2.0/$_pkgname-$_pkgver.tar.bz2")
 
 package() {
   cd "$srcdir/$_pkgname-$_pkgver"
 
-  # Just to make sure, since currently we have /usr/include/ruby-1.9.1 for ruby 1.9.2
-  _hdrdir=`ruby -e "require 'rbconfig'; puts Config::CONFIG['rubyhdrdir']"`
+  _hdrdir=`ruby -e "require 'rbconfig'; puts RbConfig::CONFIG['rubyhdrdir']"`
 
   install -d "$pkgdir$_hdrdir/$_pkgname-$_pkgver"
   install -m644 *.{h,inc} "$pkgdir$_hdrdir/$_pkgname-$_pkgver"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c')
+md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a')
diff --git a/~fauno/ruby-mustache/PKGBUILD b/pcr/ruby-mustache/PKGBUILD
index 8c8d924c1..ddb5215d3 100644
--- a/~fauno/ruby-mustache/PKGBUILD
+++ b/pcr/ruby-mustache/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: David Campbell <davekong@archlinux.us>
 pkgname=ruby-mustache
 pkgver=0.99.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A framework-agnostic way to render logic-free views."
 arch=('any')
 url="http://github.com/defunkt/mustache"
 license=(MIT)
-depends=('ruby')
+depends=('ruby>=2')
 makedepends=('rubygems')
 source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem"
         "https://raw.github.com/defunkt/mustache/master/LICENSE")
@@ -18,6 +18,7 @@ build() {
   cd $srcdir
   local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
   gem install \
+      --no-user-install \
       --ignore-dependencies \
       -i "$pkgdir$_gemdir" mustache-$pkgver.gem \
       -n "$pkgdir/usr/bin"
diff --git a/pcr/sigil/PKGBUILD b/pcr/sigil/PKGBUILD
new file mode 100644
index 000000000..0d5802ac1
--- /dev/null
+++ b/pcr/sigil/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 59836 2011-11-30 22:56:23Z giovanni $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
+# Contributor: Jorge Araya Navarro <jorgean@lavabit.com>
+
+pkgname=sigil
+pkgver=0.7.2
+pkgrel=1
+pkgdesc="A WYSIWYG ebook editor"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/sigil/"
+license=('GPL3')
+depends=('qt5-base' 'qt5-svg' 'qt5-webkit' 'qt5-xmlpatterns' 'qt5-tools')
+makedepends=('cmake')
+provides=('sigil')
+conflicts=('sigil')
+install=sigil.install
+source=("http://sigil.googlecode.com/files/Sigil-0.7.2-Code.zip"
+	"sigil.desktop")
+
+build() {
+    cd ${srcdir}
+    mkdir build
+    cd build
+    cmake -G "Unix Makefiles" \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
+	-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_SKIP_RPATH=ON ..
+
+    make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make install DESTDIR="${pkgdir}"
+
+  install -d -m 0755 "${pkgdir}"/usr/share/applications
+  install -m 0644 "${srcdir}"/sigil.desktop "${pkgdir}"/usr/share/applications
+
+  for _pic in 16 32 48 128 256; do
+      install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
+	  "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/sigil.png
+  done
+}
+sha256sums=('8a6f5fd7c59fd8524ce0f48e7d13d13bad137053c9071fe2e1653ea55d5ed940'
+            '92a1014794dbf81fa997449338ded9a0e84593e3552020eb9269039b916bea36')
diff --git a/pcr/sigil/sigil.desktop b/pcr/sigil/sigil.desktop
new file mode 100755
index 000000000..cdb4ce1b2
--- /dev/null
+++ b/pcr/sigil/sigil.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Sigil
+Comment=WYSIWYG ebook editor
+TryExec=sigil
+Exec=sigil %F
+Icon=sigil
+Terminal=false
+StartupNotify=false
+Categories=Application;Office;
+MimeType=application/epub+zip;
diff --git a/pcr/sigil/sigil.install b/pcr/sigil/sigil.install
new file mode 100644
index 000000000..ec506fa93
--- /dev/null
+++ b/pcr/sigil/sigil.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/~fauno/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD
index 5e3699bce..5e3699bce 100644
--- a/~fauno/transmission-remote-cli/PKGBUILD
+++ b/pcr/transmission-remote-cli/PKGBUILD
diff --git a/~fauno/transmission-remote-cli/python2.patch b/pcr/transmission-remote-cli/python2.patch
index 256b676f0..256b676f0 100644
--- a/~fauno/transmission-remote-cli/python2.patch
+++ b/pcr/transmission-remote-cli/python2.patch