summaryrefslogtreecommitdiffstats
path: root/meta-demoapps
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2012-03-23 22:30:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-26 10:59:54 +0100
commit8809f2be927a0cbe2160a87c52120ed93c069ac8 (patch)
tree86e1cd5f2574b00051e86a90715af3dbc3cd9e9e /meta-demoapps
parente3a6524579f84569889edf267cf9753e2d9bc95c (diff)
downloadpoky-8809f2be927a0cbe2160a87c52120ed93c069ac8.tar.gz
xev: move from meta-demoapps
* The location where xev was located didn't contain xorg-app-common.inc, but still xev requires it. So moving it fixes that issue. * File checksums and License checksums were also added. (From OE-Core rev: 764bc41950513bede2ff763d0db55961f00318da) Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-demoapps')
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xev/diet-x11.patch82
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xev_1.0.3.bb7
2 files changed, 0 insertions, 89 deletions
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xev/diet-x11.patch b/meta-demoapps/recipes-graphics/xorg-app/xev/diet-x11.patch
deleted file mode 100644
index 139838c357..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xev/diet-x11.patch
+++ /dev/null
@@ -1,82 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3---
4 xev.c | 16 ++++++++--------
5 1 file changed, 8 insertions(+), 8 deletions(-)
6
7Index: xev-1.0.2/xev.c
8===================================================================
9--- xev-1.0.2.orig/xev.c 2006-06-02 00:25:44.000000000 +0100
10+++ xev-1.0.2/xev.c 2007-05-10 15:22:07.000000000 +0100
11@@ -109,7 +109,7 @@ do_KeyPress (XEvent *eventp)
12 nbytes = XLookupString (e, str, 256, &ks, NULL);
13
14 /* not supposed to call XmbLookupString on a key release event */
15- if (e->type == KeyPress && xic) {
16+ /*if (e->type == KeyPress && xic) {
17 do {
18 nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status);
19 buf[nmbbytes] = '\0';
20@@ -119,7 +119,7 @@ do_KeyPress (XEvent *eventp)
21 buf = realloc (buf, bsize);
22 }
23 } while (status == XBufferOverflow);
24- }
25+ }*/
26
27 if (ks == NoSymbol)
28 ksname = "NoSymbol";
29@@ -149,7 +149,7 @@ do_KeyPress (XEvent *eventp)
30 }
31
32 /* not supposed to call XmbLookupString on a key release event */
33- if (e->type == KeyPress && xic) {
34+ /*if (e->type == KeyPress && xic) {
35 printf (" XmbLookupString gives %d bytes: ", nmbbytes);
36 if (nmbbytes > 0) {
37 dump (buf, nmbbytes);
38@@ -157,7 +157,7 @@ do_KeyPress (XEvent *eventp)
39 } else {
40 printf ("\n");
41 }
42- }
43+ } */
44
45 printf (" XFilterEvent returns: %s\n",
46 XFilterEvent (eventp, e->window) ? "True" : "False");
47@@ -804,7 +804,7 @@ main (int argc, char **argv)
48 fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
49 }
50
51- xim = XOpenIM (dpy, NULL, NULL, NULL);
52+ /*xim = XOpenIM (dpy, NULL, NULL, NULL);
53 if (xim == NULL) {
54 fprintf (stderr, "%s: XOpenIM failed\n", ProgramName);
55 }
56@@ -831,7 +831,7 @@ main (int argc, char **argv)
57 }
58 XFree (xim_styles);
59 }
60- }
61+ }*/
62
63 screen = DefaultScreen (dpy);
64
65@@ -891,7 +891,7 @@ main (int argc, char **argv)
66 printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
67 }
68
69- if (xim && xim_style) {
70+ /*if (xim && xim_style) {
71 xic = XCreateIC (xim,
72 XNInputStyle, xim_style,
73 XNClientWindow, w,
74@@ -901,7 +901,7 @@ main (int argc, char **argv)
75 if (xic == NULL) {
76 fprintf (stderr, "XCreateIC failed\n");
77 }
78- }
79+ }*/
80
81 for (done = 0; !done; ) {
82 XEvent event;
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xev_1.0.3.bb b/meta-demoapps/recipes-graphics/xorg-app/xev_1.0.3.bb
deleted file mode 100644
index b7a4070a8f..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xev_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X Event Viewer"
4LICENSE = "MIT"
5PE = "1"
6
7SRC_URI += "file://diet-x11.patch;patch=1"