diff --git a/0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch b/0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch deleted file mode 100644 index 6f7e6b4..0000000 --- a/0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 88399e01be679bfcc9a5e8922ffe2c47f0e56dee Mon Sep 17 00:00:00 2001 -From: Yuxuan Shui -Date: Tue, 3 Jan 2023 15:09:28 +0000 -Subject: [PATCH libX11] Revert "Update XPutBackEvent() to support clients that - put back unpadded events" - -This reverts commit d6d6cba90215d323567fef13d6565756c9956f60. - -The reverted commit intended to fix the problem where an unpadded X -event struct is passed into XPutBackEvent, by creating a padded struct -with _XEventToWire and _XWireToEvent. However, _XWireToEvent updates the -last sequence number in Display, which may cause xlib to complain about -lost sequence numbers. - -IMO, the problem that commit tried to solve is a bug in the client -library, and workaround it inside Xlib is bad practice, especially given -the problem it caused. Plus, the offender cited in the original commit -message, freeglut, has already fixed this problem. - -Fixes: #176 #174 - -Signed-off-by: Yuxuan Shui ---- - src/PutBEvent.c | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/src/PutBEvent.c b/src/PutBEvent.c -index f7b74b31..0f9df342 100644 ---- a/src/PutBEvent.c -+++ b/src/PutBEvent.c -@@ -79,22 +79,9 @@ XPutBackEvent ( - register XEvent *event) - { - int ret; -- xEvent wire = {0}; -- XEvent lib = {0}; -- Status (*fp)(Display *, XEvent *, xEvent *); -- int type = event->type & 0177; - - LockDisplay(dpy); -- fp = dpy->wire_vec[type]; -- if (fp == NULL) -- fp = _XEventToWire; -- ret = (*fp)(dpy, event, &wire); -- if (ret) -- { -- ret = (*dpy->event_vec[type])(dpy, &lib, &wire); -- if (ret) -- ret = _XPutBackEvent(dpy, &lib); -- } -+ ret = _XPutBackEvent(dpy, event); - UnlockDisplay(dpy); - return ret; - } --- -2.39.0 - diff --git a/libX11.spec b/libX11.spec index d03a265..748ce88 100644 --- a/libX11.spec +++ b/libX11.spec @@ -4,8 +4,8 @@ Summary: Core X11 protocol client library Name: libX11 -Version: 1.8.3 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.8.4 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -19,7 +19,6 @@ Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}. Patch2: dont-forward-keycode-0.patch -Patch3: 0001-Revert-Update-XPutBackEvent-to-support-clients-that-.patch BuildRequires: make BuildRequires: xorg-x11-util-macros >= 1.11 @@ -123,6 +122,9 @@ make %{?_smp_mflags} check %{_mandir}/man5/*.5* %changelog +* Wed Feb 08 2023 Peter Hutterer - 1.8.4-1 +- libX11 1.8.4 + * Thu Jan 19 2023 Fedora Release Engineering - 1.8.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index a5cb762..5bc0f1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libX11-1.8.3.tar.xz) = bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 +SHA512 (libX11-1.8.4.tar.xz) = 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e