Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libX11 for openSUSE:Factory checked 
in at 2025-03-10 17:57:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libX11 (Old)
 and      /work/SRC/openSUSE:Factory/.libX11.new.19136 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libX11"

Mon Mar 10 17:57:41 2025 rev:58 rq:1251488 version:1.8.12

Changes:
--------
--- /work/SRC/openSUSE:Factory/libX11/libX11.changes    2025-02-26 
17:13:41.307068334 +0100
+++ /work/SRC/openSUSE:Factory/.libX11.new.19136/libX11.changes 2025-03-10 
17:57:46.635645399 +0100
@@ -1,0 +2,8 @@
+Sun Mar  9 03:23:20 UTC 2025 - Stefan Dirsch <sndir...@suse.com>
+
+- Update to 1.8.12; this release includes:
+  * x11.pc: Add URL field (!280)
+  * xkb: Bring over fixes from Xserver to shared XKB source files (!279)
+- supersedes 
U_CVE-2025-26597-0001-xkb-Fix-buffer-overflow-in-XkbChangeTypesOfKey.patch
+
+-------------------------------------------------------------------

Old:
----
  U_CVE-2025-26597-0001-xkb-Fix-buffer-overflow-in-XkbChangeTypesOfKey.patch
  libX11-1.8.11.tar.xz

New:
----
  libX11-1.8.12.tar.xz

BETA DEBUG BEGIN:
  Old:  * xkb: Bring over fixes from Xserver to shared XKB source files (!279)
- supersedes 
U_CVE-2025-26597-0001-xkb-Fix-buffer-overflow-in-XkbChangeTypesOfKey.patch
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libX11.spec ++++++
--- /var/tmp/diff_new_pack.wYDxbp/_old  2025-03-10 17:57:47.419678308 +0100
+++ /var/tmp/diff_new_pack.wYDxbp/_new  2025-03-10 17:57:47.423678476 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           libX11
-Version:        1.8.11
+Version:        1.8.12
 Release:        0
 Summary:        Core X11 protocol client library
 License:        MIT
@@ -32,7 +32,6 @@
 # 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
-Patch1237431:   
U_CVE-2025-26597-0001-xkb-Fix-buffer-overflow-in-XkbChangeTypesOfKey.patch
 BuildRequires:  fdupes
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -122,7 +121,6 @@
 %patch -P 1
 %patch -P 2
 %patch -P 3 -p1
-%patch -P 1237431 -p1
 
 %build
 %configure \

++++++ libX11-1.8.11.tar.xz -> libX11-1.8.12.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/ChangeLog new/libX11-1.8.12/ChangeLog
--- old/libX11-1.8.11/ChangeLog 2025-02-02 23:10:09.000000000 +0100
+++ new/libX11-1.8.12/ChangeLog 2025-03-09 00:53:24.000000000 +0100
@@ -1,3 +1,124 @@
+commit 59917d28a3c41ad22d6fc52e323cafe2cdd596d5
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sat Mar 8 15:23:04 2025 -0800
+
+    libX11 1.8.12
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 5f8077b257ea27a5fd6f114d2bc15284b2416b3c
+Author: Olivier Fourdan <ofour...@redhat.com>
+Date:   Thu Nov 28 14:09:04 2024 +0100
+
+    xkb: Fix buffer overflow in XkbChangeTypesOfKey()
+    
+    If XkbChangeTypesOfKey() is called with nGroups == 0, it will resize the
+    key syms to 0 but leave the key actions unchanged.
+    
+    If later, the same function is called with a non-zero value for nGroups,
+    this will cause a buffer overflow because the key actions are of the wrong
+    size.
+    
+    To avoid the issue, make sure to resize both the key syms and key actions
+    when nGroups is 0.
+    
+    (cherry picked from xorg/xserver@0e4ed94952b255c04fe910f6a1d9c852878dcd64)
+    
+    Signed-off-by: Olivier Fourdan <ofour...@redhat.com>
+    Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Part-of: 
<https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/279>
+
+commit 865fd56aeb5c5d1812cce46ed197873c48b08692
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sun Nov 1 15:45:08 2020 -0800
+
+    xkb: always set *mask_rtrn in XkbVirtualModsToReal
+    
+    Resolves warning from Oracle Parfait static analyser:
+    
+    Error: Uninitialised memory
+       Uninitialised memory variable [uninitialised-mem-var] (CWE 457):
+          Possible access to uninitialised memory referenced by variable 'mask'
+            at line 721 of xkb/XKBMisc.c in function 
'XkbUpdateKeyTypeVirtualMods'.
+            Path in callee avoiding write at line 720
+              mask allocated at line 718
+    
+    (cherry picked from xorg/xserver@a6574033f464c7cde02bce8f1b130ff6b2b2d9eb)
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Part-of: 
<https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/279>
+
+commit 88d1a84ca3c0f87ffcb83b9b96e34a7121d5e2d3
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sat Feb 22 11:59:13 2025 -0800
+
+    XkbChangeTypesOfKey: verify newTypesIn is not null before using it
+    
+    Based on xorg/xserver@97c9e6a7139e07a0761be05034fae42fcd65ba36
+    
+    Fixes: 8ba0ca32 ("Janitor: ansification, make distcheck, compiler 
warnings.")
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Part-of: 
<https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/279>
+
+commit 48a1335cab13d883e15b4eb5e9a5e080289a5c64
+Author: Siddhesh Poyarekar <siddhesh.poyare...@gmail.com>
+Date:   Tue May 29 10:17:50 2012 +0530
+
+    xkb: Allocate size_syms correctly when width of a type increases
+    
+    The current code seems to skip syms with width less than
+    type->num_levels when calculating the total size for the new
+    size_syms. This leads to less space being allocated than necessary
+    during the next phase, which is to copy over the syms to the new
+    location. This results in an overflow leading to a crash.
+    
+    (cherry picked from xorg/xserver@42ae2e8199fe875319978249963de7499607988b)
+    
+    Signed-off-by: Siddhesh Poyarekar <siddhesh.poyare...@gmail.com>
+    Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Part-of: 
<https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/279>
+
+commit 158be3ebd7d1da4d16bfc2dee82aac477fbcb833
+Author: Daniel Stone <dan...@fooishbar.org>
+Date:   Wed Mar 21 02:04:12 2007 +0200
+
+    XKB: Fix size_syms calculation bug
+    
+    Apparently it needed to be nSyms*15/10, not *12/10; make it match the
+    other allocation code.
+    
+    (cherry picked from xorg/xserver@f292de2ef13dc994a38029cee9e2642576893332)
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Part-of: 
<https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/279>
+
+commit d6e1ca046aef42ec5465ece5edbdffe0bc7c0cb6
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sat Feb 22 10:13:52 2025 -0800
+
+    XkbFreeKeyboard: set xkb->geom to NULL after freeing it
+    
+    Because XkbFreeGeometry takes a pointer to the geometry structure,
+    and not the overall xkb structure like the other XkbFree*() calls,
+    the caller is responsible for clearing the xkb->geom pointer to
+    ensure it is not used after free.
+    
+    Based on xorg/xserver@629798c73ad76a77fa6a55bc6403fd9b95ade2bb
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Part-of: 
<https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/279>
+
+commit 4a3ca6eeced253aacb0e2ecf640b9eb93863badc
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sun Feb 23 15:19:54 2025 -0800
+
+    x11.pc: Add URL field
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Part-of: 
<https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/280>
+
 commit 23f0352eca362515d598bfdbd8ecec070dcd1b28
 Author: Alan Coopersmith <alan.coopersm...@oracle.com>
 Date:   Sun Feb 2 13:54:27 2025 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/README.md new/libX11-1.8.12/README.md
--- old/libX11-1.8.11/README.md 2025-02-02 23:09:39.000000000 +0100
+++ new/libX11-1.8.12/README.md 2025-03-09 00:52:54.000000000 +0100
@@ -31,6 +31,11 @@
 
   https://www.x.org/wiki/Development/Documentation/SubmittingPatches
 
+## Release 1.8.12
+
+ * x11.pc: Add URL field (!280)
+ * xkb: Bring over fixes from Xserver to shared XKB source files (!279)
+
 ## Release 1.8.11
 
  * Close xcb connection after freeing display structure to avoid XIO error
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/aclocal.m4 new/libX11-1.8.12/aclocal.m4
--- old/libX11-1.8.11/aclocal.m4        2025-02-02 23:09:53.000000000 +0100
+++ new/libX11-1.8.12/aclocal.m4        2025-03-09 00:53:08.000000000 +0100
@@ -3510,7 +3510,7 @@
 ]) # XORG_CHANGELOG
 
 dnl
-dnl Copyright (c) 2005, Oracle and/or its affiliates.
+dnl Copyright (c) 2005, 2025, Oracle and/or its affiliates.
 dnl
 dnl Permission is hereby granted, free of charge, to any person obtaining a
 dnl copy of this software and associated documentation files (the "Software"),
@@ -3544,10 +3544,12 @@
  fi
 
  # Needs to come after above checks for libsocket & libnsl for SVR4 systems
+ AC_CHECK_FUNCS([getaddrinfo inet_ntop])
+
  AC_ARG_ENABLE(ipv6,
        AS_HELP_STRING([--enable-ipv6],[Enable IPv6 support]),
        [IPV6CONN=$enableval],
-       [AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])])
+       [IPV6CONN=$ac_cv_func_getaddrinfo])
  AC_MSG_CHECKING([if IPv6 support should be built])
  if test "$IPV6CONN" = "yes"; then
        AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
@@ -3564,9 +3566,11 @@
  ])
 
  # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
- AC_CHECK_TYPES([socklen_t], [], [], [
+ # and added a type defined to be large enough to hold any sockaddr format.
+ AC_CHECK_TYPES([socklen_t, struct sockaddr_storage], [], [], [
 AC_INCLUDES_DEFAULT
-#include <sys/socket.h>])
+#include <sys/socket.h>
+ ])
 
  # XPG4v2/UNIX95 added msg_control - check to see if we need to define
  # _XOPEN_SOURCE to get it (such as on Solaris)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/configure new/libX11-1.8.12/configure
--- old/libX11-1.8.11/configure 2025-02-02 23:09:54.000000000 +0100
+++ new/libX11-1.8.12/configure 2025-03-09 00:53:09.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for libX11 1.8.11.
+# Generated by GNU Autoconf 2.72 for libX11 1.8.12.
 #
 # Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues>.
 #
@@ -675,8 +675,8 @@
 # Identity of this package.
 PACKAGE_NAME='libX11'
 PACKAGE_TARNAME='libX11'
-PACKAGE_VERSION='1.8.11'
-PACKAGE_STRING='libX11 1.8.11'
+PACKAGE_VERSION='1.8.12'
+PACKAGE_STRING='libX11 1.8.12'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues'
 PACKAGE_URL=''
 
@@ -1550,7 +1550,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures libX11 1.8.11 to adapt to many kinds of systems.
+'configure' configures libX11 1.8.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1621,7 +1621,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libX11 1.8.11:";;
+     short | recursive ) echo "Configuration of libX11 1.8.12:";;
    esac
   cat <<\_ACEOF
 
@@ -1794,7 +1794,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libX11 configure 1.8.11
+libX11 configure 1.8.12
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2277,7 +2277,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libX11 $as_me 1.8.11, which was
+It was created by libX11 $as_me 1.8.12, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -5169,7 +5169,7 @@
 
 # Define the identity of the package.
  PACKAGE='libX11'
- VERSION='1.8.11'
+ VERSION='1.8.12'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -22636,20 +22636,26 @@
  fi
 
  # Needs to come after above checks for libsocket & libnsl for SVR4 systems
+ ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
+if test "x$ac_cv_func_getaddrinfo" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
+if test "x$ac_cv_func_inet_ntop" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h
+
+fi
+
+
  # Check whether --enable-ipv6 was given.
 if test ${enable_ipv6+y}
 then :
   enableval=$enable_ipv6; IPV6CONN=$enableval
 else case e in #(
-  e) ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
-if test "x$ac_cv_func_getaddrinfo" = xyes
-then :
-  IPV6CONN=yes
-else case e in #(
-  e) IPV6CONN=no ;;
-esac
-fi
- ;;
+  e) IPV6CONN=$ac_cv_func_getaddrinfo ;;
 esac
 fi
 
@@ -22679,9 +22685,11 @@
 
 
  # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ # and added a type defined to be large enough to hold any sockaddr format.
  ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
 $ac_includes_default
 #include <sys/socket.h>
+
 "
 if test "x$ac_cv_type_socklen_t" = xyes
 then :
@@ -22690,6 +22698,18 @@
 
 
 fi
+ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" 
"ac_cv_type_struct_sockaddr_storage" "
+$ac_includes_default
+#include <sys/socket.h>
+
+"
+if test "x$ac_cv_type_struct_sockaddr_storage" = xyes
+then :
+
+printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h
+
+
+fi
 
 
  # XPG4v2/UNIX95 added msg_control - check to see if we need to define
@@ -24747,7 +24767,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libX11 $as_me 1.8.11, which was
+This file was extended by libX11 $as_me 1.8.12, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24815,7 +24835,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-libX11 config.status 1.8.11
+libX11 config.status 1.8.12
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/configure.ac 
new/libX11-1.8.12/configure.ac
--- old/libX11-1.8.11/configure.ac      2025-02-02 23:09:39.000000000 +0100
+++ new/libX11-1.8.12/configure.ac      2025-03-09 00:52:54.000000000 +0100
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.70])
-AC_INIT([libX11], [1.8.11],
+AC_INIT([libX11], [1.8.12],
         [https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues], [libX11])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/src/config.h.in 
new/libX11-1.8.12/src/config.h.in
--- old/libX11-1.8.11/src/config.h.in   2025-02-02 23:09:55.000000000 +0100
+++ new/libX11-1.8.12/src/config.h.in   2025-03-09 00:53:10.000000000 +0100
@@ -21,9 +21,15 @@
 /* Use dlopen to load shared libraries */
 #undef HAVE_DLOPEN
 
+/* Define to 1 if you have the 'getaddrinfo' function. */
+#undef HAVE_GETADDRINFO
+
 /* Define to 1 if you have the 'getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
+/* Define to 1 if you have the 'inet_ntop' function. */
+#undef HAVE_INET_NTOP
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -72,6 +78,9 @@
 /* Define to 1 if you have the 'strtol' function. */
 #undef HAVE_STRTOL
 
+/* Define to 1 if the system has the type 'struct sockaddr_storage'. */
+#undef HAVE_STRUCT_SOCKADDR_STORAGE
+
 /* Define to 1 if you have the <sys/filio.h> header file. */
 #undef HAVE_SYS_FILIO_H
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/src/xkb/XKBAlloc.c 
new/libX11-1.8.12/src/xkb/XKBAlloc.c
--- old/libX11-1.8.11/src/xkb/XKBAlloc.c        2025-02-02 23:09:39.000000000 
+0100
+++ new/libX11-1.8.12/src/xkb/XKBAlloc.c        2025-03-09 00:52:54.000000000 
+0100
@@ -296,8 +296,10 @@
         XkbFreeIndicatorMaps(xkb);
     if (which & XkbNamesMask)
         XkbFreeNames(xkb, XkbAllNamesMask, True);
-    if ((which & XkbGeometryMask) && (xkb->geom != NULL))
+    if ((which & XkbGeometryMask) && (xkb->geom != NULL)) {
         XkbFreeGeometry(xkb->geom, XkbGeomAllMask, True);
+        xkb->geom = NULL;
+    }
     if (which & XkbControlsMask)
         XkbFreeControls(xkb, XkbAllControlsMask, True);
     if (freeAll)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/src/xkb/XKBMAlloc.c 
new/libX11-1.8.12/src/xkb/XKBMAlloc.c
--- old/libX11-1.8.11/src/xkb/XKBMAlloc.c       2025-02-02 23:09:39.000000000 
+0100
+++ new/libX11-1.8.12/src/xkb/XKBMAlloc.c       2025-03-09 00:52:54.000000000 
+0100
@@ -436,8 +436,10 @@
         nResize = 0;
         for (nTotal = 1, i = xkb->min_key_code; i <= xkb->max_key_code; i++) {
             width = XkbKeyGroupsWidth(xkb, i);
-            if (width < type->num_levels)
+            if (width < type->num_levels || width >= new_num_lvls) {
+                nTotal += XkbKeyNumSyms(xkb,i);
                 continue;
+            }
             for (match = 0, g = XkbKeyNumGroups(xkb, i) - 1;
                  (g >= 0) && (!match); g--) {
                 if (XkbKeyKeyTypeIndex(xkb, i, g) == type_ndx) {
@@ -445,7 +447,7 @@
                     match = 1;
                 }
             }
-            if ((!match) || (width >= new_num_lvls))
+            if (!match)
                 nTotal += XkbKeyNumSyms(xkb, i);
             else {
                 nTotal += XkbKeyNumGroups(xkb, i) * new_num_lvls;
@@ -455,7 +457,7 @@
         if (nResize > 0) {
             int nextMatch;
 
-            xkb->map->size_syms = (nTotal * 12) / 10;
+            xkb->map->size_syms = (nTotal * 15) / 10;
             newSyms = _XkbTypedCalloc(xkb->map->size_syms, KeySym);
             if (newSyms == NULL)
                 return BadAlloc;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/src/xkb/XKBMisc.c 
new/libX11-1.8.12/src/xkb/XKBMisc.c
--- old/libX11-1.8.11/src/xkb/XKBMisc.c 2025-02-02 23:09:39.000000000 +0100
+++ new/libX11-1.8.12/src/xkb/XKBMisc.c 2025-03-09 00:52:54.000000000 +0100
@@ -682,8 +682,8 @@
     int width, nOldGroups, oldWidth, newTypes[XkbNumKbdGroups];
 
     if ((!xkb) || (!XkbKeycodeInRange(xkb, key)) || (!xkb->map) ||
-        (!xkb->map->types) || ((groups & XkbAllGroupsMask) == 0) ||
-        (nGroups > XkbNumKbdGroups)) {
+        (!xkb->map->types) || (!newTypesIn) ||
+        ((groups & XkbAllGroupsMask) == 0) || (nGroups > XkbNumKbdGroups)) {
         return BadMatch;
     }
     if (nGroups == 0) {
@@ -694,6 +694,7 @@
         i = XkbSetNumGroups(i, 0);
         xkb->map->key_sym_map[key].group_info = i;
         XkbResizeKeySyms(xkb, key, 0);
+        XkbResizeKeyActions(xkb, key, 0);
         return Success;
     }
 
@@ -804,14 +805,14 @@
     register int i, bit;
     register unsigned mask;
 
-    if (xkb == NULL)
+    if ((xkb == NULL) || (xkb->server == NULL)) {
+        *mask_rtrn = 0;
         return False;
+    }
     if (virtual_mask == 0) {
         *mask_rtrn = 0;
         return True;
     }
-    if (xkb->server == NULL)
-        return False;
     for (i = mask = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) {
         if (virtual_mask & bit)
             mask |= xkb->server->vmods[i];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libX11-1.8.11/x11.pc.in new/libX11-1.8.12/x11.pc.in
--- old/libX11-1.8.11/x11.pc.in 2025-02-02 23:09:40.000000000 +0100
+++ new/libX11-1.8.12/x11.pc.in 2025-03-09 00:52:54.000000000 +0100
@@ -7,6 +7,7 @@
 
 Name: X11
 Description: X Library
+URL: https://gitlab.freedesktop.org/xorg/lib/libx11/
 Version: @PACKAGE_VERSION@
 Requires: xproto @XKBPROTO_REQUIRES@
 Requires.private: @X11_EXTRA_DEPS@

Reply via email to