[OE-core] [PATCH 07/12] xev: update to 1.2.3
akuster808
akuster808 at gmail.com
Mon Mar 11 14:37:35 UTC 2019
On 3/11/19 1:04 AM, Mittal, Anuj wrote:
> Looks like this is failing with musl:
Of course, anything will fall over with a little musl applied against it ; )
>
> https://errors.yoctoproject.org/Errors/Details/232435/
thanks,
armin
>
> On Sun, 2019-03-10 at 11:07 -0700, Armin Kuster wrote:
>> refactor diet-x11 patch
>>
>> LIC_FILES_CHKSUM changed to do merging of copyright/license notices
>> https://gitlab.freedesktop.org/xorg/app/mkfontscale/commit/8609ad731b9c9c670a815c915055ae416d2396d8
>>
>> Signed-off-by: Armin Kuster <akuster808 at gmail.com>
>> ---
>> meta/recipes-graphics/xorg-app/xev/diet-x11.patch | 79
>> ++++++++++++----------
>> .../xorg-app/{xev_1.2.2.bb => xev_1.2.3.bb} | 4 +-
>> 2 files changed, 46 insertions(+), 37 deletions(-)
>> rename meta/recipes-graphics/xorg-app/{xev_1.2.2.bb => xev_1.2.3.bb}
>> (77%)
>>
>> diff --git a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
>> b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
>> index 6130959..b4415e3 100644
>> --- a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
>> +++ b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
>> @@ -4,79 +4,88 @@ Upstream-Status: Inappropriate [disable feature]
>> xev.c | 16 ++++++++--------
>> 1 file changed, 8 insertions(+), 8 deletions(-)
>>
>> -Index: xev-1.2.0/xev.c
>> +Index: xev-1.2.3/xev.c
>> ===================================================================
>> ---- xev-1.2.0.orig/xev.c
>> -+++ xev-1.2.0/xev.c
>> -@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp)
>> - nbytes = XLookupString (e, str, 256, &ks, NULL);
>> +--- xev-1.2.3.orig/xev.c
>> ++++ xev-1.2.3/xev.c
>> +@@ -125,7 +125,7 @@ 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) {
>> + /*if (e->type == KeyPress && xic) {
>> do {
>> - nmbbytes = XmbLookupString (xic, e, buf, bsize - 1,
>> &ks, &status);
>> + nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks,
>> &status);
>> buf[nmbbytes] = '\0';
>> -@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp)
>> - buf = realloc (buf, bsize);
>> +@@ -135,7 +135,7 @@ do_KeyPress(XEvent *eventp)
>> + buf = realloc(buf, bsize);
>> }
>> } while (status == XBufferOverflow);
>> - }
>> + }*/
>>
>> if (ks == NoSymbol)
>> - ksname = "NoSymbol";
>> -@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp)
>> + ksname = "NoSymbol";
>> +@@ -168,7 +168,7 @@ do_KeyPress(XEvent *eventp)
>> }
>>
>> /* not supposed to call XmbLookupString on a key release event
>> */
>> - if (e->type == KeyPress && xic) {
>> -+ /*if (e->type == KeyPress && xic) {
>> - printf (" XmbLookupString gives %d bytes: ", nmbbytes);
>> ++ /* if (e->type == KeyPress && xic) {
>> + printf(" XmbLookupString gives %d bytes: ", nmbbytes);
>> if (nmbbytes > 0) {
>> - dump (buf, nmbbytes);
>> -@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp)
>> - } else {
>> - printf ("\n");
>> + dump(buf, nmbbytes);
>> +@@ -177,7 +177,7 @@ do_KeyPress(XEvent *eventp)
>> + else {
>> + printf("\n");
>> }
>> - }
>> + } */
>>
>> - printf (" XFilterEvent returns: %s\n",
>> - XFilterEvent (eventp, e->window) ? "True" : "False");
>> -@@ -1015,7 +1015,7 @@ main (int argc, char **argv)
>> - fprintf (stderr, "%s: XSetLocaleModifiers failed\n",
>> ProgramName);
>> + printf(" XFilterEvent returns: %s\n",
>> + XFilterEvent(eventp, e->window) ? "True" : "False");
>> +@@ -1141,7 +1141,7 @@ parse_event_mask(const char *s, long eve
>> + if (s)
>> + return True;
>> + }
>> +- }
>> ++ }*/
>> +
>> + if (s != NULL)
>> + fprintf(stderr, "%s: unrecognized event mask '%s'\n",
>> ProgramName, s);
>> +@@ -1288,7 +1288,7 @@ main(int argc, char **argv)
>> + fprintf(stderr, "%s: XSetLocaleModifiers failed\n",
>> ProgramName);
>> }
>>
>> -- xim = XOpenIM (dpy, NULL, NULL, NULL);
>> -+ /*xim = XOpenIM (dpy, NULL, NULL, NULL);
>> +- xim = XOpenIM(dpy, NULL, NULL, NULL);
>> ++ /*xim = XOpenIM(dpy, NULL, NULL, NULL);
>> if (xim == NULL) {
>> - fprintf (stderr, "%s: XOpenIM failed\n", ProgramName);
>> + fprintf(stderr, "%s: XOpenIM failed\n", ProgramName);
>> }
>> -@@ -1042,7 +1042,7 @@ main (int argc, char **argv)
>> +@@ -1317,7 +1317,7 @@ main(int argc, char **argv)
>> }
>> - XFree (xim_styles);
>> + XFree(xim_styles);
>> }
>> - }
>> -+ }*/
>> ++ }*/
>>
>> - screen = DefaultScreen (dpy);
>> + screen = DefaultScreen(dpy);
>>
>> -@@ -1109,7 +1109,7 @@ main (int argc, char **argv)
>> - printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w,
>> subw);
>> +@@ -1373,7 +1373,7 @@ main(int argc, char **argv)
>> + printf("Outer window is 0x%lx, inner window is 0x%lx\n", w,
>> subw);
>> }
>>
>> - if (xim && xim_style) {
>> + /*if (xim && xim_style) {
>> - xic = XCreateIC (xim,
>> - XNInputStyle, xim_style,
>> - XNClientWindow, w,
>> -@@ -1119,7 +1119,7 @@ main (int argc, char **argv)
>> + xic = XCreateIC(xim,
>> + XNInputStyle, xim_style,
>> + XNClientWindow, w, XNFocusWindow, w, NULL);
>> +@@ -1381,7 +1381,7 @@ main(int argc, char **argv)
>> if (xic == NULL) {
>> - fprintf (stderr, "XCreateIC failed\n");
>> + fprintf(stderr, "XCreateIC failed\n");
>> }
>> - }
>> + }*/
>>
>> - have_rr = XRRQueryExtension (dpy, &rr_event_base,
>> &rr_error_base);
>> + have_rr = XRRQueryExtension(dpy, &rr_event_base,
>> &rr_error_base);
>> if (have_rr) {
>> diff --git a/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
>> b/meta/recipes-graphics/xorg-app/xev_1.2.3.bb
>> similarity index 77%
>> rename from meta/recipes-graphics/xorg-app/xev_1.2.2.bb
>> rename to meta/recipes-graphics/xorg-app/xev_1.2.3.bb
>> index 0705b7f..6a69e74 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"
>>
>> SRC_URI += "file://diet-x11.patch"
>>
>> -SRC_URI[md5sum] = "249bdde90f01c0d861af52dc8fec379e"
>> -SRC_URI[sha256sum] =
>> "d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f"
>> +SRC_URI[md5sum] = "eec82a5d4b599736f0fa637e96136746"
>> +SRC_URI[sha256sum] =
>> "66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09"
>> --
>> 2.7.4
>>
More information about the Openembedded-core
mailing list