Revision bump to fix building with new xcb-util. Per bug #364967.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 100 insertions, 2 deletions

diff --git a/x11-apps/xlsclients/ChangeLog b/x11-apps/xlsclients/ChangeLog
index 37b76f546b1a..08af94197248 100644
--- a/x11-apps/xlsclients/ChangeLog
+++ b/x11-apps/xlsclients/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xlsclients
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/ChangeLog,v 1.53 2011/02/14 18:43:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/ChangeLog,v 1.54 2011/04/26 18:58:14 scarabeus Exp $
+
+*xlsclients-1.1.1-r1 (26 Apr 2011)
+
+  26 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.1.1-xcb_util.patch, +xlsclients-1.1.1-r1.ebuild:
+  Revision bump to fix building with new xcb-util. Per bug #364967.
 
   14 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
   xlsclients-1.1.1.ebuild:
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 541382352294..9dea5ca19500 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.1.1-xcb_util.patch 2227 RMD160 9b308bb72150abe6b09243a6c89f3a41644ccdb0 SHA1 b577144ae3842585ee3b14dadd5f60c5881bd8e0 SHA256 c7291ad02318145a490cfb386ab27e0c1c24293792a1d5afbf0631c12461aacf
 DIST xlsclients-1.1.1.tar.bz2 109742 RMD160 5da161d038782d3b2922defb33220749a76f0dab SHA1 67bfdcb089e8669df7ec5bc7a137e037047f2535 SHA256 453b5e13a61d4b2a2a52ba75d529c5d761bbb65ecd65fe5b7b0121402a0be859
+EBUILD xlsclients-1.1.1-r1.ebuild 517 RMD160 1c5980a286fd4b15391d7ef2d5cd12d3697c1cdc SHA1 c24580e5f4c9b279cda7f712fe06444425002ffa SHA256 cfecf6f65db15730ae66c8bbcfd2adbe693fc0b09b0ecf502b3c095c23d0f476
 EBUILD xlsclients-1.1.1.ebuild 456 RMD160 5826ef4166a2e77bc7ac61e96965b09fc1e0863c SHA1 c46f127996dfd39e13eaf8da4d5b7021f5ca9645 SHA256 5e67e926f71a2b59041b6cfeb70d54519ecb3b96a7b1dfcb2f5a33248758ab3e
-MISC ChangeLog 6108 RMD160 771a372e3b38607812805b91071c9f00247de08b SHA1 9e5d93f31fd61dcc45647934107fe0e388a320ce SHA256 4f1ec19e43d5ac18893cf415303b145fa6321344b44b0857ef53c62dcbd29af8
+MISC ChangeLog 6327 RMD160 911f621c7726bfd318b1a3c778301e19e4829409 SHA1 ff4207ff311bbf6e8c06b6ff6ea6b03ef1e2cc55 SHA256 d8398087937aad81197bc919af7e41265e3433d615861f77ac4b9d575b2d5bc0
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk23FcwACgkQHB6c3gNBRYcJgACfVfGMBq2i1gmFS2HEtO4Wnz7M
+hj4AmgIAwTdM6AXh+7y4a6vkDESiSJDX
+=g9TU
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xlsclients/files/1.1.1-xcb_util.patch b/x11-apps/xlsclients/files/1.1.1-xcb_util.patch
new file mode 100644
index 000000000000..3752b7036288
--- /dev/null
+++ b/x11-apps/xlsclients/files/1.1.1-xcb_util.patch
@@ -0,0 +1,59 @@
+From 223851b68fedad730747652bc6560e40ca695ea7 Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Mon, 07 Mar 2011 13:54:53 +0000
+Subject: Use XCB_ATOM_* atom names rather than deprecated atom names
+
+Those deprecated atom names were removed from xcb/util in commit
+2f0334b3eb49fa3a0d6daf6b9dde10e480a5c59f
+
+Found by tinderbox, see:
+
+http://tinderbox.freedesktop.org/builds/2011-03-06-0008/logs/xlsclients/#build
+http://tinderbox.freedesktop.org/builds/2011-03-07-0001/logs/xlsclients/#build
+
+Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+Tested-by: Dan Nicholson <dbn.lists@gmail.com>
+Signed-off-by: Peter Harris <pharris@opentext.com>
+---
+diff --git a/xlsclients.c b/xlsclients.c
+index 3a34865..15d3f1a 100644
+--- a/xlsclients.c
++++ b/xlsclients.c
+@@ -539,21 +539,21 @@ print_client_properties(xcb_connection_t *dpy, xcb_window_t w, int verbose, int
+      * get the WM_CLIENT_MACHINE and WM_COMMAND list of strings
+      */
+     cs->client_machine = xcb_get_property(dpy, 0, w,
+-			    WM_CLIENT_MACHINE, XCB_GET_PROPERTY_TYPE_ANY,
++			    XCB_ATOM_WM_CLIENT_MACHINE, XCB_GET_PROPERTY_TYPE_ANY,
+ 			    0, 1000000L);
+     cs->command = xcb_get_property(dpy, 0, w,
+-			    WM_COMMAND, XCB_GET_PROPERTY_TYPE_ANY,
++			    XCB_ATOM_WM_COMMAND, XCB_GET_PROPERTY_TYPE_ANY,
+ 			    0, 1000000L);
+ 
+     if (verbose) {
+ 	cs->name = xcb_get_property(dpy, 0, w,
+-			    WM_NAME, XCB_GET_PROPERTY_TYPE_ANY,
++			    XCB_ATOM_WM_NAME, XCB_GET_PROPERTY_TYPE_ANY,
+ 			    0, 1000000L);
+ 	cs->icon_name = xcb_get_property(dpy, 0, w,
+-			    WM_ICON_NAME, XCB_GET_PROPERTY_TYPE_ANY,
++			    XCB_ATOM_WM_ICON_NAME, XCB_GET_PROPERTY_TYPE_ANY,
+ 			    0, 1000000L);
+ 	cs->wm_class = xcb_get_property(dpy, 0, w,
+-			    WM_CLASS, STRING,
++			    XCB_ATOM_WM_CLASS, XCB_ATOM_STRING,
+ 			    0, 1000000L);
+     }
+ 
+@@ -569,7 +569,7 @@ print_text_field(xcb_connection_t *dpy, char *s, xcb_get_property_reply_t *tp)
+     }
+ 
+     if (s) printf ("%s", s);
+-    if (tp->type == STRING && tp->format == 8) {
++    if (tp->type == XCB_ATOM_STRING && tp->format == 8) {
+ 	printf ("%.*s", (int)tp->value_len, (char *)xcb_get_property_value(tp));
+     } else {
+ 	unknown (dpy, tp->type, tp->format);
+--
+cgit v0.8.3-6-g21f6
diff --git a/x11-apps/xlsclients/xlsclients-1.1.1-r1.ebuild b/x11-apps/xlsclients/xlsclients-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..b1fec39ec6db
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-1.1.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-1.1.1-r1.ebuild,v 1.1 2011/04/26 18:58:14 scarabeus Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libxcb
+	x11-libs/xcb-util
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-xcb_util.patch"
+)