Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2018-03-24 16:10:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbd" Sat Mar 24 16:10:16 2018 rev:88 rq:590384 version:2.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2018-01-30 15:38:01.728462058 +0100 +++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2018-03-24 16:10:21.218369233 +0100 @@ -1,0 +2,6 @@ +Thu Mar 15 17:04:06 CET 2018 - [email protected] + +- Do not cause error on UNICODE characters >= 0xF000 (e. g. + ligature fi) (bsc#1085432, kbd-unicode-fxxx.patch). + +------------------------------------------------------------------- New: ---- kbd-unicode-fxxx.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.gC3ANf/_old 2018-03-24 16:10:23.094301609 +0100 +++ /var/tmp/diff_new_pack.gC3ANf/_new 2018-03-24 16:10:23.102301320 +0100 @@ -26,7 +26,7 @@ Release: 0 Summary: Keyboard and Font Utilities # git: git://git.altlinux.org/people/legion/packages/kbd.git -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Console Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/ # ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh @@ -65,6 +65,8 @@ Patch13: kbd-1.15.5-loadkeys-search-path.patch # PATCH-FEATURE-OPENSUSE kbdsettings-nox86.patch [email protected] -- Disable "bios" option for NumLock settings on non x86 platforms. Patch14: kbdsettings-nox86.patch +# PATCH-FIX-SLE kbd-unicode-fxxx.patch [email protected] bsc1085432 -- Do not cause error on UNICODE characters >= 0xF000 (e. g. ligature fi) +Patch15: kbd-unicode-fxxx.patch BuildRequires: automake BuildRequires: bison BuildRequires: check-devel @@ -128,6 +130,7 @@ %ifnarch %{ix86} x86_64 %patch14 -p0 %endif +%patch15 -p1 %build for i in `find data/keymaps/mac -type f` ; do ++++++ kbd-unicode-fxxx.patch ++++++ Partially revert 3f065394 to not fail on ligature fi and other characters with UNICODE code 0xFxxx. Index: kbd-2.0.4/src/libkeymap/analyze.l =================================================================== --- kbd-2.0.4.orig/src/libkeymap/analyze.l +++ kbd-2.0.4/src/libkeymap/analyze.l @@ -361,11 +361,6 @@ To to|To|TO } {Unicode} { yylval->num = strtol(yytext + 1, NULL, 16); - if (yylval->num >= 0xf000) { - ERR(yyextra, _("unicode keysym out of range: %s"), - yytext); - return(ERROR); - } return(UNUMBER); } {Decimal}|{Octal}|{Hex} { Index: kbd-2.0.4/src/libkeymap/analyze.c =================================================================== --- kbd-2.0.4.orig/src/libkeymap/analyze.c +++ kbd-2.0.4/src/libkeymap/analyze.c @@ -1499,11 +1499,6 @@ YY_RULE_SETUP #line 362 "analyze.l" { yylval->num = strtol(yytext + 1, NULL, 16); - if (yylval->num >= 0xf000) { - ERR(yyextra, _("unicode keysym out of range: %s"), - yytext); - return(ERROR); - } return(UNUMBER); } YY_BREAK
