| 1 |
scarabeus 11/04/26 18:58:14 |
| 2 |
|
| 3 |
Added: 1.1.1-xcb_util.patch |
| 4 |
Log: |
| 5 |
Revision bump to fix building with new xcb-util. Per bug #364967. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-apps/xlsclients/files/1.1.1-xcb_util.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xlsclients/files/1.1.1-xcb_util.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xlsclients/files/1.1.1-xcb_util.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.1.1-xcb_util.patch |
| 16 |
=================================================================== |
| 17 |
From 223851b68fedad730747652bc6560e40ca695ea7 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Jon TURNEY <jon.turney@×××××××××××××.uk> |
| 19 |
Date: Mon, 07 Mar 2011 13:54:53 +0000 |
| 20 |
Subject: Use XCB_ATOM_* atom names rather than deprecated atom names |
| 21 |
|
| 22 |
Those deprecated atom names were removed from xcb/util in commit |
| 23 |
2f0334b3eb49fa3a0d6daf6b9dde10e480a5c59f |
| 24 |
|
| 25 |
Found by tinderbox, see: |
| 26 |
|
| 27 |
http://tinderbox.freedesktop.org/builds/2011-03-06-0008/logs/xlsclients/#build |
| 28 |
http://tinderbox.freedesktop.org/builds/2011-03-07-0001/logs/xlsclients/#build |
| 29 |
|
| 30 |
Signed-off-by: Jon TURNEY <jon.turney@×××××××××××××.uk> |
| 31 |
Tested-by: Dan Nicholson <dbn.lists@×××××.com> |
| 32 |
Signed-off-by: Peter Harris <pharris@××××××××.com> |
| 33 |
--- |
| 34 |
diff --git a/xlsclients.c b/xlsclients.c |
| 35 |
index 3a34865..15d3f1a 100644 |
| 36 |
--- a/xlsclients.c |
| 37 |
+++ b/xlsclients.c |
| 38 |
@@ -539,21 +539,21 @@ print_client_properties(xcb_connection_t *dpy, xcb_window_t w, int verbose, int |
| 39 |
* get the WM_CLIENT_MACHINE and WM_COMMAND list of strings |
| 40 |
*/ |
| 41 |
cs->client_machine = xcb_get_property(dpy, 0, w, |
| 42 |
- WM_CLIENT_MACHINE, XCB_GET_PROPERTY_TYPE_ANY, |
| 43 |
+ XCB_ATOM_WM_CLIENT_MACHINE, XCB_GET_PROPERTY_TYPE_ANY, |
| 44 |
0, 1000000L); |
| 45 |
cs->command = xcb_get_property(dpy, 0, w, |
| 46 |
- WM_COMMAND, XCB_GET_PROPERTY_TYPE_ANY, |
| 47 |
+ XCB_ATOM_WM_COMMAND, XCB_GET_PROPERTY_TYPE_ANY, |
| 48 |
0, 1000000L); |
| 49 |
|
| 50 |
if (verbose) { |
| 51 |
cs->name = xcb_get_property(dpy, 0, w, |
| 52 |
- WM_NAME, XCB_GET_PROPERTY_TYPE_ANY, |
| 53 |
+ XCB_ATOM_WM_NAME, XCB_GET_PROPERTY_TYPE_ANY, |
| 54 |
0, 1000000L); |
| 55 |
cs->icon_name = xcb_get_property(dpy, 0, w, |
| 56 |
- WM_ICON_NAME, XCB_GET_PROPERTY_TYPE_ANY, |
| 57 |
+ XCB_ATOM_WM_ICON_NAME, XCB_GET_PROPERTY_TYPE_ANY, |
| 58 |
0, 1000000L); |
| 59 |
cs->wm_class = xcb_get_property(dpy, 0, w, |
| 60 |
- WM_CLASS, STRING, |
| 61 |
+ XCB_ATOM_WM_CLASS, XCB_ATOM_STRING, |
| 62 |
0, 1000000L); |
| 63 |
} |
| 64 |
|
| 65 |
@@ -569,7 +569,7 @@ print_text_field(xcb_connection_t *dpy, char *s, xcb_get_property_reply_t *tp) |
| 66 |
} |
| 67 |
|
| 68 |
if (s) printf ("%s", s); |
| 69 |
- if (tp->type == STRING && tp->format == 8) { |
| 70 |
+ if (tp->type == XCB_ATOM_STRING && tp->format == 8) { |
| 71 |
printf ("%.*s", (int)tp->value_len, (char *)xcb_get_property_value(tp)); |
| 72 |
} else { |
| 73 |
unknown (dpy, tp->type, tp->format); |
| 74 |
-- |
| 75 |
cgit v0.8.3-6-g21f6 |
Archives