From 453f3b8b2c568e9babcdc4852772278a39f130c0 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 16 May 2013 01:06:25 -0700 Subject: Thu May 16 01:06:25 PDT 2013 --- community/muffin/PKGBUILD | 15 +++++---------- community/muffin/fix-dnd.patch | 29 ----------------------------- 2 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 community/muffin/fix-dnd.patch (limited to 'community/muffin') diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index e73fd266a..a21cfe27d 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90125 2013-05-06 21:32:15Z faidoc $ +# $Id: PKGBUILD 90940 2013-05-15 21:35:03Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') @@ -16,11 +16,9 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" - "switch-applications.patch" - "fix-dnd.patch") -sha256sums=('4b3f872c0a0325d88d2d6ece4b67202b7b91b89634fb3c8ff93ebd5c6acfbd67' - '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' - '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939') + "switch-applications.patch") +sha256sums=('6907d2b2fb78c7b710c4454ef321d40cffe5ab1273df14facbbd5cda691ccb34' + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96') build() { cd ${pkgname}-${pkgver} @@ -28,9 +26,6 @@ build() { # 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 diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch deleted file mode 100644 index f30e22521..000000000 --- a/community/muffin/fix-dnd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001 -From: luyikei -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 - -- cgit v1.2.3-54-g00ecf