diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch')
| -rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch index 897882b8d8..2a723b7e43 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch +++ b/poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch @@ -17,19 +17,19 @@ https://patchwork.freedesktop.org/patch/171458/ Signed-off-by: Tatu Frisk <tatu.frisk@ge.com> Signed-off-by: Jose Alarcon <jose.alarcon@ge.com> + +[Refreshed for 1.6.7 update] +Signed-off-by: Armin Kuster <akuster808@gmail.com> + --- src/xcb_io.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) -diff --git a/src/xcb_io.c b/src/xcb_io.c -index 5987329..c64eb04 100644 ---- a/src/xcb_io.c -+++ b/src/xcb_io.c -@@ -609,22 +609,17 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard) - * letting anyone else process this sequence number, we - * need to process any events that should have come - * earlier. */ -- +Index: libX11-1.6.7/src/xcb_io.c +=================================================================== +--- libX11-1.6.7.orig/src/xcb_io.c ++++ libX11-1.6.7/src/xcb_io.c +@@ -620,18 +620,14 @@ Status _XReply(Display *dpy, xReply *rep if(dpy->xcb->event_owner == XlibOwnsEventQueue) { xcb_generic_reply_t *event; @@ -42,6 +42,9 @@ index 5987329..c64eb04 100644 - while(dpy->xcb->event_waiter) - { /* need braces around ConditionWait */ - ConditionWait(dpy, dpy->xcb->event_notify); +- } +- while((event = poll_for_event(dpy, True))) +- handle_response(dpy, event, True); + + /* Assume event queue is empty if another thread is blocking + * waiting for event. */ @@ -49,12 +52,7 @@ index 5987329..c64eb04 100644 + { + while((event = poll_for_response(dpy))) + handle_response(dpy, event, True); - } -- while((event = poll_for_event(dpy))) -- handle_response(dpy, event, True); ++ } } req->reply_waiter = 0; --- -2.10.1 - |