summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-app/xev/diet-x11.patch35
-rw-r--r--meta/recipes-graphics/xorg-app/xev_1.2.4.bb (renamed from meta/recipes-graphics/xorg-app/xev_1.2.3.bb)3
2 files changed, 21 insertions, 17 deletions
diff --git a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
index 53c0ac2e61..361369b291 100644
--- a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
+++ b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
@@ -1,14 +1,19 @@
1From b9b2b8d1af283a13cdccea55562cf332de48dcb9 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross@openedhand.com>
3Date: Wed, 28 Mar 2007 16:10:50 +0000
4Subject: [PATCH] Add xev
5
1Upstream-Status: Inappropriate [disable feature] 6Upstream-Status: Inappropriate [disable feature]
2 7
3--- 8---
4 xev.c | 16 ++++++++-------- 9 xev.c | 64 +----------------------------------------------------------
5 1 file changed, 8 insertions(+), 8 deletions(-) 10 1 file changed, 1 insertion(+), 63 deletions(-)
6 11
7Index: xev-1.2.3/xev.c 12diff --git a/xev.c b/xev.c
8=================================================================== 13index ea69234..6d5eb30 100644
9--- xev-1.2.3.orig/xev.c 14--- a/xev.c
10+++ xev-1.2.3/xev.c 15+++ b/xev.c
11@@ -125,17 +125,6 @@ do_KeyPress(XEvent *eventp) 16@@ -175,17 +175,6 @@ do_KeyPress(XEvent *eventp)
12 nbytes = XLookupString(e, str, 256, &ks, NULL); 17 nbytes = XLookupString(e, str, 256, &ks, NULL);
13 18
14 /* not supposed to call XmbLookupString on a key release event */ 19 /* not supposed to call XmbLookupString on a key release event */
@@ -26,24 +31,24 @@ Index: xev-1.2.3/xev.c
26 31
27 if (ks == NoSymbol) 32 if (ks == NoSymbol)
28 ksname = "NoSymbol"; 33 ksname = "NoSymbol";
29@@ -168,16 +157,6 @@ do_KeyPress(XEvent *eventp) 34@@ -220,16 +209,6 @@ do_KeyPress(XEvent *eventp)
30 } 35 }
31 36
32 /* not supposed to call XmbLookupString on a key release event */ 37 /* not supposed to call XmbLookupString on a key release event */
33- if (e->type == KeyPress && xic) { 38- if (e->type == KeyPress && xic) {
34- printf(" XmbLookupString gives %d bytes: ", nmbbytes); 39- output(Indent, "XmbLookupString gives %d bytes: ", nmbbytes);
35- if (nmbbytes > 0) { 40- if (nmbbytes > 0) {
36- dump(buf, nmbbytes); 41- dump(buf, nmbbytes);
37- printf(" \"%s\"\n", buf); 42- output(NewLine, " \"%s\"", buf);
38- } 43- }
39- else { 44- else {
40- printf("\n"); 45- output_new_line();
41- } 46- }
42- } 47- }
43 48
44 printf(" XFilterEvent returns: %s\n", 49 output(Indent | NewLine, "XFilterEvent returns: %s",
45 XFilterEvent(eventp, e->window) ? "True" : "False"); 50 XFilterEvent(eventp, e->window) ? "True" : "False");
46@@ -1141,7 +1120,7 @@ parse_event_mask(const char *s, long eve 51@@ -1211,7 +1190,7 @@ parse_event_mask(const char *s, long event_masks[])
47 if (s) 52 if (s)
48 return True; 53 return True;
49 } 54 }
@@ -52,7 +57,7 @@ Index: xev-1.2.3/xev.c
52 57
53 if (s != NULL) 58 if (s != NULL)
54 fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s); 59 fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s);
55@@ -1288,37 +1267,6 @@ main(int argc, char **argv) 60@@ -1361,37 +1340,6 @@ main(int argc, char **argv)
56 fprintf(stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); 61 fprintf(stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
57 } 62 }
58 63
@@ -90,7 +95,7 @@ Index: xev-1.2.3/xev.c
90 screen = DefaultScreen(dpy); 95 screen = DefaultScreen(dpy);
91 96
92 attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE]; 97 attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE];
93@@ -1373,16 +1321,6 @@ main(int argc, char **argv) 98@@ -1446,16 +1394,6 @@ main(int argc, char **argv)
94 printf("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); 99 printf("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
95 } 100 }
96 101
diff --git a/meta/recipes-graphics/xorg-app/xev_1.2.3.bb b/meta/recipes-graphics/xorg-app/xev_1.2.4.bb
index 6a69e747a6..9407fa65f1 100644
--- a/meta/recipes-graphics/xorg-app/xev_1.2.3.bb
+++ b/meta/recipes-graphics/xorg-app/xev_1.2.4.bb
@@ -14,5 +14,4 @@ DEPENDS += "libxrandr xorgproto"
14 14
15SRC_URI += "file://diet-x11.patch" 15SRC_URI += "file://diet-x11.patch"
16 16
17SRC_URI[md5sum] = "eec82a5d4b599736f0fa637e96136746" 17SRC_URI[sha256sum] = "d700e08bfe751ed2dbf802baa204b056d0e49348b6eb3c6f9cb035d8ae4885e2"
18SRC_URI[sha256sum] = "66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09"