mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

xev: Drop diet libx11 related patch

Browse Source 
We dropped diet-libx11 back in 2019 in 1a502765db2093e573c9e3ecd6c1bc7621476963.
Drop the patch we don't need from xev to match.

(From OE-Core rev: a9b51a42fc1fd3c01852b51e3f21cf4d4480f3e8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2024-01-22 13:52:15 +00:00
parent 1df683df5c
commit 7ca6bd8977
2 changed files with 0 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
meta/recipes-graphics/xorg-app/xev/diet-x11.patch
View File

@@ -1,114 +0,0 @@
From b9b2b8d1af283a13cdccea55562cf332de48dcb9 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Wed, 28 Mar 2007 16:10:50 +0000
Subject: [PATCH] Add xev
Upstream-Status: Inappropriate [disable feature]
---
xev.c | 64 +----------------------------------------------------------
1 file changed, 1 insertion(+), 63 deletions(-)
diff --git a/xev.c b/xev.c
index ea69234..6d5eb30 100644
--- a/xev.c
+++ b/xev.c
@@ -175,17 +175,6 @@ do_KeyPress(XEvent *eventp)
nbytes = XLookupString(e, str, 256, &ks, NULL);
/* not supposed to call XmbLookupString on a key release event */
- if (e->type == KeyPress && xic) {
- do {
- nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks, &status);
- buf[nmbbytes] = '\0';
-
- if (status == XBufferOverflow) {
- bsize = nmbbytes + 1;
- buf = realloc(buf, bsize);
- }
- } while (status == XBufferOverflow);
- }
if (ks == NoSymbol)
ksname = "NoSymbol";
@@ -220,16 +209,6 @@ do_KeyPress(XEvent *eventp)
}
/* not supposed to call XmbLookupString on a key release event */
- if (e->type == KeyPress && xic) {
- output(Indent, "XmbLookupString gives %d bytes: ", nmbbytes);
- if (nmbbytes > 0) {
- dump(buf, nmbbytes);
- output(NewLine, " \"%s\"", buf);
- }
- else {
- output_new_line();
- }
- }
output(Indent | NewLine, "XFilterEvent returns: %s",
XFilterEvent(eventp, e->window) ? "True" : "False");
@@ -1211,7 +1190,7 @@ parse_event_mask(const char *s, long event_masks[])
if (s)
return True;
}
- }
+ }
if (s != NULL)
fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s);
@@ -1361,37 +1340,6 @@ main(int argc, char **argv)
fprintf(stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
}
- xim = XOpenIM(dpy, NULL, NULL, NULL);
- if (xim == NULL) {
- fprintf(stderr, "%s: XOpenIM failed\n", ProgramName);
- }
-
- if (xim) {
- imvalret = XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL);
- if (imvalret != NULL || xim_styles == NULL) {
- fprintf(stderr, "%s: input method doesn't support any styles\n",
- ProgramName);
- }
-
- if (xim_styles) {
- xim_style = 0;
- for (i = 0; i < xim_styles->count_styles; i++) {
- if (xim_styles->supported_styles[i] ==
- (XIMPreeditNothing | XIMStatusNothing)) {
- xim_style = xim_styles->supported_styles[i];
- break;
- }
- }
-
- if (xim_style == 0) {
- fprintf(stderr,
- "%s: input method doesn't support the style we support\n",
- ProgramName);
- }
- XFree(xim_styles);
- }
- }
-
screen = DefaultScreen(dpy);
attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE];
@@ -1446,16 +1394,6 @@ main(int argc, char **argv)
printf("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
}
- if (xim && xim_style) {
- xic = XCreateIC(xim,
- XNInputStyle, xim_style,
- XNClientWindow, w, XNFocusWindow, w, NULL);
-
- if (xic == NULL) {
- fprintf(stderr, "XCreateIC failed\n");
- }
- }
-
have_rr = XRRQueryExtension(dpy, &rr_event_base, &rr_error_base);
if (have_rr) {
int rr_major, rr_minor;

2
meta/recipes-graphics/xorg-app/xev_1.2.5.bb
View File

@@ -12,8 +12,6 @@ PE = "1"
DEPENDS += "libxrandr xorgproto"
SRC_URI += "file://diet-x11.patch"
SRC_URI[sha256sum] = "c9461a4389714e0f33974f9e75934bdc38d836a0f059b8dc089c7cbf2ce36ec1"
SRC_URI_EXT = "xz"