kbd: Update to 2.3.0

6 files changed, 43 insertions, 26 deletions

diff --git a/pkg/kbd/.gitignore b/pkg/kbd/.gitignore
index 622a75d0..b7f0d10d 100644
--- a/pkg/kbd/.gitignore
+++ b/pkg/kbd/.gitignore
@@ -1,2 +1,2 @@
-/kbd-2.2.0.tar.gz
+/kbd-2.3.0.tar.gz
 /src
diff --git a/pkg/kbd/gen.lua b/pkg/kbd/gen.lua
index 84f0ee7b..bfca0749 100644
--- a/pkg/kbd/gen.lua
+++ b/pkg/kbd/gen.lua
@@ -1,6 +1,5 @@
 cflags{
-	'-Wall',
-	'-Wno-incompatible-pointer-types',  -- fixed in upcoming release
+	'-Wall', '-Wno-stringop-truncation',
 	string.format([[-D 'DATADIR="%s/share/kbd"']], config.prefix),
 	'-I $dir',
 	'-I $srcdir',
@@ -9,6 +8,7 @@ cflags{
 	'-I $srcdir/src/libkbdfile',
 	'-I $srcdir/src/libkeymap',
 	'-I $srcdir/src/libkeymap/keymap',
+	'-I $srcdir/src/libkfont',
 	'-isystem $builddir/pkg/linux-headers/include',
 }
 
@@ -16,24 +16,39 @@ pkg.deps = {
 	'pkg/linux-headers/headers',
 }
 
-lib('libcommon.a', 'src/libcommon/(getfd.c error.c version.c xmalloc.c)')
+lib('libcommon.a', 'src/libcommon/(getfd.c error.c version.c)')
 lib('libkbdfile.a', 'src/libkbdfile/(init.c kbdfile.c)')
-lib('libkeymap.a', [[src/libkeymap/(
-	analyze.c
-	array.c
-	common.c
-	diacr.c
-	dump.c
-	func.c
-	kernel.c
-	kmap.c
-	ksyms.c
-	loadkeys.c
-	modifiers.c
-	parser.c
-	summary.c
-)]])
-lib('libfont.a', 'src/(kdfontop.c kdmapop.c loadunimap.c psffontop.c utf8.c)')
+lib('libkeymap.a', [[
+	src/libkeymap/(
+		analyze.c
+		array.c
+		common.c
+		diacr.c
+		dump.c
+		func.c
+		kernel.c
+		kmap.c
+		ksyms.c
+		loadkeys.c
+		modifiers.c
+		parser.c
+		summary.c
+	)
+]])
+lib('libkfont.a', [[
+	src/libkfont/(
+		psffontop.c
+		psfxtable.c
+		context.c
+		unicode.c
+		utf8.c
+		kdmapop.c
+		loadunimap.c
+		mapscrn.c
+		setfont.c
+		kdfontop.c
+	)
+]])
 
 -- old: loadunimap mapscrn
 -- optional: clrunmap getunimap setlogcons setvesablank setpalette screendump
@@ -50,7 +65,7 @@ local tools = {
 	{'loadkeys',        '1', true},
 	{'openvt',          '1'},
 	{'psfxtable',       '1'},
-	{'setfont',         '8', true, {'src/setfont.c', 'src/mapscrn.c'}},
+	{'setfont',         '8', true},
 	{'setkeycodes',     '8'},
 	{'setvtrgb',        '8'},
 	{'showconsolefont', '8'},
@@ -58,8 +73,8 @@ local tools = {
 }
 
 for _, tool in ipairs(tools) do
-	local name, sect, subst, srcs = tool[1], tool[2], tool[3], tool[4]
-	exe(name, {srcs or 'src/'..name..'.c', 'libcommon.a', 'libfont.a', 'libkeymap.a', 'libkbdfile.a'})
+	local name, sect, subst = tool[1], tool[2], tool[3]
+	exe(name, {'src/'..name..'.c', 'libcommon.a', 'libkfont.a', 'libkeymap.a', 'libkbdfile.a'})
 	file('bin/'..name, '755', '$outdir/'..name)
 	if sect then
 		local manpage = string.format('docs/man/man%s/%s.%s', sect, name, sect)
diff --git a/pkg/kbd/keymaps.txt b/pkg/kbd/keymaps.txt
index cc9adbc9..f1f22a9a 100644
--- a/pkg/kbd/keymaps.txt
+++ b/pkg/kbd/keymaps.txt
@@ -72,6 +72,7 @@ i386/qwerty/br-latin1-us.map
 i386/qwerty/by-cp1251.map
 i386/qwerty/by.map
 i386/qwerty/bywin-cp1251.map
+i386/qwerty/ca.map
 i386/qwerty/cf.map
 i386/qwerty/cz-cp1250.map
 i386/qwerty/cz-lat2-prog.map
@@ -178,6 +179,7 @@ i386/qwerty/ua.map
 i386/qwerty/uk.map
 i386/qwerty/us-acentos.map
 i386/qwerty/us.map
+i386/qwerty/us1.map
 i386/qwertz/croat.map
 i386/qwertz/cz-us-qwertz.map
 i386/qwertz/cz.map
diff --git a/pkg/kbd/sha256 b/pkg/kbd/sha256
index cb5d9fab..16580dbe 100644
--- a/pkg/kbd/sha256
+++ b/pkg/kbd/sha256
@@ -1 +1 @@
-a3b096955efe5123974015c519c81be23bbfd5ee969dca3e7b01a8f93be5b347  kbd-2.2.0.tar.gz
+bb8f07badb6308a5f935b8784abdaea2c86d13c16aad75384162b2f7c448c64c  kbd-2.3.0.tar.gz
diff --git a/pkg/kbd/url b/pkg/kbd/url
index 8267575f..1d069730 100644
--- a/pkg/kbd/url
+++ b/pkg/kbd/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/linux/utils/kbd/kbd-2.2.0.tar.gz"
+url = "https://www.kernel.org/pub/linux/utils/kbd/kbd-2.3.0.tar.gz"
diff --git a/pkg/kbd/ver b/pkg/kbd/ver
index f056dab4..c1a00844 100644
--- a/pkg/kbd/ver
+++ b/pkg/kbd/ver
@@ -1 +1 @@
-2.2.0 r0
+2.3.0 r0