Date: Thursday, May 2, 2013 @ 17:47:37 Author: bgyorgy Revision: 89819
archrelease: copy trunk to community-i686, community-x86_64 Added: muffin/repos/community-i686/PKGBUILD (from rev 89818, muffin/trunk/PKGBUILD) muffin/repos/community-i686/fix-dnd.patch (from rev 89818, muffin/trunk/fix-dnd.patch) muffin/repos/community-i686/muffin.install (from rev 89818, muffin/trunk/muffin.install) muffin/repos/community-i686/switch-applications.patch (from rev 89818, muffin/trunk/switch-applications.patch) muffin/repos/community-x86_64/PKGBUILD (from rev 89818, muffin/trunk/PKGBUILD) muffin/repos/community-x86_64/fix-dnd.patch (from rev 89818, muffin/trunk/fix-dnd.patch) muffin/repos/community-x86_64/muffin.install (from rev 89818, muffin/trunk/muffin.install) muffin/repos/community-x86_64/switch-applications.patch (from rev 89818, muffin/trunk/switch-applications.patch) Deleted: muffin/repos/community-i686/PKGBUILD muffin/repos/community-i686/muffin.install muffin/repos/community-i686/switch-applications.patch muffin/repos/community-x86_64/PKGBUILD muffin/repos/community-x86_64/muffin.install muffin/repos/community-x86_64/switch-applications.patch --------------------------------------------+ /PKGBUILD | 88 +++++++++++++++++++++++++++ /muffin.install | 20 ++++++ /switch-applications.patch | 40 ++++++++++++ community-i686/PKGBUILD | 40 ------------ community-i686/fix-dnd.patch | 29 ++++++++ community-i686/muffin.install | 10 --- community-i686/switch-applications.patch | 20 ------ community-x86_64/PKGBUILD | 40 ------------ community-x86_64/fix-dnd.patch | 29 ++++++++ community-x86_64/muffin.install | 10 --- community-x86_64/switch-applications.patch | 20 ------ 11 files changed, 206 insertions(+), 140 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-05-02 15:47:26 UTC (rev 89818) +++ community-i686/PKGBUILD 2013-05-02 15:47:37 UTC (rev 89819) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> -# Contributor: Adam Hani Schakaki <a...@schakaki.net> -# Contributor: Ner0 - -pkgname=muffin -pkgver=1.7.4 -pkgrel=1 -pkgdesc="Cinnamon window manager based on Mutter" -arch=('i686' 'x86_64') -url="https://github.com/linuxmint/muffin" -license=('GPL') -depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ - 'libcanberra' 'startup-notification' 'zenity' 'dconf') -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" - "switch-applications.patch") -md5sums=('d64bfe853e6fda5ec11a06581743f774' - 'a5d5d76dc281277a8afc83d7affdcc7b') - -build() { - cd linuxmint-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 -} - -package() { - cd linuxmint-muffin-* - make DESTDIR="$pkgdir/" install -} - - -# vim:set ts=2 sw=2 et: Copied: muffin/repos/community-i686/PKGBUILD (from rev 89818, muffin/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-05-02 15:47:37 UTC (rev 89819) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Contributor: Adam Hani Schakaki <a...@schakaki.net> +# Contributor: Ner0 + +pkgname=muffin +pkgver=1.7.4 +pkgrel=2 +pkgdesc="Cinnamon window manager based on Mutter" +arch=('i686' 'x86_64') +url="https://github.com/linuxmint/muffin" +license=('GPL') +depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ + 'libcanberra' 'startup-notification' 'zenity' 'dconf') +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" + "switch-applications.patch" + "fix-dnd.patch") +md5sums=('d64bfe853e6fda5ec11a06581743f774' + 'a5d5d76dc281277a8afc83d7affdcc7b' + '6d787466831def299360419cc3b5e47b') + +build() { + cd linuxmint-muffin-* + + # Fix windows switcher keybinding with default settings in GNOME 3.8 + patch -Np1 -i ../switch-applications.patch + + # Fix unresponsive panel on DND + patch -RNp1 -i ../fix-dnd.patch + + PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ + --localstatedir=/var --disable-static --disable-schemas-compile + make +} + +package() { + cd linuxmint-muffin-* + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: Copied: muffin/repos/community-i686/fix-dnd.patch (from rev 89818, muffin/trunk/fix-dnd.patch) =================================================================== --- community-i686/fix-dnd.patch (rev 0) +++ community-i686/fix-dnd.patch 2013-05-02 15:47:37 UTC (rev 89819) @@ -0,0 +1,29 @@ +From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001 +From: luyikei <luyikei.qm...@gmail.com> +Date: Wed, 16 Jan 2013 14:09:39 +0900 +Subject: [PATCH] Put the rest of redirect window types into the top window + group + +--- + src/compositor/meta-window-actor.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c +index 4113e72..66ba3c4 100644 +--- a/src/compositor/meta-window-actor.c ++++ b/src/compositor/meta-window-actor.c +@@ -1513,7 +1513,10 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) + + if (window->type == META_WINDOW_DROPDOWN_MENU || + window->type == META_WINDOW_POPUP_MENU || +- window->type == META_WINDOW_COMBO){ ++ window->type == META_WINDOW_COMBO || ++ window->type == META_WINDOW_NOTIFICATION || ++ window->type == META_WINDOW_DND || ++ window->type == META_WINDOW_OVERRIDE_OTHER){ + clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), + CLUTTER_ACTOR (self)); + } +-- +1.8.1.6 + Deleted: community-i686/muffin.install =================================================================== --- community-i686/muffin.install 2013-05-02 15:47:26 UTC (rev 89818) +++ community-i686/muffin.install 2013-05-02 15:47:37 UTC (rev 89819) @@ -1,10 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} -post_remove() { - post_install -} Copied: muffin/repos/community-i686/muffin.install (from rev 89818, muffin/trunk/muffin.install) =================================================================== --- community-i686/muffin.install (rev 0) +++ community-i686/muffin.install 2013-05-02 15:47:37 UTC (rev 89819) @@ -0,0 +1,10 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} +post_remove() { + post_install +} Deleted: community-i686/switch-applications.patch =================================================================== --- community-i686/switch-applications.patch 2013-05-02 15:47:26 UTC (rev 89818) +++ community-i686/switch-applications.patch 2013-05-02 15:47:37 UTC (rev 89819) @@ -1,20 +0,0 @@ -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, Copied: muffin/repos/community-i686/switch-applications.patch (from rev 89818, muffin/trunk/switch-applications.patch) =================================================================== --- community-i686/switch-applications.patch (rev 0) +++ community-i686/switch-applications.patch 2013-05-02 15:47:37 UTC (rev 89819) @@ -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, Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-05-02 15:47:26 UTC (rev 89818) +++ community-x86_64/PKGBUILD 2013-05-02 15:47:37 UTC (rev 89819) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> -# Contributor: Adam Hani Schakaki <a...@schakaki.net> -# Contributor: Ner0 - -pkgname=muffin -pkgver=1.7.4 -pkgrel=1 -pkgdesc="Cinnamon window manager based on Mutter" -arch=('i686' 'x86_64') -url="https://github.com/linuxmint/muffin" -license=('GPL') -depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ - 'libcanberra' 'startup-notification' 'zenity' 'dconf') -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" - "switch-applications.patch") -md5sums=('d64bfe853e6fda5ec11a06581743f774' - 'a5d5d76dc281277a8afc83d7affdcc7b') - -build() { - cd linuxmint-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 -} - -package() { - cd linuxmint-muffin-* - make DESTDIR="$pkgdir/" install -} - - -# vim:set ts=2 sw=2 et: Copied: muffin/repos/community-x86_64/PKGBUILD (from rev 89818, muffin/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-05-02 15:47:37 UTC (rev 89819) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Contributor: Adam Hani Schakaki <a...@schakaki.net> +# Contributor: Ner0 + +pkgname=muffin +pkgver=1.7.4 +pkgrel=2 +pkgdesc="Cinnamon window manager based on Mutter" +arch=('i686' 'x86_64') +url="https://github.com/linuxmint/muffin" +license=('GPL') +depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ + 'libcanberra' 'startup-notification' 'zenity' 'dconf') +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" + "switch-applications.patch" + "fix-dnd.patch") +md5sums=('d64bfe853e6fda5ec11a06581743f774' + 'a5d5d76dc281277a8afc83d7affdcc7b' + '6d787466831def299360419cc3b5e47b') + +build() { + cd linuxmint-muffin-* + + # Fix windows switcher keybinding with default settings in GNOME 3.8 + patch -Np1 -i ../switch-applications.patch + + # Fix unresponsive panel on DND + patch -RNp1 -i ../fix-dnd.patch + + PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ + --localstatedir=/var --disable-static --disable-schemas-compile + make +} + +package() { + cd linuxmint-muffin-* + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: Copied: muffin/repos/community-x86_64/fix-dnd.patch (from rev 89818, muffin/trunk/fix-dnd.patch) =================================================================== --- community-x86_64/fix-dnd.patch (rev 0) +++ community-x86_64/fix-dnd.patch 2013-05-02 15:47:37 UTC (rev 89819) @@ -0,0 +1,29 @@ +From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001 +From: luyikei <luyikei.qm...@gmail.com> +Date: Wed, 16 Jan 2013 14:09:39 +0900 +Subject: [PATCH] Put the rest of redirect window types into the top window + group + +--- + src/compositor/meta-window-actor.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c +index 4113e72..66ba3c4 100644 +--- a/src/compositor/meta-window-actor.c ++++ b/src/compositor/meta-window-actor.c +@@ -1513,7 +1513,10 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) + + if (window->type == META_WINDOW_DROPDOWN_MENU || + window->type == META_WINDOW_POPUP_MENU || +- window->type == META_WINDOW_COMBO){ ++ window->type == META_WINDOW_COMBO || ++ window->type == META_WINDOW_NOTIFICATION || ++ window->type == META_WINDOW_DND || ++ window->type == META_WINDOW_OVERRIDE_OTHER){ + clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), + CLUTTER_ACTOR (self)); + } +-- +1.8.1.6 + Deleted: community-x86_64/muffin.install =================================================================== --- community-x86_64/muffin.install 2013-05-02 15:47:26 UTC (rev 89818) +++ community-x86_64/muffin.install 2013-05-02 15:47:37 UTC (rev 89819) @@ -1,10 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} -post_remove() { - post_install -} Copied: muffin/repos/community-x86_64/muffin.install (from rev 89818, muffin/trunk/muffin.install) =================================================================== --- community-x86_64/muffin.install (rev 0) +++ community-x86_64/muffin.install 2013-05-02 15:47:37 UTC (rev 89819) @@ -0,0 +1,10 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} +post_remove() { + post_install +} Deleted: community-x86_64/switch-applications.patch =================================================================== --- community-x86_64/switch-applications.patch 2013-05-02 15:47:26 UTC (rev 89818) +++ community-x86_64/switch-applications.patch 2013-05-02 15:47:37 UTC (rev 89819) @@ -1,20 +0,0 @@ -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, Copied: muffin/repos/community-x86_64/switch-applications.patch (from rev 89818, muffin/trunk/switch-applications.patch) =================================================================== --- community-x86_64/switch-applications.patch (rev 0) +++ community-x86_64/switch-applications.patch 2013-05-02 15:47:37 UTC (rev 89819) @@ -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,