diff options
Diffstat (limited to 'community/muffin')
| -rw-r--r-- | community/muffin/PKGBUILD | 16 | ||||
| -rw-r--r-- | community/muffin/fix-dnd.patch | 51 |
2 files changed, 6 insertions, 61 deletions
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 462b6ff07..a577edb80 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90969 2013-05-16 21:05:16Z bgyorgy $ +# $Id: PKGBUILD 91466 2013-05-23 00:58:44Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.2 +pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -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=('6907d2b2fb78c7b710c4454ef321d40cffe5ab1273df14facbbd5cda691ccb34' - '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' - '4d8f5ed1bec02160d252a956ffd441ab3c119db29f690f86568dbd34474d1a90') + "switch-applications.patch") +sha256sums=('903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049' + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96') build() { cd ${pkgname}-${pkgver} @@ -28,8 +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 -Np1 -i ../fix-dnd.patch PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch deleted file mode 100644 index 268ea296e..000000000 --- a/community/muffin/fix-dnd.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 9f3216b081104c92c4ce5ce3ca2cc48f14bad85a Mon Sep 17 00:00:00 2001 -From: Albert Pool <albertpool@solcon.nl> -Date: Mon, 13 May 2013 12:04:17 +0200 -Subject: [PATCH 1/2] Remove NOTIFICATION from top window group - ---- - src/compositor/meta-window-actor.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c -index de8d292..7b0f83c 100644 ---- a/src/compositor/meta-window-actor.c -+++ b/src/compositor/meta-window-actor.c -@@ -1514,7 +1514,6 @@ 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_NOTIFICATION || - window->type == META_WINDOW_OVERRIDE_OTHER){ - clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), - CLUTTER_ACTOR (self)); --- -1.8.1.6 - - -From bbbde724320036f894779c2402fc6eba969428d2 Mon Sep 17 00:00:00 2001 -From: Albert Pool <albertpool@solcon.nl> -Date: Mon, 13 May 2013 12:09:58 +0200 -Subject: [PATCH 2/2] Remove OVERRIDE_OTHER from top window group - ---- - src/compositor/meta-window-actor.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c -index 7b0f83c..fb77f1d 100644 ---- a/src/compositor/meta-window-actor.c -+++ b/src/compositor/meta-window-actor.c -@@ -1513,8 +1513,7 @@ 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_OVERRIDE_OTHER){ -+ window->type == META_WINDOW_COMBO) { - clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), - CLUTTER_ACTOR (self)); - } --- -1.8.1.6 - |