commit: 650a6bdd3b0f8e5b1db7505dde784b238679d2c2
parent c8080a9accdd084b26bfd29954883b8f8eb9f04a
Author: Michael Forney <mforney@mforney.org>
Date: Wed, 17 Jul 2019 09:27:44 -0700
kbd: Update to 2.1.0
Diffstat:
9 files changed, 215 insertions(+), 324 deletions(-)
diff --git a/pkg/kbd/.gitignore b/pkg/kbd/.gitignore
@@ -1,2 +1,2 @@
-/kbd-2.0.4.tar.gz
+/kbd-2.1.0.tar.gz
/src
diff --git a/pkg/kbd/config.h b/pkg/kbd/config.h
@@ -47,18 +47,16 @@
#define HAVE_WORKING_VFORK 1
#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
#define LT_OBJDIR ".libs/"
-/* #undef NO_MINUS_C_MINUS_O */
#define PACKAGE "kbd"
#define PACKAGE_BUGREPORT "gladkov.alexey@gmail.com"
#define PACKAGE_NAME "kbd"
-#define PACKAGE_STRING "kbd 2.0.4"
+#define PACKAGE_STRING "kbd 2.1.0"
#define PACKAGE_TARNAME "kbd"
#define PACKAGE_URL "http://kbd-project.org/"
-#define PACKAGE_VERSION "2.0.4"
-#define RETSIGTYPE void
+#define PACKAGE_VERSION "2.1.0"
#define STDC_HEADERS 1
/* #undef TM_IN_SYS_TIME */
-#define VERSION "2.0.4"
+#define VERSION "2.1.0"
/* #undef YYTEXT_POINTER */
/* #undef const */
/* #undef gid_t */
diff --git a/pkg/kbd/gen.lua b/pkg/kbd/gen.lua
@@ -3,19 +3,20 @@ cflags{
'-I $dir',
'-I $srcdir',
'-I $srcdir/src',
+ '-I $srcdir/src/libcommon',
+ '-I $srcdir/src/libkbdfile',
'-I $srcdir/src/libkeymap',
'-I $srcdir/src/libkeymap/keymap',
}
-lib('libcommon.a', 'src/(getfd.c xmalloc.c kbd_error.c version.c)')
-lib('libfont.a', 'src/(kdfontop.c kdmapop.c loadunimap.c psffontop.c utf8.c)')
+lib('libcommon.a', 'src/libcommon/(getfd.c error.c version.c xmalloc.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
- findfile.c
func.c
kernel.c
kmap.c
@@ -25,6 +26,7 @@ lib('libkeymap.a', [[src/libkeymap/(
parser.c
summary.c
)]])
+lib('libfont.a', 'src/(kdfontop.c kdmapop.c loadunimap.c psffontop.c utf8.c)')
-- old: loadunimap mapscrn
-- optional: clrunmap getunimap setlogcons setvesablank setpalette screendump
@@ -35,7 +37,7 @@ local function x(cmd, section, subst, srcs)
if not srcs then
srcs = 'src/'..cmd..'.c'
end
- exe(cmd, {srcs, 'libcommon.a', 'libfont.a', 'libkeymap.a'})
+ exe(cmd, {srcs, 'libcommon.a', 'libfont.a', 'libkeymap.a', 'libkbdfile.a'})
file('bin/'..cmd, '755', '$outdir/'..cmd)
if not section then
return
diff --git a/pkg/kbd/keymaps.txt b/pkg/kbd/keymaps.txt
@@ -1,241 +1,255 @@
-# 2,<cd src/data/keymaps && find * -type f '!' '(' -name README -o -name mk_modmap ')'
-amiga/amiga-us.map
+# 2,<cd src/data/keymaps && find * -type f '!' '(' -name README -o -name mk_modmap ')' | LC_COLLATE=C sort
amiga/amiga-de.map
+amiga/amiga-us.map
+atari/atari-de.map
atari/atari-se.map
atari/atari-uk-falcon.map
-atari/atari-de.map
atari/atari-us.map
+i386/azerty/azerty.map
+i386/azerty/be-latin1.map
+i386/azerty/fr-latin1.map
+i386/azerty/fr-latin9.map
+i386/azerty/fr-pc.map
+i386/azerty/fr.map
+i386/azerty/wangbe.map
+i386/azerty/wangbe2.map
+i386/bepo/fr-bepo-latin9.map
+i386/bepo/fr-bepo.map
i386/carpalx/carpalx-full.map
i386/carpalx/carpalx.map
-i386/dvorak/dvorak.map
-i386/dvorak/dvorak-l.map
-i386/dvorak/dvorak-fr.map
+i386/colemak/en-latin9.map
i386/dvorak/ANSI-dvorak.map
-i386/dvorak/no.map
-i386/dvorak/dvorak-uk.map
-i386/dvorak/dvorak-la.map
-i386/dvorak/dvorak-ru.map
-i386/dvorak/dvorak-sv-a1.map
i386/dvorak/dvorak-ca-fr.map
i386/dvorak/dvorak-es.map
-i386/dvorak/dvorak-sv-a5.map
+i386/dvorak/dvorak-fr.map
+i386/dvorak/dvorak-l.map
+i386/dvorak/dvorak-la.map
+i386/dvorak/dvorak-no.map
i386/dvorak/dvorak-programmer.map
i386/dvorak/dvorak-r.map
-i386/azerty/wangbe2.map
-i386/azerty/fr-latin9.map
-i386/azerty/azerty.map
-i386/azerty/fr-latin1.map
-i386/azerty/fr.map
-i386/azerty/wangbe.map
-i386/azerty/fr-pc.map
-i386/azerty/be-latin1.map
-i386/bepo/fr-bepo-latin9.map
-i386/bepo/fr-bepo.map
+i386/dvorak/dvorak-ru.map
+i386/dvorak/dvorak-sv-a1.map
+i386/dvorak/dvorak-sv-a5.map
+i386/dvorak/dvorak-uk.map
+i386/dvorak/dvorak-ukp.map
+i386/dvorak/dvorak.map
+i386/fgGIod/tr_f-latin5.map
+i386/fgGIod/trf.map
+i386/include/applkey.map
+i386/include/azerty-layout.inc
+i386/include/backspace.map
+i386/include/compose.inc
+i386/include/ctrl.map
+i386/include/euro.map
+i386/include/euro1.inc
+i386/include/euro1.map
+i386/include/euro2.map
+i386/include/keypad.map
+i386/include/linux-keys-bare.inc
+i386/include/linux-keys-extd.inc
+i386/include/linux-with-alt-and-altgr.inc
+i386/include/linux-with-modeshift-altgr.inc
+i386/include/linux-with-two-alt-keys.inc
+i386/include/qwerty-layout.inc
+i386/include/qwertz-layout.inc
+i386/include/unicode.map
+i386/include/windowkeys.map
+i386/neo/README.md
+i386/neo/neo.map
+i386/olpc/es.map
+i386/olpc/pt.map
+i386/qwerty/bashkir.map
i386/qwerty/bg-cp1251.map
-i386/qwerty/ttwin_alt-UTF-8.map
-i386/qwerty/ruwin_cplk-CP1251.map
-i386/qwerty/pl1.map
-i386/qwerty/no-latin1.map
-i386/qwerty/lv-tilde.map
-i386/qwerty/nl2.map
-i386/qwerty/ru-yawerty.map
-i386/qwerty/nl.map
-i386/qwerty/cz-lat2.map
-i386/qwerty/ttwin_cplk-UTF-8.map
-i386/qwerty/ruwin_alt_sh-UTF-8.map
-i386/qwerty/ruwin_ctrl-CP1251.map
-i386/qwerty/tralt.map
-i386/qwerty/ru-ms.map
-i386/qwerty/kyrgyz.map
-i386/qwerty/ua.map
-i386/qwerty/pl2.map
-i386/qwerty/trf.map
-i386/qwerty/it2.map
+i386/qwerty/bg-cp855.map
+i386/qwerty/bg_bds-cp1251.map
+i386/qwerty/bg_bds-utf8.map
+i386/qwerty/bg_pho-cp1251.map
+i386/qwerty/bg_pho-utf8.map
+i386/qwerty/br-abnt.map
+i386/qwerty/br-abnt2.map
+i386/qwerty/br-latin1-abnt2.map
+i386/qwerty/br-latin1-us.map
+i386/qwerty/by-cp1251.map
+i386/qwerty/by.map
i386/qwerty/bywin-cp1251.map
-i386/qwerty/ky_alt_sh-UTF-8.map
-i386/qwerty/ruwin_cplk-KOI8-R.map
-i386/qwerty/et-nodeadkeys.map
-i386/qwerty/us.map
-i386/qwerty/ru_win.map
-i386/qwerty/ruwin_ctrl-UTF-8.map
-i386/qwerty/pt-latin1.map
-i386/qwerty/il.map
-i386/qwerty/no-latin1.doc
-i386/qwerty/it-ibm.map
i386/qwerty/cf.map
-i386/qwerty/mk0.map
-i386/qwerty/lt.baltic.map
-i386/qwerty/pl.map
-i386/qwerty/trq.map
-i386/qwerty/no.map
+i386/qwerty/cz-cp1250.map
+i386/qwerty/cz-lat2-prog.map
+i386/qwerty/cz-lat2.map
+i386/qwerty/cz.map
+i386/qwerty/defkeymap.map
+i386/qwerty/defkeymap_V1.0.map
i386/qwerty/dk-latin1.map
-i386/qwerty/ru.map
-i386/qwerty/ua-utf-ws.map
-i386/qwerty/br-abnt2.map
-i386/qwerty/et.map
-i386/qwerty/ru3.map
+i386/qwerty/dk.map
+i386/qwerty/emacs.map
+i386/qwerty/emacs2.map
i386/qwerty/es-cp850.map
-i386/qwerty/sr-cy.map
-i386/qwerty/cz-lat2-prog.map
-i386/qwerty/il-heb.map
-i386/qwerty/cz-cp1250.map
-i386/qwerty/sk-qwerty.map
-i386/qwerty/ttwin_ct_sh-UTF-8.map
-i386/qwerty/se-fi-ir209.map
-i386/qwerty/pc110.map
+i386/qwerty/es.map
+i386/qwerty/et-nodeadkeys.map
+i386/qwerty/et.map
+i386/qwerty/fa.map
i386/qwerty/fi.map
-i386/qwerty/lt.l4.map
-i386/qwerty/pt-latin9.map
+i386/qwerty/gr-pc.map
+i386/qwerty/gr.map
+i386/qwerty/hu101.map
+i386/qwerty/hypermap.m4
+i386/qwerty/il-heb.map
+i386/qwerty/il-phonetic.map
+i386/qwerty/il.map
i386/qwerty/is-latin1-us.map
-i386/qwerty/br-abnt.map
+i386/qwerty/is-latin1.map
+i386/qwerty/it-ibm.map
i386/qwerty/it.map
-i386/qwerty/mk-utf.map
-i386/qwerty/se-ir209.map
-i386/qwerty/defkeymap_V1.0.map
+i386/qwerty/it2.map
+i386/qwerty/jp106.map
+i386/qwerty/kazakh.map
+i386/qwerty/ky_alt_sh-UTF-8.map
+i386/qwerty/kyrgyz.map
+i386/qwerty/la-latin1.map
+i386/qwerty/lt.baltic.map
+i386/qwerty/lt.l4.map
+i386/qwerty/lt.map
+i386/qwerty/lv-tilde.map
+i386/qwerty/lv.map
i386/qwerty/mk-cp1251.map
-i386/qwerty/emacs.map
-i386/qwerty/ruwin_ct_sh-KOI8-R.map
-i386/qwerty/se-fi-lat6.map
-i386/qwerty/ru2.map
+i386/qwerty/mk-utf.map
i386/qwerty/mk.map
-i386/qwerty/ruwin_alt-UTF-8.map
-i386/qwerty/ro_std.map
-i386/qwerty/bg_bds-utf8.map
-i386/qwerty/ttwin_ctrl-UTF-8.map
-i386/qwerty/emacs2.map
-i386/qwerty/br-latin1-us.map
-i386/qwerty/ru-cp1251.map
-i386/qwerty/ua-cp1251.map
-i386/qwerty/ro.map
-i386/qwerty/jp106.map
-i386/qwerty/tj_alt-UTF8.map
-i386/qwerty/bg_bds-cp1251.map
+i386/qwerty/mk0.map
+i386/qwerty/nl.map
+i386/qwerty/nl2.map
+i386/qwerty/no-latin1.doc
+i386/qwerty/no-latin1.map
+i386/qwerty/no.map
+i386/qwerty/pc110.map
+i386/qwerty/pl.map
+i386/qwerty/pl1.map
+i386/qwerty/pl2.map
i386/qwerty/pl3.map
i386/qwerty/pl4.map
-i386/qwerty/ruwin_alt-KOI8-R.map
-i386/qwerty/sk-prog-qwerty.map
-i386/qwerty/tr_q-latin5.map
-i386/qwerty/se-lat6.map
-i386/qwerty/hypermap.m4
-i386/qwerty/hu101.map
-i386/qwerty/dk.map
-i386/qwerty/kazakh.map
-i386/qwerty/ua-ws.map
-i386/qwerty/bg_pho-cp1251.map
-i386/qwerty/ruwin_ctrl-KOI8-R.map
-i386/qwerty/ruwin_ct_sh-UTF-8.map
+i386/qwerty/pt-latin1.map
+i386/qwerty/pt-latin9.map
+i386/qwerty/ro.map
+i386/qwerty/ro_std.map
+i386/qwerty/ro_win.map
+i386/qwerty/ru-cp1251.map
+i386/qwerty/ru-ms.map
+i386/qwerty/ru-yawerty.map
+i386/qwerty/ru.map
+i386/qwerty/ru1.map
+i386/qwerty/ru2.map
+i386/qwerty/ru3.map
i386/qwerty/ru4.map
-i386/qwerty/is-latin1.map
-i386/qwerty/by-cp1251.map
-i386/qwerty/lv.map
+i386/qwerty/ru_win.map
i386/qwerty/ruwin_alt-CP1251.map
-i386/qwerty/ruwin_ct_sh-CP1251.map
-i386/qwerty/lt.map
-i386/qwerty/ro_win.map
-i386/qwerty/us-acentos.map
-i386/qwerty/bg_pho-utf8.map
-i386/qwerty/gr.map
+i386/qwerty/ruwin_alt-KOI8-R.map
+i386/qwerty/ruwin_alt-UTF-8.map
+i386/qwerty/ruwin_alt_sh-UTF-8.map
+i386/qwerty/ruwin_cplk-CP1251.map
+i386/qwerty/ruwin_cplk-KOI8-R.map
i386/qwerty/ruwin_cplk-UTF-8.map
-i386/qwerty/defkeymap.map
-i386/qwerty/uk.map
+i386/qwerty/ruwin_ct_sh-CP1251.map
+i386/qwerty/ruwin_ct_sh-KOI8-R.map
+i386/qwerty/ruwin_ct_sh-UTF-8.map
+i386/qwerty/ruwin_ctrl-CP1251.map
+i386/qwerty/ruwin_ctrl-KOI8-R.map
+i386/qwerty/ruwin_ctrl-UTF-8.map
+i386/qwerty/se-fi-ir209.map
+i386/qwerty/se-fi-lat6.map
+i386/qwerty/se-ir209.map
+i386/qwerty/se-lat6.map
+i386/qwerty/sk-prog-qwerty.map
+i386/qwerty/sk-qwerty.map
+i386/qwerty/sr-cy.map
i386/qwerty/sv-latin1.map
-i386/qwerty/es.map
-i386/qwerty/gr-pc.map
-i386/qwerty/il-phonetic.map
-i386/qwerty/by.map
-i386/qwerty/ru1.map
-i386/qwerty/br-latin1-abnt2.map
-i386/qwerty/cz.map
-i386/qwerty/bashkir.map
-i386/qwerty/bg-cp855.map
-i386/qwerty/la-latin1.map
+i386/qwerty/tj_alt-UTF8.map
+i386/qwerty/tr_q-latin5.map
+i386/qwerty/tralt.map
+i386/qwerty/trf.map
+i386/qwerty/trq.map
+i386/qwerty/ttwin_alt-UTF-8.map
+i386/qwerty/ttwin_cplk-UTF-8.map
+i386/qwerty/ttwin_ct_sh-UTF-8.map
+i386/qwerty/ttwin_ctrl-UTF-8.map
+i386/qwerty/ua-cp1251.map
+i386/qwerty/ua-utf-ws.map
i386/qwerty/ua-utf.map
-i386/fgGIod/trf.map
-i386/fgGIod/tr_f-latin5.map
-i386/olpc/pt.map
-i386/olpc/es.map
-i386/colemak/en-latin9.map
-i386/qwertz/de-latin1.map
-i386/qwertz/sg-latin1-lk450.map
-i386/qwertz/de-latin1-nodeadkeys.map
-i386/qwertz/cz-us-qwertz.map
-i386/qwertz/fr_CH.map
-i386/qwertz/de_alt_UTF-8.map
+i386/qwerty/ua-ws.map
+i386/qwerty/ua.map
+i386/qwerty/uk.map
+i386/qwerty/us-acentos.map
+i386/qwerty/us.map
i386/qwertz/croat.map
-i386/qwertz/sg.map
+i386/qwertz/cz-us-qwertz.map
+i386/qwertz/cz.map
+i386/qwertz/de-latin1-nodeadkeys.map
+i386/qwertz/de-latin1.map
+i386/qwertz/de-mobii.map
+i386/qwertz/de.map
i386/qwertz/de_CH-latin1.map
-i386/qwertz/slovene.map
+i386/qwertz/de_alt_UTF-8.map
i386/qwertz/fr_CH-latin1.map
-i386/qwertz/sg-latin1.map
+i386/qwertz/fr_CH.map
i386/qwertz/hu.map
-i386/qwertz/de-mobii.map
-i386/qwertz/de.map
-i386/qwertz/sk-qwertz.map
+i386/qwertz/sg-latin1-lk450.map
+i386/qwertz/sg-latin1.map
+i386/qwertz/sg.map
i386/qwertz/sk-prog-qwertz.map
-i386/qwertz/cz.map
-i386/include/compose.inc
-i386/include/keypad.map
-i386/include/euro2.map
-i386/include/linux-with-alt-and-altgr.inc
-i386/include/euro1.inc
-i386/include/linux-keys-extd.inc
-i386/include/ctrl.map
-i386/include/linux-with-modeshift-altgr.inc
-i386/include/applkey.map
-i386/include/euro.map
-i386/include/qwerty-layout.inc
-i386/include/linux-with-two-alt-keys.inc
-i386/include/euro1.map
-i386/include/unicode.map
-i386/include/backspace.map
-i386/include/windowkeys.map
-i386/include/azerty-layout.inc
-i386/include/linux-keys-bare.inc
-i386/include/qwertz-layout.inc
-include/compose.latin3
+i386/qwertz/sk-qwertz.map
+i386/qwertz/slovene.map
+i386/qwertz/sr-latin.map
include/compose.8859_7
include/compose.8859_8
-include/compose.latin4
include/compose.latin
+include/compose.latin1
include/compose.latin2
+include/compose.latin3
+include/compose.latin4
include/vim-compose.latin1
-include/compose.latin1
-mac/all/mac-dk-latin1.map
-mac/all/mac-fi-latin1.map
-mac/all/mac-de-latin1.map
-mac/all/mac-es.map
-mac/all/mac-it.map
+mac/all/apple-a1048-sv.map
+mac/all/apple-a1243-sv-fn-reverse.map
+mac/all/apple-a1243-sv.map
+mac/all/apple-internal-0x0253-sv-fn-reverse.map
+mac/all/apple-internal-0x0253-sv.map
mac/all/mac-be.map
-mac/all/mac-dvorak.map
-mac/all/mac-se.map
-mac/all/mac-us.map
mac/all/mac-de-latin1-nodeadkeys.map
-mac/all/mac-fr_CH-latin1.map
+mac/all/mac-de-latin1.map
+mac/all/mac-de_CH.map
+mac/all/mac-dk-latin1.map
+mac/all/mac-dvorak.map
+mac/all/mac-es.map
+mac/all/mac-fi-latin1.map
mac/all/mac-fr.map
+mac/all/mac-fr_CH-latin1.map
+mac/all/mac-it.map
+mac/all/mac-no-latin1.map
mac/all/mac-pl.map
mac/all/mac-pt-latin1.map
+mac/all/mac-se.map
mac/all/mac-template.map
mac/all/mac-uk.map
-mac/all/mac-de_CH.map
-mac/include/mac-linux-keys-bare.inc
-mac/include/mac-euro2.map
-mac/include/mac-qwertz-layout.inc
+mac/all/mac-us.map
+mac/include/apple-a1048-base.inc
+mac/include/apple-a1243-fn-reverse.inc
+mac/include/apple-a1243-fn.inc
mac/include/mac-azerty-layout.inc
-mac/include/mac-qwerty-layout.inc
mac/include/mac-euro.map
-sun/sunt5-uk.map
-sun/sunt4-no-latin1.map
-sun/sunt5-fr-latin1.map
-sun/sunt5-cz-us.map
+mac/include/mac-euro2.map
+mac/include/mac-linux-keys-bare.inc
+mac/include/mac-qwerty-layout.inc
+mac/include/mac-qwertz-layout.inc
sun/sun-pl-altgraph.map
-sun/sunt5-de-latin1.map
-sun/sunt5-ru.map
+sun/sun-pl.map
+sun/sundvorak.map
sun/sunkeymap.map
+sun/sunt4-es.map
sun/sunt4-fi-latin1.map
-sun/sundvorak.map
-sun/sun-pl.map
-sun/sunt6-uk.map
+sun/sunt4-no-latin1.map
+sun/sunt5-cz-us.map
+sun/sunt5-de-latin1.map
sun/sunt5-es.map
-sun/sunt4-es.map
sun/sunt5-fi-latin1.map
+sun/sunt5-fr-latin1.map
+sun/sunt5-ru.map
+sun/sunt5-uk.map
sun/sunt5-us-cz.map
+sun/sunt6-uk.map
diff --git a/pkg/kbd/patch/0001-Avoid-pointer-arithmetic-on-void.patch b/pkg/kbd/patch/0001-Avoid-pointer-arithmetic-on-void.patch
@@ -1,61 +0,0 @@
-From 36ab4890a83ec2347dc1955dd8cc40095e497890 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 12 Mar 2019 16:45:54 -0700
-Subject: [PATCH] Avoid pointer arithmetic on `void *`
-
-Standard C requires that the pointer operand to the + operator be to a
-complete object type[0], so use a `char *` instead.
-
-[0] http://port70.net/~nsz/c/c11/n1570.html#6.5.6p2
----
- src/libkeymap/array.c | 6 +++---
- src/libkeymap/keymap/array.h | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/libkeymap/array.c b/src/libkeymap/array.c
-index 076c1de..ec175df 100644
---- a/src/libkeymap/array.c
-+++ b/src/libkeymap/array.c
-@@ -54,7 +54,7 @@ int lk_array_exists(struct lk_array *a, unsigned int i)
- return 0;
- }
-
-- s = (char *)(a->array + (a->memb * i));
-+ s = a->array + (a->memb * i);
-
- for (k = 0; k < a->memb; k++) {
- if (s[k] != 0)
-@@ -80,7 +80,7 @@ lk_array_get_ptr(struct lk_array *a, unsigned int i)
- if (!a || i >= a->total) {
- return NULL;
- }
-- ptr = a->array;
-+ ptr = (void **)a->array;
- return *(ptr + i);
- }
-
-@@ -91,7 +91,7 @@ array_resize(struct lk_array *a, unsigned int i)
- return -EINVAL;
-
- if (i >= a->total) {
-- void *tmp = realloc(a->array, a->memb * (i + 1));
-+ char *tmp = realloc(a->array, a->memb * (i + 1));
- if (!tmp)
- return -ENOMEM;
-
-diff --git a/src/libkeymap/keymap/array.h b/src/libkeymap/keymap/array.h
-index 9894af1..caac6fb 100644
---- a/src/libkeymap/keymap/array.h
-+++ b/src/libkeymap/keymap/array.h
-@@ -6,7 +6,7 @@
- * @details The array is designed to store an arbitrary number of similar items.
- */
- struct lk_array {
-- void *array; /**< Data pointer. */
-+ char *array; /**< Data pointer. */
- size_t memb; /**< One element size. */
- size_t count; /**< Number of elements. */
- size_t total; /**< Total number of allocated elements. */
---
-2.20.1
-
diff --git a/pkg/kbd/patch/0002-Avoid-duplicate-external-definitions-of-progname.patch b/pkg/kbd/patch/0002-Avoid-duplicate-external-definitions-of-progname.patch
@@ -1,62 +0,0 @@
-From 474ee8777d5fd011ec61bd66d42c95c6d99499f9 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 30 May 2019 21:37:42 -0700
-Subject: [PATCH] Avoid duplicate external definitions of progname
-
----
- src/Makefile.am | 5 +++--
- src/version.c | 5 +++++
- src/version.h | 2 +-
- 3 files changed, 9 insertions(+), 3 deletions(-)
- create mode 100644 src/version.c
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d4e0583..1d80cf8 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -39,7 +39,8 @@ EXTRA_DIST = \
- libcommon_a_SOURCES = \
- getfd.c getfd.h \
- xmalloc.c xmalloc.h \
-- kbd_error.c kbd_error.h
-+ kbd_error.c kbd_error.h \
-+ version.c version.h
-
- libfont_a_SOURCES = \
- psf.h psffontop.c psffontop.h \
-@@ -48,7 +49,7 @@ libfont_a_SOURCES = \
- loadunimap.c loadunimap.h \
- kdfontop.c kdfontop.h
-
--ALL_S = nls.h paths.h version.h kbd.h
-+ALL_S = nls.h paths.h kbd.h
-
- chvt_SOURCES = $(ALL_S) chvt.c
- clrunimap_SOURCES = $(ALL_S) clrunimap.c
-diff --git a/src/version.c b/src/version.c
-new file mode 100644
-index 0000000..29b5161
---- /dev/null
-+++ b/src/version.c
-@@ -0,0 +1,5 @@
-+#include "config.h"
-+
-+#include "version.h"
-+
-+char *progname;
-diff --git a/src/version.h b/src/version.h
-index 31d1435..4daf24c 100644
---- a/src/version.h
-+++ b/src/version.h
-@@ -5,7 +5,7 @@
- #include <string.h>
- #include <stdlib.h>
-
--char *progname;
-+extern char *progname;
-
- static inline void
- set_progname(char *name)
---
-2.20.1
-
diff --git a/pkg/kbd/sha256 b/pkg/kbd/sha256
@@ -1 +1 @@
-a6fd449701bedcb98d92575d7b0f6cb394c07cae8d71347170efa49fc1ec0da3 kbd-2.0.4.tar.gz
+50637e41eaa4d8ee2dc3bcfccafdabe082e165f0804c1a84cce20a32ff850ce1 kbd-2.1.0.tar.gz
diff --git a/pkg/kbd/url b/pkg/kbd/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.4.tar.gz"
+url = "https://www.kernel.org/pub/linux/utils/kbd/kbd-2.1.0.tar.gz"
diff --git a/pkg/kbd/ver b/pkg/kbd/ver
@@ -1 +1 @@
-2.0.4 r1
+2.1.0 r0
