summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-03-11 14:28:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-18 11:12:26 +0000
commit2bfdddfabfc9d5e80ba628283d2d344c49bceaff (patch)
treeb606be5f4e06596dfb354de49e860bf0a61ff3b0 /meta
parent456a03bc744e9dff8a335c4ee20699fa1edd5930 (diff)
downloadpoky-2bfdddfabfc9d5e80ba628283d2d344c49bceaff.tar.gz
xev: update to 1.2.3
refactor diet-x11 patch LIC_FILES_CHKSUM changed to do merging of copyright/license notices (From OE-Core rev: 7b6383ae8ea8eca0eb4f2de94c419fc617116e7a) Signed-off-by: Armin Kuster <akuster808@gmail.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.patch133
-rw-r--r--meta/recipes-graphics/xorg-app/xev_1.2.3.bb (renamed from meta/recipes-graphics/xorg-app/xev_1.2.2.bb)4
2 files changed, 82 insertions, 55 deletions
diff --git a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
index 6130959f86..53c0ac2e61 100644
--- a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
+++ b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
@@ -4,79 +4,106 @@ 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.2.0/xev.c 7Index: xev-1.2.3/xev.c
8=================================================================== 8===================================================================
9--- xev-1.2.0.orig/xev.c 9--- xev-1.2.3.orig/xev.c
10+++ xev-1.2.0/xev.c 10+++ xev-1.2.3/xev.c
11@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp) 11@@ -125,17 +125,6 @@ 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 */
15- if (e->type == KeyPress && xic) { 15- if (e->type == KeyPress && xic) {
16+ /*if (e->type == KeyPress && xic) { 16- do {
17 do { 17- nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks, &status);
18 nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); 18- buf[nmbbytes] = '\0';
19 buf[nmbbytes] = '\0'; 19-
20@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp) 20- if (status == XBufferOverflow) {
21 buf = realloc (buf, bsize); 21- bsize = nmbbytes + 1;
22 } 22- buf = realloc(buf, bsize);
23 } while (status == XBufferOverflow); 23- }
24- } while (status == XBufferOverflow);
24- } 25- }
25+ }*/
26 26
27 if (ks == NoSymbol) 27 if (ks == NoSymbol)
28 ksname = "NoSymbol"; 28 ksname = "NoSymbol";
29@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp) 29@@ -168,16 +157,6 @@ 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 */
33- if (e->type == KeyPress && xic) { 33- if (e->type == KeyPress && xic) {
34+ /*if (e->type == KeyPress && xic) { 34- printf(" XmbLookupString gives %d bytes: ", nmbbytes);
35 printf (" XmbLookupString gives %d bytes: ", nmbbytes); 35- if (nmbbytes > 0) {
36 if (nmbbytes > 0) { 36- dump(buf, nmbbytes);
37 dump (buf, nmbbytes); 37- printf(" \"%s\"\n", buf);
38@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp) 38- }
39 } else { 39- else {
40 printf ("\n"); 40- printf("\n");
41- }
42- }
43
44 printf(" XFilterEvent returns: %s\n",
45 XFilterEvent(eventp, e->window) ? "True" : "False");
46@@ -1141,7 +1120,7 @@ parse_event_mask(const char *s, long eve
47 if (s)
48 return True;
41 } 49 }
42- } 50- }
43+ } */ 51+ }
44 52
45 printf (" XFilterEvent returns: %s\n", 53 if (s != NULL)
46 XFilterEvent (eventp, e->window) ? "True" : "False"); 54 fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s);
47@@ -1015,7 +1015,7 @@ main (int argc, char **argv) 55@@ -1288,37 +1267,6 @@ main(int argc, char **argv)
48 fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); 56 fprintf(stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
49 } 57 }
50 58
51- xim = XOpenIM (dpy, NULL, NULL, NULL); 59- xim = XOpenIM(dpy, NULL, NULL, NULL);
52+ /*xim = XOpenIM (dpy, NULL, NULL, NULL); 60- if (xim == NULL) {
53 if (xim == NULL) { 61- fprintf(stderr, "%s: XOpenIM failed\n", ProgramName);
54 fprintf (stderr, "%s: XOpenIM failed\n", ProgramName);
55 }
56@@ -1042,7 +1042,7 @@ main (int argc, char **argv)
57 }
58 XFree (xim_styles);
59 }
60- } 62- }
61+ }*/ 63-
62 64- if (xim) {
63 screen = DefaultScreen (dpy); 65- imvalret = XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL);
66- if (imvalret != NULL || xim_styles == NULL) {
67- fprintf(stderr, "%s: input method doesn't support any styles\n",
68- ProgramName);
69- }
70-
71- if (xim_styles) {
72- xim_style = 0;
73- for (i = 0; i < xim_styles->count_styles; i++) {
74- if (xim_styles->supported_styles[i] ==
75- (XIMPreeditNothing | XIMStatusNothing)) {
76- xim_style = xim_styles->supported_styles[i];
77- break;
78- }
79- }
80-
81- if (xim_style == 0) {
82- fprintf(stderr,
83- "%s: input method doesn't support the style we support\n",
84- ProgramName);
85- }
86- XFree(xim_styles);
87- }
88- }
89-
90 screen = DefaultScreen(dpy);
64 91
65@@ -1109,7 +1109,7 @@ main (int argc, char **argv) 92 attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE];
66 printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); 93@@ -1373,16 +1321,6 @@ main(int argc, char **argv)
94 printf("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
67 } 95 }
68 96
69- if (xim && xim_style) { 97- if (xim && xim_style) {
70+ /*if (xim && xim_style) { 98- xic = XCreateIC(xim,
71 xic = XCreateIC (xim, 99- XNInputStyle, xim_style,
72 XNInputStyle, xim_style, 100- XNClientWindow, w, XNFocusWindow, w, NULL);
73 XNClientWindow, w, 101-
74@@ -1119,7 +1119,7 @@ main (int argc, char **argv) 102- if (xic == NULL) {
75 if (xic == NULL) { 103- fprintf(stderr, "XCreateIC failed\n");
76 fprintf (stderr, "XCreateIC failed\n"); 104- }
77 }
78- } 105- }
79+ }*/ 106-
80 107 have_rr = XRRQueryExtension(dpy, &rr_event_base, &rr_error_base);
81 have_rr = XRRQueryExtension (dpy, &rr_event_base, &rr_error_base);
82 if (have_rr) { 108 if (have_rr) {
109 int rr_major, rr_minor;
diff --git a/meta/recipes-graphics/xorg-app/xev_1.2.2.bb b/meta/recipes-graphics/xorg-app/xev_1.2.3.bb
index 0705b7f7f1..6a69e747a6 100644
--- a/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-app/xev_1.2.3.bb
@@ -14,5 +14,5 @@ DEPENDS += "libxrandr xorgproto"
14 14
15SRC_URI += "file://diet-x11.patch" 15SRC_URI += "file://diet-x11.patch"
16 16
17SRC_URI[md5sum] = "249bdde90f01c0d861af52dc8fec379e" 17SRC_URI[md5sum] = "eec82a5d4b599736f0fa637e96136746"
18SRC_URI[sha256sum] = "d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f" 18SRC_URI[sha256sum] = "66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09"