add patch to fix fd.o bug #14029. Related to XCB locking.

(Portage version: 2.1.4.4)

3 files changed, 69 insertions, 2 deletions

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index 6b58ec6dbe7e..30d6c6802564 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libX11
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.89 2007/12/19 23:33:35 cla Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.90 2008/02/28 19:39:20 cardoe Exp $
+
+*libX11-1.1.3-r1 (28 Feb 2008)
+
+  28 Feb 2008; Doug Klima <cardoe@gentoo.org>
+  +files/libX11-1.1.3-xcb-locking.patch, +libX11-1.1.3-r1.ebuild:
+  add patch to fix fd.o bug #14029. Related to XCB locking.
 
   19 Dec 2007; Dawid Węgliński <cla@gentoo.org> libX11-1.1.3.ebuild:
   Stable on x86 (bug #202087)
diff --git a/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch b/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch
new file mode 100644
index 000000000000..78845d34c2fb
--- /dev/null
+++ b/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch
@@ -0,0 +1,28 @@
+commit e02e4ccafcaf3eb8993152dfcbfbee0240ea2db2
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sun Feb 24 20:00:43 2008 -0500
+
+    Bug #14029: Don't LockDisplay() recursively.
+    
+    See also Red Hat bugzilla #326461.
+
+diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
+index e190d00..4dc9265 100644
+--- a/src/xkb/XKBBind.c
++++ b/src/xkb/XKBBind.c
+@@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
+ 	     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 XkbMapNotifyEvent *event)
+ 	    xkbi->flags&= ~XkbMapPending;
+ 	    bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
+ 	}
+-	UnlockDisplay(dpy);
+ 	return rtrn;
+     }
+     return BadMatch;
\ No newline at end of file
diff --git a/x11-libs/libX11/libX11-1.1.3-r1.ebuild b/x11-libs/libX11/libX11-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..c34308331c0b
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.1.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.1.3-r1.ebuild,v 1.1 2008/02/28 19:39:20 cardoe Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 xcb"
+RDEPEND=">=x11-libs/xtrans-1.0.1
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-proto/kbproto
+	>=x11-proto/xproto-7.0.6
+	xcb? ( >=x11-libs/libxcb-1.0 )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86bigfontproto
+	x11-proto/bigreqsproto
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xcmiscproto
+	>=x11-misc/util-macros-0.99.0_p20051007"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)
+	$(use_with xcb)"
+PATCHES="${FILESDIR}/libX11-1.1.3-xcb-locking.patch"
+
+# xorg really doesn't like xlocale disabled.
+# $(use_enable nls xlocale)