diff mbox series

kbd: Update to 2.5.1

Message ID 2bf091d4-49e8-7ec2-101a-f74bd6b257bf@ipfire.org
State Accepted
Commit 5e39d521a85108ecd0ab32f2b6014f4b3b73b116
Headers
Series kbd: Update to 2.5.1 |

Commit Message

Peter Müller Aug. 7, 2022, 9:44 a.m. UTC 
  Changes since 2.2.0 can be obtained from https://github.com/legionus/kbd/releases.

See also: #12857

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/common/kbd | 96 +++++++++++++++----------------------
 lfs/kbd                     |  8 ++--
 2 files changed, 42 insertions(+), 62 deletions(-)
diff mbox series

Patch

diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd
index 7f3296559..3c18ff27e 100644
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -249,6 +249,7 @@  lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz
 #lib/kbd/consolefonts/partialfonts/none.00-17.16.gz
 #lib/kbd/consolefonts/ruscii_8x16.psfu.gz
 #lib/kbd/consolefonts/ruscii_8x8.psfu.gz
+#lib/kbd/consolefonts/solar24x32.psfu.gz
 #lib/kbd/consolefonts/sun12x22.psfu.gz
 #lib/kbd/consolefonts/t.fnt.gz
 #lib/kbd/consolefonts/t850b.fnt.gz
@@ -370,6 +371,14 @@  lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/include/qwertz-layout.inc
 #lib/kbd/keymaps/i386/include/unicode.map.gz
 #lib/kbd/keymaps/i386/include/windowkeys.map.gz
+#lib/kbd/keymaps/i386/neo
+#lib/kbd/keymaps/i386/neo/3l.map.gz
+#lib/kbd/keymaps/i386/neo/README.md
+#lib/kbd/keymaps/i386/neo/adnw.map.gz
+#lib/kbd/keymaps/i386/neo/bone.map.gz
+#lib/kbd/keymaps/i386/neo/koy.map.gz
+#lib/kbd/keymaps/i386/neo/neo.map.gz
+#lib/kbd/keymaps/i386/neo/neoqwertz.map.gz
 #lib/kbd/keymaps/i386/olpc
 #lib/kbd/keymaps/i386/olpc/es.map.gz
 #lib/kbd/keymaps/i386/olpc/pt.map.gz
@@ -388,6 +397,7 @@  lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwerty/by-cp1251.map.gz
 #lib/kbd/keymaps/i386/qwerty/by.map.gz
 #lib/kbd/keymaps/i386/qwerty/bywin-cp1251.map.gz
+#lib/kbd/keymaps/i386/qwerty/ca.map.gz
 #lib/kbd/keymaps/i386/qwerty/cf.map.gz
 #lib/kbd/keymaps/i386/qwerty/cz-cp1250.map.gz
 #lib/kbd/keymaps/i386/qwerty/cz-lat2-prog.map.gz
@@ -409,6 +419,7 @@  lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwerty/gr.map.gz
 #lib/kbd/keymaps/i386/qwerty/hu101.map.gz
 #lib/kbd/keymaps/i386/qwerty/hypermap.m4
+#lib/kbd/keymaps/i386/qwerty/ie.map.gz
 #lib/kbd/keymaps/i386/qwerty/il-heb.map.gz
 #lib/kbd/keymaps/i386/qwerty/il-phonetic.map.gz
 #lib/kbd/keymaps/i386/qwerty/il.map.gz
@@ -494,6 +505,7 @@  lib/kbd/keymaps/i386/include
 #lib/kbd/keymaps/i386/qwerty/uk.map.gz
 #lib/kbd/keymaps/i386/qwerty/us-acentos.map.gz
 #lib/kbd/keymaps/i386/qwerty/us.map.gz
+#lib/kbd/keymaps/i386/qwerty/us1.map.gz
 #lib/kbd/keymaps/i386/qwertz
 #lib/kbd/keymaps/i386/qwertz/croat.map.gz
 #lib/kbd/keymaps/i386/qwertz/cz-us-qwertz.map.gz
@@ -558,6 +570,8 @@  lib/kbd/keymaps/include
 #lib/kbd/keymaps/mac/include/mac-linux-keys-bare.inc
 #lib/kbd/keymaps/mac/include/mac-qwerty-layout.inc
 #lib/kbd/keymaps/mac/include/mac-qwertz-layout.inc
+#lib/kbd/keymaps/pine
+#lib/kbd/keymaps/pine/en.map.gz
 #lib/kbd/keymaps/ppc
 #lib/kbd/keymaps/sun
 #lib/kbd/keymaps/sun/sun-pl-altgraph.map.gz
@@ -576,64 +590,6 @@  lib/kbd/keymaps/include
 #lib/kbd/keymaps/sun/sunt5-uk.map.gz
 #lib/kbd/keymaps/sun/sunt5-us-cz.map.gz
 #lib/kbd/keymaps/sun/sunt6-uk.map.gz
-#lib/kbd/locale
-#lib/kbd/locale/cs
-#lib/kbd/locale/cs/LC_MESSAGES
-#lib/kbd/locale/cs/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/da
-#lib/kbd/locale/da/LC_MESSAGES
-#lib/kbd/locale/da/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/de
-#lib/kbd/locale/de/LC_MESSAGES
-#lib/kbd/locale/de/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/el
-#lib/kbd/locale/el/LC_MESSAGES
-#lib/kbd/locale/el/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/eo
-#lib/kbd/locale/eo/LC_MESSAGES
-#lib/kbd/locale/eo/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/es
-#lib/kbd/locale/es/LC_MESSAGES
-#lib/kbd/locale/es/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/fr
-#lib/kbd/locale/fr/LC_MESSAGES
-#lib/kbd/locale/fr/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/gr
-#lib/kbd/locale/gr/LC_MESSAGES
-#lib/kbd/locale/gr/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/id
-#lib/kbd/locale/id/LC_MESSAGES
-#lib/kbd/locale/id/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/it
-#lib/kbd/locale/it/LC_MESSAGES
-#lib/kbd/locale/it/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/nl
-#lib/kbd/locale/nl/LC_MESSAGES
-#lib/kbd/locale/nl/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/pl
-#lib/kbd/locale/pl/LC_MESSAGES
-#lib/kbd/locale/pl/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/ro
-#lib/kbd/locale/ro/LC_MESSAGES
-#lib/kbd/locale/ro/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/ru
-#lib/kbd/locale/ru/LC_MESSAGES
-#lib/kbd/locale/ru/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/sv
-#lib/kbd/locale/sv/LC_MESSAGES
-#lib/kbd/locale/sv/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/tr
-#lib/kbd/locale/tr/LC_MESSAGES
-#lib/kbd/locale/tr/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/uk
-#lib/kbd/locale/uk/LC_MESSAGES
-#lib/kbd/locale/uk/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/vi
-#lib/kbd/locale/vi/LC_MESSAGES
-#lib/kbd/locale/vi/LC_MESSAGES/kbd.mo
-#lib/kbd/locale/zh_CN
-#lib/kbd/locale/zh_CN/LC_MESSAGES
-#lib/kbd/locale/zh_CN/LC_MESSAGES/kbd.mo
 lib/kbd/unimaps
 #lib/kbd/unimaps/8859-1.a0-ff.uni
 #lib/kbd/unimaps/8859-10.a0-ff.uni
@@ -721,6 +677,30 @@  usr/bin/showconsolefont
 usr/bin/showkey
 usr/bin/unicode_start
 usr/bin/unicode_stop
+#usr/share/locale/cs/LC_MESSAGES/kbd.mo
+#usr/share/locale/da/LC_MESSAGES/kbd.mo
+#usr/share/locale/de/LC_MESSAGES/kbd.mo
+#usr/share/locale/el/LC_MESSAGES/kbd.mo
+#usr/share/locale/eo/LC_MESSAGES/kbd.mo
+#usr/share/locale/es/LC_MESSAGES/kbd.mo
+#usr/share/locale/fr/LC_MESSAGES/kbd.mo
+#usr/share/locale/gr
+#usr/share/locale/gr/LC_MESSAGES
+#usr/share/locale/gr/LC_MESSAGES/kbd.mo
+#usr/share/locale/id/LC_MESSAGES/kbd.mo
+#usr/share/locale/it/LC_MESSAGES/kbd.mo
+#usr/share/locale/nl/LC_MESSAGES/kbd.mo
+#usr/share/locale/pl/LC_MESSAGES/kbd.mo
+#usr/share/locale/pt/LC_MESSAGES/kbd.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/kbd.mo
+#usr/share/locale/ro/LC_MESSAGES/kbd.mo
+#usr/share/locale/ru/LC_MESSAGES/kbd.mo
+#usr/share/locale/sr/LC_MESSAGES/kbd.mo
+#usr/share/locale/sv/LC_MESSAGES/kbd.mo
+#usr/share/locale/tr/LC_MESSAGES/kbd.mo
+#usr/share/locale/uk/LC_MESSAGES/kbd.mo
+#usr/share/locale/vi/LC_MESSAGES/kbd.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/kbd.mo
 #usr/share/man/man1/chvt.1
 #usr/share/man/man1/deallocvt.1
 #usr/share/man/man1/dumpkeys.1
diff --git a/lfs/kbd b/lfs/kbd
index 460673721..9dbd0f421 100644
--- a/lfs/kbd
+++ b/lfs/kbd
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 2.2.0
+VER        = 2.5.1
 
 THISAPP    = kbd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@  $(DL_FILE)                            = $(DL_FROM)/$(DL_FILE)
 kbd-latarcyrheb-16-fixed.tar.bz2      = $(DL_FROM)/kbd-latarcyrheb-16-fixed.tar.bz2
 kbd-latsun-fonts.tar.bz2              = $(DL_FROM)/kbd-latsun-fonts.tar.bz2
 
-$(DL_FILE)_BLAKE2 = d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6
+$(DL_FILE)_BLAKE2 = aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae
 kbd-latarcyrheb-16-fixed.tar.bz2_BLAKE2  = d5c701333b9eae7e0c467aebee5b2217c3225dee615622f77e501569f1464a8c32380b2d4a522730db74a909e1ea746e660ea6849bbf48195af22bda73858d1b
 kbd-latsun-fonts.tar.bz2_BLAKE2	         = c3def1192331a65f3edcf608ca164370d2db0c61444f71fc83bf35cb86d417ae92582180ace853a3cf93e569a83a42fca054fbadbf7f5986a1abd17e8bb6691f
 
@@ -74,7 +74,7 @@  $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-backspace-1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kbd-2.2.0-backspace-1.patch
 
 	# Extract our own fonts
 	cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2