From 6e4a9ce4b0809e1eeb57f514f5ea71e2e77355bb Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 24 Apr 2013 00:49:38 -0700
Subject: Wed Apr 24 00:49:37 PDT 2013

---
 community/metacity/PKGBUILD                   | 13 +++++++++----
 community/metacity/application-switcher.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 community/metacity/application-switcher.patch

(limited to 'community/metacity')

diff --git a/community/metacity/PKGBUILD b/community/metacity/PKGBUILD
index 5955d5b88..1eef10aa0 100644
--- a/community/metacity/PKGBUILD
+++ b/community/metacity/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88686 2013-04-21 22:17:01Z heftig $
+# $Id: PKGBUILD 88820 2013-04-23 01:21:30Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=metacity
 pkgver=2.34.13
-pkgrel=4
+pkgrel=5
 pkgdesc="Legacy GNOME window manager"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,12 +17,14 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p
         fix_compositing_startup.patch
         fix_force_quit.patch
         fix_shadows.patch
-        enable_compositing.patch)
+        enable_compositing.patch
+        application-switcher.patch)
 sha256sums=('8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075'
             '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2'
             '917760ac3375894ebb4052dfc7c8dff1ac556fb81033d7a7caf02123ceede50d'
             'a0981477e9b3fd108fd03b7637bfd1f17a1f6cb13ec703d86b424b55076096f3'
-            'e53c1c20e19cd3d94d05d08045c7a9a373ce52051928ccc69bf3068081f30f9a')
+            'e53c1c20e19cd3d94d05d08045c7a9a373ce52051928ccc69bf3068081f30f9a'
+            '177ded8203c3ff25f59a24445145cb54da9aba4216a0014c34979b7c12f3c099')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -39,6 +41,9 @@ build() {
   # Enable compositing by default (required for the desktop rendering feature of nautilus)
   patch -Np1 -i "$srcdir/enable_compositing.patch"
 
+  # Rename switch-windows to switch-applications (required for GNOME 3.8 compatibility)
+  patch -Np1 -i "$srcdir/application-switcher.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-schemas-compile
   make
diff --git a/community/metacity/application-switcher.patch b/community/metacity/application-switcher.patch
new file mode 100644
index 000000000..2832d262c
--- /dev/null
+++ b/community/metacity/application-switcher.patch
@@ -0,0 +1,26 @@
+diff -Naur metacity-2.34.13.orig/src/50-metacity-navigation.xml.in metacity-2.34.13/src/50-metacity-navigation.xml.in
+--- metacity-2.34.13.orig/src/50-metacity-navigation.xml.in	2012-10-15 20:06:27.000000000 +0200
++++ metacity-2.34.13/src/50-metacity-navigation.xml.in	2013-04-23 02:35:18.000734619 +0200
+@@ -29,7 +29,7 @@
+ 	<KeyListEntry name="move-to-workspace-down"
+ 	              _description="Move window one workspace down" />
+ 
+-	<KeyListEntry name="switch-windows"
++	<KeyListEntry name="switch-applications"
+ 	              _description="Switch applications"/>
+ 
+ 	<KeyListEntry name="switch-group"
+diff -Naur metacity-2.34.13.orig/src/include/all-keybindings.h metacity-2.34.13/src/include/all-keybindings.h
+--- metacity-2.34.13.orig/src/include/all-keybindings.h	2012-02-09 19:07:40.000000000 +0100
++++ metacity-2.34.13/src/include/all-keybindings.h	2013-04-23 02:34:22.632775305 +0200
+@@ -126,8 +126,8 @@
+ keybind (switch-group, handle_switch, META_TAB_LIST_GROUP, BINDING_REVERSES)
+ keybind (switch-group-backward, handle_switch, META_TAB_LIST_GROUP,
+          REVERSES_AND_REVERSED)
+-keybind (switch-windows, handle_switch, META_TAB_LIST_NORMAL, BINDING_REVERSES)
+-keybind (switch-windows-backward, handle_switch, META_TAB_LIST_NORMAL,
++keybind (switch-applications, handle_switch, META_TAB_LIST_NORMAL, BINDING_REVERSES)
++keybind (switch-applications-backward, handle_switch, META_TAB_LIST_NORMAL,
+          REVERSES_AND_REVERSED)
+ keybind (switch-panels, handle_switch, META_TAB_LIST_DOCKS, BINDING_REVERSES)
+ keybind (switch-panels-backward, handle_switch, META_TAB_LIST_DOCKS,
-- 
cgit v1.2.3-54-g00ecf