[arch-commits] Commit in cinnamon/trunk (3 files)
Balló György
bgyorgy at nymeria.archlinux.org
Thu Apr 25 02:01:38 UTC 2013
Date: Thursday, April 25, 2013 @ 04:01:38
Author: bgyorgy
Revision: 88933
upgpkg: cinnamon 1.7.4-3
Fix Alt-Tab switcher keybinding, add media keys and mount helpers (FS#34924)
Added:
cinnamon/trunk/fallback-helpers.patch
cinnamon/trunk/switch-applications.patch
Modified:
cinnamon/trunk/PKGBUILD
---------------------------+
PKGBUILD | 24 +++++++++++++------
fallback-helpers.patch | 21 ++++++++++++++++
switch-applications.patch | 55 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 93 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-24 22:25:52 UTC (rev 88932)
+++ PKGBUILD 2013-04-25 02:01:38 UTC (rev 88933)
@@ -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 @@
'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 @@
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,14 +48,20 @@
# 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 \
--libexecdir=/usr/lib/cinnamon \
Added: fallback-helpers.patch
===================================================================
--- fallback-helpers.patch (rev 0)
+++ fallback-helpers.patch 2013-04-25 02:01:38 UTC (rev 88933)
@@ -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
Added: switch-applications.patch
===================================================================
--- switch-applications.patch (rev 0)
+++ switch-applications.patch 2013-04-25 02:01:38 UTC (rev 88933)
@@ -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));
More information about the arch-commits
mailing list