Add a fix from upstream that removes an unnecessary call to UnlockDisplay.

This fixes behaviour with xcb enabled in libX11.
Package-Manager: portage-2.1.2_pre2-r9

8 files changed, 88 insertions, 2 deletions

diff --git a/x11-libs/libXcomposite/ChangeLog b/x11-libs/libXcomposite/ChangeLog
index 3c30b8618f38..d1782b333356 100644
--- a/x11-libs/libXcomposite/ChangeLog
+++ b/x11-libs/libXcomposite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXcomposite
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/ChangeLog,v 1.28 2006/10/01 16:59:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/ChangeLog,v 1.29 2006/10/13 04:08:51 joshuabaergen Exp $
+
+*libXcomposite-0.3-r1 (13 Oct 2006)
+
+  13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/drop-extra-unlockdisplay.patch, +libXcomposite-0.3-r1.ebuild:
+  Add a fix from upstream that removes an unnecessary call to UnlockDisplay.
+  This fixes behaviour with xcb enabled in libX11.
 
   01 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   libXcomposite-0.3.ebuild:
diff --git a/x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r1 b/x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r1
new file mode 100644
index 000000000000..d4543f70cf7b
--- /dev/null
+++ b/x11-libs/libXcomposite/files/digest-libXcomposite-0.3-r1
@@ -0,0 +1,3 @@
+MD5 135d4b02d63c59178922cea8765a24c1 libXcomposite-0.3.tar.bz2 218916
+RMD160 4dda230431ba4666104ea84944a61b70e7f23cf4 libXcomposite-0.3.tar.bz2 218916
+SHA256 455f042df4de2bea0f69d7b5efb9be0717fc069ce3222e922707e5a639ea116e libXcomposite-0.3.tar.bz2 218916
diff --git a/x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch b/x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch
new file mode 100644
index 000000000000..73345b129dfb
--- /dev/null
+++ b/x11-libs/libXcomposite/files/drop-extra-unlockdisplay.patch
@@ -0,0 +1,10 @@
+--- src/Xcomposite.c
++++ src/Xcomposite.c
+@@ -235,8 +235,6 @@ XCompositeQueryVersion (Display *dpy,
+     XCompositeCheckExtension (dpy, info, 0);
+     *major_versionp = info->major_version;
+     *minor_versionp = info->minor_version;
+-    UnlockDisplay (dpy);
+-    SyncHandle ();
+     return 1;
+ }
diff --git a/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild
new file mode 100644
index 000000000000..cd180b7c7bac
--- /dev/null
+++ b/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.3-r1.ebuild,v 1.1 2006/10/13 04:08:51 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Xcomposite library"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXext
+	>=x11-proto/compositeproto-0.3
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+PATCHES="${FILESDIR}/drop-extra-unlockdisplay.patch"
diff --git a/x11-libs/libXrandr/ChangeLog b/x11-libs/libXrandr/ChangeLog
index 41a8b0750c4f..ebd332af8982 100644
--- a/x11-libs/libXrandr/ChangeLog
+++ b/x11-libs/libXrandr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXrandr
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/ChangeLog,v 1.27 2006/07/19 18:19:14 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/ChangeLog,v 1.28 2006/10/13 04:11:14 joshuabaergen Exp $
+
+*libXrandr-1.1.1-r1 (13 Oct 2006)
+
+  13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/drop-extra-unlockdisplay.patch, +libXrandr-1.1.1-r1.ebuild:
+  Add a fix from upstream that removes an unnecessary call to UnlockDisplay.
+  This fixes behaviour with xcb enabled in libX11.
 
   19 Jul 2006; Guy Martin <gmsoft@gentoo.org> libXrandr-1.1.1.ebuild:
   Stable on hppa.
diff --git a/x11-libs/libXrandr/files/digest-libXrandr-1.1.1-r1 b/x11-libs/libXrandr/files/digest-libXrandr-1.1.1-r1
new file mode 100644
index 000000000000..f7c5c3e30a2d
--- /dev/null
+++ b/x11-libs/libXrandr/files/digest-libXrandr-1.1.1-r1
@@ -0,0 +1,3 @@
+MD5 000374333b982ff13b30c2fc49ac41f8 libXrandr-1.1.1.tar.bz2 231984
+RMD160 90377bb35682dd4fc0c171b92ad4fcb5efa10dfe libXrandr-1.1.1.tar.bz2 231984
+SHA256 4ffb4ca0af47eb88a1a4643acbae1c2257ce7a6b237f71e0a2ef14b81f396562 libXrandr-1.1.1.tar.bz2 231984
diff --git a/x11-libs/libXrandr/files/drop-extra-unlockdisplay.patch b/x11-libs/libXrandr/files/drop-extra-unlockdisplay.patch
new file mode 100644
index 000000000000..b8cb8537d515
--- /dev/null
+++ b/x11-libs/libXrandr/files/drop-extra-unlockdisplay.patch
@@ -0,0 +1,15 @@
+--- src/Xrandr.c
++++ 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;
+ }
diff --git a/x11-libs/libXrandr/libXrandr-1.1.1-r1.ebuild b/x11-libs/libXrandr/libXrandr-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..dc0696053ba1
--- /dev/null
+++ b/x11-libs/libXrandr/libXrandr-1.1.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.1.1-r1.ebuild,v 1.1 2006/10/13 04:11:14 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+# SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Xrandr library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-proto/randrproto
+	x11-proto/xproto"
+DEPEND="${RDEPEND}
+	x11-proto/renderproto"
+
+PATCHES="${FILESDIR}/drop-extra-unlockdisplay.patch"