From 5c30fe1878bb98954abb6a64632a571b05510f28 Mon Sep 17 00:00:00 2001 From: wangkerong Date: Tue, 21 Jun 2022 15:12:55 +0800 Subject: [PATCH] fix error from unknow XF86Macroxx keysym (cherry picked from commit 46df1c97c6cb2471c2101e73d9e9008d137020fa) --- ...tend-unresolved-symbols-are-an-error.patch | 34 +++++++++++++++++++ xorg-x11-xkb-utils.spec | 7 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 backport-Do-not-pretend-unresolved-symbols-are-an-error.patch diff --git a/backport-Do-not-pretend-unresolved-symbols-are-an-error.patch b/backport-Do-not-pretend-unresolved-symbols-are-an-error.patch new file mode 100644 index 0000000..555500a --- /dev/null +++ b/backport-Do-not-pretend-unresolved-symbols-are-an-error.patch @@ -0,0 +1,34 @@ +From c8cfca25ab2ed65013448f7502bae933c66390ae Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 5 Jun 2020 14:23:09 +1000 +Subject: [PATCH] Don't pretend unresolved symbols are an error + +Whenever xkeyboard-config is newer than xorgproto, or libX11 just hasn't yet +been rebuilt against the protocol we end up with some unresolved symbols. +That's not an error, it just happens. Let's downgrade this to a warning +instead. + +Signed-off-by: Peter Hutterer + +Conflict:NA +Reference:https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/commit/c8cfca25ab2ed65013448f7502bae933c66390ae +--- + symbols.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/symbols.c b/symbols.c +index 3fe0195..ece1caa 100644 +--- a/symbols.c ++++ b/symbols.c +@@ -968,7 +968,7 @@ AddSymbolsToKey(KeyInfo * key, + key->symsDefined |= (1 << ndx); + for (i = 0; i < nSyms; i++) { + if (!LookupKeysym(value->value.list.syms[i], &key->syms[ndx][i])) { +- WSGO1("Could not resolve keysym %s\n", value->value.list.syms[i]); ++ WARN2("Could not resolve keysym %s\n", value->value.list.syms[i]); + key->syms[ndx][i] = NoSymbol; + } + } +-- +2.27.0 + diff --git a/xorg-x11-xkb-utils.spec b/xorg-x11-xkb-utils.spec index 43483d4..2d37778 100644 --- a/xorg-x11-xkb-utils.spec +++ b/xorg-x11-xkb-utils.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 xkb utilities Name: xorg-x11-xkb-utils Version: 7.7 -Release: 30 +Release: 31 License: MIT URL: https://www.x.org @@ -12,6 +12,7 @@ Source3: https://www.x.org/pub/individual/app/xkbprint-1.0.4.tar.bz2 Source4: https://www.x.org/pub/individual/app/xkbutils-1.0.4.tar.bz2 Patch6000: backport-Suppress-high-keycode-warnings-at-the-default-warning-level.patch +Patch6001: backport-Do-not-pretend-unresolved-symbols-are-an-error.patch BuildRequires: byacc pkgconfig(x11) pkgconfig(xaw7) pkgconfig(xkbfile) pkgconfig(xorg-macros) >= 1.8 pkgconfig(xt) @@ -41,6 +42,7 @@ X.Org X11 xkb utilities development files. %setup -q -c xorg-x11-xkb-utils-%{version} -a1 -a2 -a3 -a4 pushd xkbcomp-* %patch6000 -p1 +%patch6001 -p1 popd %build @@ -93,6 +95,9 @@ popd %{_libdir}/pkgconfig/xkbcomp.pc %changelog +* Thu Jun 21 2022 wangkerong - 7.7-31 +- fix error from unknow XF86Macroxx keysym + * Wed Apr 13 2022 xingxing - 7.7-30 - enable patch 6000 -- Gitee