Accepting request 1320983 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/1320983
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libX11?expand=0&rev=59

libX11-ignore-incompatible-XkbMapNotify.patch

@@ -0,0 +1,68 @@
+From 7f31a215ad23adf71d1ce604487ee1e0f5121cc9 Mon Sep 17 00:00:00 2001
+From: Julian Orth <ju.orth@gmail.com>
+Date: Fri, 24 Oct 2025 20:15:37 +0200
+Subject: [PATCH] Ignore XkbMapNotify events that don't belong to the core
+ keyboard
+
+Such events can contain values that are incompatible with the core
+keyboard map.
+
+Fixes a potentially fatal error when such values are later used in a
+XkbGetMap request.
+
+Signed-off-by: Julian Orth <ju.orth@gmail.com>
+---
+ src/xkb/XKBBind.c |  2 ++
+ src/xkb/XKBUse.c  | 16 ++++++++++------
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
+index 467e4198..5459e42d 100644
+--- a/src/xkb/XKBBind.c
++++ b/src/xkb/XKBBind.c
+@@ -369,6 +369,8 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent * event)
+         XkbMapChangesRec changes;
+         Status rtrn;
+ 
++        if (!xkbi->desc || xkbi->desc->device_spec != event->device)
++            return Success;
+         if (xkbi->flags & XkbMapPending)
+             changes = xkbi->changes;
+         else
+diff --git a/src/xkb/XKBUse.c b/src/xkb/XKBUse.c
+index ab5027b0..9a01a8fb 100644
+--- a/src/xkb/XKBUse.c
++++ b/src/xkb/XKBUse.c
+@@ -290,9 +290,11 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
+             mev->num_modmap_keys = mn->nModMapKeys;
+             mev->first_vmodmap_key = mn->firstVModMapKey;
+             mev->num_vmodmap_keys = mn->nVModMapKeys;
+-            XkbNoteMapChanges(&xkbi->changes, mev, XKB_XLIB_MAP_MASK);
+-            if (xkbi->changes.changed)
+-                xkbi->flags |= XkbMapPending;
++            if (xkbi->desc && xkbi->desc->device_spec == mn->deviceID) {
++                XkbNoteMapChanges(&xkbi->changes, mev, XKB_XLIB_MAP_MASK);
++                if (xkbi->changes.changed)
++                    xkbi->flags |= XkbMapPending;
++            }
+             return True;
+         }
+         else if (mn->nKeySyms > 0) {
+@@ -306,9 +308,11 @@ wire_to_event(Display *dpy, XEvent *re, xEvent *event)
+             ev->first_keycode = mn->firstKeySym;
+             ev->request = MappingKeyboard;
+             ev->count = mn->nKeySyms;
+-            _XkbNoteCoreMapChanges(&xkbi->changes, ev, XKB_XLIB_MAP_MASK);
+-            if (xkbi->changes.changed)
+-                xkbi->flags |= XkbMapPending;
++            if (xkbi->desc && xkbi->desc->device_spec == mn->deviceID) {
++                _XkbNoteCoreMapChanges(&xkbi->changes, ev, XKB_XLIB_MAP_MASK);
++                if (xkbi->changes.changed)
++                    xkbi->flags |= XkbMapPending;
++            }
+             return True;
+         }
+     }
+-- 
+GitLab
+

libX11.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov 28 08:52:07 UTC 2025 - Alynx Zhou <alynx.zhou@suse.com>
+
+- Add libX11-ignore-incompatible-XkbMapNotify.patch: Fix
+  mutter-x11-frames crash caused by keyboard layout change
+  triggered by orca screen reader. (bsc#1253076)
+
 -------------------------------------------------------------------
 Sun Mar  9 03:23:20 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
 
@@ -74,7 +81,9 @@ Mon Mar 25 01:45:51 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 
 - update to 1.8.8
  * Fix XIM input sometimes jumbled (#198, !236)
+   (bsc#1252250)
  * Fix _XkbReadGetDeviceInfoReply for nButtons == dev->buttons (!237)
+   (bsc#1252250)
  * Drop ifdefs for platforms that are no longer supported (!242, !243)
  * Assorted memory handling cleanups
 

libX11.spec

@@ -32,6 +32,8 @@ Patch1:         p_xlib_skip_ext_env.diff
 # PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales
 Patch2:         en-locales.diff
 Patch3:         u_no-longer-crash-in-XVisualIDFromVisual.patch
+# PATCH-FIX-UPSTREAM libX11-ignore-incompatible-XkbMapNotify.patch bsc#1253076 alynx.zhou@suse.com -- Fix mutter-x11-frames crash due to orca screen reader
+Patch4:         libX11-ignore-incompatible-XkbMapNotify.patch
 BuildRequires:  fdupes
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -121,6 +123,7 @@ test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
 %patch -P 1
 %patch -P 2
 %patch -P 3 -p1
+%patch -P 4 -p1
 
 %build
 %configure \