Add a DisplayUnlock fix from upstream. Fixes related XCB asserts.

Package-Manager: portage-2.1.2_pre3-r2

5 files changed, 59 insertions, 15 deletions

diff --git a/x11-libs/libXfixes/ChangeLog b/x11-libs/libXfixes/ChangeLog
index 209fb026e6d8..9a0a695d2fa3 100644
--- a/x11-libs/libXfixes/ChangeLog
+++ b/x11-libs/libXfixes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXfixes
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfixes/ChangeLog,v 1.32 2006/07/19 09:43:02 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfixes/ChangeLog,v 1.33 2006/10/16 03:10:59 joshuabaergen Exp $
+
+*libXfixes-4.0.1-r1 (16 Oct 2006)
+
+  16 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-bad-unlock.patch, +libXfixes-4.0.1-r1.ebuild:
+  Add a DisplayUnlock fix from upstream.  Fixes related XCB asserts.
 
   19 Jul 2006; Guy Martin <gmsoft@gentoo.org> libXfixes-4.0.1.ebuild:
   Stable on hppa.
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index 0e76a2c392b9..32e3311abf1b 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,15 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fix-bad-unlock.patch 319 RMD160 82e37ba6f2729cfbca9f0d1f0029a6aa8901c5bd SHA1 f7fd414cff84a9de22a51ba0360c4b38bc89cb42 SHA256 00ab3ace2673fd617aa9b539f41c00e76017add92a0e748dccf007836bcb4640
+MD5 243944a1277c96f9c1322265e86d2b6b files/fix-bad-unlock.patch 319
+RMD160 82e37ba6f2729cfbca9f0d1f0029a6aa8901c5bd files/fix-bad-unlock.patch 319
+SHA256 00ab3ace2673fd617aa9b539f41c00e76017add92a0e748dccf007836bcb4640 files/fix-bad-unlock.patch 319
 DIST libXfixes-4.0.1.tar.bz2 227707 RMD160 4349ea0d586f07ba34fc46141354d9a1136c638f SHA1 5a37df7aacde815f70c8efb47adadfa7da4857ed SHA256 0f6117672c9fea63f933c11127f1d552e7b91c33079d8fa14299f927c9624da4
+EBUILD libXfixes-4.0.1-r1.ebuild 619 RMD160 f97322fce1773d2c0c216429cadde65524f1a164 SHA1 1e8d4b0c27dc8cd84bc19faf85c60eb176b5a188 SHA256 37543cb036d0f70877280f307b90425ff95863f8e4ef18d21522fe09599e98fa
+MD5 7146d067887bc3e730a0780b2a7ad7cd libXfixes-4.0.1-r1.ebuild 619
+RMD160 f97322fce1773d2c0c216429cadde65524f1a164 libXfixes-4.0.1-r1.ebuild 619
+SHA256 37543cb036d0f70877280f307b90425ff95863f8e4ef18d21522fe09599e98fa libXfixes-4.0.1-r1.ebuild 619
 EBUILD libXfixes-4.0.1.ebuild 553 RMD160 0e5593a8fdb2b39537d822107ddb5a54cb247652 SHA1 484d0748f3ee698617db15b4efb2747fc9942afa SHA256 a8537778a8eb7214bd1cb280720e98ab92905fd06d018cb0e90cef3634291fd3
 MD5 8bdb9c0285e552109fe2bfce260af5ee libXfixes-4.0.1.ebuild 553
 RMD160 0e5593a8fdb2b39537d822107ddb5a54cb247652 libXfixes-4.0.1.ebuild 553
 SHA256 a8537778a8eb7214bd1cb280720e98ab92905fd06d018cb0e90cef3634291fd3 libXfixes-4.0.1.ebuild 553
-MISC ChangeLog 4024 RMD160 1d74354e61bcd003ece69954fd46aac3a3ee42c6 SHA1 d91654a1d28117551cf81db019f2a062d677e88c SHA256 dda21de57dffdd41fc05ba36889b9f75760d89d6d02cc01e5ebb1dbab1d63370
-MD5 510691afa09bf793cb39cbcf8198e03b ChangeLog 4024
-RMD160 1d74354e61bcd003ece69954fd46aac3a3ee42c6 ChangeLog 4024
-SHA256 dda21de57dffdd41fc05ba36889b9f75760d89d6d02cc01e5ebb1dbab1d63370 ChangeLog 4024
+MISC ChangeLog 4252 RMD160 99d270f358c26e60a33c502879c660cb5865f92b SHA1 8bd7718579ba4b52dc92f19c124dbdd19458146a SHA256 84436fbf919cf1812cad920da0318be42d85dfcf28fe4d03e3c861c556139f51
+MD5 a7197eb9439be2ce2e20e75ffc422699 ChangeLog 4252
+RMD160 99d270f358c26e60a33c502879c660cb5865f92b ChangeLog 4252
+SHA256 84436fbf919cf1812cad920da0318be42d85dfcf28fe4d03e3c861c556139f51 ChangeLog 4252
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -17,10 +22,6 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 d267237e6da0babfe0bea1b189fe3598 files/digest-libXfixes-4.0.1 250
 RMD160 2cefd844ea09958bab207e5e94ee4cf006b620a5 files/digest-libXfixes-4.0.1 250
 SHA256 302c59565d32bafd57625b3394e818d605451975d519f84f827d794033b7c60b files/digest-libXfixes-4.0.1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFA9bZamhnQswr0vIRAseCAJ9IIUHDDgwY1N5Jlitbju7rWXZMuwCfXGff
-IEuON5yXUn6CqmkW4uCxxWE=
-=XjG5
------END PGP SIGNATURE-----
+MD5 d267237e6da0babfe0bea1b189fe3598 files/digest-libXfixes-4.0.1-r1 250
+RMD160 2cefd844ea09958bab207e5e94ee4cf006b620a5 files/digest-libXfixes-4.0.1-r1 250
+SHA256 302c59565d32bafd57625b3394e818d605451975d519f84f827d794033b7c60b files/digest-libXfixes-4.0.1-r1 250
diff --git a/x11-libs/libXfixes/files/digest-libXfixes-4.0.1-r1 b/x11-libs/libXfixes/files/digest-libXfixes-4.0.1-r1
new file mode 100644
index 000000000000..55d5ca8fd174
--- /dev/null
+++ b/x11-libs/libXfixes/files/digest-libXfixes-4.0.1-r1
@@ -0,0 +1,3 @@
+MD5 c20eba4be3e8379fd774e999b65d3f90 libXfixes-4.0.1.tar.bz2 227707
+RMD160 4349ea0d586f07ba34fc46141354d9a1136c638f libXfixes-4.0.1.tar.bz2 227707
+SHA256 0f6117672c9fea63f933c11127f1d552e7b91c33079d8fa14299f927c9624da4 libXfixes-4.0.1.tar.bz2 227707
diff --git a/x11-libs/libXfixes/files/fix-bad-unlock.patch b/x11-libs/libXfixes/files/fix-bad-unlock.patch
new file mode 100644
index 000000000000..27d82116d7f5
--- /dev/null
+++ b/x11-libs/libXfixes/files/fix-bad-unlock.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Xfixes.c b/src/Xfixes.c
+index 5b279a1..cf56b5a 100644
+--- a/src/Xfixes.c
++++ b/src/Xfixes.c
+@@ -322,8 +322,6 @@ XFixesQueryVersion (Display *dpy,
+ 
+     *major_versionp = info->major_version;
+     *minor_versionp = info->minor_version;
+-    UnlockDisplay (dpy);
+-    SyncHandle ();
+     return 1;
+ }
+ 
diff --git a/x11-libs/libXfixes/libXfixes-4.0.1-r1.ebuild b/x11-libs/libXfixes/libXfixes-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..fca2f0e3e616
--- /dev/null
+++ b/x11-libs/libXfixes/libXfixes-4.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfixes/libXfixes-4.0.1-r1.ebuild,v 1.1 2006/10/16 03:10:59 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Xfixes library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+RESTRICT="mirror"
+
+RDEPEND="x11-libs/libX11
+	>=x11-proto/fixesproto-4
+	x11-proto/xproto"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+PATCHES="${FILESDIR}/fix-bad-unlock.patch"