Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libx11
Commits: 764cd66f by Timo Aaltonen at 2021-09-15T09:18:19+03:00 Add an upstream commit to handle new _EVDEVK symbols. - - - - - 33eebc77 by Timo Aaltonen at 2021-09-15T09:19:30+03:00 release to sid - - - - - 3 changed files: - debian/changelog - + debian/patches/0001-makekeys-handle-the-new-_EVDEVK-xorgproto-symbols.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +libx11 (2:1.7.2-2) unstable; urgency=medium + + * Add an upstream commit to handle new _EVDEVK symbols. + + -- Timo Aaltonen <[email protected]> Wed, 15 Sep 2021 09:18:20 +0300 + libx11 (2:1.7.2-1) unstable; urgency=medium [ Timo Aaltonen ] ===================================== debian/patches/0001-makekeys-handle-the-new-_EVDEVK-xorgproto-symbols.patch ===================================== @@ -0,0 +1,43 @@ +From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <[email protected]> +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 <[email protected]> +--- + 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. */ +-- +2.32.0 + ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ 008_remove_ko_Compose.diff 009_remove_th_Compose.diff 015_russian_locale_alias.diff +0001-makekeys-handle-the-new-_EVDEVK-xorgproto-symbols.patch View it on GitLab: https://salsa.debian.org/xorg-team/lib/libx11/-/compare/db34414f7755283730e1ed915993b353af49f003...33eebc7788a7a8140701e8b39689892f243f9470 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/libx11/-/compare/db34414f7755283730e1ed915993b353af49f003...33eebc7788a7a8140701e8b39689892f243f9470 You're receiving this email because of your account on salsa.debian.org.
