Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apvlv/PKGBUILD
	community/audit/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/dia/PKGBUILD
	community/gedit-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/gitg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnome-screensaver/PKGBUILD
	community/gtranslator/PKGBUILD
	community/metacity/PKGBUILD
	community/zeitgeist-datahub/PKGBUILD
	core/glib2/PKGBUILD
	core/perl/PKGBUILD
	extra/anjuta-extras/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/brltty/PKGBUILD
	extra/cheese/PKGBUILD
	extra/clutter/PKGBUILD
	extra/cogl/PKGBUILD
	extra/devhelp/PKGBUILD
	extra/empathy/PKGBUILD
	extra/eog/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution/PKGBUILD
	extra/fontconfig/PKGBUILD
	extra/gcr/PKGBUILD
	extra/gdl/PKGBUILD
	extra/gedit/PKGBUILD
	extra/gjs/PKGBUILD
	extra/glade/PKGBUILD
	extra/glib-networking/PKGBUILD
	extra/gnome-calculator/PKGBUILD
	extra/gnome-contacts/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-documents/PKGBUILD
	extra/gnome-font-viewer/PKGBUILD
	extra/gnome-games/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-screenshot/PKGBUILD
	extra/gnome-session/PKGBUILD
	extra/gnome-terminal/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/grilo-plugins/PKGBUILD
	extra/gssdp/PKGBUILD
	extra/gthumb/PKGBUILD
	extra/gtkmm3/PKGBUILD
	extra/gtksourceview3/PKGBUILD
	extra/gucharmap/PKGBUILD
	extra/gupnp-av/PKGBUILD
	extra/gupnp-dlna/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/gupnp/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/js/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libgweather/PKGBUILD
	extra/liboauth/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/libsocialweb/PKGBUILD
	extra/libsoup/PKGBUILD
	extra/mash/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/mutter/PKGBUILD
	extra/mysql/PKGBUILD
	extra/nautilus-sendto/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/network-manager-applet/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/p11-kit/PKGBUILD
	extra/pango/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rest/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/rygel/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vala/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vte3/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/yelp/PKGBUILD
	extra/zeitgeist/PKGBUILD
	libre/rp-pppoe-libre/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

2 files changed, 34 insertions, 12 deletions

diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index f75f0a08b..88af35822 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,30 +1,32 @@
-# $Id: PKGBUILD 85924 2013-03-09 00:51:47Z faidoc $
+# $Id: PKGBUILD 88909 2013-04-24 17:12:07Z bgyorgy $
+# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=1.7.2
-pkgrel=1
+pkgver=1.7.3
+pkgrel=2
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/linuxmint/muffin"
 license=('GPL')
-depends=('libsm' 'clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \
+depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \
 		 'libcanberra' 'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils')
-provides=('muffin-wm')
-conflicts=('muffin-wm')
-replaces=('muffin-wm')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver")
-md5sums=('c39cd212959c7de8f834abe9e3fee8da')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver"
+        "switch-applications.patch")
+md5sums=('30e329da6af10e825dace490f13e445f'
+         'a5d5d76dc281277a8afc83d7affdcc7b')
 
 build() {
   cd linuxmint-muffin-*
 
-  autoreconf -vfi
-  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
+  # Fix windows switcher keybinding with default settings in GNOME 3.8
+  patch -Np1 -i ../switch-applications.patch
+
+  PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
   				 			 --localstatedir=/var --disable-static --disable-schemas-compile
   make
 }
diff --git a/community/muffin/switch-applications.patch b/community/muffin/switch-applications.patch
new file mode 100644
index 000000000..61b727b57
--- /dev/null
+++ b/community/muffin/switch-applications.patch
@@ -0,0 +1,20 @@
+diff -Naur linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c linuxmint-muffin-1ad6bd4/src/core/keybindings.c
+--- linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c	2013-04-15 15:53:35.000000000 +0200
++++ linuxmint-muffin-1ad6bd4/src/core/keybindings.c	2013-04-24 18:37:54.028549911 +0200
+@@ -3774,14 +3774,14 @@
+                           handle_switch, META_TAB_LIST_GROUP);
+ 
+   add_builtin_keybinding (display,
+-                          "switch-windows",
++                          "switch-applications",
+                           SCHEMA_COMMON_KEYBINDINGS,
+                           META_KEY_BINDING_REVERSES,
+                           META_KEYBINDING_ACTION_SWITCH_WINDOWS,
+                           handle_switch, META_TAB_LIST_NORMAL);
+ 
+   add_builtin_keybinding (display,
+-                          "switch-windows-backward",
++                          "switch-applications-backward",
+                           SCHEMA_COMMON_KEYBINDINGS,
+                           REVERSES_AND_REVERSED,
+                           META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD,