Author: jamey
Date: 2006-11-27 14:45:16 -0500 (Mon, 27 Nov 2006)
New Revision: 4081
Added:
trunk/lib/libxcomposite/debian/patches/
trunk/lib/libxcomposite/debian/patches/00_upstream_000_unlockdisplay.diff
trunk/lib/libxcomposite/debian/patches/series
Modified:
trunk/lib/libxcomposite/debian/changelog
Log:
Add upstream patch to fix bug #400440.
Modified: trunk/lib/libxcomposite/debian/changelog
===================================================================
--- trunk/lib/libxcomposite/debian/changelog 2006-11-27 19:27:51 UTC (rev
4080)
+++ trunk/lib/libxcomposite/debian/changelog 2006-11-27 19:45:16 UTC (rev
4081)
@@ -1,3 +1,10 @@
+libxcomposite (1:0.3-3) UNRELEASED; urgency=low
+
+ * calls UnlockDisplay without calling LockDisplay first (Closes:
+ #400440)
+
+ -- Jamey Sharp <[EMAIL PROTECTED]> Mon, 27 Nov 2006 11:42:10 -0800
+
libxcomposite (1:0.3-2) unstable; urgency=low
[ Thierry Reding ]
Added: trunk/lib/libxcomposite/debian/patches/00_upstream_000_unlockdisplay.diff
===================================================================
--- trunk/lib/libxcomposite/debian/patches/00_upstream_000_unlockdisplay.diff
(rev 0)
+++ trunk/lib/libxcomposite/debian/patches/00_upstream_000_unlockdisplay.diff
2006-11-27 19:45:16 UTC (rev 4081)
@@ -0,0 +1,22 @@
+From: Jamey Sharp <[EMAIL PROTECTED]>
+Date: Fri, 13 Oct 2006 00:42:18 +0000 (-0700)
+Subject: Do not call UnlockDisplay without calling LockDisplay.
+X-Git-Url:
http://gitweb.freedesktop.org/?p=xorg/lib/libXcomposite.git;a=commitdiff;h=f0a1453f24e29a9badc8f29d81c42c0eb3f67065
+
+Do not call UnlockDisplay without calling LockDisplay.
+
+Thanks to Magnus Kessler <[EMAIL PROTECTED]> for reporting this
+bug and a correct fix.
+---
+
+--- a/src/Xcomposite.c
++++ b/src/Xcomposite.c
+@@ -235,8 +235,6 @@ XCompositeQueryVersion (Display *dpy,
+ XCompositeCheckExtension (dpy, info, 0);
+ *major_versionp = info->major_version;
+ *minor_versionp = info->minor_version;
+- UnlockDisplay (dpy);
+- SyncHandle ();
+ return 1;
+ }
+
Added: trunk/lib/libxcomposite/debian/patches/series
===================================================================
--- trunk/lib/libxcomposite/debian/patches/series
(rev 0)
+++ trunk/lib/libxcomposite/debian/patches/series 2006-11-27 19:45:16 UTC
(rev 4081)
@@ -0,0 +1 @@
+00_upstream_000_unlockdisplay.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
