Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f61a4f22d57c9d84ef10fd74f6950c1e0facc37b
commit f61a4f22d57c9d84ef10fd74f6950c1e0facc37b Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Sat Jan 26 04:05:49 2008 +0100 kbd-1.12-22-i686 - added kbd_mode.diff, which is used in rc.keymap - fixed up rc.font and rc.keymap for 2.6.24 (utf8 is now the default) diff --git a/source/base/kbd/FrugalBuild b/source/base/kbd/FrugalBuild index 3854b5a..eb0d94a 100644 --- a/source/base/kbd/FrugalBuild +++ b/source/base/kbd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kbd pkgver=1.12 -pkgrel=21 +pkgrel=22 pkgdesc="Keyboard maps and console fonts" url="http://www.ibiblio.org/pub/Linux/system/keyboards/"; up2date="lynx -dump 'http://www.ibiblio.org/pub/Linux/system/keyboards/?C=M;O=D'|grep kbd.*tar.gz$ | grep -v 'GR' |sed -n 's/.*d-\(.*\)\.t.*/\1/;1 p'" @@ -13,7 +13,8 @@ archs=('i686' 'x86_64' 'ppc') backup=(etc/sysconfig/font) source=(ftp://ftp.win.tue.nl/pub/linux-local/utils/$pkgname/$pkgname-$pkgver.tar.gz \ $pkgname-$pkgver-{alias,find_map_fix}.patch rc.font \ - rc.font-{de,hu}.po rc.keymap rc.keymap-{de,hu}.po font) + rc.font-{de,hu}.po rc.keymap rc.keymap-{de,hu}.po font \ + kbd_mode.diff) build() { @@ -34,12 +35,13 @@ build() # optimization OK sha1sums=('d4917da308e01e74d67d7b814bf527063b3919fc' \ - '2a266a3fc520371bba9050ea8fa13f4592892e83' \ - '420fd29fc06e3518dac3fac8003c8ac71ae3b28e' \ - 'e66e2e5772e182d292963a6151529e4e0f2e874d' \ - '7b1e17e399608f54ff70ac22cf8e697e01ea6b23' \ - 'd385735e880bea9f8444dfbc5144007eaaffee32' \ - '6c0f9f8eae09b57687c43a8298fea5deb6b6e4a5' \ - 'beceda61cdf168e4063873a9ea6312dbc8284613' \ - 'b9c50c54c7f3b1efce7858a39b0dd7490cc742a3' \ - '84e361527f415ef4d560b3e6affea0d463d544de') + '2a266a3fc520371bba9050ea8fa13f4592892e83' \ + '420fd29fc06e3518dac3fac8003c8ac71ae3b28e' \ + 'd9d18594eb5b2e4c163e90d4bfb775ba46b9321b' \ + '7b1e17e399608f54ff70ac22cf8e697e01ea6b23' \ + 'd385735e880bea9f8444dfbc5144007eaaffee32' \ + '1f340e6351baceae3bb393d3f7395c7df746dcfb' \ + 'beceda61cdf168e4063873a9ea6312dbc8284613' \ + 'b9c50c54c7f3b1efce7858a39b0dd7490cc742a3' \ + '84e361527f415ef4d560b3e6affea0d463d544de' \ + 'dde0580490e0b7c62bacaadc5c3a3e2ece7fa1ff') diff --git a/source/base/kbd/kbd_mode.diff b/source/base/kbd/kbd_mode.diff new file mode 100644 index 0000000..5629a5a --- /dev/null +++ b/source/base/kbd/kbd_mode.diff @@ -0,0 +1,34 @@ +diff -Naur kbd-1.12.orig/src/kbd_mode.c kbd-1.12/src/kbd_mode.c +--- kbd-1.12.orig/src/kbd_mode.c 2004-01-16 20:45:31.000000000 +0100 ++++ kbd-1.12/src/kbd_mode.c 2008-01-26 02:57:35.000000000 +0100 +@@ -15,7 +15,7 @@ + + static void + usage(void){ +- fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s]\n")); ++ fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s] [device]\n")); + exit(1); + } + +@@ -32,7 +32,11 @@ + if (argc == 2 && !strcmp(argv[1], "-V")) + print_version_and_exit(); + +- fd = getfd(NULL); ++ if(argc == 3) { ++ fd = getfd(argv[2]); ++ } else { ++ fd = getfd(NULL); ++ } + + if (argc == 1) { + /* report mode */ +@@ -59,7 +63,7 @@ + } + exit(1); + } +- if (argc != 2) ++ if (argc < 2) + usage(); + if (!strcmp(argv[1], "-a")) + mode = K_XLATE; diff --git a/source/base/kbd/rc.font b/source/base/kbd/rc.font index 66f8814..b40557d 100644 --- a/source/base/kbd/rc.font +++ b/source/base/kbd/rc.font @@ -27,4 +27,8 @@ fi if echo $LANG |grep -qi utf; then kbd_mode -u dumpkeys |loadkeys --unicode + echo -n -e '\033%G' +else + kbd_mode -a + echo -n -e '\033%@' fi diff --git a/source/base/kbd/rc.keymap b/source/base/kbd/rc.keymap index b23b3bd..8a55236 100644 --- a/source/base/kbd/rc.keymap +++ b/source/base/kbd/rc.keymap @@ -29,6 +29,13 @@ rc_start() else ok 999 fi + if ! echo $LANG |grep -qi utf; then + for i in `seq 1 63` + do + kbd_mode -a /dev/tty$i + echo -n -e '\033%@' > /dev/tty$i + done + fi } rc_stop() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
