X Strike Force X.Org X11 SVN commit: r4084 - in trunk/lib/libxfixes/debian: . patches
Author: jamey
Date: 2006-11-27 15:36:14 -0500 (Mon, 27 Nov 2006)
New Revision: 4084
Added:
trunk/lib/libxfixes/debian/patches/00_upstream_000_unlockdisplay.diff
Modified:
trunk/lib/libxfixes/debian/changelog
trunk/lib/libxfixes/debian/patches/series
Log:
Add upstream patch to fix bug #400446.
Modified: trunk/lib/libxfixes/debian/changelog
===================================================================
--- trunk/lib/libxfixes/debian/changelog 2006-11-27 20:30:20 UTC (rev 4083)
+++ trunk/lib/libxfixes/debian/changelog 2006-11-27 20:36:14 UTC (rev 4084)
@@ -1,3 +1,10 @@
+libxfixes (1:4.0.1-5) UNRELEASED; urgency=low
+
+ * libXfixes: Unlocks the Display without having it locked (Closes:
+ #400446)
+
+ -- Jamey Sharp <sharpone@debian.org> Mon, 27 Nov 2006 12:34:54 -0800
+
libxfixes (1:4.0.1-4) unstable; urgency=low
[ Drew Parsons ]
Added: trunk/lib/libxfixes/debian/patches/00_upstream_000_unlockdisplay.diff
===================================================================
--- trunk/lib/libxfixes/debian/patches/00_upstream_000_unlockdisplay.diff (rev 0)
+++ trunk/lib/libxfixes/debian/patches/00_upstream_000_unlockdisplay.diff 2006-11-27 20:36:14 UTC (rev 4084)
@@ -0,0 +1,21 @@
+From: Lars Knoll <lars@trolltech.com>
+Date: Sun, 15 Oct 2006 21:13:14 +0000 (-0700)
+Subject: Don't unlock the Display when you have not locked it.
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libXfixes.git;a=commitdiff;h=9dc7945eaa9216bf7b0056e815fba5bf8b5ded07
+
+Don't unlock the Display when you have not locked it.
+
+Acked-by: Jamey Sharp <jamey@minilop.net>
+---
+
+--- a/src/Xfixes.c
++++ b/src/Xfixes.c
+@@ -322,8 +322,6 @@ XFixesQueryVersion (Display *dpy,
+
+ *major_versionp = info->major_version;
+ *minor_versionp = info->minor_version;
+- UnlockDisplay (dpy);
+- SyncHandle ();
+ return 1;
+ }
+
Modified: trunk/lib/libxfixes/debian/patches/series
===================================================================
--- trunk/lib/libxfixes/debian/patches/series 2006-11-27 20:30:20 UTC (rev 4083)
+++ trunk/lib/libxfixes/debian/patches/series 2006-11-27 20:36:14 UTC (rev 4084)
@@ -1 +1,2 @@
+00_upstream_000_unlockdisplay.diff
01_include_xlib.h.diff
Reply to: