From 89bc5885ec7988380394874bdd05a59e06f3a55bc3c33ec4681bc443e7a3a122 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Thu, 22 Mar 2018 17:17:16 +0000
Subject: [PATCH] Accepting request 587937 from
 home:sbrabec:branches-kbd-fi-1085432

- 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
---
 kbd-unicode-fxxx.patch | 34 ++++++++++++++++++++++++++++++++++
 kbd.changes            |  6 ++++++
 kbd.spec               |  5 ++++-
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 kbd-unicode-fxxx.patch

diff --git a/kbd-unicode-fxxx.patch b/kbd-unicode-fxxx.patch
new file mode 100644
index 0000000..dd3af40
--- /dev/null
+++ b/kbd-unicode-fxxx.patch
@@ -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
diff --git a/kbd.changes b/kbd.changes
index 5c42057..4f463da 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -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
 
diff --git a/kbd.spec b/kbd.spec
index 31f9667..c846c9b 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -26,7 +26,7 @@ Version:        2.0.4
 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 @@ Patch12:        kbd-2.0.2-fix-bashisms.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.
 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:  bison
 BuildRequires:  check-devel
@@ -128,6 +130,7 @@ cp -fp %{SOURCE22} .
 %ifnarch %{ix86} x86_64
 %patch14 -p0
 %endif
+%patch15 -p1
 
 %build
 for i in `find data/keymaps/mac -type f` ; do