[arch-commits] Commit in muffin/trunk (PKGBUILD fix-dnd.patch)

[Balló György]

    Date: Thursday, May 16, 2013 @ 23:05:03
  Author: bgyorgy
Revision: 90968

upgpkg: muffin 1.8.1-2

Fix unresponsive panel again

Added:
  muffin/trunk/fix-dnd.patch
Modified:
  muffin/trunk/PKGBUILD

---------------+
 PKGBUILD      |   11 ++++++++---
 fix-dnd.patch |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-16 19:50:32 UTC (rev 90967)
+++ PKGBUILD	2013-05-16 21:05:03 UTC (rev 90968)
@@ -5,7 +5,7 @@
 
 pkgname=muffin
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/muffin"
@@ -16,9 +16,11 @@
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
-        "switch-applications.patch")
+        "switch-applications.patch"
+        "fix-dnd.patch")
 sha256sums=('6907d2b2fb78c7b710c4454ef321d40cffe5ab1273df14facbbd5cda691ccb34'
-            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96')
+            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96'
+            '4d8f5ed1bec02160d252a956ffd441ab3c119db29f690f86568dbd34474d1a90')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -26,6 +28,9 @@
   # 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
   make

Added: fix-dnd.patch
===================================================================
--- fix-dnd.patch	                        (rev 0)
+++ fix-dnd.patch	2013-05-16 21:05:03 UTC (rev 90968)
@@ -0,0 +1,51 @@
+From 9f3216b081104c92c4ce5ce3ca2cc48f14bad85a Mon Sep 17 00:00:00 2001
+From: Albert Pool <albertpool at 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 at 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
+