r40234 - in /desktop/experimental/mutter/debian: changelog patches/prevent-double-lock-deadlock.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Tue Nov  5 09:56:28 2013
New Revision: 40234

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40234
Log:
* debian/patches/prevent-double-lock-deadlock.patch:
  + Added. Don't call X functions that lock the display in code paths that
    have already locked the display if X threads have been initialized
    (bgo#704101)

Added:
    desktop/experimental/mutter/debian/patches/prevent-double-lock-deadlock.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=40234&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog	[utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog	[utf-8] Tue Nov  5 09:56:28 2013
@@ -1,3 +1,12 @@
+mutter (3.10.1-3) UNRELEASED; urgency=low
+
+  * debian/patches/prevent-double-lock-deadlock.patch:
+    + Added. Don't call X functions that lock the display in code paths that
+      have already locked the display if X threads have been initialized
+      (bgo#704101)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 05 Nov 2013 10:55:32 +0100
+
 mutter (3.10.1-2) experimental; urgency=low
 
   * Force build against G3.10 version of gnome-desktop

Added: desktop/experimental/mutter/debian/patches/prevent-double-lock-deadlock.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/prevent-double-lock-deadlock.patch?rev=40234&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/prevent-double-lock-deadlock.patch	(added)
+++ desktop/experimental/mutter/debian/patches/prevent-double-lock-deadlock.patch	[utf-8] Tue Nov  5 09:56:28 2013
@@ -0,0 +1,15 @@
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -9566,7 +9566,11 @@
+    * GDK will handle later these events, and eventually
+    * free the cookie data itself.
+    */
+-  XGetEventData (display, &ev->xcookie);
++   /* We do NOT call XGetEventData (display, &ev->xcookie); here
++     because we're not supposed to call X functions from within a predicate.
++     XGetEventData has a lock, which fails as XCheckIfEvent has
++     already locked.  */
++  _XFetchEventCookie(display, &ev->xcookie);
+   xev = (XIEvent *) ev->xcookie.data;
+ 
+   if (xev->evtype != XI_Motion)

Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=40234&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series	[utf-8] Tue Nov  5 09:56:28 2013
@@ -1 +1,2 @@
 01_Wcast-align.patch
+prevent-double-lock-deadlock.patch