<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0f837090912ec9fb638ce41d097ae5909d6e101b">https://github.com/macports/macports-ports/commit/0f837090912ec9fb638ce41d097ae5909d6e101b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0f837090912 xorg-libX11: Address "sequence lost" warning messages
</span>0f837090912 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0f837090912ec9fb638ce41d097ae5909d6e101b
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Thu Jan 26 19:42:00 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> xorg-libX11: Address "sequence lost" warning messages
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://github.com/XQuartz/XQuartz/issues/319
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
x11/xorg-libX11/Portfile | 5 +-
...te-XPutBackEvent-to-support-clients-that-.patch | 57 ++++++++++++++++++++++
2 files changed, 60 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libX11/Portfile b/x11/xorg-libX11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d0efde3990..4f94c0716b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libX11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libX11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name xorg-libX11
version 1.8.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
checksums rmd160 9749f273a0c7d82e1a0c165d107357e480547670 \
sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,8 @@ master_sites xorg:individual/lib/
</span> distname libX11-${version}
# move pragmas outside functions to keep old gcc compilers happy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-xorg-libX11-pragmas-inside-functions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-xorg-libX11-pragmas-inside-functions.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch
</span>
use_xz yes
use_parallel_build yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libX11/files/0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch b/x11/xorg-libX11/files/0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a69e6533b29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libX11/files/0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,57 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 88399e01be679bfcc9a5e8922ffe2c47f0e56dee Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Yuxuan Shui <yshuiv7@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 3 Jan 2023 15:09:28 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Revert "Update XPutBackEvent() to support clients that put
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ back unpadded events"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This reverts commit d6d6cba90215d323567fef13d6565756c9956f60.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The reverted commit intended to fix the problem where an unpadded X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+event struct is passed into XPutBackEvent, by creating a padded struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with _XEventToWire and _XWireToEvent. However, _XWireToEvent updates the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+last sequence number in Display, which may cause xlib to complain about
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lost sequence numbers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+IMO, the problem that commit tried to solve is a bug in the client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+library, and workaround it inside Xlib is bad practice, especially given
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the problem it caused. Plus, the offender cited in the original commit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+message, freeglut, has already fixed this problem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: #176 #174
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/PutBEvent.c | 15 +--------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 14 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/PutBEvent.c b/src/PutBEvent.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f7b74b31..0f9df342 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/PutBEvent.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/PutBEvent.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,22 +79,9 @@ XPutBackEvent (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register XEvent *event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xEvent wire = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XEvent lib = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Status (*fp)(Display *, XEvent *, xEvent *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int type = event->type & 0177;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LockDisplay(dpy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fp = dpy->wire_vec[type];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (fp == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fp = _XEventToWire;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = (*fp)(dpy, event, &wire);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ret)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = (*dpy->event_vec[type])(dpy, &lib, &wire);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ret)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = _XPutBackEvent(dpy, &lib);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = _XPutBackEvent(dpy, event);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UnlockDisplay(dpy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.39.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>