summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2012-06-20 10:57:50 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-25 16:35:52 +0100
commit7874440990404bfe4707b7eee04b53a4a29a3b3e (patch)
tree9daa4c838729586851f0c3c6cf479ed381f4ce54 /meta
parent288dcf4238ac181fbe88e817e299912071fd9635 (diff)
downloadpoky-7874440990404bfe4707b7eee04b53a4a29a3b3e.tar.gz
xev: updated to 1.2.0
tested on sato (From OE-Core rev: e7b3040f0a0f5356949e6a51d9d9d1c8dcf1f3c9) Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-app/xev/diet-x11.patch38
-rw-r--r--meta/recipes-graphics/xorg-app/xev_1.0.3.bb10
-rw-r--r--meta/recipes-graphics/xorg-app/xev_1.2.0.bb10
3 files changed, 29 insertions, 29 deletions
diff --git a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
index 139838c357..6130959f86 100644
--- a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
+++ b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
@@ -4,11 +4,11 @@ Upstream-Status: Inappropriate [disable feature]
4 xev.c | 16 ++++++++-------- 4 xev.c | 16 ++++++++--------
5 1 file changed, 8 insertions(+), 8 deletions(-) 5 1 file changed, 8 insertions(+), 8 deletions(-)
6 6
7Index: xev-1.0.2/xev.c 7Index: xev-1.2.0/xev.c
8=================================================================== 8===================================================================
9--- xev-1.0.2.orig/xev.c 2006-06-02 00:25:44.000000000 +0100 9--- xev-1.2.0.orig/xev.c
10+++ xev-1.0.2/xev.c 2007-05-10 15:22:07.000000000 +0100 10+++ xev-1.2.0/xev.c
11@@ -109,7 +109,7 @@ do_KeyPress (XEvent *eventp) 11@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp)
12 nbytes = XLookupString (e, str, 256, &ks, NULL); 12 nbytes = XLookupString (e, str, 256, &ks, NULL);
13 13
14 /* not supposed to call XmbLookupString on a key release event */ 14 /* not supposed to call XmbLookupString on a key release event */
@@ -17,7 +17,7 @@ Index: xev-1.0.2/xev.c
17 do { 17 do {
18 nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); 18 nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status);
19 buf[nmbbytes] = '\0'; 19 buf[nmbbytes] = '\0';
20@@ -119,7 +119,7 @@ do_KeyPress (XEvent *eventp) 20@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp)
21 buf = realloc (buf, bsize); 21 buf = realloc (buf, bsize);
22 } 22 }
23 } while (status == XBufferOverflow); 23 } while (status == XBufferOverflow);
@@ -26,7 +26,7 @@ Index: xev-1.0.2/xev.c
26 26
27 if (ks == NoSymbol) 27 if (ks == NoSymbol)
28 ksname = "NoSymbol"; 28 ksname = "NoSymbol";
29@@ -149,7 +149,7 @@ do_KeyPress (XEvent *eventp) 29@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp)
30 } 30 }
31 31
32 /* not supposed to call XmbLookupString on a key release event */ 32 /* not supposed to call XmbLookupString on a key release event */
@@ -35,16 +35,16 @@ Index: xev-1.0.2/xev.c
35 printf (" XmbLookupString gives %d bytes: ", nmbbytes); 35 printf (" XmbLookupString gives %d bytes: ", nmbbytes);
36 if (nmbbytes > 0) { 36 if (nmbbytes > 0) {
37 dump (buf, nmbbytes); 37 dump (buf, nmbbytes);
38@@ -157,7 +157,7 @@ do_KeyPress (XEvent *eventp) 38@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp)
39 } else { 39 } else {
40 printf ("\n"); 40 printf ("\n");
41 } 41 }
42- } 42- }
43+ } */ 43+ } */
44 44
45 printf (" XFilterEvent returns: %s\n", 45 printf (" XFilterEvent returns: %s\n",
46 XFilterEvent (eventp, e->window) ? "True" : "False"); 46 XFilterEvent (eventp, e->window) ? "True" : "False");
47@@ -804,7 +804,7 @@ main (int argc, char **argv) 47@@ -1015,7 +1015,7 @@ main (int argc, char **argv)
48 fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); 48 fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
49 } 49 }
50 50
@@ -53,30 +53,30 @@ Index: xev-1.0.2/xev.c
53 if (xim == NULL) { 53 if (xim == NULL) {
54 fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); 54 fprintf (stderr, "%s: XOpenIM failed\n", ProgramName);
55 } 55 }
56@@ -831,7 +831,7 @@ main (int argc, char **argv) 56@@ -1042,7 +1042,7 @@ main (int argc, char **argv)
57 } 57 }
58 XFree (xim_styles); 58 XFree (xim_styles);
59 } 59 }
60- } 60- }
61+ }*/ 61+ }*/
62 62
63 screen = DefaultScreen (dpy); 63 screen = DefaultScreen (dpy);
64 64
65@@ -891,7 +891,7 @@ main (int argc, char **argv) 65@@ -1109,7 +1109,7 @@ main (int argc, char **argv)
66 printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); 66 printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
67 } 67 }
68 68
69- if (xim && xim_style) { 69- if (xim && xim_style) {
70+ /*if (xim && xim_style) { 70+ /*if (xim && xim_style) {
71 xic = XCreateIC (xim, 71 xic = XCreateIC (xim,
72 XNInputStyle, xim_style, 72 XNInputStyle, xim_style,
73 XNClientWindow, w, 73 XNClientWindow, w,
74@@ -901,7 +901,7 @@ main (int argc, char **argv) 74@@ -1119,7 +1119,7 @@ main (int argc, char **argv)
75 if (xic == NULL) { 75 if (xic == NULL) {
76 fprintf (stderr, "XCreateIC failed\n"); 76 fprintf (stderr, "XCreateIC failed\n");
77 } 77 }
78- } 78- }
79+ }*/ 79+ }*/
80 80
81 for (done = 0; !done; ) { 81 have_rr = XRRQueryExtension (dpy, &rr_event_base, &rr_error_base);
82 XEvent event; 82 if (have_rr) {
diff --git a/meta/recipes-graphics/xorg-app/xev_1.0.3.bb b/meta/recipes-graphics/xorg-app/xev_1.0.3.bb
deleted file mode 100644
index 21ba62e246..0000000000
--- a/meta/recipes-graphics/xorg-app/xev_1.0.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require xorg-app-common.inc
2LIC_FILES_CHKSUM = "file://xev.c;startline=0;endline=35;md5=db2e69260ca64f1d332efa6ab4b7e2b5"
3DESCRIPTION = "X Event Viewer"
4LICENSE = "MIT"
5PE = "1"
6
7SRC_URI += "file://diet-x11.patch"
8
9SRC_URI[md5sum] = "a9532c3d1683c99bb5df1895cb3a60b1"
10SRC_URI[sha256sum] = "d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a"
diff --git a/meta/recipes-graphics/xorg-app/xev_1.2.0.bb b/meta/recipes-graphics/xorg-app/xev_1.2.0.bb
new file mode 100644
index 0000000000..b3404092ed
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xev_1.2.0.bb
@@ -0,0 +1,10 @@
1require xorg-app-common.inc
2LIC_FILES_CHKSUM = "file://xev.c;startline=0;endline=35;md5=2f39a0038b59269c1e62efae64cfd056"
3DESCRIPTION = "X Event Viewer"
4LICENSE = "MIT"
5PE = "1"
6
7SRC_URI += "file://diet-x11.patch"
8
9SRC_URI[md5sum] = "2727c72f3eba0c23f8f6b2e618d195a2"
10SRC_URI[sha256sum] = "3786a77dab17741d508d5d117a0ff33bb6eabf93e0935388b5f920bfcf2fb38f"