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

[Alexandre Restovtsev]

commit:     11678b04097c3a43cb3c2eb9b983660424eaf652
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jul 28 06:07:48 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jul 28 06:07:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=11678b04

x11-wm/mutter: 3.1.3.1 → 3.1.4

Version bump with various bugfixes and improvements. Update clutter
dependency. Patches have been applied upstream.

---
 .../files/mutter-3.1.3.1-crash-on-exit.patch       |   37 -----
 .../mutter-3.1.3.1-meta_later-reentrant.patch      |  141 --------------------
 .../{mutter-3.1.3.1.ebuild => mutter-3.1.4.ebuild} |   12 +--
 3 files changed, 2 insertions(+), 188 deletions(-)

diff --git a/x11-wm/mutter/files/mutter-3.1.3.1-crash-on-exit.patch b/x11-wm/mutter/files/mutter-3.1.3.1-crash-on-exit.patch
deleted file mode 100644
index 65d9ab4..0000000
--- a/x11-wm/mutter/files/mutter-3.1.3.1-crash-on-exit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d2b63eaf1f5486380595f3ebb7a26386c1f20363 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@×××××.org>
-Date: Tue, 12 Jul 2011 17:07:15 +0000
-Subject: fix a crash-on-exit
-
-meta_frames_destroy() was not safe to be called multiple times, which
-was causing a crash on exit due to something else changing somewhere
-that makes it get called multiple times.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=654489
----
-diff --git a/src/ui/frames.c b/src/ui/frames.c
-index d9e2bca..167d5dc 100644
---- a/src/ui/frames.c
-+++ b/src/ui/frames.c
-@@ -313,8 +313,17 @@ meta_frames_destroy (GtkWidget *object)
-     }
-   g_slist_free (winlist);
- 
--  g_object_unref (frames->normal_style);
--  g_hash_table_destroy (frames->style_variants);
-+  if (frames->normal_style)
-+    {
-+      g_object_unref (frames->normal_style);
-+      frames->normal_style = NULL;
-+    }
-+
-+  if (frames->style_variants)
-+    {
-+      g_hash_table_destroy (frames->style_variants);
-+      frames->style_variants = NULL;
-+    }
- 
-   GTK_WIDGET_CLASS (meta_frames_parent_class)->destroy (object);
- }
---
-cgit v0.9

diff --git a/x11-wm/mutter/files/mutter-3.1.3.1-meta_later-reentrant.patch b/x11-wm/mutter/files/mutter-3.1.3.1-meta_later-reentrant.patch
deleted file mode 100644
index 63387f8..0000000
--- a/x11-wm/mutter/files/mutter-3.1.3.1-meta_later-reentrant.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From cd7a9680932868d1d2ef5447c77712cef9a443dd Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@×××××.org>
-Date: Tue, 29 Mar 2011 19:18:57 +0000
-Subject: util: fix a reentrancy problem with meta_later
-
-Calling meta_later_add() or meta_later_remove() from within a
-META_LATER_BEFORE_REDRAW callback ended up being a no-op, because of
-how run_repaint_laters() was fiddling with the laters list. (This
-resulted in a crash in window.c:idle_calc_repaint(), which assumed it
-would only be called when a certain queue was non-empty, but was
-getting called anyway because of a failed meta_later_remove() call.)
-
-Fix this by having run_repaint_laters() work on a copy of the laters
-list instead, and add refcounting to MetaLater so that removing a
-later that run_repaint_laters() hasn't gotten to yet won't cause
-problems.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=642957
----
-diff --git a/src/core/util.c b/src/core/util.c
-index aea1210..2ce5f79 100644
---- a/src/core/util.c
-+++ b/src/core/util.c
-@@ -708,6 +708,7 @@ static guint last_later_id = 0;
- typedef struct
- {
-   guint id;
-+  guint ref_count;
-   MetaLaterType when;
-   GSourceFunc func;
-   gpointer data;
-@@ -724,13 +725,29 @@ static guint later_repaint_func = 0;
- static void ensure_later_repaint_func (void);
- 
- static void
-+unref_later (MetaLater *later)
-+{
-+  if (--later->ref_count == 0)
-+    {
-+      if (later->notify)
-+        {
-+          later->notify (later->data);
-+          later->notify = NULL;
-+        }
-+      g_slice_free (MetaLater, later);
-+    }
-+}
-+
-+static void
- destroy_later (MetaLater *later)
- {
-   if (later->source)
--    g_source_remove (later->source);
--  if (later->notify)
--    later->notify (later->data);
--  g_slice_free (MetaLater, later);
-+    {
-+      g_source_remove (later->source);
-+      later->source = 0;
-+    }
-+  later->func = NULL;
-+  unref_later (later);
- }
- 
- /* Used to sort the list of laters with the highest priority
-@@ -746,34 +763,41 @@ compare_laters (gconstpointer a,
- static gboolean
- run_repaint_laters (gpointer data)
- {
--  GSList *old_laters = laters;
-+  GSList *laters_copy;
-   GSList *l;
-   gboolean keep_timeline_running = FALSE;
--  laters = NULL;
- 
--  for (l = old_laters; l; l = l->next)
-+  laters_copy = NULL;
-+  for (l = laters; l; l = l->next)
-     {
-       MetaLater *later = l->data;
-       if (later->source == 0 ||
-           (later->when <= META_LATER_BEFORE_REDRAW && !later->run_once))
-         {
--          if (later->func (later->data))
--            {
--              if (later->source == 0)
--                keep_timeline_running = TRUE;
--              laters = g_slist_insert_sorted (laters, later, compare_laters);
--            }
--          else
--            destroy_later (later);
-+          later->ref_count++;
-+          laters_copy = g_slist_prepend (laters_copy, later);
-+        }
-+    }
-+  laters_copy = g_slist_reverse (laters_copy);
-+
-+  for (l = laters_copy; l; l = l->next)
-+    {
-+      MetaLater *later = l->data;
-+
-+      if (later->func && later->func (later->data))
-+        {
-+          if (later->source == 0)
-+            keep_timeline_running = TRUE;
-         }
-       else
--        laters = g_slist_insert_sorted (laters, later, compare_laters);
-+        meta_later_remove (later->id);
-+      unref_later (later);
-     }
- 
-   if (!keep_timeline_running)
-     clutter_timeline_stop (later_timeline);
- 
--  g_slist_free (old_laters);
-+  g_slist_free (laters_copy);
- 
-   /* Just keep the repaint func around - it's cheap if the list is empty */
-   return TRUE;
-@@ -800,9 +824,7 @@ call_idle_later (gpointer data)
- 
-   if (!later->func (later->data))
-     {
--      laters = g_slist_remove (laters, later);
--      later->source = 0;
--      destroy_later (later);
-+      meta_later_remove (later->id);
-       return FALSE;
-     }
-   else
-@@ -838,6 +860,7 @@ meta_later_add (MetaLaterType  when,
-   MetaLater *later = g_slice_new0 (MetaLater);
- 
-   later->id = ++last_later_id;
-+  later->ref_count = 1;
-   later->when = when;
-   later->func = func;
-   later->data = data;
---
-cgit v0.9

diff --git a/x11-wm/mutter/mutter-3.1.3.1.ebuild b/x11-wm/mutter/mutter-3.1.4.ebuild
similarity index 87%
rename from x11-wm/mutter/mutter-3.1.3.1.ebuild
rename to x11-wm/mutter/mutter-3.1.4.ebuild
index 3f8a0e9..8758e2c 100644
--- a/x11-wm/mutter/mutter-3.1.3.1.ebuild
+++ b/x11-wm/mutter/mutter-3.1.4.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
@@ -29,7 +29,7 @@ COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	>=x11-libs/gtk+-2.91.7:3[introspection?]
 	>=gnome-base/gconf-2:2
 	>=dev-libs/glib-2.14:2
-	>=media-libs/clutter-1.2:1.0
+	>=media-libs/clutter-1.7.5:1.0
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
@@ -76,11 +76,3 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_enable xinerama)"
 }
-
-src_prepare() {
-	# Crash fixes from upstream git, will be in next release
-	epatch "${FILESDIR}/${P}-crash-on-exit.patch"
-	epatch "${FILESDIR}/${P}-meta_later-reentrant.patch"
-
-	gnome2_src_prepare
-}