<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0ef9d194621128b8371af917fdde282bcbebb7a5">https://github.com/macports/macports-ports/commit/0ef9d194621128b8371af917fdde282bcbebb7a5</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 0ef9d194621 xorg-libX11: update to 1.8.4
</span>0ef9d194621 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0ef9d194621128b8371af917fdde282bcbebb7a5
</span>Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
AuthorDate: Wed Feb 8 22:56:35 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> xorg-libX11: update to 1.8.4
</span>---
x11/xorg-libX11/Portfile | 13 +++--
...te-XPutBackEvent-to-support-clients-that-.patch | 57 ----------------------
2 files changed, 6 insertions(+), 64 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 4f94c0716b6..f6572f57e46 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;'>@@ -4,12 +4,12 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name xorg-libX11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9749f273a0c7d82e1a0c165d107357e480547670 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1811712
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 77bde3f0df542766934555f4e5a9aca00c107f8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1835316
</span>
categories x11 devel
license X11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +23,7 @@ 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:#ffe0e0;'>- 0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-xorg-libX11-pragmas-inside-functions.diff
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a69e6533b29..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libX11/files/0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,57 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 88399e01be679bfcc9a5e8922ffe2c47f0e56dee Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Yuxuan Shui <yshuiv7@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 3 Jan 2023 15:09:28 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Revert "Update XPutBackEvent() to support clients that put
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- back unpadded events"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This reverts commit d6d6cba90215d323567fef13d6565756c9956f60.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The reverted commit intended to fix the problem where an unpadded X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-event struct is passed into XPutBackEvent, by creating a padded struct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with _XEventToWire and _XWireToEvent. However, _XWireToEvent updates the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-last sequence number in Display, which may cause xlib to complain about
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-lost sequence numbers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IMO, the problem that commit tried to solve is a bug in the client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-library, and workaround it inside Xlib is bad practice, especially given
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the problem it caused. Plus, the offender cited in the original commit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-message, freeglut, has already fixed this problem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes: #176 #174
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/PutBEvent.c | 15 +--------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 14 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/PutBEvent.c b/src/PutBEvent.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f7b74b31..0f9df342 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/PutBEvent.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/PutBEvent.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,22 +79,9 @@ XPutBackEvent (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- register XEvent *event)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xEvent wire = {0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XEvent lib = {0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Status (*fp)(Display *, XEvent *, xEvent *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int type = event->type & 0177;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LockDisplay(dpy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fp = dpy->wire_vec[type];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (fp == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fp = _XEventToWire;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ret = (*fp)(dpy, event, &wire);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ret)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ret = (*dpy->event_vec[type])(dpy, &lib, &wire);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ret)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ret = _XPutBackEvent(dpy, &lib);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ret = _XPutBackEvent(dpy, event);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UnlockDisplay(dpy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.39.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>