From: Armin Kuster <akuster808@gmail.com>
To: akuster808@gmail.com, openembedded-core@lists.openembedded.org
Subject: [PATCH 08/13] libx11: update to 1.6.7 and sytle cleanup
Date: Mon, 22 Oct 2018 15:05:07 +0100 [thread overview]
Message-ID: <1540217112-24479-9-git-send-email-akuster808@gmail.com> (raw)
In-Reply-To: <1540217112-24479-1-git-send-email-akuster808@gmail.com>
refresh Fix-hanging-issue-in-_XReply.patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../libx11/Fix-hanging-issue-in-_XReply.patch | 28 ++++++++++------------
.../xorg-lib/{libx11_1.6.6.bb => libx11_1.6.7.bb} | 10 ++++----
2 files changed, 19 insertions(+), 19 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11_1.6.6.bb => libx11_1.6.7.bb} (64%)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
index 897882b..2a723b7 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
+++ b/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
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
similarity index 64%
rename from meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb
rename to meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
index 0fee1a9..f0f1bfd 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
@@ -1,14 +1,16 @@
require libx11.inc
-inherit gettext
-BBCLASSEXTEND = "native nativesdk"
+SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
+SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
SRC_URI += "file://disable_tests.patch \
file://Fix-hanging-issue-in-_XReply.patch \
"
+
+inherit gettext
+
do_configure_append () {
sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile
}
-SRC_URI[md5sum] = "6b0f83e851b3b469dd660f3a95ac3e42"
-SRC_URI[sha256sum] = "65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f"
+BBCLASSEXTEND = "native nativesdk"
--
2.7.4
next prev parent reply other threads:[~2018-10-22 14:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-22 14:04 [PATCH 00/13] Master package updates Armin Kuster
2018-10-22 14:05 ` [PATCH 01/13] nss: update to 3.39 includes CVE-2018-12384 Armin Kuster
2018-10-22 14:05 ` [PATCH 02/13] nspr: Update to 4.20 Armin Kuster
2018-10-23 13:41 ` Khem Raj
2018-10-22 14:05 ` [PATCH 03/13] gnutls: update to 2.6.4 Armin Kuster
2018-10-22 20:06 ` Andre McCurdy
2018-10-23 7:42 ` akuster808
2018-11-01 10:02 ` Andre McCurdy
2018-10-22 14:05 ` [PATCH 04/13] libpcre2: update to 10.32 Armin Kuster
2018-10-22 14:05 ` [PATCH 05/13] curl: update to 7.61.1 Armin Kuster
2018-10-22 14:05 ` [PATCH 06/13] openssh: Update to 7.9 primarily bug fixes Armin Kuster
2018-10-22 14:05 ` [PATCH 07/13] libsm: update to 1.2.3 Armin Kuster
2018-10-22 14:05 ` Armin Kuster [this message]
2018-10-22 14:05 ` [PATCH 09/13] libxcb: update to 1.13.1 Armin Kuster
2018-10-22 14:05 ` [PATCH 10/13] xkeyboard-config: update to 2.25 Armin Kuster
2018-10-22 14:05 ` [PATCH 11/13] xf86-input-libinput: update to 0.28.1 Armin Kuster
2018-10-22 14:05 ` [PATCH 12/13] tzcode: update to 2018f Armin Kuster
2018-10-22 14:05 ` [PATCH 13/13] tzdata: " Armin Kuster
2018-10-22 14:33 ` ✗ patchtest: failure for Master package updates (rev3) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1540217112-24479-9-git-send-email-akuster808@gmail.com \
--to=akuster808@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox