!28 [sync] PR-27: fix error from unkown X86FMacroxx keysym

From: @openeuler-sync-bot 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125

backport-makekeys-handle-the-new-EVDEVK-xorgproto-symbols.patch

@@ -0,0 +1,46 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+Conflict:NA
+Reference:https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/e92efc63acd7b377faa9e534f4bf52aaa86be2a9
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
+

libX11.spec

@@ -1,12 +1,13 @@
 Name:		libX11
 Version:	1.7.2
-Release:	2
+Release:	3
 Summary:	Core X11 protocol client library
 License:	MIT
 URL:		http://www.x.org
 Source0:	https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 
 Patch1:         dont-forward-keycode-0.patch
+Patch2:         backport-makekeys-handle-the-new-EVDEVK-xorgproto-symbols.patch
 
 BuildRequires:	xorg-x11-util-macros >= 1.11 xorg-x11-proto-devel perl-Pod-Usage libXau-devel
 BuildRequires:  libxcb-devel >= 1.2 libXdmcp-devel xorg-x11-xtrans-devel >= 1.0.3-4
@@ -73,6 +74,9 @@ make %{?_smp_mflags} check
 %{_mandir}/*/*
 
 %changelog
+* Tue Jun 21 2022 wangkerong <wangkerong@h-partners.com> - 1.7.2-3
+- fix error from unkown X86FMacroxx keysym
+
 * Wed Dec 15 2021 wangkerong <wangkerong@huawei.com> - 1.7.2-2
 - provide XKBgeom header file