From cfa57197f6a73334ad3925c689046cca27f79937b113b2f878745addc74b6080 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 2 Nov 2022 11:41:57 +0000 Subject: [PATCH] - Update to version 22.1.5 * This is a follow-up release to address a couple of regressions which found their way into the recent xwayland-22.1.4 release, namely: + Double scroll wheel events with some Wayland compositors https://gitlab.freedesktop.org/xorg/xserver/-/issues/1392 + Key keeps repeating when a window is closed while a key is pressed https://gitlab.freedesktop.org/xorg/xserver/-/issues/1395 - supersedes U_Do-not-ignore-leave-events.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xwayland?expand=0&rev=36 --- U_Do-not-ignore-leave-events.patch | 48 ----------------------------- xwayland-22.1.4.tar.xz | 3 -- xwayland-22.1.4.tar.xz.sig | Bin 95 -> 0 bytes xwayland-22.1.5.tar.xz | 3 ++ xwayland-22.1.5.tar.xz.sig | Bin 0 -> 95 bytes xwayland.changes | 13 ++++++++ xwayland.spec | 3 +- 7 files changed, 17 insertions(+), 53 deletions(-) delete mode 100644 U_Do-not-ignore-leave-events.patch delete mode 100644 xwayland-22.1.4.tar.xz delete mode 100644 xwayland-22.1.4.tar.xz.sig create mode 100644 xwayland-22.1.5.tar.xz create mode 100644 xwayland-22.1.5.tar.xz.sig diff --git a/U_Do-not-ignore-leave-events.patch b/U_Do-not-ignore-leave-events.patch deleted file mode 100644 index 34d7124..0000000 --- a/U_Do-not-ignore-leave-events.patch +++ /dev/null @@ -1,48 +0,0 @@ -From bd39c17e2398f82910978ed55ac772c67d8f940a Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Mon, 24 Oct 2022 09:24:01 +0200 -Subject: [PATCH] xwayland/input: Do not ignore leave events - -Commit 8a5f3ddb2 ("set tag on our surface") introduced the use of tags -to differentiate our own surfaces, and commit a1d14aa8c ("Clear the -"xwl-window" tag on unrealize") removed the tags before the surfaces are -actually destroyed. - -Xwayland would then rely on these tags on the surface to decide whether -to ignore or to process the Wayland event in various places. - -However, in doing so, it also checked for the tag on keyboard leave -events. - -As a result, if the keyboard leave events is received after the X11 -window is unrealized, keyboard_handle_leave() would not queue the -LeaveNotify events for the DIX to proceed, and the key repeat would -kick in and repeat the key event indefinitely. - -To avoid the issue, process events regardless of the tag as before -in keyboard_handle_leave(). - -Signed-off-by: Olivier Fourdan -Fixes: 8a5f3ddb2 - "xwayland: set tag on our surface" -Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1395 ---- - hw/xwayland/xwayland-input.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c -index 240eb0139..9eda1ef71 100644 ---- a/hw/xwayland/xwayland-input.c -+++ b/hw/xwayland/xwayland-input.c -@@ -1147,9 +1147,6 @@ keyboard_handle_leave(void *data, struct wl_keyboard *keyboard, - struct xwl_seat *xwl_seat = data; - uint32_t *k; - -- if (surface != NULL && !is_surface_from_xwl_window(surface)) -- return; -- - xwl_seat->xwl_screen->serial = serial; - - wl_array_for_each(k, &xwl_seat->keys) --- -GitLab - diff --git a/xwayland-22.1.4.tar.xz b/xwayland-22.1.4.tar.xz deleted file mode 100644 index 0248e85..0000000 --- a/xwayland-22.1.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c39bdd77444c3fa7a0e2ef317ae69ddde89a901dc8914dbc8eac39a9313512a -size 1273552 diff --git a/xwayland-22.1.4.tar.xz.sig b/xwayland-22.1.4.tar.xz.sig deleted file mode 100644 index f286af555d69e077d033f0525a49dde29ae05b554af1afa6a212eddcedff7f96..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WJ$l%_9@B!=wI)xO0gmZx%=e2T^(4Nk^_w-7`QkEU?K$_4D&Ru vA3e5R;rYDo*-Y+SxBL!GsQA>(u;AOBH0hf+Sf59=o{Cc!=QUN$s`LT?BlIL0 diff --git a/xwayland-22.1.5.tar.xz b/xwayland-22.1.5.tar.xz new file mode 100644 index 0000000..2b1f08b --- /dev/null +++ b/xwayland-22.1.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e317ac1f119f8321654921761420901e4abd95585a8c763ce26af3b045ac1672 +size 1273444 diff --git a/xwayland-22.1.5.tar.xz.sig b/xwayland-22.1.5.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..17c4b6b872da9813269d57954967d74a705d9482978ca138d54fb6264ac42e19 GIT binary patch literal 95 zcmeB(WnmCxVvrS6WJ$l%_9@B!=wI)xO0gmZx%=e2T^(4Nl9Mbd8MrtFU?SPZ3=0{`~9Tgv<@+IPPR9DCyd4`Rf1x9dabg literal 0 HcmV?d00001 diff --git a/xwayland.changes b/xwayland.changes index aed5a1a..e06468c 100644 --- a/xwayland.changes +++ b/xwayland.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Nov 2 11:27:06 UTC 2022 - Stefan Dirsch + +- Update to version 22.1.5 + * This is a follow-up release to address a couple of regressions + which found their way into the recent xwayland-22.1.4 release, + namely: + + Double scroll wheel events with some Wayland compositors + https://gitlab.freedesktop.org/xorg/xserver/-/issues/1392 + + Key keeps repeating when a window is closed while a key is pressed + https://gitlab.freedesktop.org/xorg/xserver/-/issues/1395 +- supersedes U_Do-not-ignore-leave-events.patch + ------------------------------------------------------------------- Mon Oct 24 13:50:22 UTC 2022 - Stefan Dirsch diff --git a/xwayland.spec b/xwayland.spec index 1271317..a8bae0d 100644 --- a/xwayland.spec +++ b/xwayland.spec @@ -24,7 +24,7 @@ %endif Name: xwayland -Version: 22.1.4 +Version: 22.1.5 Release: 0 URL: http://xorg.freedesktop.org/ Summary: X @@ -33,7 +33,6 @@ Group: System/X11/Servers/XF86_4 Source0: %{url}/archive/individual/xserver/%{name}-%{version}.tar.xz Source1: %{url}/archive/individual/xserver/%{name}-%{version}.tar.xz.sig Source2: xwayland.keyring -Patch0: U_Do-not-ignore-leave-events.patch BuildRequires: meson BuildRequires: ninja BuildRequires: pkgconfig