r52210 - in /desktop/unstable/mutter/debian: changelog patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Mar 10 16:50:58 2017
New Revision: 52210

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52210
Log:
* debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch
  - Add patch from 3.22 branch to fix a gnome-shell crash when using the
    alternatetab extension. (Closes: #857290)

Added:
    desktop/unstable/mutter/debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch
Modified:
    desktop/unstable/mutter/debian/changelog
    desktop/unstable/mutter/debian/patches/series

Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=52210&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog	[utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog	[utf-8] Fri Mar 10 16:50:58 2017
@@ -1,3 +1,11 @@
+mutter (3.22.3-2) UNRELEASED; urgency=medium
+
+  * debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch
+    - Add patch from 3.22 branch to fix a gnome-shell crash when using the
+      alternatetab extension. (Closes: #857290)
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 10 Mar 2017 17:45:26 +0100
+
 mutter (3.22.3-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/mutter/debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch?rev=52210&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch	(added)
+++ desktop/unstable/mutter/debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch	[utf-8] Fri Mar 10 16:50:58 2017
@@ -0,0 +1,60 @@
+From cc8d61e5cf912462d051e0aad14aa362d4a6a1d8 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos at gmail.com>
+Date: Thu, 2 Mar 2017 19:18:43 +0100
+Subject: [PATCH] clutter-clone: Unset source when source actor is destroyed
+
+Otherwise we might be holding on to a source actor that's no longer
+fully functioning and cause crashes if for example we try to paint it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=779483
+---
+ clutter/clutter/clutter-clone.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/clutter/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c
+index af03a4e81..f0eea2459 100644
+--- a/clutter/clutter/clutter-clone.c
++++ b/clutter/clutter/clutter-clone.c
+@@ -54,6 +54,7 @@
+ struct _ClutterClonePrivate
+ {
+   ClutterActor *clone_source;
++  gulong source_destroy_id;
+ };
+ 
+ G_DEFINE_TYPE_WITH_PRIVATE (ClutterClone, clutter_clone, CLUTTER_TYPE_ACTOR)
+@@ -377,6 +378,13 @@ clutter_clone_new (ClutterActor *source)
+ }
+ 
+ static void
++on_source_destroyed (ClutterActor *source,
++                     ClutterClone *self)
++{
++  clutter_clone_set_source_internal (self, NULL);
++}
++
++static void
+ clutter_clone_set_source_internal (ClutterClone *self,
+ 				   ClutterActor *source)
+ {
+@@ -387,6 +395,8 @@ clutter_clone_set_source_internal (ClutterClone *self,
+ 
+   if (priv->clone_source != NULL)
+     {
++      g_signal_handler_disconnect (priv->clone_source, priv->source_destroy_id);
++      priv->source_destroy_id = 0;
+       _clutter_actor_detach_clone (priv->clone_source, CLUTTER_ACTOR (self));
+       g_object_unref (priv->clone_source);
+       priv->clone_source = NULL;
+@@ -396,6 +406,8 @@ clutter_clone_set_source_internal (ClutterClone *self,
+     {
+       priv->clone_source = g_object_ref (source);
+       _clutter_actor_attach_clone (priv->clone_source, CLUTTER_ACTOR (self));
++      priv->source_destroy_id = g_signal_connect (priv->clone_source, "destroy",
++                                                  G_CALLBACK (on_source_destroyed), self);
+     }
+ 
+   g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SOURCE]);
+-- 
+2.11.0
+

Modified: desktop/unstable/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/series?rev=52210&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/series	[utf-8] Fri Mar 10 16:50:58 2017
@@ -1 +1,2 @@
 bgo768531_workaround-startup-notifications.patch
+clutter-clone-Unset-source-when-source-actor-is-dest.patch