[gentoo-commits] proj/gnome:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     34b3b429e948921b3a733b846bae4fa71b873440
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 05:19:17 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 18 05:19:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=34b3b429

x11-wm/mutter: 3.2.0 → 3.2.1

Bump, fixes crashes, multiple monitor support, invisible window border
drawing, and keyboard shortcuts.

---
 ...tter-3.2.0-clutter_actor_get_effects-leak.patch |   38 --------------------
 ...{mutter-3.2.0-r1.ebuild => mutter-3.2.1.ebuild} |    8 +----
 2 files changed, 1 insertions(+), 45 deletions(-)

diff --git a/x11-wm/mutter/files/mutter-3.2.0-clutter_actor_get_effects-leak.patch b/x11-wm/mutter/files/mutter-3.2.0-clutter_actor_get_effects-leak.patch
deleted file mode 100644
index e269c5b..0000000
--- a/x11-wm/mutter/files/mutter-3.2.0-clutter_actor_get_effects-leak.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1b4dce6f843d50fbc9b0fa8f86527788fb0c29d7 Mon Sep 17 00:00:00 2001
-From: Adel Gadllah <adel.gadllah@gmail.com>
-Date: Thu, 29 Sep 2011 13:16:33 +0000
-Subject: meta-window-group: Plug memory leak
-
-We have to free the list returned by clutter_actor_get_effects() .
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660464
----
-diff --git a/src/compositor/meta-window-group.c b/src/compositor/meta-window-group.c
-index 107e7ba..8889503 100644
---- a/src/compositor/meta-window-group.c
-+++ b/src/compositor/meta-window-group.c
-@@ -108,7 +108,7 @@ meta_window_group_paint (ClutterActor *actor)
-   cairo_region_t *unredirected_window_region = NULL;
-   ClutterActor *stage;
-   cairo_rectangle_int_t visible_rect, unredirected_rect;
--  GList *children, *l;
-+  GList *children, *l, *effects;
- 
-   MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
-   MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen);
-@@ -161,8 +161,11 @@ meta_window_group_paint (ClutterActor *actor)
-        * as well for the same reason, but omitted for simplicity in the
-        * hopes that no-one will do that.
-        */
--      if (clutter_actor_get_effects (l->data) != NULL)
--        continue;
-+      if ((effects = clutter_actor_get_effects (l->data)) != NULL)
-+        {
-+          g_list_free (effects);
-+          continue;
-+        }
- 
-       if (META_IS_WINDOW_ACTOR (l->data))
-         {
---
-cgit v0.9.0.2

diff --git a/x11-wm/mutter/mutter-3.2.0-r1.ebuild b/x11-wm/mutter/mutter-3.2.1.ebuild
similarity index 91%
rename from x11-wm/mutter/mutter-3.2.0-r1.ebuild
rename to x11-wm/mutter/mutter-3.2.1.ebuild
index afcaf9a..11ab719 100644
--- a/x11-wm/mutter/mutter-3.2.0-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -77,9 +77,3 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_enable xinerama)"
 }
-
-src_prepare() {
-	gnome2_src_prepare
-	# Fix memory leak, will be in next release
-	epatch "${FILESDIR}/${P}-clutter_actor_get_effects-leak.patch"
-}