r43964 - in /desktop/unstable/mutter/debian: changelog control patches/10_window-actor_unredirect.patch patches/11_black_background.patch patches/series

Sun Nov 30 14:15:40 UTC 2014

Author: joss
Date: Sun Nov 30 14:15:40 2014
New Revision: 43964

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43964
Log:
* New upstream bugfix release.
* 10_window-actor_unredirect.patch: patch from upstream git. Fix crash 
  when closing a window.
* 11_black_background.patch: patch from upstream git. Don’t set a 
  black background when switching from the display manager.

Added:
    desktop/unstable/mutter/debian/patches/10_window-actor_unredirect.patch
    desktop/unstable/mutter/debian/patches/11_black_background.patch
Modified:
    desktop/unstable/mutter/debian/changelog
    desktop/unstable/mutter/debian/control
    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=43964&op=diff
==============================================================================

--- desktop/unstable/mutter/debian/changelog	[utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog	[utf-8] Sun Nov 30 14:15:40 2014
@@ -1,3 +1,13 @@
+mutter (3.14.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * 10_window-actor_unredirect.patch: patch from upstream git. Fix crash 
+    when closing a window.
+  * 11_black_background.patch: patch from upstream git. Don’t set a 
+    black background when switching from the display manager.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 30 Nov 2014 15:05:14 +0100
+
 mutter (3.14.1-2) unstable; urgency=medium
 
   * gir1.2-mutter-3.0: tighten dependency on libmutter0e by making

Modified: desktop/unstable/mutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/control?rev=43964&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/control	[utf-8] (original)
+++ desktop/unstable/mutter/debian/control	[utf-8] Sun Nov 30 14:15:40 2014
@@ -6,7 +6,7 @@
 Section: x11
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs (>= 0.4.90),
                debhelper (>= 9),
                gnome-pkg-tools (>= 0.10),

Added: desktop/unstable/mutter/debian/patches/10_window-actor_unredirect.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/10_window-actor_unredirect.patch?rev=43964&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/10_window-actor_unredirect.patch	(added)
+++ desktop/unstable/mutter/debian/patches/10_window-actor_unredirect.patch	[utf-8] Sun Nov 30 14:15:40 2014
@@ -0,0 +1,27 @@
+From 2e7b9e0dfed8ca637cf70bc160489610b93234fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Fri, 14 Nov 2014 13:23:15 +0100
+Subject: window-actor: Do not request unredirection when destroyed
+
+WindowActors can outlive their corresponding window to animate unmap.
+Unredirecting the actor does not make sense in that case, so make
+sure to not request it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740133
+
+diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
+index 39864d6..eb21c46 100644
+--- a/src/compositor/meta-window-actor.c
++++ b/src/compositor/meta-window-actor.c
+@@ -1155,7 +1155,7 @@ gboolean
+ meta_window_actor_should_unredirect (MetaWindowActor *self)
+ {
+   MetaWindowActorPrivate *priv = self->priv;
+-  if (priv->surface)
++  if (!meta_window_actor_is_destroyed (self) && priv->surface)
+     return meta_surface_actor_should_unredirect (priv->surface);
+   else
+     return FALSE;
+-- 
+cgit v0.10.1
+

Added: desktop/unstable/mutter/debian/patches/11_black_background.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/11_black_background.patch?rev=43964&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/11_black_background.patch	(added)
+++ desktop/unstable/mutter/debian/patches/11_black_background.patch	[utf-8] Sun Nov 30 14:15:40 2014
@@ -0,0 +1,44 @@
+From 6d3e64226d43a55f4554e1dcacaf56d81d3dae86 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 20 Nov 2014 14:40:19 -0500
+Subject: Revert "screen: Set a black background for testing purposes"
+
+This reverts commit ec8ed1dbb04ce8169c0a38ddf066d5565117c587.
+
+1) It turns out to add a momentary flicker from the transition
+between the login screen and user session
+2) It actually isn't needed anymore since bug 733026
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740377
+
+diff --git a/src/core/screen.c b/src/core/screen.c
+index dbf3f60..b26137e 100644
+--- a/src/core/screen.c
++++ b/src/core/screen.c
+@@ -496,15 +496,6 @@ create_guard_window (Display *xdisplay, MetaScreen *screen)
+   return guard_window;
+ }
+ 
+-/* Set a black background on the root window so that we don't
+- * see confusing old copies of old windows when debugging
+- * and testing. */
+-static void
+-meta_screen_set_background (MetaScreen *screen)
+-{
+-  XSetWindowBackground (screen->display->xdisplay, screen->xroot, 0x00000000);
+-}
+-
+ MetaScreen*
+ meta_screen_new (MetaDisplay *display,
+                  int          number,
+@@ -709,7 +700,6 @@ meta_screen_new (MetaDisplay *display,
+   reload_monitor_infos (screen);
+ 
+   meta_screen_set_cursor (screen, META_CURSOR_DEFAULT);
+-  meta_screen_set_background (screen);
+ 
+   /* Handle creating a no_focus_window for this screen */
+   screen->no_focus_window =
+-- 
+cgit v0.10.1
+

Modified: desktop/unstable/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/series?rev=43964&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/series	[utf-8] Sun Nov 30 14:15:40 2014
@@ -1 +1,3 @@
 01_Wcast-align.patch
+10_window-actor_unredirect.patch
+11_black_background.patch


