r54317 - in /desktop/experimental/mutter/debian: changelog patches/git_fix_xorg_maximize_crash.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Tue Oct 10 14:22:21 2017
New Revision: 54317

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54317
Log:
Add git_fix_xorg_maximize_crash.patch (LP: #1722510)

Cherry-pick fix for crash when closing windows on Budgie or
GNOME Shell (LP: #1722510)

Added:
    desktop/experimental/mutter/debian/patches/git_fix_xorg_maximize_crash.patch
Modified:
    desktop/experimental/mutter/debian/changelog
    desktop/experimental/mutter/debian/patches/series

Modified: desktop/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/changelog?rev=54317&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog	[utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog	[utf-8] Tue Oct 10 14:22:21 2017
@@ -1,3 +1,11 @@
+mutter (3.26.1-2) UNRELEASED; urgency=medium
+
+  * Add git_fix_xorg_maximize_crash.patch:
+    - Cherry-pick fix for crash when closing windows on Budgie or
+      GNOME Shell (LP: #1722510)
+
+ -- Jeremy Bicha <jbicha at debian.org>  Tue, 10 Oct 2017 10:17:47 -0400
+
 mutter (3.26.1-1) experimental; urgency=medium
 
   * New upstream release

Added: desktop/experimental/mutter/debian/patches/git_fix_xorg_maximize_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/git_fix_xorg_maximize_crash.patch?rev=54317&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/git_fix_xorg_maximize_crash.patch	(added)
+++ desktop/experimental/mutter/debian/patches/git_fix_xorg_maximize_crash.patch	[utf-8] Tue Oct 10 14:22:21 2017
@@ -0,0 +1,33 @@
+Description: [PATCH] x11: Protect XChangeProperty call with error traps
+ When closing maximized window of any GTK app gnome-shell and
+ budgie desktop crashes and restarts. This issue specifically affects
+ users of the gnome-shell xorg session together with all budgie desktop
+ users.
+Author: polygamma <jonny.westphalen at googlemail.com>
+Origin: upstream commit f9c625924e5358afd3e47733e68d166770edd496
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788666
+Bug-Ubuntu: https://launchpad.net/bugs/1722510
+Last-Update: 2017-10-09
+
+---
+ src/x11/window-x11.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
+index 36a5e70a3..4885f5fea 100644
+--- a/src/x11/window-x11.c
++++ b/src/x11/window-x11.c
+@@ -920,11 +920,13 @@ update_gtk_edge_constraints (MetaWindow *window)
+ 
+   meta_verbose ("Setting _GTK_EDGE_CONSTRAINTS to %lu\n", data[0]);
+ 
++  meta_error_trap_push (window->display);
+   XChangeProperty (window->display->xdisplay,
+                    window->xwindow,
+                    window->display->atom__GTK_EDGE_CONSTRAINTS,
+                    XA_CARDINAL, 32, PropModeReplace,
+                    (guchar*) data, 1);
++  meta_error_trap_pop (window->display);
+ }
+ 
+ static gboolean

Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=54317&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series	[utf-8] Tue Oct 10 14:22:21 2017
@@ -1,3 +1,4 @@
 bgo768531_workaround-startup-notifications.patch
 skip-failing-tests.patch
 skip-failing-tests-325.patch
+git_fix_xorg_maximize_crash.patch