pool/kbd
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 587937 from home:sbrabec:branches-kbd-fi-1085432

Browse Source 
- Do not cause error on UNICODE characters >= 0xF000 (e. g.
  ligature fi) (bsc#1085432, kbd-unicode-fxxx.patch).

OBS-URL: https://build.opensuse.org/request/show/587937
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=107
This commit is contained in:
Stanislav Brabec 2018-03-22 17:17:16 +00:00 committed by Git OBS Bridge
parent 89ce0ab9ee
commit 93a30b004f
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kbd-unicode-fxxx.patch Normal file
View File

@ -0,0 +1,34 @@
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

6
kbd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 15 17:04:06 CET 2018 - sbrabec@suse.com
- Do not cause error on UNICODE characters >= 0xF000 (e. g.
ligature fi) (bsc#1085432, kbd-unicode-fxxx.patch).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 12 17:39:18 CET 2018 - sbrabec@suse.com Fri Jan 12 17:39:18 CET 2018 - sbrabec@suse.com

5
kbd.spec
View File

@ -26,7 +26,7 @@ Version: 2.0.4
Release: 0 Release: 0
Summary: Keyboard and Font Utilities Summary: Keyboard and Font Utilities
# git: git://git.altlinux.org/people/legion/packages/kbd.git # git: git://git.altlinux.org/people/legion/packages/kbd.git
License: GPL-2.0+ License: GPL-2.0-or-later
Group: System/Console Group: System/Console
Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/ Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/
# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh # ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
@ -65,6 +65,8 @@ Patch12: kbd-2.0.2-fix-bashisms.patch
Patch13: kbd-1.15.5-loadkeys-search-path.patch Patch13: kbd-1.15.5-loadkeys-search-path.patch
# PATCH-FEATURE-OPENSUSE kbdsettings-nox86.patch sbrabec@suse.cz -- Disable "bios" option for NumLock settings on non x86 platforms. # PATCH-FEATURE-OPENSUSE kbdsettings-nox86.patch sbrabec@suse.cz -- Disable "bios" option for NumLock settings on non x86 platforms.
Patch14: kbdsettings-nox86.patch Patch14: kbdsettings-nox86.patch
# PATCH-FIX-SLE kbd-unicode-fxxx.patch sbrabec@suse.com bsc1085432 -- Do not cause error on UNICODE characters >= 0xF000 (e. g. ligature fi)
Patch15: kbd-unicode-fxxx.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: bison BuildRequires: bison
BuildRequires: check-devel BuildRequires: check-devel
@ -128,6 +130,7 @@ cp -fp %{SOURCE22} .
%ifnarch %{ix86} x86_64 %ifnarch %{ix86} x86_64
%patch14 -p0 %patch14 -p0
%endif %endif
%patch15 -p1
%build %build
for i in `find data/keymaps/mac -type f` ; do for i in `find data/keymaps/mac -type f` ; do