X Strike Force X.Org X11 SVN commit: r4083 - in trunk/lib/libxdamage/debian: . patches
Author: jamey
Date: 2006-11-27 15:30:20 -0500 (Mon, 27 Nov 2006)
New Revision: 4083
Added:
trunk/lib/libxdamage/debian/patches/
trunk/lib/libxdamage/debian/patches/00_upstream_000_unlockdisplay.diff
trunk/lib/libxdamage/debian/patches/series
Modified:
trunk/lib/libxdamage/debian/changelog
Log:
Add upstream patch to fix bug #400445.
Modified: trunk/lib/libxdamage/debian/changelog
===================================================================
--- trunk/lib/libxdamage/debian/changelog 2006-11-27 20:11:17 UTC (rev 4082)
+++ trunk/lib/libxdamage/debian/changelog 2006-11-27 20:30:20 UTC (rev 4083)
@@ -1,3 +1,10 @@
+libxdamage (1:1.0.3-3) UNRELEASED; urgency=low
+
+ * calls UnlockDisplay and SyncHandle when it shouldn't (Closes:
+ #400445)
+
+ -- Jamey Sharp <sharpone@debian.org> Mon, 27 Nov 2006 12:16:44 -0800
+
libxdamage (1:1.0.3-2) unstable; urgency=low
* Bring X11R7.1 into unstable.
Added: trunk/lib/libxdamage/debian/patches/00_upstream_000_unlockdisplay.diff
===================================================================
--- trunk/lib/libxdamage/debian/patches/00_upstream_000_unlockdisplay.diff (rev 0)
+++ trunk/lib/libxdamage/debian/patches/00_upstream_000_unlockdisplay.diff 2006-11-27 20:30:20 UTC (rev 4083)
@@ -0,0 +1,25 @@
+From: Josh Triplett <josh@freedesktop.org>
+Date: Mon, 16 Oct 2006 09:58:24 +0000 (-0700)
+Subject: Remove incorrect UnlockDisplay and SyncHandle from XDamageQueryVersion
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libXdamage.git;a=commitdiff;h=31829be123a9ce58bf8e0c4718815b7b63d0d512
+
+Remove incorrect UnlockDisplay and SyncHandle from XDamageQueryVersion
+
+XDamageQueryVersion calls UnlockDisplay and SyncHandle, without a matching
+LockDisplay. This triggers an assertion in Xlib/XCB designed to catch these
+kinds of bugs. Remove the two calls, which fixes the assertion.
+
+Thanks to Mike Auty <mike.auty@gmail.com> for the report.
+---
+
+--- a/src/Xdamage.c
++++ b/src/Xdamage.c
+@@ -305,8 +305,6 @@ XDamageQueryVersion (Display *dpy,
+
+ *major_versionp = info->major_version;
+ *minor_versionp = info->minor_version;
+- UnlockDisplay (dpy);
+- SyncHandle ();
+ return 1;
+ }
+
Added: trunk/lib/libxdamage/debian/patches/series
===================================================================
--- trunk/lib/libxdamage/debian/patches/series (rev 0)
+++ trunk/lib/libxdamage/debian/patches/series 2006-11-27 20:30:20 UTC (rev 4083)
@@ -0,0 +1 @@
+00_upstream_000_unlockdisplay.diff
Reply to: