diff --git a/SOURCES/0001-Don-t-pretend-unresolved-symbols-are-an-error.patch b/SOURCES/0001-Don-t-pretend-unresolved-symbols-are-an-error.patch new file mode 100644 index 0000000..1fced8f --- /dev/null +++ b/SOURCES/0001-Don-t-pretend-unresolved-symbols-are-an-error.patch @@ -0,0 +1,31 @@ +From c8cfca25ab2ed65013448f7502bae933c66390ae Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 5 Jun 2020 14:23:09 +1000 +Subject: [PATCH xkbcomp] 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 +--- + 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.26.2 + diff --git a/SPECS/xorg-x11-xkb-utils.spec b/SPECS/xorg-x11-xkb-utils.spec index dd66201..da12011 100644 --- a/SPECS/xorg-x11-xkb-utils.spec +++ b/SPECS/xorg-x11-xkb-utils.spec @@ -8,7 +8,7 @@ Summary: X.Org X11 xkb utilities Name: xorg-x11-xkb-utils Version: 7.7 -Release: 27%{?dist} +Release: 28%{?dist} License: MIT URL: https://www.x.org @@ -19,6 +19,7 @@ Source3: https://www.x.org/pub/individual/app/xkbprint-%{xkbprint}.tar.bz2 Source4: https://www.x.org/pub/individual/app/xkbutils-%{xkbutils}.tar.bz2 Patch0: 0001-Suppress-high-keycode-warnings-at-the-default-warnin.patch +Patch1: 0001-Don-t-pretend-unresolved-symbols-are-an-error.patch BuildRequires: byacc BuildRequires: pkgconfig(x11) @@ -54,6 +55,7 @@ X.Org X11 xkb gadgets. %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 pushd xkbcomp-* %patch0 -p1 +%patch1 -p1 popd %build @@ -108,6 +110,9 @@ popd %{_libdir}/pkgconfig/xkbcomp.pc %changelog +* Mon Jun 08 2020 Peter Hutterer 7.7-28 +- Downgrade errors about unresolved keysyms to warnings (#1780463) + * Wed Oct 17 2018 Adam Jackson - 7.7-27 - Suppress high-keycode warnings from xkbcomp