Remove an erroneous call to UnlockDisplay. Fixes another XCB compatibility

issue.
Package-Manager: portage-2.1.2_pre3-r2

5 files changed, 57 insertions, 15 deletions

diff --git a/x11-libs/libXdamage/ChangeLog b/x11-libs/libXdamage/ChangeLog
index c77b4d357772..b3edb943635a 100644
--- a/x11-libs/libXdamage/ChangeLog
+++ b/x11-libs/libXdamage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXdamage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdamage/ChangeLog,v 1.26 2006/07/19 18:14:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdamage/ChangeLog,v 1.27 2006/10/17 01:56:46 joshuabaergen Exp $
+
+*libXdamage-1.0.3-r1 (17 Oct 2006)
+
+  17 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-bad-unlock.patch, +libXdamage-1.0.3-r1.ebuild:
+  Remove an erroneous call to UnlockDisplay.  Fixes another XCB compatibility
+  issue.
 
   19 Jul 2006; Guy Martin <gmsoft@gentoo.org> libXdamage-1.0.3.ebuild:
   Stable on hppa.
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index b2f660e59ea3..9f33775e70fb 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,15 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fix-bad-unlock.patch 247 RMD160 fe5c6bcadf350cd7b21d368e42d72e2a4e8857ec SHA1 5f2b5aec7db3001a15e426f8a34ffad41014862d SHA256 50e245e0f376f96ce340c63b2d5a4ab1260aec45ea1e6ab2ab7ed5d6af706882
+MD5 fd6130da0d7b2637adec61e30ecc6d2a files/fix-bad-unlock.patch 247
+RMD160 fe5c6bcadf350cd7b21d368e42d72e2a4e8857ec files/fix-bad-unlock.patch 247
+SHA256 50e245e0f376f96ce340c63b2d5a4ab1260aec45ea1e6ab2ab7ed5d6af706882 files/fix-bad-unlock.patch 247
 DIST libXdamage-1.0.3.tar.bz2 223597 RMD160 70c3ea1b587634c3f2fd7a2e93099410636f6f60 SHA1 be9513ffe0429b2872b20eae7a8315df186a712a SHA256 a076bd8e5834655d6ea06a770b33d0acc59de82b63c4e87e720c8065bdefb441
+EBUILD libXdamage-1.0.3-r1.ebuild 600 RMD160 ffde20a85c290df8ad43f0597b1d4323c33afdb1 SHA1 35a5736f6749e887a8f6b2e1a4359d273c81a4f7 SHA256 0a965c934f46834f3debf672c58342357c0c77337ed765fb1e1f993af0d9c7b6
+MD5 1d151bdb6ec9b9783723eba485aada4a libXdamage-1.0.3-r1.ebuild 600
+RMD160 ffde20a85c290df8ad43f0597b1d4323c33afdb1 libXdamage-1.0.3-r1.ebuild 600
+SHA256 0a965c934f46834f3debf672c58342357c0c77337ed765fb1e1f993af0d9c7b6 libXdamage-1.0.3-r1.ebuild 600
 EBUILD libXdamage-1.0.3.ebuild 534 RMD160 2f7a01833ed9f66b434bb60b720d1808fc06338d SHA1 b05c8b9c6f179f518fee28277f505df858ff316d SHA256 fbe49e7a1828036b282399242e7666fdaa0cd0e91ba78dd1f578f53cc3792522
 MD5 07e21da9b3d58e77c4f4af789b4b9da6 libXdamage-1.0.3.ebuild 534
 RMD160 2f7a01833ed9f66b434bb60b720d1808fc06338d libXdamage-1.0.3.ebuild 534
 SHA256 fbe49e7a1828036b282399242e7666fdaa0cd0e91ba78dd1f578f53cc3792522 libXdamage-1.0.3.ebuild 534
-MISC ChangeLog 3303 RMD160 7e9c02937b75616dc920ecefecf7d2b0b491a6f4 SHA1 0089836ff15018e68c9f721d081223b4e0558ed8 SHA256 5590ce2accb5d4c941ef06c61542a4c41edcf07012bb7fee2638c23ba2c51430
-MD5 4ac43379d8c9650539864775030c6fce ChangeLog 3303
-RMD160 7e9c02937b75616dc920ecefecf7d2b0b491a6f4 ChangeLog 3303
-SHA256 5590ce2accb5d4c941ef06c61542a4c41edcf07012bb7fee2638c23ba2c51430 ChangeLog 3303
+MISC ChangeLog 3551 RMD160 9cafe22f91a905d9f0685b9cf731d0deb650abed SHA1 69e3c712e574fb966f509960b0583b3a0f21cea6 SHA256 0a9faa0c5706c61450bccba9f4788e0a464062b408fa2ed817a097c0aad6ce00
+MD5 d1ffe94c3c67df3bd2708aede344aa2a ChangeLog 3551
+RMD160 9cafe22f91a905d9f0685b9cf731d0deb650abed ChangeLog 3551
+SHA256 0a9faa0c5706c61450bccba9f4788e0a464062b408fa2ed817a097c0aad6ce00 ChangeLog 3551
 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 0fd853617d626ff1a4363e4a71d2d661 files/digest-libXdamage-1.0.3 253
 RMD160 5efc44192dc2031a520ce27ef87c1a5fbcb07813 files/digest-libXdamage-1.0.3 253
 SHA256 b5cb5ad85db45a9d8c8de0de8be745fd1b3b523261967006f0a48ce2268c987a files/digest-libXdamage-1.0.3 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFA9beamhnQswr0vIRApRcAKCaQ8gihvb73r47vvkoXoiDo3W9ZQCfdpcz
-O7Ict+bvEx/CV9WN93pw0yE=
-=gsj/
------END PGP SIGNATURE-----
+MD5 0fd853617d626ff1a4363e4a71d2d661 files/digest-libXdamage-1.0.3-r1 253
+RMD160 5efc44192dc2031a520ce27ef87c1a5fbcb07813 files/digest-libXdamage-1.0.3-r1 253
+SHA256 b5cb5ad85db45a9d8c8de0de8be745fd1b3b523261967006f0a48ce2268c987a files/digest-libXdamage-1.0.3-r1 253
diff --git a/x11-libs/libXdamage/files/digest-libXdamage-1.0.3-r1 b/x11-libs/libXdamage/files/digest-libXdamage-1.0.3-r1
new file mode 100644
index 000000000000..7e95a957a188
--- /dev/null
+++ b/x11-libs/libXdamage/files/digest-libXdamage-1.0.3-r1
@@ -0,0 +1,3 @@
+MD5 ff05bcad724383515cdedfe44b386653 libXdamage-1.0.3.tar.bz2 223597
+RMD160 70c3ea1b587634c3f2fd7a2e93099410636f6f60 libXdamage-1.0.3.tar.bz2 223597
+SHA256 a076bd8e5834655d6ea06a770b33d0acc59de82b63c4e87e720c8065bdefb441 libXdamage-1.0.3.tar.bz2 223597
diff --git a/x11-libs/libXdamage/files/fix-bad-unlock.patch b/x11-libs/libXdamage/files/fix-bad-unlock.patch
new file mode 100644
index 000000000000..a03572519737
--- /dev/null
+++ b/x11-libs/libXdamage/files/fix-bad-unlock.patch
@@ -0,0 +1,11 @@
+--- src/Xdamage.c
++++ src/Xdamage.c
+@@ -305,8 +305,6 @@ XDamageQueryVersion (Display *dpy,
+ 
+     *major_versionp = info->major_version;
+     *minor_versionp = info->minor_version;
+-    UnlockDisplay (dpy);
+-    SyncHandle ();
+     return 1;
+ }
+ 
diff --git a/x11-libs/libXdamage/libXdamage-1.0.3-r1.ebuild b/x11-libs/libXdamage/libXdamage-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..a4d03eb635f4
--- /dev/null
+++ b/x11-libs/libXdamage/libXdamage-1.0.3-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdamage/libXdamage-1.0.3-r1.ebuild,v 1.1 2006/10/17 01:56:46 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Xdamage library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXfixes
+	x11-proto/damageproto
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+PATCHES="${FILESDIR}/fix-bad-unlock.patch"