| 1 |
cardoe 08/02/28 19:39:21 |
| 2 |
|
| 3 |
Added: libX11-1.1.3-xcb-locking.patch |
| 4 |
Log: |
| 5 |
add patch to fix fd.o bug #14029. Related to XCB locking. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libX11-1.1.3-xcb-locking.patch |
| 15 |
=================================================================== |
| 16 |
commit e02e4ccafcaf3eb8993152dfcbfbee0240ea2db2 |
| 17 |
Author: Adam Jackson <ajax@××××××.com> |
| 18 |
Date: Sun Feb 24 20:00:43 2008 -0500 |
| 19 |
|
| 20 |
Bug #14029: Don't LockDisplay() recursively. |
| 21 |
|
| 22 |
See also Red Hat bugzilla #326461. |
| 23 |
|
| 24 |
diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c |
| 25 |
index e190d00..4dc9265 100644 |
| 26 |
--- a/src/xkb/XKBBind.c |
| 27 |
+++ b/src/xkb/XKBBind.c |
| 28 |
@@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event) |
| 29 |
changes= xkbi->changes; |
| 30 |
else bzero(&changes,sizeof(changes)); |
| 31 |
XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK); |
| 32 |
- LockDisplay(dpy); |
| 33 |
if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) { |
| 34 |
#ifdef DEBUG |
| 35 |
fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n"); |
| 36 |
@@ -379,7 +378,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event) |
| 37 |
xkbi->flags&= ~XkbMapPending; |
| 38 |
bzero(&xkbi->changes,sizeof(XkbMapChangesRec)); |
| 39 |
} |
| 40 |
- UnlockDisplay(dpy); |
| 41 |
return rtrn; |
| 42 |
} |
| 43 |
return BadMatch; |
| 44 |
|
| 45 |
|
| 46 |
-- |
| 47 |
gentoo-commits@l.g.o mailing list |
Archives