###############################################################################
name = kbd
-version = 1.15
+version = 1.15.3
release = 1
epoch = 1
summary = Tools for configuring the console (keyboard, virtual terminals, etc.).
description
- The kbd package contains tools for managing a Linux \
- system's console's behavior, including the keyboard, the screen \
+ The kbd package contains tools for managing a Linux
+ system's console's behavior, including the keyboard, the screen
fonts, the virtual terminals and font files.
end
sources += kbd-latsun-fonts.tar.bz2
build
+ requires
+ bison
+ flex
+ gettext
+ end
+
configure_options += \
- --datadir=/lib/kbd
-
- # Adding our own fonts
+ --datadir=/lib/kbd \
+ --disable-rpath \
+ --enable-nls
+
prepare_cmds
+ # Adding our own fonts.
+ cd %{DIR_APP}
%{MACRO_EXTRACT} %{DIR_DL}/kbd-latarcyrheb-16-fixed.tar.bz2
%{MACRO_EXTRACT} %{DIR_DL}/kbd-latsun-fonts.tar.bz2
+
+ # 7-bit maps are obsolete; so are non-euro maps
+ cd %{DIR_APP}/data/keymaps/i386
+ mv qwerty/fi.map qwerty/fi-old.map
+ cp qwerty/fi-latin9.map qwerty/fi.map
+ cp qwerty/pt-latin9.map qwerty/pt.map
+ cp qwerty/sv-latin1.map qwerty/se-latin1.map
+ mv azerty/fr.map azerty/fr-old.map
+ cp azerty/fr-latin9.map azerty/fr.map
+ cp azerty/fr-latin9.map azerty/fr-latin0.map
+
+ # Rename conflicting keymaps
+ mv dvorak/no.map dvorak/no-dvorak.map
+ mv fgGIod/trf.map fgGIod/trf-fgGIod.map
+ mv olpc/es.map olpc/es-olpc.map
+ mv olpc/pt.map olpc/pt-olpc.map
+ mv qwerty/cz.map qwerty/cz-qwerty.map
+
+ # remove obsolete "gr" translation
+ cd %{DIR_APP}/po
+ rm -f gr.po gr.gmo
end
install_cmds
+++ /dev/null
-diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in
---- kbd-1.15/po/Makefile.in_old 2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/po/Makefile.in 2008-12-09 15:35:58.000000000 +0100
-@@ -4,10 +4,10 @@ srcdir = @srcdir@
-
- prefix = @prefix@
- datarootdir = @datarootdir@
--datadir = @datadir@
--localedir = $(DESTDIR)$(datadir)/locale
--gnulocaledir = $(DESTDIR)$(datadir)/locale
--gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
-+datadir = $(DESTDIR)@datadir@
-+localedir = $(DESTDIR)@localedir@
-+gnulocaledir = $(DESTDIR)@localedir@
-+gettextsrcdir = $(datadir)/gettext/po
-
- FOREIGN = @FOREIGN@
- HAVE_XGETTEXT = @HAVE_XGETTEXT@
-@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL)
- COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
- # Enter here all .po files
--POFILES = cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \
-+POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po \
- ro.po ru.po sv.po tr.po
- # the same but with .gmo
--GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \
-+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \
- pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
-
- CATALOGS = $(GMOFILES)
+++ /dev/null
-diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in
---- kbd-1.15/man/man1/loadkeys.1.in_old 2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/man/man1/loadkeys.1.in 2009-03-05 13:11:08.000000000 +0100
-@@ -19,6 +19,8 @@ loadkeys \- load keyboard translation ta
- ] [
- .I -m --mktable
- ] [
-+.I -q --quiet
-+] [
- .I -s --clearstrings
- ] [
- .I -v --verbose
-@@ -148,6 +150,10 @@ command (and does not modify the current
- .B loadkeys
- prints its version number and a short usage message to the programs
- standard error output and exits.
-+.TP
-+.B \-q \-\-quiet
-+.B loadkeys
-+suppresses all normal output.
- .SH WARNING
- Note that anyone having read access to
- .B /dev/console
-diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c
---- kbd-1.15/src/loadkeys.c_old 2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/src/loadkeys.c 2009-03-05 13:09:00.000000000 +0100
-@@ -1966,6 +1966,7 @@ usage(void) {
- " -d --default load \"%s\"\n"
- " -h --help display this help text\n"
- " -m --mktable output a \"defkeymap.c\" to stdout\n"
-+" -q --quiet suppress all normal output\n"
- " -s --clearstrings clear kernel string table\n"
- " -u --unicode implicit conversion to Unicode\n"
- " -v --verbose report the changes\n"), PACKAGE_VERSION, DEFMAP);
+++ /dev/null
-diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8
---- kbd-1.15/man/man8/kbdrate.8_old 2008-12-10 14:20:33.000000000 +0100
-+++ kbd-1.15/man/man8/kbdrate.8 2008-12-10 14:41:10.000000000 +0100
-@@ -22,7 +22,7 @@ Using
- without any options will reset the repeat rate to 10.9 characters per second (cps)
- and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
- These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
--to 5 cps and the delay to 200 ms.
-+to 20 cps and the delay to 200 ms.
-
- .SH OPTIONS
- .TP
-@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa
- .I /etc/rc.local
- .br
- .I /dev/port
-+.br
-+.I /dev/kbd
-diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
---- kbd-1.15/src/kbdrate.c_old 2008-12-10 14:00:25.000000000 +0100
-+++ kbd-1.15/src/kbdrate.c 2008-12-10 14:20:11.000000000 +0100
-@@ -77,7 +77,6 @@ beats rebuilding the kernel!
-
- #ifdef __sparc__
- #include <asm/param.h>
--#include <asm/kbio.h>
- #endif
-
- #ifndef KDKBDREP
-@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500,
-
- static int
- KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
-+#if defined(KDKBDREP) && !defined(__sparc__)
- /*
- * This ioctl is defined in <linux/kd.h> but is not
- * implemented anywhere - must be in some m68k patches.
-+ * We cannot blindly try unimplemented ioctls on sparc64 -
-+ * the 32<->64bit transition layer does not like it.
- * Since 2.4.9 also on i386.
-- */
-+ */
-+
- struct my_kbd_repeat kbdrep_s;
-
- /* don't change, just test */
-@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
- rate, kbdrep_s.delay );
-
- return 1; /* success! */
-+#else /* no KDKBDREP or __sparc__ */
-+ return 0;
-+#endif /* KDKBDREP */
- }
-
- static int
-@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) {
- int
- main( int argc, char **argv ) {
- #ifdef __sparc__
-- double rate = 5.0; /* Default rate */
-+ double rate = 20.0; /* Default rate */
- int delay = 200; /* Default delay */
- #else
- double rate = 10.9; /* Default rate */
-@@ -272,7 +278,9 @@ main( int argc, char **argv ) {
-
-
- /* The ioport way */
-+ /* The ioport way - will crash on sparc */
-
-+#ifndef __sparc__
- for (i = 0; i < RATE_COUNT; i++)
- if (rate * 10 >= valid_rates[i]) {
- value &= 0x60;
-@@ -335,5 +343,7 @@ main( int argc, char **argv ) {
- valid_rates[value & 0x1f] / 10.0,
- valid_delays[ (value & 0x60) >> 5 ] );
-
-+#endif
-+
- return 0;
- }
-diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c
---- kbd-1.15/src/setleds.c_old 2008-12-10 14:00:02.000000000 +0100
-+++ kbd-1.15/src/setleds.c 2008-12-10 14:00:16.000000000 +0100
-@@ -14,10 +14,6 @@
- #include "nls.h"
- #include "version.h"
-
--#ifdef __sparc__
--#include <asm/kbio.h>
--#endif
--
- static void
- usage(void)
- {
--- /dev/null
+diff -up kbd-1.15.3/man/man1/dumpkeys.1.in.orig kbd-1.15.3/man/man1/dumpkeys.1.in
+--- kbd-1.15.3/man/man1/dumpkeys.1.in.orig 2011-08-23 13:06:16.905892768 +0200
++++ kbd-1.15.3/man/man1/dumpkeys.1.in 2011-08-23 13:15:18.264853435 +0200
+@@ -156,6 +156,14 @@ output of
+ .BR dumpkeys .
+ .LP
+ .TP
++.B \-1 \-\-separate-lines
++This forces
++.B dumpkeys
++to write one line per (modifier,keycode) pair. It prefixes the word
++.I plain
++for plain keycodes.
++.LP
++.TP
+ .B \-\-funcs-only
+ When this option is given,
+ .B dumpkeys
--- /dev/null
+diff -up kbd-1.15.3/po/es.po.orig kbd-1.15.3/po/es.po
+--- kbd-1.15.3/po/es.po.orig 2011-08-22 15:18:35.262343023 +0200
++++ kbd-1.15.3/po/es.po 2011-08-22 15:19:14.844340262 +0200
+@@ -1363,7 +1363,7 @@ msgstr "No se encontró nada que guardar
+ #: src/setfont.c:682
+ #, c-format
+ msgid "Saved %d-char %dx%d font file on %s\n"
+-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
+
+ #: src/setkeycodes.c:21
+ #, c-format
projects / people / ms / ipfire-3.x.git / commitdiff
