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

Package-Manager: portage-2.1.4.4

4 files changed, 82 insertions, 3 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/Manifest b/x11-libs/libX11/Manifest
index b8ac835ebada..ff9aeae9ce20 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libX11-1.1.2-XGetMotionEvents-order-fix.patch 405 RMD160 811390446d70bacfec06cfe2b243ea5420bb23a3 SHA1 ffb6009f5365d902f2c2d63c210a4655cf7cf779 SHA256 65eb3ec5598d88e10b2cc5f79f5c5a0d77bc04140f02da749862587cf240ba9b
 AUX libX11-1.1.2-XimGetWindowEventmask-fix.patch 1099 RMD160 c1177dfd4cbfa470fc98ab9a8a3aeaa8548d1177 SHA1 5135d7772f0b755e508c735612104b8d32f4a519 SHA256 ac8ecbf83fe6af7085b4fd9335c03fbaf3e73791f17a1b74631ce43eb5b1d878
+AUX libX11-1.1.3-xcb-locking.patch 966 RMD160 59f9bc11591454bea86e30574866d070dafcd3fb SHA1 3a0838317ba656aec70732353fccc38e26d466b6 SHA256 944357ec53cb862f7b4b7dfe16f876adfa5a1f5ad35bdd0f74d11ae7dc3ecab2
 DIST libX11-1.1.2.tar.bz2 1523644 RMD160 c722e1eaa04a3d753660496d4e527b695c68db38 SHA1 7190d36389eb7903831cd9541d919f55ac5098e9 SHA256 b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e
 DIST libX11-1.1.3.tar.bz2 1526958 RMD160 fcb8d5d31befa0ae227210dc7274c17b30c37fad SHA1 235f69172b262f874d2a2d7bd17e8197aea5b767 SHA256 4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a
 EBUILD libX11-1.1.2-r1.ebuild 1020 RMD160 876d24906ee06ed6d61f95a80f7b43016fbfe83b SHA1 101288b5155bff01a6945a5f8f2eccb5d4afcf6a SHA256 a3cefcc19a61689e40c7d40314220b642362e214d6b227e1a35a1b0466aeab80
+EBUILD libX11-1.1.3-r1.ebuild 961 RMD160 83100f53117a479032b4ce31f381903ab5e3e4c4 SHA1 98a85f9df91bad87ddc8b9ceca32cd789dddc01b SHA256 9a1782098366772a07724f9c8c116f0e20a92c4d030809f988cffbda5913c93f
 EBUILD libX11-1.1.3.ebuild 893 RMD160 d686c5980053fe35ae317e877718745d5215e730 SHA1 6ef1bb018a452956b372a0e47bd3978613ac6f40 SHA256 c35015e571f4cdddc823a9dfbb128db1463c29c4610b48736ebc6c8c05fed0db
-MISC ChangeLog 13235 RMD160 241ea8ef643b15d8faf1d50f72041be4131bad7b SHA1 a2044f0c78f2acaeaa493499edea8cf50a21ef78 SHA256 04366debffdb230ee9acd0073af19e6f864c1900633dc828d0f4af3decda15df
+MISC ChangeLog 13443 RMD160 0f735508852dda4f5d8a26a6f23a557f5e53cb57 SHA1 de5ce80d533a70451b54658a8ba6051a59aba157 SHA256 2e1274992e80e370bb13c0f26a041faf79427b60f24474da8a23b4ebe8b03162
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHxw3yoeSe8B0zEfwRAmcNAJ49fDjt3lc2rAfvJnCGPXGjhpOrtgCfdn10
+r/uj6ZFpuy2xE3ZPHmcE8Mk=
+=KblB
+-----END PGP SIGNATURE-----
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)