Fri Apr 26 00:59:18 PDT 2013

3 files changed, 94 insertions, 8 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));