X Strike Force X.Org X11 SVN commit: r4080 - in trunk/lib/libxrandr/debian: . patches
Author: jamey
Date: 2006-11-27 14:27:51 -0500 (Mon, 27 Nov 2006)
New Revision: 4080
Added:
trunk/lib/libxrandr/debian/patches/00_upstream_0001_lockdisplay.diff
Modified:
trunk/lib/libxrandr/debian/changelog
trunk/lib/libxrandr/debian/patches/series
Log:
Add upstream patch to fix bug #400441.
Modified: trunk/lib/libxrandr/debian/changelog
===================================================================
--- trunk/lib/libxrandr/debian/changelog 2006-11-26 06:21:42 UTC (rev 4079)
+++ trunk/lib/libxrandr/debian/changelog 2006-11-27 19:27:51 UTC (rev 4080)
@@ -1,9 +1,14 @@
libxrandr (2:1.1.0.2-5) UNRELEASED; urgency=low
+ [ Thierry Reding ]
* Add libxrender-dev dependency to libxrandr-dev.
- -- Thierry Reding <thierry@gilfi.de> Sun, 26 Nov 2006 00:59:30 +0100
+ [ Jamey Sharp ]
+ * libXrandr: Calls UnlockDisplay without calling LockDisplay. (Closes:
+ #400441)
+ -- Jamey Sharp <sharpone@debian.org> Mon, 27 Nov 2006 11:24:09 -0800
+
libxrandr (2:1.1.0.2-4) unstable; urgency=low
* Reorder makeshlib command in rules file so that ldconfig is run
Added: trunk/lib/libxrandr/debian/patches/00_upstream_0001_lockdisplay.diff
===================================================================
--- trunk/lib/libxrandr/debian/patches/00_upstream_0001_lockdisplay.diff (rev 0)
+++ trunk/lib/libxrandr/debian/patches/00_upstream_0001_lockdisplay.diff 2006-11-27 19:27:51 UTC (rev 4080)
@@ -0,0 +1,28 @@
+From: Jamey Sharp <jamey@minilop.net>
+Date: Fri, 13 Oct 2006 00:42:48 +0000 (-0700)
+Subject: Do not call UnlockDisplay without calling LockDisplay.
+X-Git-Tag: libXrandr-1.1.1
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libXrandr.git;a=commitdiff;h=d914d05d34991b4cfa3af411fd2a3e281ea0e73b
+
+Do not call UnlockDisplay without calling LockDisplay.
+
+Thanks to Magnus Kessler <Magnus.Kessler@gmx.net> for reporting this
+bug and a correct fix.
+---
+
+--- a/src/Xrandr.c
++++ b/src/Xrandr.c
+@@ -390,11 +390,11 @@ Status XRRQueryVersion (Display *dpy,
+ xrri->major_version = rep.majorVersion;
+ xrri->minor_version = rep.minorVersion;
+ xrri->has_rates = _XRRHasRates (xrri->major_version, xrri->minor_version);
++ UnlockDisplay (dpy);
++ SyncHandle ();
+ }
+ *major_versionp = xrri->major_version;
+ *minor_versionp = xrri->minor_version;
+- UnlockDisplay (dpy);
+- SyncHandle ();
+ return 1;
+ }
+
Modified: trunk/lib/libxrandr/debian/patches/series
===================================================================
--- trunk/lib/libxrandr/debian/patches/series 2006-11-26 06:21:42 UTC (rev 4079)
+++ trunk/lib/libxrandr/debian/patches/series 2006-11-27 19:27:51 UTC (rev 4080)
@@ -1 +1,2 @@
+00_upstream_0001_lockdisplay.diff
01_manpage_location.diff
Reply to: