rpms/libX11/devel libX11-1.1.3-xkb-lock-fix.patch, NONE, 1.1 libX11.spec, 1.40, 1.41

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1041

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.3-xkb-lock-fix.patch 
Log Message:
* Wed Oct 10 2007 Adam Jackson <ajax at redhat.com> 1.1.3-2
- libX11-1.1.3-xkb-lock-fix.patch: Don't LockDisplay() recursively.  Fixes
  Gnome hang at logout. (#326461)


libX11-1.1.3-xkb-lock-fix.patch:

--- NEW FILE libX11-1.1.3-xkb-lock-fix.patch ---
diff -up libX11-1.1.3/src/xkb/XKBBind.c.jx libX11-1.1.3/src/xkb/XKBBind.c
--- libX11-1.1.3/src/xkb/XKBBind.c.jx	2007-05-16 11:34:44.000000000 -0400
+++ libX11-1.1.3/src/xkb/XKBBind.c	2007-10-10 15:16:08.000000000 -0400
@@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMa
 	     changes= xkbi->changes;
 	else bzero(&changes,sizeof(changes));
 	XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
-	LockDisplay(dpy);
 	if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
 #ifdef DEBUG
 	    fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n");
@@ -379,7 +378,6 @@ XkbRefreshKeyboardMapping(register XkbMa
 	    xkbi->flags&= ~XkbMapPending;
 	    bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
 	}
-	UnlockDisplay(dpy);
 	return rtrn;
     }
     return BadMatch;


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libX11.spec	24 Sep 2007 19:11:41 -0000	1.40
+++ libX11.spec	10 Oct 2007 20:20:16 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -15,6 +15,7 @@
 # manually confirm each patch hunk before removal.
 Patch2: dont-forward-keycode-0.patch
 Patch3: bug-201284.patch
+Patch4: libX11-1.1.3-xkb-lock-fix.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -56,6 +57,7 @@
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1 -b .3-bug201284
+%patch4 -p1 -b .jx
 
 %build
 %configure \
@@ -245,6 +247,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Oct 10 2007 Adam Jackson <ajax at redhat.com> 1.1.3-2
+- libX11-1.1.3-xkb-lock-fix.patch: Don't LockDisplay() recursively.  Fixes
+  Gnome hang at logout. (#326461)
+
 * Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 1.1.3-1
 - libX11 1.1.3