pool/kbd
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=20

Browse Source
This commit is contained in:
OBS User unknown 2008-08-21 21:56:49 +00:00 committed by Git OBS Bridge
parent 7748ad39cf
commit 234213e7f9
42 changed files with 2079 additions and 3088 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bnc147581_jp106.diff
View File

@ -1,11 +0,0 @@
--- kbd-1.12/data/keymaps/i386/qwerty/jp106.map.orig 2008-04-25 11:58:38.000000000 +0200
+++ kbd-1.12/data/keymaps/i386/qwerty/jp106.map 2008-04-25 12:00:26.504126000 +0200
@@ -24,7 +24,7 @@
keycode 8 = seven apostrophe
keycode 9 = eight parenleft
keycode 10 = nine parenright
-keycode 11 = zero asciitilde
+keycode 11 = zero underscore
control keycode 11 = nul
keycode 12 = minus equal
keycode 13 = asciicircum asciitilde

1025
kbd-1.12-Meta-Tab.diff
View File

File diff suppressed because it is too large Load Diff

54
kbd-1.12-be-nice-to-kdm.diff
View File

@ -1,54 +0,0 @@
--- kbd-1.12/src/setfont.c.orig 2005-03-03 19:17:42.000000000 +0000
+++ kbd-1.12/src/setfont.c 2005-03-04 15:19:13.000000000 +0000
@@ -189,6 +189,20 @@
fd = getfd(console);
+ int kd_mode = -1;
+ if (!ioctl(fd, KDGETMODE, &kd_mode) && (kd_mode == KD_GRAPHICS))
+ {
+ /*
+ * PIO_FONT will fail on a console which is in foreground and in KD_GRAPHICS mode.
+ * 2005-03-03, jw@suse.de.
+ */
+ if (verbose)
+ printf("setfont: graphics console %s skipped\n", console?console:"");
+ close(fd);
+ return 0;
+ }
+
+
if (!ifilct && !mfil && !ufil &&
!Ofil && !ofil && !omfil && !oufil && !restore)
/* reset to some default */
--- kbd-1.12/src/kdfontop.c.orig 2005-03-03 19:14:27.000000000 +0000
+++ kbd-1.12/src/kdfontop.c 2005-03-03 19:42:28.000000000 +0000
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <errno.h>
#include <stdlib.h> /* free() */
+#include <unistd.h> /* usleep() */
#include <sys/ioctl.h>
#include <linux/kd.h>
#include "kdfontop.h"
@@ -275,7 +276,19 @@
/* Third attempt: PIO_FONT */
/* This will load precisely 256 chars, independent of count */
- i = ioctl(fd, PIO_FONT, buf);
+ int loop = 0;
+
+ /* we allow ourselves to hang here for ca 5 seconds, xdm may be playing tricks on us. */
+ while ((loop++ < 20) && (i = ioctl(fd, PIO_FONT, buf)))
+ {
+ if (loop <= 1)
+ fprintf(stderr, "putfont: PIO_FONT trying ...\n");
+ else
+ fprintf(stderr, ".");
+ usleep(250000);
+ }
+ fprintf(stderr, "\n");
+
if (i) {
fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i);
perror("putfont: PIO_FONT");

21
kbd-1.12-cz-us-qwertz.diff
View File

@ -1,21 +0,0 @@
diff -Nur kbd-1.12-12/data/keymaps/i386/qwertz/cz-us-qwertz.map kbd-1.12-13/data/keymaps/i386/qwertz/cz-us-qwertz.map
--- kbd-1.12-12/data/keymaps/i386/qwertz/cz-us-qwertz.map 2004-02-27 17:19:23.000000000 +0100
+++ kbd-1.12-13/data/keymaps/i386/qwertz/cz-us-qwertz.map 2004-02-27 17:23:00.000000000 +0100
@@ -35,7 +35,7 @@
keycode 18 = e
keycode 19 = r
keycode 20 = t
-keycode 21 = z
+keycode 21 = z Z y Y
keycode 22 = u
keycode 23 = i
keycode 24 = o
@@ -61,7 +61,7 @@
keycode 41 = grave semicolon grave asciitilde nul VoidSymbol nul VoidSymbol Meta_grave VoidSymbol Meta_grave VoidSymbol
keycode 42 = Shift
keycode 43 = backslash bar backslash bar Control_backslash VoidSymbol Control_backslash VoidSymbol Meta_backslash VoidSymbol Meta_backslash VoidSymbol
-keycode 44 = y
+keycode 44 = y Y z Z
keycode 45 = x
keycode 46 = c
keycode 47 = v

34
kbd-1.12-dumpkeys-full.diff
View File

@ -1,34 +0,0 @@
diff -Nur kbd-1.12-7/src/dumpkeys.c kbd-1.12-8/src/dumpkeys.c
--- kbd-1.12-7/src/dumpkeys.c 2004-02-26 22:56:09.000000000 +0100
+++ kbd-1.12-8/src/dumpkeys.c 2004-02-26 23:00:23.000000000 +0100
@@ -126,6 +126,7 @@
int t;
int v;
const char *p;
+ int plus;
printf(" ");
t = KTYP(code);
@@ -138,18 +139,20 @@
printf("U+%04x ", code);
return;
}
+ plus = 0;
if (t == KT_LETTER) {
t = KT_LATIN;
printf("+");
+ plus++;
}
if (!numeric && t < syms_size && v < syms[t].size &&
(p = syms[t].table[v])[0])
- printf("%-16s", p);
+ printf("%-*s", 16 - plus, p);
else if (!numeric && t == KT_META && v < 128 && v < syms[0].size &&
(p = syms[0].table[v])[0])
printf("Meta_%-11s", p);
else
- printf("0x%04x ", code);
+ printf("0x%04x %s", code, plus ? "" : " ");
}
static char

14
kbd-1.12-el-locale-update.diff
View File

@ -1,14 +0,0 @@
--- po/Makefile.in
+++ po/Makefile.in
@@ -34,9 +34,9 @@
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
# Enter here all .po files
-POFILES = cs.po da.po de.po es.po fr.po gr.po nl.po pl.po ro.po ru.po sv.po tr.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 es.gmo fr.gmo gr.gmo nl.gmo pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
+GMOFILES = $(patsubst %.po, %.gmo, $(POFILES))
CATALOGS = $(GMOFILES)
CATOBJEXT = .gmo

39
kbd-1.12-handle-small-table.diff
View File

@ -1,39 +0,0 @@
diff -Nur kbd-1.12-10/src/dumpkeys.c kbd-1.12-11/src/dumpkeys.c
--- kbd-1.12-10/src/dumpkeys.c 2004-02-26 23:10:19.000000000 +0100
+++ kbd-1.12-11/src/dumpkeys.c 2004-02-27 17:18:15.000000000 +0100
@@ -113,10 +113,13 @@
ke.kb_index = index;
ke.kb_table = table;
if (ioctl(fd, KDGKBENT, (unsigned long)&ke)) {
- perror("KDGKBENT");
- fprintf(stderr, _("KDGKBENT error at index %d in table %d\n"),
- index, table);
- exit(1);
+ if (index < 128) {
+ perror("KDGKBENT");
+ fprintf(stderr, _("KDGKBENT error at index %d in table %d\n"),
+ index, table);
+ exit(1);
+ } else
+ return -1;
}
return ke.kb_value;
}
@@ -375,6 +378,8 @@
int buf0, buf1, type;
buf0 = get_bind(i, j);
+ if (buf0 == -1)
+ break;
type = KTYP(buf0);
if ((type == KT_LATIN || type == KT_LETTER)
&& KVAL(buf0) < 128) {
@@ -404,6 +409,8 @@
#endif
for (j = 0; j < keymapnr; j++)
buf[j] = get_bind(i, good_keymap[j]);
+ if (buf[0] == -1)
+ break;
if (table_shape == FULL_TABLE) {
printf("keycode %3d =", i);

146
kbd-1.12-happy-abuild.diff
View File

@ -1,146 +0,0 @@
--- kbd-1.12/src/psffontop.c.orig 2005-07-07 15:00:50.547440043 +0200
+++ kbd-1.12/src/psffontop.c 2005-07-07 15:02:49.642520578 +0200
@@ -465,7 +465,7 @@
writepsffontheader(ofil, width, height, fontlen, &psftype, flags);
utf8 = (psftype == 2);
- fwrite(fontbuf, charsize, fontlen, ofil);
+ (void)fwrite(fontbuf, charsize, fontlen, ofil);
/* unimaps: -1 => do nothing: caller will append map */
if (uclistheads != NULL && uclistheads != (struct unicode_list*)-1) {
struct unicode_list *ul;
--- kbd-1.12/src/loadkeys.y.orig 2005-07-07 15:00:50.891379623 +0200
+++ kbd-1.12/src/loadkeys.y 2005-07-07 15:02:19.174871991 +0200
@@ -20,6 +20,7 @@
#include <sys/ioctl.h>
#include <linux/kd.h>
#include <linux/keyboard.h>
+#include <unistd.h> /* readlink */
#include "paths.h"
#include "getfd.h"
#include "findfile.h"
@@ -65,9 +66,9 @@
static void loadkeys(char *console, int *warned);
static void mktable(void);
static void strings_as_usual(void);
-static void keypad_as_usual(char *keyboard);
-static void function_keys_as_usual(char *keyboard);
-static void consoles_as_usual(char *keyboard);
+/* static void keypad_as_usual(char *keyboard); */
+/* static void function_keys_as_usual(char *keyboard); */
+/* static void consoles_as_usual(char *keyboard); */
static void compose_as_usual(char *charset);
static void lkfatal0(const char *, int);
extern int set_charset(const char *charset);
@@ -559,7 +560,6 @@
void
open_include(char *s) {
- char *t, *te;
if (verbose)
/* start reading include file */
@@ -713,7 +713,6 @@
int alttable = table | M_ALT;
int type = KTYP(keycode);
int val = KVAL(keycode);
- char *p;
if (alttable != table && defining[alttable] &&
(!keymap_was_set[alttable] ||
!(keymap_was_set[alttable])[index]) &&
@@ -1021,7 +1020,7 @@
static void
loadkeys (char *console, int *warned) {
int fd;
- int keyct, funcct, diacct;
+ int keyct, funcct, diacct = 0;
fd = getfd(console);
keyct = defkeys(fd, console, &warned);
@@ -1156,7 +1155,6 @@
mktable () {
int i, imax, j;
- struct kbsentry kbs;
u_char *p;
int maxfunc;
unsigned int keymap_count = 0;
--- kbd-1.12/src/mapscrn.c.orig 2005-07-07 15:00:50.869383487 +0200
+++ kbd-1.12/src/mapscrn.c 2005-07-07 15:02:19.190869181 +0200
@@ -126,7 +126,7 @@
FILE *fp;
struct stat stbuf;
int u = 0;
- int lineno;
+ int lineno = 0;
if ((fp = findfile(mfil, mapdirpath, mapsuffixes)) == NULL) {
fprintf(stderr, _("mapscrn: cannot open map file _%s_\n"),
@@ -215,18 +215,18 @@
if ((strncmp(s,"0x",2) == 0) &&
(strspn(s+2,"0123456789abcdefABCDEF") == strlen(s+2)))
- sscanf(s+2,"%x",&i);
+ (void)sscanf(s+2,"%x",&i);
else if ((*s == '0') &&
(strspn(s,"01234567") == strlen(s)))
- sscanf(s,"%o",&i);
+ (void)sscanf(s,"%o",&i);
else if (strspn(s,"0123456789") == strlen(s))
- sscanf(s,"%d",&i);
+ (void)sscanf(s,"%d",&i);
else if ((strncmp(s,"U+",2) == 0) && strlen(s) == 6 &&
(strspn(s+2,"0123456789abcdefABCDEF") == 4))
- sscanf(s+2,"%x",&i);
+ (void)sscanf(s+2,"%x",&i);
else if ((strlen(s) == 3) && (s[0] == '\'') && (s[2] == '\''))
i=s[1];
--- kbd-1.12/src/outpsfheader.c.orig 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12/src/outpsfheader.c 2005-07-07 15:02:19.205866546 +0200
@@ -1,6 +1,7 @@
/* outpsfheader - auxiliary fn - not to be installed */
/* assumes a little-endian machine */
#include <stdio.h>
+#include <stdlib.h> /* exit */
#include "psf.h"
void
--- kbd-1.12/src/spawn_console.c.orig 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12/src/spawn_console.c 2005-07-07 15:02:19.220863912 +0200
@@ -12,6 +12,10 @@
#include <signal.h>
#include <errno.h>
#include <linux/kd.h>
+#include <stdlib.h> /* system */
+#include <fcntl.h> /* open */
+#include <sys/ioctl.h> /* ioctl */
+#include <unistd.h> /* sleep */
void
sighup(){
--- kbd-1.12/src/setleds.c.orig 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12/src/setleds.c 2005-07-07 15:01:56.377876261 +0200
@@ -149,7 +149,7 @@
int optL = 0, optD = 0, optF = 0, verbose = 0;
char oleds, nleds, oflags, nflags, odefflags, ndefflags;
char nval, ndef, sign;
- char osunleds, nsunleds, nsunval, nsundef;
+ char osunleds = 0, nsunleds, nsunval, nsundef;
char *ap;
struct led *lp;
--- kbd-1.12/openvt/Makefile.orig 2004-01-03 15:44:41.000000000 +0100
+++ kbd-1.12/openvt/Makefile 2005-07-07 15:02:19.235861278 +0200
@@ -1,6 +1,7 @@
CC=gcc
-CFLAGS=-O2 -Wall -ansi
+RPM_OPT_FLAGS=-O2 -Wall -ansi
+CFLAGS=$(RPM_OPT_FLAGS)
LDFLAGS=$(CFLAGS) -s
SRC=openvt.c

99
kbd-1.12-kbd_mode.diff
View File

@ -1,99 +0,0 @@
diff -ru 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 2004-03-30 18:02:49.976870814 +0200
@@ -6,6 +6,7 @@
*/
#include <fcntl.h>
#include <stdio.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include <linux/types.h>
#include <linux/kd.h>
@@ -15,13 +16,14 @@
static void
usage(void){
- fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s]\n"));
+ fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s] [-C device]\n"));
exit(1);
}
int
main(int argc, char *argv[]){
- int fd, mode;
+ int fd, mode, c, n = 0;
+ char *console = NULL;
set_progname(argv[0]);
@@ -32,9 +34,45 @@
if (argc == 2 && !strcmp(argv[1], "-V"))
print_version_and_exit();
- fd = getfd(NULL);
+ while ((c = getopt(argc, argv, "auskC:")) != EOF) {
+ switch (c) {
+ case 'a':
+ if (n > 0)
+ usage ();
+ mode = K_XLATE;
+ n++;
+ break;
+ case 'u':
+ if (n > 0)
+ usage ();
+ mode = K_UNICODE;
+ n++;
+ break;
+ case 's':
+ if (n > 0)
+ usage ();
+ mode = K_RAW;
+ n++;
+ break;
+ case 'k':
+ if (n > 0)
+ usage ();
+ mode = K_MEDIUMRAW;
+ n++;
+ break;
+ case 'C':
+ if (!optarg || !optarg[0])
+ usage ();
+ console = optarg;
+ break;
+ default:
+ usage();
+ }
+ }
+
+ fd = getfd(console);
- if (argc == 1) {
+ if (n == 0) {
/* report mode */
if (ioctl(fd, KDGKBMODE, &mode)) {
perror("KDGKBMODE");
@@ -57,20 +95,9 @@
default:
printf(_("The keyboard is in some unknown mode\n"));
}
- exit(1);
+ exit(0);
}
- if (argc != 2)
- usage();
- if (!strcmp(argv[1], "-a"))
- mode = K_XLATE;
- else if (!strcmp(argv[1], "-u"))
- mode = K_UNICODE;
- else if (!strcmp(argv[1], "-s"))
- mode = K_RAW;
- else if (!strcmp(argv[1], "-k"))
- mode = K_MEDIUMRAW;
- else
- usage();
+
if (ioctl(fd, KDSKBMODE, mode)) {
perror("KDSKBMODE");
fprintf(stderr, _("%s: error setting keyboard mode\n"), progname);

154
kbd-1.12-loadkeys-C-opt.diff
View File

@ -1,154 +0,0 @@
--- kbd-1.12/man/man1/loadkeys.1.in.orig 2005-03-04 19:10:30.000000000 +0000
+++ kbd-1.12/man/man1/loadkeys.1.in 2005-03-04 19:11:13.000000000 +0000
@@ -7,6 +7,10 @@
[
.I -c --clearcompose
] [
+.I -C '<cons1 cons2 ...>'
+|
+.I --console=cons1,cons2,...
+] [
.I -d --default
] [
.I -h --help
@@ -28,6 +32,11 @@
reads the file or files specified by
.IR filename... .
Its main purpose is to load the kernel keymap for the console.
+The affected console device or devices can be specified using the
+.I -C
+(or
+.I --console
+) option. This option supports a list of device names
.SH "RESET TO DEFAULT"
If the
.I -d
--- kbd-1.12/src/loadkeys.y.orig 2005-03-08 17:55:08.000000000 +0000
+++ kbd-1.12/src/loadkeys.y 2005-03-08 17:10:06.000000000 +0000
@@ -62,7 +62,7 @@
static void compose(int diacr, int base, int res);
static void do_constant(void);
static void do_constant_key (int, u_short);
-static void loadkeys(void);
+static void loadkeys(char *console, int *warned);
static void mktable(void);
static void strings_as_usual(void);
static void keypad_as_usual(char *keyboard);
@@ -250,6 +250,8 @@
"valid options are:\n"
"\n"
" -c --clearcompose clear kernel compose table\n"
+" -C <cons1,cons2,...>\n"
+" --console=<...> Indicate console device(s) to be used.\n"
" -d --default load \"" DEFMAP "\"\n"
" -h --help display this help text\n"
" -m --mktable output a \"defkeymap.c\" to stdout\n"
@@ -269,9 +271,10 @@
int
main(unsigned int argc, char *argv[]) {
- const char *short_opts = "cdhmsuqvV";
+ const char *short_opts = "cC:dhmsuqvV";
const struct option long_opts[] = {
{ "clearcompose", no_argument, NULL, 'c' },
+ { "console", 1, NULL, 'C' },
{ "default", no_argument, NULL, 'd' },
{ "help", no_argument, NULL, 'h' },
{ "mktable", no_argument, NULL, 'm' },
@@ -283,6 +286,8 @@
{ NULL, 0, NULL, 0 }
};
int c;
+ char *console = NULL;
+ int warned = 0;
set_progname(argv[0]);
@@ -292,6 +297,9 @@
case 'c':
nocompose = 1;
break;
+ case 'C':
+ console = optarg;
+ break;
case 'd':
optd = 1;
break;
@@ -330,8 +338,26 @@
do_constant();
if(optm)
mktable();
+ else if (console)
+ {
+ char *buf = strdup(console); /* make writable */
+ char *e, *s = buf;
+ while (*s)
+ {
+ while ( *s == ' ' || *s == '\t' || *s == ',') s++;
+ e = s;
+ while (*e && *e != ' ' && *e != '\t' && *e != ',') e++;
+ char c = *e;
+ *e = '\0';
+ if (verbose) printf("%s\n", s);
+ loadkeys(s, &warned);
+ *e = c;
+ s = e;
+ }
+ free(buf);
+ }
else
- loadkeys();
+ loadkeys(NULL, &warned);
exit(0);
}
@@ -760,7 +786,7 @@
}
static int
-defkeys(int fd) {
+defkeys(int fd, char *cons, int *warned) {
struct kbentry ke;
int ct = 0;
int i,j,fail;
@@ -845,9 +871,21 @@
fprintf(stderr, _("%s: failed to restore keyboard mode\n"),
progname);
}
- fprintf(stderr, _("%s: warning: this map uses Unicode symbols\n"
- " (perhaps you want to do `kbd_mode -u'?)\n"),
- progname);
+
+ if (!warned++)
+ {
+ int kd_mode = -1;
+ if (ioctl(fd, KDGETMODE, &kd_mode) || (kd_mode != KD_GRAPHICS))
+ {
+ /*
+ * It is okay for the graphics console to have a non-unicode mode.
+ * only talk about other consoles
+ */
+ fprintf(stderr, _("%s: warning: this map uses Unicode symbols, %s mode=%d\n"
+ " (perhaps you want to do `kbd_mode -u'?)\n"),
+ progname, cons ? cons : "NULL", kd_mode);
+ }
+ }
}
return ct;
}
@@ -981,12 +1019,12 @@
}
static void
-loadkeys (void) {
+loadkeys (char *console, int *warned) {
int fd;
int keyct, funcct, diacct;
- fd = getfd(NULL);
- keyct = defkeys(fd);
+ fd = getfd(console);
+ keyct = defkeys(fd, console, &warned);
funcct = deffuncs(fd);
if (accent_table_size > 0 || nocompose)
diacct = defdiacs(fd);

23
kbd-1.12-loadkeys-repstdout.diff
View File

@ -1,23 +0,0 @@
diff -Nur kbd-1.12-5/src/loadkeys.y kbd-1.12-6/src/loadkeys.y
--- kbd-1.12-5/src/loadkeys.y 2004-02-26 22:49:25.000000000 +0100
+++ kbd-1.12-6/src/loadkeys.y 2004-02-26 22:52:44.000000000 +0100
@@ -537,7 +537,7 @@
if (verbose)
/* start reading include file */
- fprintf(stderr, _("switching to %s\n"), s);
+ fprintf(stdout, _("switching to %s\n"), s);
lk_push();
@@ -613,8 +613,8 @@
*/
gotf:
filename = xstrdup(pathname);
- if (!quiet)
- fprintf(stderr, _("Loading %s\n"), pathname);
+ if (!quiet && !optm)
+ fprintf(stdout, _("Loading %s\n"), pathname);
if (first_file) {
yyin = f;
first_file = 0;

99
kbd-1.12-mac-de.diff
View File

@ -1,99 +0,0 @@
---
data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map | 2 -
data/keymaps/mac/all/mac-de-latin1.map | 38 ++++++++++++----------
data/keymaps/mac/include/mac-euro2.map | 6 +++
3 files changed, 28 insertions(+), 18 deletions(-)
Index: kbd-1.12/data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map
===================================================================
--- kbd-1.12.orig/data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map
+++ kbd-1.12/data/keymaps/mac/all/mac-de-latin1-nodeadkeys.map
@@ -7,7 +7,7 @@ include "mac-de-latin1.map"
keycode 24 = apostrophe grave
keycode 30 = plus asterisk asciitilde
keycode 50 = asciicircum degree
- alt keycode 45 = asciitilde
+ altgr keycode 45 = asciitilde
# corresponding keys in mac-de-latin1.map:
# keycode 24 = dead_acute dead_grave
Index: kbd-1.12/data/keymaps/mac/all/mac-de-latin1.map
===================================================================
--- kbd-1.12.orig/data/keymaps/mac/all/mac-de-latin1.map
+++ kbd-1.12/data/keymaps/mac/all/mac-de-latin1.map
@@ -11,22 +11,23 @@ include "mac-qwerty-layout"
#include "linux-with-alt-and-altgr"
include "mac-linux-keys-bare.inc"
plain keycode 65 = KP_Comma
-include "mac-euro.map"
+include "mac-euro2.map"
compose as usual for "iso-8859-1"
strings as usual
-# Normal Shift AltGr Strg
-# Normal Shift AltGr Shift+AltGr Ctrl Shift+Ctrl AltGr+Ctrl Shift+AltGr+Ctrl Alt Shift+Alt AltGr+Alt Shift+AltGr+Alt
-keycode 26 = seven slash braceleft a b c d e f g h i j k
+# Normal Shift AltGr Shift+AltGr Ctrl Shift+Ctrl AltGr+Ctrl Shift+AltGr+Ctrl Alt Shift+Alt AltGr+Alt Shift+AltGr+Alt
keycode 18 = one exclam
shift altgr keycode 18 = at
-keycode 19 = two quotedbl twosuperior nul
-keycode 20 = three section threesuperior Escape
+keycode 19 = two quotedbl twosuperior
+ control keycode 19 = nul
+keycode 20 = three section threesuperior
+ control keycode 29 = Escape
keycode 21 = four dollar
-keycode 23 = five percent
-keycode 22 = six ampersand
-keycode 28 = eight parenleft bracketleft
-keycode 25 = nine parenright bracketright
+keycode 23 = five percent bracketleft
+keycode 22 = six ampersand bracketright
+keycode 26 = seven slash bar
+keycode 28 = eight parenleft braceleft
+keycode 25 = nine parenright braceright
control altgr keycode 25 = Control_bracketright
keycode 29 = zero equal braceright
keycode 27 = ssharp question backslash
@@ -38,20 +39,23 @@ keycode 33 = +udiaeresis +Udiaere
keycode 30 = plus asterisk dead_tilde
keycode 41 = +odiaeresis +Odiaeresis
keycode 39 = +adiaeresis +Adiaeresis
-keycode 10 = dead_circumflex degree Meta_asciicircum Control_asciicircum
+keycode 50 = dead_circumflex degree
+ alt keycode 50 = Meta_asciicircum
+ control keycode 50 = Control_asciicircum
keycode 42 = numbersign apostrophe
keycode 43 = comma semicolon
keycode 47 = period colon
-keycode 44 = minus underscore Meta_minus
+keycode 44 = minus underscore
shift control keycode 44 = Control_underscore
-keycode 49 = space space Meta_space nul
+keycode 49 = space space
+ control keycode 49 = nul
keycode 10 = less greater bar
keycode 16 = z
keycode 6 = y
- alt keycode 12 = at
- alt keycode 50 = bar
+ altgr keycode 12 = at
+ altgr keycode 37 = at
+ altgr keycode 42 = bar
# altgr keycode 26 = bar
- alt keycode 30 = dead_tilde
- alt keycode 45 = dead_tilde
+ altgr keycode 45 = dead_tilde
Index: kbd-1.12/data/keymaps/mac/include/mac-euro2.map
===================================================================
--- /dev/null
+++ kbd-1.12/data/keymaps/mac/include/mac-euro2.map
@@ -0,0 +1,6 @@
+# Euro and cent
+# [Say: "loadkeys mac-euro2" to get Euro and cent with AltGr (Option key)
+# on the positions where many keyboards have E and C.
+# To get it displayed, use a latin0 (i.e., latin9) font.]
+altgr keycode 14 = currency
+altgr keycode 8 = cent

26
kbd-1.12-mac-dk.diff
View File

@ -1,26 +0,0 @@
diff -Nur kbd-1.12-6/data/keymaps/mac/all/mac-dk-latin1.map kbd-1.12-7/data/keymaps/mac/all/mac-dk-latin1.map
--- kbd-1.12-6/data/keymaps/mac/all/mac-dk-latin1.map 2004-02-26 22:52:20.000000000 +0100
+++ kbd-1.12-7/data/keymaps/mac/all/mac-dk-latin1.map 2004-02-26 22:57:47.000000000 +0100
@@ -23,18 +23,20 @@
keycode 25 = nine parenright bracketright
keycode 29 = zero equal
keycode 27 = plus question
-keycode 24 = acute grave
+keycode 24 = acute grave at
keycode 33 = aring Aring
keycode 30 = diaeresis circumflex asciitilde
keycode 41 = ae AE adiaeresis Adiaeresis
keycode 39 = oslash Oslash odiaeresis Odiaeresis
-keycode 42 = apostrophe asterisk
+keycode 42 = apostrophe asterisk at
keycode 43 = comma semicolon
keycode 47 = period colon
keycode 44 = minus underscore Meta_minus
shift control keycode 44 = Control_underscore
keycode 49 = space space Meta_space nul
keycode 10 = less greater bar
+# odd
+keycode 34 = i I bar
alt keycode 12 = at

24
kbd-1.12-noclaudio.diff
View File

@ -1,24 +0,0 @@
diff -Nur kbd-1.12-3/data/keymaps/mac/all/mac-de_CH.map kbd-1.12-4/data/keymaps/mac/all/mac-de_CH.map
--- kbd-1.12-3/data/keymaps/mac/all/mac-de_CH.map 2004-02-26 22:39:18.000000000 +0100
+++ kbd-1.12-4/data/keymaps/mac/all/mac-de_CH.map 2004-02-26 22:48:31.000000000 +0100
@@ -11,7 +11,7 @@
! CtrlR 128 not used
! plain,shift,command,control,alt,ctrl-alt
-# from http://www.claudio.ch/Etc/pb-sg.kmap
+# from Claudio Nieder
# modified by olh@suse.de
alt_is_meta
diff -Nur kbd-1.12-3/data/keymaps/mac/all/mac-fr_CH-latin1.map kbd-1.12-4/data/keymaps/mac/all/mac-fr_CH-latin1.map
--- kbd-1.12-3/data/keymaps/mac/all/mac-fr_CH-latin1.map 2004-02-26 22:39:18.000000000 +0100
+++ kbd-1.12-4/data/keymaps/mac/all/mac-fr_CH-latin1.map 2004-02-26 22:48:31.000000000 +0100
@@ -11,7 +11,7 @@
! CtrlR 128 not used
! plain,shift,command,control,alt,ctrl-alt
-# from http://www.claudio.ch/Etc/pb-sg.kmap
+# from Claudio Nieder
# modified by olh@suse.de from mac-de_CH
alt_is_meta

44
kbd-1.12-nohang-kbdrate2.diff
View File

@ -1,44 +0,0 @@
diff -Nur kbd-1.12-4/src/kbdrate.c kbd-1.12-5/src/kbdrate.c
--- kbd-1.12-4/src/kbdrate.c 2004-02-26 22:46:55.000000000 +0100
+++ kbd-1.12-5/src/kbdrate.c 2004-02-26 22:50:19.000000000 +0100
@@ -90,6 +90,8 @@
};
#endif
+#include <signal.h>
+
#include "nls.h"
#include "version.h"
@@ -185,6 +187,12 @@
#endif /* KIOCSRATE */
}
+void
+sigalrmhandler( int sig ) {
+ fprintf( stderr, "kbdrate: Failed waiting for kbd controller!\n" );
+ raise( SIGINT );
+}
+
int
main( int argc, char **argv ) {
#ifdef __sparc__
@@ -260,6 +268,9 @@
exit( 1 );
}
+ signal( SIGALRM, sigalrmhandler );
+ alarm( 3 );
+
do {
lseek( fd, 0x64, 0 );
read( fd, &data, 1 );
@@ -274,6 +285,8 @@
read( fd, &data, 1 );
} while ((data & 2) == 2 ); /* wait */
+ alarm( 0 );
+
lseek( fd, 0x60, 0 );
sleep( 1 );
write( fd, &value, 1 );

40
kbd-1.12-nounicode-nontty.diff
View File

@ -1,40 +0,0 @@
diff -Nur kbd-1.12-13/src/unicode_start kbd-1.12-14/src/unicode_start
--- kbd-1.12-13/src/unicode_start 2004-02-27 17:22:32.000000000 +0100
+++ kbd-1.12-14/src/unicode_start 2004-02-27 17:24:51.000000000 +0100
@@ -1,6 +1,17 @@
#!/bin/sh
# Enables Unicode processing in the current console.
-#
+
+# 0. Check whether we're on a console
+TTY=`/usr/bin/tty`
+case $TTY in
+ /dev/console|/dev/tty[0-9]*)
+ ;;
+ *)
+ echo "unicode_start skipped on $TTY"
+ exit 0
+ ;;
+esac
+
# 1. The input side: the keyboard driver.
# Set the keyboard driver in Unicode mode. (Default is ASCII mode.)
diff -Nur kbd-1.12-13/src/unicode_stop kbd-1.12-14/src/unicode_stop
--- kbd-1.12-13/src/unicode_stop 2004-02-27 17:22:32.000000000 +0100
+++ kbd-1.12-14/src/unicode_stop 2004-02-27 17:24:51.000000000 +0100
@@ -1,5 +1,14 @@
#!/bin/sh
# stop unicode
+TTY=`/usr/bin/tty`
+case $TTY in
+ /dev/console|/dev/tty[0-9]*)
+ ;;
+ *)
+ echo "unicode_stop skipped on $TTY"
+ exit 0
+ ;;
+esac
kbd_mode -a
echo -n -e '\033%@'

274
kbd-1.12-prtscr_no_sigquit.diff
View File

@ -1,274 +0,0 @@
diff -ur kbd-1.12-0/data/keymaps/i386/azerty/fr-latin9.map kbd-1.12-1/data/keymaps/i386/azerty/fr-latin9.map
--- kbd-1.12-0/data/keymaps/i386/azerty/fr-latin9.map 2002-10-13 01:47:01.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/azerty/fr-latin9.map 2004-02-27 19:04:47.000000000 +0100
@@ -417,6 +417,7 @@
# La touche Ctrl+Pause = Attn = 101 a un code pour elle-męme
#
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Home
diff -ur kbd-1.12-0/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.12-1/data/keymaps/i386/fgGIod/tr_f-latin5.map
--- kbd-1.12-0/data/keymaps/i386/fgGIod/tr_f-latin5.map 2002-10-13 02:21:12.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/fgGIod/tr_f-latin5.map 2004-02-27 19:04:47.000000000 +0100
@@ -217,6 +217,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/bg-cp1251.map kbd-1.12-1/data/keymaps/i386/qwerty/bg-cp1251.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/bg-cp1251.map 2004-01-03 18:07:57.000000000 +0100
+++ kbd-1.12-1/data/keymaps/i386/qwerty/bg-cp1251.map 2004-02-27 19:04:47.000000000 +0100
@@ -311,6 +311,7 @@
altgr alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/bg_bds-cp1251.map kbd-1.12-1/data/keymaps/i386/qwerty/bg_bds-cp1251.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/bg_bds-cp1251.map 2002-10-14 01:39:32.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/bg_bds-cp1251.map 2004-02-27 19:04:47.000000000 +0100
@@ -636,6 +636,7 @@
keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/br-abnt.map kbd-1.12-1/data/keymaps/i386/qwerty/br-abnt.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/br-abnt.map 2002-10-13 02:10:14.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/br-abnt.map 2004-02-27 19:04:47.000000000 +0100
@@ -197,6 +197,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/by.map kbd-1.12-1/data/keymaps/i386/qwerty/by.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/by.map 2002-10-13 02:10:31.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/by.map 2004-02-27 19:04:47.000000000 +0100
@@ -529,6 +529,7 @@
Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash
keycode 100 = Alt
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up Up Up \
KeyboardSignal Up Up \
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/cz-cp1250.map kbd-1.12-1/data/keymaps/i386/qwerty/cz-cp1250.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/cz-cp1250.map 2002-10-13 02:12:14.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/cz-cp1250.map 2004-02-27 19:04:47.000000000 +0100
@@ -138,6 +138,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/cz-lat2-prog.map kbd-1.12-1/data/keymaps/i386/qwerty/cz-lat2-prog.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/cz-lat2-prog.map 2002-10-13 02:02:58.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/cz-lat2-prog.map 2004-02-27 19:04:47.000000000 +0100
@@ -141,6 +141,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/cz-lat2.map kbd-1.12-1/data/keymaps/i386/qwerty/cz-lat2.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/cz-lat2.map 2002-10-13 02:03:21.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/cz-lat2.map 2004-02-27 19:04:47.000000000 +0100
@@ -138,6 +138,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/cz.map kbd-1.12-1/data/keymaps/i386/qwerty/cz.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/cz.map 2002-10-11 13:08:50.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/cz.map 2004-02-27 19:04:47.000000000 +0100
@@ -1083,13 +1083,13 @@
keycode 100 = AltGr
#
#keycode 101 = Break
-keycode 101 = Break Break VoidSymbol VoidSymbol VoidSymbol \
- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
+keycode 101 = Break Break VoidSymbol VoidSymbol Control_c \
+ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol \
- Break Break VoidSymbol VoidSymbol VoidSymbol \
- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
+ Break Break VoidSymbol VoidSymbol Control_c \
+ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap.map kbd-1.12-1/data/keymaps/i386/qwerty/defkeymap.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap.map 2004-02-27 19:03:48.000000000 +0100
+++ kbd-1.12-1/data/keymaps/i386/qwerty/defkeymap.map 2004-02-27 19:04:47.000000000 +0100
@@ -222,6 +222,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap_V1.0.map kbd-1.12-1/data/keymaps/i386/qwerty/defkeymap_V1.0.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap_V1.0.map 2002-10-13 02:05:31.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/defkeymap_V1.0.map 2004-02-27 19:04:47.000000000 +0100
@@ -185,6 +185,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/lt.baltic.map kbd-1.12-1/data/keymaps/i386/qwerty/lt.baltic.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/lt.baltic.map 2002-10-13 02:09:50.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/lt.baltic.map 2004-02-27 19:04:47.000000000 +0100
@@ -171,6 +171,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/lt.l4.map kbd-1.12-1/data/keymaps/i386/qwerty/lt.l4.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/lt.l4.map 2002-10-13 01:59:51.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/lt.l4.map 2004-02-27 19:04:47.000000000 +0100
@@ -463,6 +463,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break # 101=Control-Pause
+ control keycode 101 = Control_c
string F102 = "\033[7$"
keycode 102 = Find # =Home
shift keycode 102 = F102
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/lt.map kbd-1.12-1/data/keymaps/i386/qwerty/lt.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/lt.map 2002-10-13 02:00:25.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/lt.map 2004-02-27 19:04:47.000000000 +0100
@@ -462,6 +462,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break # 101=Control-Pause
+ control keycode 101 = Control_c
string F102 = "\033[7$"
keycode 102 = Find # =Home
shift keycode 102 = F102
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/pl2.map kbd-1.12-1/data/keymaps/i386/qwerty/pl2.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/pl2.map 2002-10-13 02:06:29.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/pl2.map 2004-02-27 19:04:47.000000000 +0100
@@ -241,6 +241,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
control keycode 102 = F106
keycode 103 = Up
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/sk-prog-qwerty.map kbd-1.12-1/data/keymaps/i386/qwerty/sk-prog-qwerty.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/sk-prog-qwerty.map 2002-10-13 02:09:26.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/sk-prog-qwerty.map 2004-02-27 19:04:47.000000000 +0100
@@ -122,6 +122,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.12-1/data/keymaps/i386/qwerty/ua-utf-ws.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/ua-utf-ws.map 2002-10-13 02:07:56.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/ua-utf-ws.map 2004-02-27 19:04:47.000000000 +0100
@@ -1526,6 +1526,7 @@
ctrlr keycode 100 = CtrlR_Lock
ctrll ctrlr keycode 100 = CtrlR_Lock
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/ua-utf.map kbd-1.12-1/data/keymaps/i386/qwerty/ua-utf.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/ua-utf.map 2002-10-13 02:08:07.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/ua-utf.map 2004-02-27 19:04:47.000000000 +0100
@@ -1516,6 +1516,7 @@
ctrlr keycode 100 = CtrlR_Lock
ctrll ctrlr keycode 100 = CtrlR_Lock
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/ua-ws.map kbd-1.12-1/data/keymaps/i386/qwerty/ua-ws.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/ua-ws.map 2002-10-13 02:08:19.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/ua-ws.map 2004-02-27 19:04:47.000000000 +0100
@@ -1521,6 +1521,7 @@
alt keycode 99 = Control_backslash
keycode 100 = Alt
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/ua.map kbd-1.12-1/data/keymaps/i386/qwerty/ua.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/ua.map 2002-10-13 02:08:31.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/ua.map 2004-02-27 19:04:47.000000000 +0100
@@ -1515,6 +1515,7 @@
ctrlr keycode 100 = CtrlR_Lock
ctrll ctrlr keycode 100 = CtrlR_Lock
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwerty/us-acentos.map kbd-1.12-1/data/keymaps/i386/qwerty/us-acentos.map
--- kbd-1.12-0/data/keymaps/i386/qwerty/us-acentos.map 2002-10-13 02:10:02.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwerty/us-acentos.map 2004-02-27 19:04:47.000000000 +0100
@@ -193,6 +193,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
diff -ur kbd-1.12-0/data/keymaps/i386/qwertz/cz-us-qwertz.map kbd-1.12-1/data/keymaps/i386/qwertz/cz-us-qwertz.map
--- kbd-1.12-0/data/keymaps/i386/qwertz/cz-us-qwertz.map 2002-10-13 01:56:20.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwertz/cz-us-qwertz.map 2004-02-27 19:04:47.000000000 +0100
@@ -135,6 +135,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
diff -ur kbd-1.12-0/data/keymaps/i386/qwertz/sk-prog-qwertz.map kbd-1.12-1/data/keymaps/i386/qwertz/sk-prog-qwertz.map
--- kbd-1.12-0/data/keymaps/i386/qwertz/sk-prog-qwertz.map 2002-10-13 01:57:30.000000000 +0200
+++ kbd-1.12-1/data/keymaps/i386/qwertz/sk-prog-qwertz.map 2004-02-27 19:04:47.000000000 +0100
@@ -122,6 +122,7 @@
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior

29
kbd-1.12-setfont-fpclose.diff
View File

@ -1,29 +0,0 @@
--- kbd-1.12/src/setfont.c.orig 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12/src/setfont.c 2006-06-21 17:28:56.999867425 +0200
@@ -398,8 +398,10 @@
fprintf(stderr, _("When loading several fonts, all "
"must be psf fonts - %s isn't\n"),
pathname);
+ fpclose(fpi);
exit(EX_DATAERR);
}
+ fpclose(fpi); // avoid zombies, jw@suse.de (#88501)
bytewidth = (width+7) / 8;
height = fontbuflth / (bytewidth * fontsize);
if (verbose)
@@ -483,6 +485,7 @@
if(readpsffont(fpi, &inbuf, &inputlth, &fontbuf, &fontbuflth,
&width, &fontsize, 0,
no_u ? NULL : &uclistheads) == 0) {
+ fpclose(fpi);
/* we've got a psf font */
bytewidth = (width+7) / 8;
height = fontbuflth / (bytewidth * fontsize);
@@ -497,6 +500,7 @@
#endif
return;
}
+ fpclose(fpi); // avoid zombies, jw@suse.de (#88501)
/* instructions to combine fonts? */
{ char *combineheader = "# combine partial fonts\n";

44
kbd-1.12-setfont-no-cruft.diff
View File

@ -1,44 +0,0 @@
--- kbd-1.12/src/kdfontop.c.orig 2007-08-21 19:28:47.000000000 +0200
+++ kbd-1.12/src/kdfontop.c 2007-08-21 19:32:50.000000000 +0200
@@ -268,26 +268,19 @@
return 0;
}
- /* Second attempt: PIO_FONTX */
- cfd.charcount = count;
- cfd.charheight = height;
- cfd.chardata = buf;
- i = ioctl(fd, PIO_FONTX, &cfd);
- if (i == 0)
- return 0;
- if (errno != ENOSYS && errno != EINVAL) {
- fprintf(stderr, "%s: putfont: %d,%dx%d:failed: %d\n", progname, count, width, height, i);
- perror("putfont: PIO_FONTX");
- return -1;
- }
-
- /* Third attempt: PIO_FONT */
- /* This will load precisely 256 chars, independent of count */
- i = ioctl(fd, PIO_FONT, buf);
- if (i) {
- fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i);
- perror("putfont: PIO_FONT");
- return -1;
- }
- return 0;
+ // We no longer try PIO_FONT* calls.
+ // A former patch even added a possible 5 seconds delay loop here, in an attempt to
+ // gain victory over kdm. We no do this fight, as it can only result in races.
+ // https://bugzilla.novell.com/show_bug.cgi?id=302010
+ //
+ // Two effects:
+ // a) Without the delay loop, we are fast enough to run early.
+ // Moving setfont calls to an earlier point most likly
+ // avoids the race.
+ // b) Without the old compat calls, it should be easier to
+ // fix this in kernel side.
+ //
+ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i);
+ perror("putfont: KDFONTOP");
+ return -1;
}

146
kbd-1.12-showconsolefont-info.diff
View File

@ -1,146 +0,0 @@
--- kbd-1.12/man/man8/showconsolefont.8
+++ kbd-1.12/man/man8/showconsolefont.8 2008-05-07 18:19:41.000000000 +0200
@@ -13,15 +13,25 @@ showconsolefont \- Show the current EGA/
.B \-C
.I console
]
+[
+.B \-i
+]
+
.SH DESCRIPTION
The
.B showconsolefont
command outputs the current console font to stdout.
-The option \-v prints additional information, while
-the option \-V prints the program version number.
-On Linux 2.6.1 and later, the option \-C allows one
+The option \fB\-v\fR prints additional information, while
+the option \fB\-V\fR prints the program version number.
+On Linux 2.6.1 and later, the option \fB\-C\fR allows one
to indicate the console involved. Its argument is a pathname.
+The option \fB\-i\fR cause
+.B showconsolefont
+not to show the font table but show the value of the
+used ROWS, COLUMNS, and character COUNT of the current
+font with the format
+.BR ROWS x COLUMNS x COUNT .
.SH "SEE ALSO"
.BR setfont (8)
--- kbd-1.12/src/kdfontop.c
+++ kbd-1.12/src/kdfontop.c 2006-07-26 18:14:55.000000000 +0200
@@ -142,8 +142,11 @@ font_charheight(char *buf, int count, in
return h;
}
-/* may be called with buf==NULL if we only want info */
-/* must not exit - we may have cleanup to do */
+/*
+ * May be called with buf==NULL if we only want info.
+ * May be called with width==NULL and height==NULL.
+ * Must not exit - we may have cleanup to do.
+ */
int
getfont(int fd, char *buf, int *count, int *width, int *height) {
struct consolefontdesc cfd;
@@ -193,6 +196,11 @@ getfont(int fd, char *buf, int *count, i
fprintf(stderr, _("bug: getfont called with count<256\n"));
return -1;
}
+ if (!buf)
+ {
+ fprintf(stderr, _("bug: getfont using GIO_FONT needs buf.\n"));
+ return -1;
+ }
i = ioctl(fd, GIO_FONT, buf);
if (i) {
perror("getfont: GIO_FONT");
@@ -206,11 +214,11 @@ getfont(int fd, char *buf, int *count, i
int
getfontsize(int fd) {
- int count, width, height;
+ int count;
int i;
- count = width = height = 0;
- i = getfont(fd, NULL, &count, &width, &height);
+ count = 0;
+ i = getfont(fd, NULL, &count, NULL, NULL);
return (i == 0) ? count : 256;
}
--- kbd-1.12/src/showconsolefont.c
+++ kbd-1.12/src/showconsolefont.c 2008-05-07 18:27:36.130879445 +0200
@@ -101,8 +101,15 @@ setnewunicodemap(int *list, int cnt) {
static void
usage(void) {
fprintf(stderr,
- _("usage: showconsolefont [-v|-V]\n"
- "(probably after loading a font with `setfont font')\n"));
+ _("usage: showconsolefont -V|--version\n"
+ " showconsolefont [-C tty] [-v] [-i]\n"
+ "(probably after loading a font with `setfont font')\n"
+ "\n"
+ "Valid options are:\n"
+ " -C tty Device to read the font from. Default: current tty.\n"
+ " -v Be more verbose.\n"
+ " -i Don't print out the font table, just show\n"
+ " ROWSxCOLSxCOUNT and exit.\n"));
exit(1);
}
@@ -110,7 +117,7 @@ int
main (int argc, char **argv) {
int c, n, cols, rows, nr, i, j, k;
char *sep, *console = NULL;
- int list[64], lth, verbose = 0;
+ int list[64], lth, info = 0, verbose = 0;
set_progname(argv[0]);
@@ -122,8 +129,11 @@ main (int argc, char **argv) {
(!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")))
print_version_and_exit();
- while ((c = getopt(argc, argv, "vC:")) != EOF) {
+ while ((c = getopt(argc, argv, "ivC:")) != EOF) {
switch (c) {
+ case 'i':
+ info = 1;
+ break;
case 'v':
verbose = 1;
break;
@@ -135,11 +145,28 @@ main (int argc, char **argv) {
}
}
- if (argc != 1)
+ if (optind != argc)
usage();
fd = getfd(console);
+ if (info)
+ {
+ nr = rows = cols = 0;
+ n = getfont(fd, NULL, &nr, &rows, &cols);
+ if (n != 0)
+ leave(1);
+ if (verbose)
+ {
+ printf("Character count: %d\n", nr);
+ printf("Font width : %d\n", rows);
+ printf("Font height : %d\n", cols);
+ }
+ else
+ printf("%dx%dx%d\n", rows, cols, nr);
+ leave(0);
+ }
+
settrivialscreenmap();
getoldunicodemap();

48
kbd-1.12-strip.diff
View File

@ -1,48 +0,0 @@
openvt/Makefile | 2 +-
src/Makefile.in | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
Index: kbd-1.12/src/Makefile.in
===================================================================
--- kbd-1.12.orig/src/Makefile.in 2006-01-13 15:03:29.000000000 +0100
+++ kbd-1.12/src/Makefile.in 2006-01-13 15:04:24.000000000 +0100
@@ -56,7 +56,7 @@ WARN = -Wall -Wmissing-prototypes -Wstri
DEFS = -DDATADIR=\"$(DATA_DIR)\"
RPM_OPT_FLAGS = -O2 -Wall
CFLAGS = $(RPM_OPT_FLAGS)
-LDFLAGS = -s
+LDFLAGS =
CC = gcc
YACC = bison -y
@@ -73,14 +73,14 @@ old: $(OLDPROGS)
install: all
install -d -m 0755 $(BINDIR) $(LOADKEYS_BINDIR)
- install -s -m 0755 $(setowner) $(PROGS) $(OLDPROGS) $(BINDIR)
-# install -s -m 0755 $(setowner) $(MISC) $(BINDIR)
+ install -m 0755 $(setowner) $(PROGS) $(OLDPROGS) $(BINDIR)
+# install -m 0755 $(setowner) $(MISC) $(BINDIR)
install -c -m 0755 $(setowner) $(SHCMDS) $(BINDIR)
for i in psfaddtable psfgettable psfstriptable; do \
rm -f $(BINDIR)/$$i; ln -s psfxtable $(BINDIR)/$$i; \
done
rm -f $(BINDIR)/loadkeys
- install -s -m 0755 $(setowner) loadkeys $(LOADKEYS_BINDIR)
+ install -m 0755 $(setowner) loadkeys $(LOADKEYS_BINDIR)
@echo "You may also want to add psf.magic to /usr/lib/magic"
Index: kbd-1.12/openvt/Makefile
===================================================================
--- kbd-1.12.orig/openvt/Makefile 2006-01-13 15:03:29.000000000 +0100
+++ kbd-1.12/openvt/Makefile 2006-01-13 15:09:53.000000000 +0100
@@ -2,7 +2,7 @@
CC=gcc
RPM_OPT_FLAGS=-O2 -Wall -ansi
CFLAGS=$(RPM_OPT_FLAGS)
-LDFLAGS=$(CFLAGS) -s
+LDFLAGS=$(CFLAGS)
SRC=openvt.c
OBJ=openvt.o getfd.o

73
kbd-1.12-swiss.diff
View File

@ -1,73 +0,0 @@
diff -Nur kbd-1.12-1/data/keymaps/i386/qwertz/fr_CH-latin1.map kbd-1.12-2/data/keymaps/i386/qwertz/fr_CH-latin1.map
--- kbd-1.12-1/data/keymaps/i386/qwertz/fr_CH-latin1.map 2004-02-26 22:12:57.000000000 +0100
+++ kbd-1.12-2/data/keymaps/i386/qwertz/fr_CH-latin1.map 2004-02-26 22:37:52.000000000 +0100
@@ -7,7 +7,7 @@
keycode 1 = Escape Escape
alt keycode 1 = Meta_Escape
-keycode 2 = one plus
+keycode 2 = one plus bar
alt keycode 2 = Meta_one
keycode 3 = two quotedbl at
control keycode 3 = nul
@@ -15,10 +15,10 @@
keycode 4 = three asterisk numbersign
control keycode 4 = Escape
alt keycode 4 = Meta_three
-keycode 5 = four ccedilla
+keycode 5 = four ccedilla degree
control keycode 5 = Control_backslash
alt keycode 5 = Meta_four
-keycode 6 = five percent
+keycode 6 = five percent section
control keycode 6 = Control_bracketright
alt keycode 6 = Meta_five
keycode 7 = six ampersand notsign
@@ -81,3 +81,6 @@
keycode 86 = less greater backslash
alt keycode 86 = Meta_less
keycode 97 = Control
+# adapted to X11 keymap
+altgr keycode 18 = currency
+#altgr keycode 46 = cent
diff -Nur kbd-1.12-1/data/keymaps/i386/qwertz/sg-latin1.map kbd-1.12-2/data/keymaps/i386/qwertz/sg-latin1.map
--- kbd-1.12-1/data/keymaps/i386/qwertz/sg-latin1.map 2002-10-12 21:57:22.000000000 +0200
+++ kbd-1.12-2/data/keymaps/i386/qwertz/sg-latin1.map 2004-02-26 22:37:52.000000000 +0100
@@ -5,7 +5,7 @@
keycode 1 = Escape Escape
alt keycode 1 = Meta_Escape
-keycode 2 = one plus bar
+keycode 2 = one plus bar
alt keycode 2 = Meta_one
keycode 3 = two quotedbl at
control keycode 3 = nul
@@ -13,10 +13,10 @@
keycode 4 = three asterisk numbersign
control keycode 4 = Escape
alt keycode 4 = Meta_three
-keycode 5 = four ccedilla
+keycode 5 = four ccedilla degree
control keycode 5 = Control_backslash
alt keycode 5 = Meta_four
-keycode 6 = five percent
+keycode 6 = five percent section
control keycode 6 = Control_bracketright
alt keycode 6 = Meta_five
keycode 7 = six ampersand notsign
@@ -44,7 +44,7 @@
keycode 26 = udiaeresis egrave bracketleft
control keycode 26 = Escape
alt keycode 26 = Meta_bracketleft
-keycode 27 = dead_diaeresis exclam bracketright
+keycode 27 = dead_diaeresis exclam bracketright
control keycode 27 = Control_bracketright
alt keycode 27 = Meta_bracketright
keycode 28 = Return
@@ -85,3 +85,6 @@
keycode 86 = less greater backslash
alt keycode 86 = Meta_less
keycode 97 = Control
+# adapted to X11 keymap
+altgr keycode 18 = currency
+#altgr keycode 46 = cent

79
kbd-1.12-unicode_scripts.diff
View File

@ -1,79 +0,0 @@
diff -Nur kbd-1.12-11/src/unicode_start kbd-1.12-12/src/unicode_start
--- kbd-1.12-11/src/unicode_start 2004-02-27 17:14:14.000000000 +0100
+++ kbd-1.12-12/src/unicode_start 2004-02-27 17:21:41.000000000 +0100
@@ -18,7 +18,19 @@
# produce UTF-8 encoded multibyte sequences, instead of single bytes
# >= 0x80 in a legacy 8-bit encoding.
-dumpkeys | loadkeys --unicode
+# There is no way of reverting the effect of "dumpkeys | loadkeys --unicode",
+# the memory of the earlier keymap is lost. Therefore, try
+# to save a copy of the original keymap to be able to reload it in unicode_stop.
+# (see also http://mail.nl.linux.org/linux-utf8/2003-08/msg00053.html):
+
+test -z "$HOME" -o "/" == "$HOME" && HOME=/root
+test -d $HOME/.kbd || mkdir $HOME/.kbd
+dumpkeys > $HOME/.kbd/.keymap_sv
+
+# redirect stderr and stdout of loadkeys to /dev/null to avoid the confusing
+# "plus before udiaeresis ignored" warnings.
+
+dumpkeys | loadkeys --unicode > /dev/null 2>&1
# 2. The output side: the console screen.
@@ -35,6 +47,14 @@
DEFAULT_UNICODE_FONT=LatArCyrHeb-16
# Also drdos8x16 is a good candidate.
+# Fonts with 512 glyphs like LatArCyrHeb-16 make it impossible to use bold
+# on the console, which makes YaST2 unusable. To be able to use bold,
+# only fonts with 256 glyphs can be used. Therefore we prefer
+# the font specified in /etc/sysconfig/console. This should be OK because
+# the default font written to /etc/sysconfig/console by YaST2
+# is currently always a font with 256 glyphs and a Unicode map
+# which is suitable for the language used during the installation.
+
case $# in
2)
setfont $1 -u $2
@@ -43,7 +63,24 @@
setfont $1
;;
0)
- setfont $DEFAULT_UNICODE_FONT
+ if [ -f /etc/sysconfig/console ] ; then
+ . /etc/sysconfig/console
+ fi
+ if [ -n "$CONSOLE_FONT" ] ; then
+ SETFONT_ARGS="$CONSOLE_FONT"
+ if [ -n "$CONSOLE_UNICODEMAP" ] ; then
+ SETFONT_ARGS="$SETFONT_ARGS -u $CONSOLE_UNICODEMAP"
+ fi
+ if [ -n "$CONSOLE_SCREENMAP" ] ; then
+ SETFONT_ARGS="$SETFONT_ARGS -m $CONSOLE_SCREENMAP"
+ fi
+ setfont $SETFONT_ARGS
+ if [ -n "$CONSOLE_MAGIC" -a "$CONSOLE_MAGIC" != "none" ] ; then
+ echo -en "\033$CONSOLE_MAGIC"
+ fi
+ else
+ setfont $DEFAULT_UNICODE_FONT
+ fi
;;
*)
echo "usage: unicode_start [font [unicode map]]"
diff -Nur kbd-1.12-11/src/unicode_stop kbd-1.12-12/src/unicode_stop
--- kbd-1.12-11/src/unicode_stop 2004-02-27 17:14:14.000000000 +0100
+++ kbd-1.12-12/src/unicode_stop 2004-02-27 17:21:41.000000000 +0100
@@ -2,3 +2,10 @@
# stop unicode
kbd_mode -a
echo -n -e '\033%@'
+
+# "dumpkeys | loadkeys --unicode" which is called in "unicode_start"
+# cannot be reverted, therefore we have to load the keyboard mapping again
+# if it could be sucessfully saved in "unicode_start":
+
+test -r $HOME/.kbd/.keymap_sv && loadkeys $HOME/.kbd/.keymap_sv
+

399
kbd-1.12.diff
View File

@ -1,399 +0,0 @@
diff -ur kbd-1.12.orig/data/keymaps/i386/include/ctrl.map kbd-1.12-0/data/keymaps/i386/include/ctrl.map
--- kbd-1.12.orig/data/keymaps/i386/include/ctrl.map 2002-10-11 13:08:50.000000000 +0200
+++ kbd-1.12-0/data/keymaps/i386/include/ctrl.map 2004-02-26 21:55:25.000000000 +0100
@@ -1,3 +1,6 @@
keycode 29 = Caps_Lock
keycode 58 = Control
keycode 97 = Compose
+# keycode 97 = Control
+# Shift keycode 97 = Compose is also popular
+# (Right Ctrl + Shift for Compose)
diff -ur kbd-1.12.orig/data/keymaps/i386/qwerty/defkeymap.map kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap.map
--- kbd-1.12.orig/data/keymaps/i386/qwerty/defkeymap.map 2002-10-13 02:03:56.000000000 +0200
+++ kbd-1.12-0/data/keymaps/i386/qwerty/defkeymap.map 2004-02-26 21:55:25.000000000 +0100
@@ -251,9 +251,9 @@
keycode 122 =
keycode 123 =
keycode 124 =
-keycode 125 =
-keycode 126 =
-keycode 127 =
+keycode 125 = Decr_Console Last_Console Incr_Console Compose
+keycode 126 = Incr_Console Last_Console Decr_Console Compose
+keycode 127 = Compose Decr_Console Incr_Console Last_Console
string F1 = "\033[[A"
string F2 = "\033[[B"
string F3 = "\033[[C"
diff -ur kbd-1.12.orig/data/keymaps/i386/qwertz/fr_CH-latin1.map kbd-1.12-0/data/keymaps/i386/qwertz/fr_CH-latin1.map
--- kbd-1.12.orig/data/keymaps/i386/qwertz/fr_CH-latin1.map 2002-10-11 13:08:48.000000000 +0200
+++ kbd-1.12-0/data/keymaps/i386/qwertz/fr_CH-latin1.map 2004-02-26 21:55:25.000000000 +0100
@@ -3,7 +3,6 @@
keymaps 0-2,4-6,8,12
include "qwertz-layout"
include "linux-with-alt-and-altgr"
- plain keycode 83 = KP_Comma
strings as usual
keycode 1 = Escape Escape
diff -ur kbd-1.12.orig/data/keymaps/i386/qwertz/fr_CH.map kbd-1.12-0/data/keymaps/i386/qwertz/fr_CH.map
--- kbd-1.12.orig/data/keymaps/i386/qwertz/fr_CH.map 2002-10-11 13:08:48.000000000 +0200
+++ kbd-1.12-0/data/keymaps/i386/qwertz/fr_CH.map 2004-02-26 21:55:25.000000000 +0100
@@ -3,7 +3,6 @@
keymaps 0-2,4-6,8,12
include "qwertz-layout"
include "linux-with-alt-and-altgr"
- plain keycode 83 = KP_Comma
strings as usual
keycode 1 = Escape Escape
diff -ur kbd-1.12.orig/data/keymaps/mac/all/mac-de_CH.map kbd-1.12-0/data/keymaps/mac/all/mac-de_CH.map
--- kbd-1.12.orig/data/keymaps/mac/all/mac-de_CH.map 2002-10-11 13:08:52.000000000 +0200
+++ kbd-1.12-0/data/keymaps/mac/all/mac-de_CH.map 2004-02-26 21:55:25.000000000 +0100
@@ -43,3 +43,5 @@
keycode 44 = minus underscore backslash Control_underscore Meta_minus Meta_Control_underscore
keycode 47 = period colon
keycode 10 = less greater
+keycode 16 = z
+keycode 6 = y
diff -ur kbd-1.12.orig/data/keymaps/mac/all/mac-dk-latin1.map kbd-1.12-0/data/keymaps/mac/all/mac-dk-latin1.map
--- kbd-1.12.orig/data/keymaps/mac/all/mac-dk-latin1.map 2002-10-11 13:08:52.000000000 +0200
+++ kbd-1.12-0/data/keymaps/mac/all/mac-dk-latin1.map 2004-02-26 21:55:25.000000000 +0100
@@ -28,7 +28,7 @@
keycode 30 = diaeresis circumflex asciitilde
keycode 41 = ae AE adiaeresis Adiaeresis
keycode 39 = oslash Oslash odiaeresis Odiaeresis
-keycode 42 = numbersign apostrophe
+keycode 42 = apostrophe asterisk
keycode 43 = comma semicolon
keycode 47 = period colon
keycode 44 = minus underscore Meta_minus
@@ -36,8 +36,6 @@
keycode 49 = space space Meta_space nul
keycode 10 = less greater bar
-keycode 16 = z
-keycode 6 = y
alt keycode 12 = at
alt keycode 50 = bar
diff -ur kbd-1.12.orig/src/Makefile.in kbd-1.12-0/src/Makefile.in
--- kbd-1.12.orig/src/Makefile.in 2004-01-03 18:53:54.000000000 +0100
+++ kbd-1.12-0/src/Makefile.in 2004-02-26 21:55:25.000000000 +0100
@@ -54,7 +54,8 @@
WARN = -Wall -Wmissing-prototypes -Wstrict-prototypes
DEFS = -DDATADIR=\"$(DATA_DIR)\"
-CFLAGS = -O2
+RPM_OPT_FLAGS = -O2 -Wall
+CFLAGS = $(RPM_OPT_FLAGS)
LDFLAGS = -s
CC = gcc
diff -ur kbd-1.12.orig/po/Makefile.in kbd-1.12-0/po/Makefile.in
--- kbd-1.12.orig/po/Makefile.in 2004-03-02 00:04:10.727687162 +0100
+++ kbd-1.12/po/Makefile.in 2004-03-02 00:04:26.390543066 +0100
@@ -13,7 +13,7 @@
FOREIGN=
SHELL = /bin/sh
-prefix = $(DESTDIR)@prefix@
+prefix = $(DESTDIR)/usr
datadir = $(prefix)/share
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
diff -ur kbd-1.12.orig/src/kdfontop.c kbd-1.12-0/src/kdfontop.c
--- kbd-1.12.orig/src/kdfontop.c 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12-0/src/kdfontop.c 2004-02-26 21:55:25.000000000 +0100
@@ -170,6 +170,8 @@
return -1;
}
+ /* The other methods do not support width != 8 */
+ if (width) *width = 8;
/* Second attempt: GIO_FONTX */
cfd.charcount = *count;
cfd.charheight = 0;
@@ -179,8 +181,6 @@
*count = cfd.charcount;
if (height)
*height = cfd.charheight;
- if (width)
- *width = 8;
return 0;
}
if (errno != ENOSYS && errno != EINVAL) {
@@ -201,8 +201,6 @@
*count = 256;
if (height)
*height = 0; /* undefined, at most 32 */
- if (width)
- *width = 8;
return 0;
}
diff -ur kbd-1.12.orig/src/loadunimap.c kbd-1.12-0/src/loadunimap.c
--- kbd-1.12.orig/src/loadunimap.c 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12-0/src/loadunimap.c 2004-02-26 21:55:25.000000000 +0100
@@ -35,6 +35,7 @@
#include "version.h"
int verbose = 0;
int force = 0;
+int debug = 0;
static void
usage(void) {
@@ -345,13 +346,29 @@
descr = getunicodemap(fd);
list = descr.entries;
+
for(i=0; i<fontsize; i++) {
- for(j=0; j<descr.entry_ct; j++)
+#if 0
+ /* More than one mapping is not a sequence! */
+ int no = 0;
+ for(j=0; j<descr.entry_ct; j++)
if (list[j].fontpos == i)
+ no++;
+ if (no > 1)
+ appendseparator(fp, 1, utf8);
+#endif
+ if (debug) printf ("\nchar %03x: ", i);
+ for(j=0; j<descr.entry_ct; j++)
+ if (list[j].fontpos == i) {
+ if (debug)
+ printf ("%04x ", list[j].unicode);
appendunicode(fp, list[j].unicode, utf8);
+ }
appendseparator(fp, 0, utf8);
}
+
+ if (debug) printf ("\n");
if (verbose)
printf(_("Appended Unicode map\n"));
}
diff -ur kbd-1.12.orig/src/loadunimap.h kbd-1.12-0/src/loadunimap.h
--- kbd-1.12.orig/src/loadunimap.h 1999-09-27 20:17:52.000000000 +0200
+++ kbd-1.12-0/src/loadunimap.h 2004-02-26 21:55:25.000000000 +0100
@@ -1,4 +1,10 @@
/* loadunimap.h */
+
+#ifndef _LOADUNIMAP_H
+#define _LOADUNIMAP_H
+
void saveunicodemap(int fd, char *oufil); /* save humanly readable */
void loadunicodemap(int fd, char *ufil);
void appendunicodemap(int fd, FILE *fp, int ct, int utf8);
+
+#endif /* _LOADUNIMAP_H */
diff -ur kbd-1.12.orig/src/mapscrn.c kbd-1.12-0/src/mapscrn.c
--- kbd-1.12.orig/src/mapscrn.c 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12-0/src/mapscrn.c 2004-02-26 21:55:25.000000000 +0100
@@ -32,6 +32,7 @@
#include "version.h"
int verbose = 0;
+int debug = 0;
int
main(int argc, char *argv[]) {
diff -ur kbd-1.12.orig/src/paths.h kbd-1.12-0/src/paths.h
--- kbd-1.12.orig/src/paths.h 1999-11-15 23:46:31.000000000 +0100
+++ kbd-1.12-0/src/paths.h 2004-02-26 21:55:25.000000000 +0100
@@ -28,3 +28,4 @@
extern void fpclose(FILE *fp);
extern int verbose;
+extern int debug;
diff -ur kbd-1.12.orig/src/psf.h kbd-1.12-0/src/psf.h
--- kbd-1.12.orig/src/psf.h 2001-02-09 13:58:44.000000000 +0100
+++ kbd-1.12-0/src/psf.h 2004-02-26 21:55:25.000000000 +0100
@@ -1,3 +1,5 @@
+/* psf.h */
+
/*
* Format of a psf font file:
*
@@ -30,6 +32,9 @@
* namely when there is no precomposed Unicode value for the glyph.
*/
+#ifndef _PSF_H
+#define _PSF_H
+
#define PSF1_MAGIC0 0x36
#define PSF1_MAGIC1 0x04
@@ -91,3 +96,5 @@
#define PSF2_MAGIC_OK(x) ((x)[0]==PSF2_MAGIC0 && (x)[1]==PSF2_MAGIC1 \
&& (x)[2]==PSF2_MAGIC2 && (x)[3]==PSF2_MAGIC3)
+
+#endif /* _PSF_H */
diff -ur kbd-1.12.orig/src/psffontop.c kbd-1.12-0/src/psffontop.c
--- kbd-1.12.orig/src/psffontop.c 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12-0/src/psffontop.c 2004-02-26 21:55:25.000000000 +0100
@@ -10,6 +10,7 @@
#include "psf.h"
#include "psffontop.h"
#include "utf8.h"
+#include "paths.h"
extern char *progname;
@@ -32,16 +33,18 @@
static void
addseq(struct unicode_list *up, unsigned int uc) {
- struct unicode_list *ul;
struct unicode_seq *us;
+ struct unicode_seq *usl;
+ struct unicode_list *ul = up->prev;
- ul = up->prev;
+ usl = ul->seq;
+ while (usl->next) usl = usl->next;
us = xmalloc(sizeof(struct unicode_seq));
us->uc = uc;
- us->prev = ul->seq->prev;
- us->prev->next = us;
+ us->prev = usl;
us->next = NULL;
- ul->seq->prev = us;
+ usl->next = us;
+ //ul->seq->prev = us;
}
static unsigned int
@@ -190,7 +193,7 @@
* just read the entire file.
*/
if (fontf) {
- inputbuflth = 16384; /* random */
+ inputbuflth = MAXFONTSIZE/4; /* random */
inputbuf = xmalloc(inputbuflth);
n = 0;
@@ -366,6 +369,13 @@
perror("appendunimap");
exit(1);
}
+ if (debug) {
+ printf ("(");
+ if (!utf8)
+ printf ("U+");
+ while (n < 6) printf ("%02x ", out[n++]);
+ printf (")");
+ }
}
void
@@ -437,7 +447,7 @@
}
-void
+int
writepsffont(FILE *ofil, char *fontbuf, int width, int height, int fontlen,
int psftype, struct unicode_list *uclistheads) {
int bytewidth, charsize, flags, utf8, i;
@@ -456,7 +466,8 @@
utf8 = (psftype == 2);
fwrite(fontbuf, charsize, fontlen, ofil);
- if (uclistheads != NULL) {
+ /* unimaps: -1 => do nothing: caller will append map */
+ if (uclistheads != NULL && uclistheads != (struct unicode_list*)-1) {
struct unicode_list *ul;
struct unicode_seq *us;
@@ -475,5 +486,6 @@
appendseparator(ofil, 0, utf8);
}
}
+ return utf8;
}
diff -ur kbd-1.12.orig/src/psffontop.h kbd-1.12-0/src/psffontop.h
--- kbd-1.12.orig/src/psffontop.h 2000-12-31 15:22:17.000000000 +0100
+++ kbd-1.12-0/src/psffontop.h 2004-02-26 21:55:25.000000000 +0100
@@ -1,3 +1,11 @@
+/* psffontop.h */
+
+#ifndef _PSFFONTOP_H
+#define _PSFFONTOP_H
+
+/* Maximum font size that we try to handle */
+#define MAXFONTSIZE 65536
+
typedef unsigned int unicode;
struct unicode_seq {
@@ -17,7 +25,7 @@
int *fontwidthp, int *fontlenp, int fontpos0,
struct unicode_list **uclistheadsp);
-extern void writepsffont(FILE *ofil, char *fontbuf,
+extern int writepsffont(FILE *ofil, char *fontbuf,
int width, int height, int fontlen, int psftype,
struct unicode_list *uclistheads);
@@ -29,3 +37,5 @@
extern void appendunicode(FILE *fp, unsigned int uc, int utf8);
extern void appendseparator(FILE *fp, int seq, int utf8);
+
+#endif /* _PSFFONTOP_H */
diff -ur kbd-1.12.orig/src/psfxtable.c kbd-1.12-0/src/psfxtable.c
--- kbd-1.12.orig/src/psfxtable.c 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12-0/src/psfxtable.c 2004-02-26 21:55:25.000000000 +0100
@@ -225,6 +225,8 @@
}
}
+int debug = 0;
+
int
main(int argc, char **argv) {
char *ifname, *ofname, *itname, *otname;
diff -ur kbd-1.12.orig/src/setfont.c kbd-1.12-0/src/setfont.c
--- kbd-1.12.orig/src/setfont.c 2004-01-16 20:45:31.000000000 +0100
+++ kbd-1.12-0/src/setfont.c 2004-02-26 21:55:25.000000000 +0100
@@ -48,6 +48,7 @@
int verbose = 0;
int force = 0;
+int debug = 0;
/* search for the font in these directories (with trailing /) */
char *fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 };
@@ -331,15 +332,28 @@
up = xmalloc(maxct * sizeof(struct unipair));
for (i = 0; i < fontsize; i++) {
ul = uclistheads[i].next;
+ if (debug) printf ("char %03x:", i);
while(ul) {
us = ul->seq;
if (us && ! us->next) {
up[ct].unicode = us->uc;
up[ct].fontpos = i;
ct++;
+ if (debug) printf (" %04x", us->uc);
}
+ else
+ if (debug) {
+ printf (" seq: <");
+ while (us) {
+ printf (" %04x", us->uc);
+ us = us->next;
+ }
+ printf (" >");
+ }
ul = ul->next;
+ if (debug) printf (",");
}
+ if (debug) printf ("\n");
}
if (ct != maxct) {
char *u = _("%s: bug in do_loadtable\n");

15
kbd-1.12.lsm
View File

@ -1,15 +0,0 @@
Begin3
Title: Keyboard and console utilities for Linux
Version: 1.12
Entered-date: 2004-01-16
Description: loadkeys dumpkeys setfont chvt openvt kbdrate kbd.FAQ A20 etc.
Keywords: keyboard mapping console font unicode
Author: several
Maintained-by: Andries E. Brouwer (aeb@cwi.nl)
Primary-site: ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd
884827 kbd-1.12.tar.gz
Alternate-site: ftp://ftp.*.kernel.org/pub/linux/utils/kbd
Alternate-site: ftp://sunsite.unc.edu/pub/Linux/system/keyboards
Alternate site: ftp://ftp.cwi.nl/pub/aeb/kbd
Copying-policy: GPL
End

3
kbd-1.12.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22dd61453c6f5feffc2170118edb151c9eda2dee8bdc98d71e5b8f5be671de75
size 635392

1459
kbd-1.14.1-2d01989f.patch Normal file
View File

File diff suppressed because it is too large Load Diff

58
kbd-1.14.1-Makefile.patch Normal file
View File

@ -0,0 +1,58 @@
temporary fix for 1.14.1, upstream switched to automake meanwhile
---
po/Makefile.in | 12 ++++++------
src/Makefile.in | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
--- kbd-1.14.1.orig/src/Makefile.in
+++ kbd-1.14.1/src/Makefile.in
@@ -14,16 +14,16 @@ PROGS = dumpkeys loadkeys showkey setf
# probably also getkeycodes and setkeycodes are arch-specific;
# they will work on an alpha, though, and perhaps be dummy on a sun
-ifeq ($(KEYCODES_PROGS),yes)
+ifeq (@KEYCODES_PROGS@,yes)
PROGS += getkeycodes setkeycodes
endif
-ifeq ($(RESIZECONS_PROGS),yes)
+ifeq (@RESIZECONS_PROGS@,yes)
PROGS += resizecons
endif
# Not installed by default
-ifeq ($(OPTIONAL_PROGS),yes)
+ifeq (@OPTIONAL_PROGS@,yes)
PROGS += screendump setlogcons setvesablank spawn_console spawn_login \
getunimap clrunimap outpsfheader setpalette
endif
--- kbd-1.14.1.orig/po/Makefile.in
+++ kbd-1.14.1/po/Makefile.in
@@ -2,10 +2,10 @@ PACKAGE_NAME = @PACKAGE_NAME@
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@
@@ -34,10 +34,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)

20
kbd-1.14.1-defkeymap.patch Normal file
View File

@ -0,0 +1,20 @@
Revert commit 743cbc3ca11301598ad7da503b2238041082bb75
---
src/paths.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- kbd-1.14.1.orig/src/paths.h
+++ kbd-1.14.1/src/paths.h
@@ -16,10 +16,10 @@
* Default keymap, and where the kernel copy of it lives.
*/
#ifdef __sparc__
-# define DEFMAP "sunkeymap.kmap"
+# define DEFMAP "sunkeymap.map"
# define KERNDIR "/usr/src/linux/drivers/sbus/char"
#else
-# define DEFMAP "defkeymap.kmap"
+# define DEFMAP "defkeymap.map"
# define KERNDIR "/usr/src/linux/drivers/char"
#endif

0
kbd-1.12-docu-X11R6-xorg.diff → kbd-1.14.1-docu-X11R6-xorg.patch
View File

0
kbd-1.12-dumpkeys-C-opt.diff → kbd-1.14.1-dumpkeys-C-opt.patch
View File

33
kbd-1.12-dumpkeys-ppc.diff → kbd-1.14.1-dumpkeys-ppc.patch
View File

@ -1,7 +1,24 @@
diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c
--- kbd-1.12-8/src/dumpkeys.c 2004-02-26 23:00:23.000000000 +0100
+++ kbd-1.12-9/src/dumpkeys.c 2004-02-26 23:07:51.000000000 +0100
@@ -163,6 +163,10 @@
XXX: this has been reverted upstream with the comment:
Revert "[SYSTEM] Apply patch from SUSE."
This is an old mistake. No, 0 is not a valid keycode.
It is used by the kernel for bookkeeping purposes.
It must not be used as keycode.
Andries
This reverts commit 49ce531d1c70017113540318b24b9d645d170773.
Signed-off-by: Andries Brouwer <Andries.Brouwer@cwi.nl>
Signed-off-by: Alexey Gladkov <legion@altlinux.org>
---
src/dumpkeys.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
--- kbd-1.14.1.orig/src/dumpkeys.c
+++ kbd-1.14.1/src/dumpkeys.c
@@ -166,6 +166,10 @@ valid_type(int t) {
ke.kb_index = 0;
ke.kb_table = 0;
ke.kb_value = K(t, 0);
@ -12,7 +29,7 @@ diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c
status = (ioctl(fd, KDSKBENT, (unsigned long)&ke) == 0);
return status;
}
@@ -245,8 +249,13 @@
@@ -248,8 +252,13 @@ static void
show_short_info(void) {
int i;
@ -26,7 +43,7 @@ diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c
printf(_("max number of actions bindable to a key: %d\n"),
MAX_NR_KEYMAPS);
get_keymaps();
@@ -358,7 +367,11 @@
@@ -361,7 +370,11 @@ dump_keys(char table_shape, char numeric
for (j = 0; j < MAX_NR_KEYMAPS; j++) {
int ja = (j | M_ALT);
if (j != ja && keymap_index[j] >= 0 && keymap_index[ja] >= 0)
@ -38,7 +55,7 @@ diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c
int buf0, buf1, type;
buf0 = get_bind(i, j);
@@ -384,7 +397,11 @@
@@ -389,7 +402,11 @@ dump_keys(char table_shape, char numeric
not_alt_is_meta:
no_shorthands:
@ -49,4 +66,4 @@ diff -Nur kbd-1.12-8/src/dumpkeys.c kbd-1.12-9/src/dumpkeys.c
+#endif
for (j = 0; j < keymapnr; j++)
buf[j] = get_bind(i, good_keymap[j]);
if (buf[0] == -1)

15
kbd-1.14.1-no-strip.patch Normal file
View File

@ -0,0 +1,15 @@
---
src/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- kbd-1.14.1.orig/src/Makefile.in
+++ kbd-1.14.1/src/Makefile.in
@@ -50,7 +50,7 @@ setuid:
install: all
install -d -m 0755 $(bindir)
- install -s -m 0755 $(PROGS) $(OLDPROGS) $(bindir)
+ install -m 0755 $(PROGS) $(OLDPROGS) $(bindir)
install -m 0755 $(SHCMDS) $(bindir)
for i in psfaddtable psfgettable psfstriptable; do \
rm -f $(bindir)/$$i; ln -s psfxtable $(bindir)/$$i; \

278
kbd-1.14.1-prtscr_no_sigquit.patch Normal file
View File

@ -0,0 +1,278 @@
XXX: reverted upstream
---
data/keymaps/i386/azerty/fr-latin9.map | 1 +
data/keymaps/i386/fgGIod/tr_f-latin5.map | 1 +
data/keymaps/i386/qwerty/bg-cp1251.map | 1 +
data/keymaps/i386/qwerty/bg_bds-cp1251.map | 1 +
data/keymaps/i386/qwerty/br-abnt.map | 1 +
data/keymaps/i386/qwerty/by.map | 1 +
data/keymaps/i386/qwerty/cz-cp1250.map | 1 +
data/keymaps/i386/qwerty/cz-lat2-prog.map | 1 +
data/keymaps/i386/qwerty/cz-lat2.map | 1 +
data/keymaps/i386/qwerty/cz.map | 8 ++++----
data/keymaps/i386/qwerty/defkeymap.map | 1 +
data/keymaps/i386/qwerty/defkeymap_V1.0.map | 1 +
data/keymaps/i386/qwerty/lt.baltic.map | 1 +
data/keymaps/i386/qwerty/lt.l4.map | 1 +
data/keymaps/i386/qwerty/lt.map | 1 +
data/keymaps/i386/qwerty/pl2.map | 1 +
data/keymaps/i386/qwerty/sk-prog-qwerty.map | 1 +
data/keymaps/i386/qwerty/ua-utf-ws.map | 1 +
data/keymaps/i386/qwerty/ua-utf.map | 1 +
data/keymaps/i386/qwerty/ua-ws.map | 1 +
data/keymaps/i386/qwerty/ua.map | 1 +
data/keymaps/i386/qwerty/us-acentos.map | 1 +
data/keymaps/i386/qwertz/cz-us-qwertz.map | 1 +
data/keymaps/i386/qwertz/sk-prog-qwertz.map | 1 +
24 files changed, 27 insertions(+), 4 deletions(-)
--- kbd-1.14.1.orig/data/keymaps/i386/azerty/fr-latin9.map
+++ kbd-1.14.1/data/keymaps/i386/azerty/fr-latin9.map
@@ -418,6 +418,7 @@ keycode 100 = AltGr
# La touche Ctrl+Pause = Attn = 101 a un code pour elle-męme
#
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Home
--- kbd-1.14.1.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map
+++ kbd-1.14.1/data/keymaps/i386/fgGIod/tr_f-latin5.map
@@ -217,6 +217,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/bg-cp1251.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/bg-cp1251.map
@@ -312,6 +312,7 @@ keycode 99 = Control_backslash
altgr alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/bg_bds-cp1251.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/bg_bds-cp1251.map
@@ -638,6 +638,7 @@ keycode 98 = KP_Divide
keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/br-abnt.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/br-abnt.map
@@ -197,6 +197,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/by.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/by.map
@@ -529,6 +529,7 @@ keycode 99 = VoidSymbol Control_backsl
Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash
keycode 100 = Alt
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up Up Up \
KeyboardSignal Up Up \
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz-cp1250.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/cz-cp1250.map
@@ -138,6 +138,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz-lat2-prog.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/cz-lat2-prog.map
@@ -141,6 +141,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz-lat2.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/cz-lat2.map
@@ -138,6 +138,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/cz.map
@@ -1086,13 +1086,13 @@ keycode 99 = dead_acute dead_acute
keycode 100 = AltGr
#
#keycode 101 = Break
-keycode 101 = Break Break VoidSymbol VoidSymbol VoidSymbol \
- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
+keycode 101 = Break Break VoidSymbol VoidSymbol Control_c \
+ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol \
- Break Break VoidSymbol VoidSymbol VoidSymbol \
- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
+ Break Break VoidSymbol VoidSymbol Control_c \
+ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
VoidSymbol
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/defkeymap.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/defkeymap.map
@@ -222,6 +222,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/defkeymap_V1.0.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/defkeymap_V1.0.map
@@ -185,6 +185,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/lt.baltic.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/lt.baltic.map
@@ -171,6 +171,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/lt.l4.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/lt.l4.map
@@ -463,6 +463,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break # 101=Control-Pause
+ control keycode 101 = Control_c
string F102 = "\033[7$"
keycode 102 = Find # =Home
shift keycode 102 = F102
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/lt.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/lt.map
@@ -462,6 +462,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break # 101=Control-Pause
+ control keycode 101 = Control_c
string F102 = "\033[7$"
keycode 102 = Find # =Home
shift keycode 102 = F102
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/pl2.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/pl2.map
@@ -242,6 +242,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/sk-prog-qwerty.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/sk-prog-qwerty.map
@@ -122,6 +122,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua-utf-ws.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/ua-utf-ws.map
@@ -1526,6 +1526,7 @@ ctrll keycode 100 = CtrlR_Lock
ctrlr keycode 100 = CtrlR_Lock
ctrll ctrlr keycode 100 = CtrlR_Lock
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua-utf.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/ua-utf.map
@@ -1516,6 +1516,7 @@ ctrll keycode 100 = CtrlR_Lock
ctrlr keycode 100 = CtrlR_Lock
ctrll ctrlr keycode 100 = CtrlR_Lock
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua-ws.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/ua-ws.map
@@ -1521,6 +1521,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = Alt
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/ua.map
@@ -1515,6 +1515,7 @@ ctrll keycode 100 = CtrlR_Lock
ctrlr keycode 100 = CtrlR_Lock
ctrll ctrlr keycode 100 = CtrlR_Lock
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/us-acentos.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/us-acentos.map
@@ -194,6 +194,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwertz/cz-us-qwertz.map
+++ kbd-1.14.1/data/keymaps/i386/qwertz/cz-us-qwertz.map
@@ -135,6 +135,7 @@ control keycode 99 = Control_backslash
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
--- kbd-1.14.1.orig/data/keymaps/i386/qwertz/sk-prog-qwertz.map
+++ kbd-1.14.1/data/keymaps/i386/qwertz/sk-prog-qwertz.map
@@ -122,6 +122,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash
keycode 100 = AltGr
keycode 101 = Break
+ control keycode 101 = Control_c
keycode 102 = Find
keycode 103 = Up
keycode 104 = Prior

32
kbd-1.14.1-setfont-no-cruft.patch Normal file
View File

@ -0,0 +1,32 @@
--- kbd-1.14.1wip/src/kdfontop.c.orig 2008-03-03 23:47:18.160420000 +0100
+++ kbd-1.14.1wip/src/kdfontop.c 2008-03-03 23:52:32.918345000 +0100
@@ -268,6 +268,23 @@
return 0;
}
+#if 1
+ // We no longer try PIO_FONT* calls.
+ // A former patch even added a possible 5 seconds delay loop here, in an attempt to
+ // gain victory over kdm. We no do this fight, as it can only result in races.
+ // https://bugzilla.novell.com/show_bug.cgi?id=302010
+ //
+ // Two effects:
+ // a) Without the delay loop, we are fast enough to run early.
+ // Moving setfont calls to an earlier point most likly
+ // avoids the race.
+ // b) Without the old compat calls, it should be easier to
+ // fix this in kernel side.
+ //
+ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i);
+ perror("putfont: KDFONTOP");
+ return -1;
+#else
/* Second attempt: PIO_FONTX */
cfd.charcount = count;
cfd.charheight = height;
@@ -302,4 +319,5 @@
return -1;
}
return 0;
+#endif
}

0
sv-latin1-keycode10.diff → kbd-1.14.1-sv-latin1-keycode10.patch
View File

47
kbd-1.14.1-unicode_scripts.patch Normal file
View File

@ -0,0 +1,47 @@
---
src/unicode_start | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
--- kbd-1.14.1.orig/src/unicode_start
+++ kbd-1.14.1/src/unicode_start
@@ -74,6 +74,14 @@ stty iutf8
DEFAULT_UNICODE_FONT='LatArCyrHeb-16'
# Also drdos8x16 is a good candidate.
+
+# Fonts with 512 glyphs like LatArCyrHeb-16 make it impossible to use bold
+# on the console, which makes YaST2 unusable. To be able to use bold,
+# only fonts with 256 glyphs can be used. Therefore we prefer
+# the font specified in /etc/sysconfig/console. This should be OK because
+# the default font written to /etc/sysconfig/console by YaST2
+# is currently always a font with 256 glyphs and a Unicode map
+# which is suitable for the language used during the installation.
case "$#" in
2)
@@ -83,7 +91,24 @@ case "$#" in
setfont "$1"
;;
0)
- setfont "$DEFAULT_UNICODE_FONT"
+ if [ -f /etc/sysconfig/console ] ; then
+ . /etc/sysconfig/console
+ fi
+ if [ -n "$CONSOLE_FONT" ] ; then
+ SETFONT_ARGS="$CONSOLE_FONT"
+ if [ -n "$CONSOLE_UNICODEMAP" ] ; then
+ SETFONT_ARGS="$SETFONT_ARGS -u $CONSOLE_UNICODEMAP"
+ fi
+ if [ -n "$CONSOLE_SCREENMAP" ] ; then
+ SETFONT_ARGS="$SETFONT_ARGS -m $CONSOLE_SCREENMAP"
+ fi
+ setfont $SETFONT_ARGS
+ if [ -n "$CONSOLE_MAGIC" -a "$CONSOLE_MAGIC" != "none" ] ; then
+ echo -en "\033$CONSOLE_MAGIC"
+ fi
+ else
+ setfont $DEFAULT_UNICODE_FONT
+ fi
;;
*)
echo "usage: unicode_start [font [unicode map]]"

3
kbd-1.14.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:93cbc8521404932e3db6a687b1e1a5580426aa4c28a92712fb585f5414a5a9c4
size 777427

54
kbd.changes
View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Wed Aug 20 19:38:44 CEST 2008 - mmarek@suse.cz
- updated to 1.14.1
* Programs
- unicode_{start,stop}: To run loadkeys is allowed only to
root.
- mapscrn: Add '.acm' suffix for compatibility with
console-tools
- fix findfile so that it does not find directories
- kbdrate: fix for sparc
* Keymaps:
- Add Norwegian dvorak keymap.
- Add turkish F (trf) keyboard map.
- Fix turkish Q (trq) keyboard map (Ozgur Murat Homurlu).
- Move qwerty/cz.map -> qwertz/cz.map.
- include/*euro.map: Change 'currency' to 'euro' symbol.
- Add OLPC (One Laptop Per Child) keymaps
- Add more romanian keymaps (Vitezslav Crhonek)
- Add another ukrainian keymap
- Add Belarusian (Belarus) keymaps
- Add Kazakh keymap
- Add Kyrgyz keymap
- Add Bashkir (Russia) keymap
- Add Tatar keymaps
- Add more russian keymaps
* Fonts:
- Add unicode fonts (UniCyrExt_8x16.psf, UniCyr_8x14.psf,
UniCyr_8x16.psf, UniCyr_8x8.psf)
- Add Lat2-Terminus16 font
- Fix sun12x22 font unicode mapping table (Vitezslav Crhonek)
* translation updates
- dropped upstreamed patches:
kbd-1.12-Meta-Tab.diff
kbd-1.12-be-nice-to-kdm.diff
kbd-1.12-cz-us-qwertz.diff
kbd-1.12-dumpkeys-full.diff
kbd-1.12-handle-small-table.diff
kbd-1.12-happy-abuild.diff
kbd-1.12-kbd_mode.diff
kbd-1.12-loadkeys-C-opt.diff
kbd-1.12-loadkeys-repstdout.diff
kbd-1.12-mac-de.diff
kbd-1.12-mac-dk.diff
kbd-1.12-nohang-kbdrate2.diff
kbd-1.12-nounicode-nontty.diff
kbd-1.12-setfont-fpclose.diff
kbd-1.12-showconsolefont-info.diff
kbd-1.12-swiss.diff
kbd-1.12.diff
piofont_debug.diff
- dropped bnc147581_jp106.diff because it was not needed
(bnc#147581)
-------------------------------------------------------------------
Mon Aug 18 18:08:29 CEST 2008 - mrueckert@suse.de

162
kbd.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package kbd (Version 1.12)
# spec file for package kbd (Version 1.14.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -23,10 +23,10 @@ Url: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd
License: GPL v2 or later
Group: System/Console
AutoReqProv: on
Version: 1.12
Release: 201
Version: 1.14.1
Release: 1
Summary: Keyboard and Font Utilities
Source: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/%{name}-%{version}.tar.bz2
Source: kbd-%{version}.tar.bz2
Source1: kbd_fonts.tar.bz2
Source2: suse-add.tar.bz2
Source3: README.SuSE
@ -40,35 +40,17 @@ Source11: fbtest.c
Source12: fbtest.8
Source42: convert-kbd-mac.sed
Source43: repack_kbd.sh
Patch: kbd-%{version}.diff
Patch2: kbd-%{version}-prtscr_no_sigquit.diff
Patch3: kbd-%{version}-swiss.diff
Patch4: kbd-%{version}-Meta-Tab.diff
Patch5: kbd-%{version}-noclaudio.diff
Patch6: kbd-%{version}-nohang-kbdrate2.diff
Patch7: kbd-%{version}-loadkeys-repstdout.diff
Patch8: kbd-%{version}-mac-dk.diff
Patch9: kbd-%{version}-dumpkeys-full.diff
Patch10: kbd-%{version}-dumpkeys-ppc.diff
Patch11: kbd-%{version}-mac-de.diff
Patch12: kbd-%{version}-handle-small-table.diff
Patch13: kbd-%{version}-unicode_scripts.diff
Patch14: kbd-%{version}-cz-us-qwertz.diff
Patch15: kbd-%{version}-nounicode-nontty.diff
Patch16: kbd-%{version}-kbd_mode.diff
Patch17: piofont_debug.diff
Patch18: kbd-%{version}-loadkeys-C-opt.diff
Patch19: kbd-%{version}-happy-abuild.diff
Patch20: kbd-%{version}-strip.diff
Patch21: kbd-%{version}-setfont-fpclose.diff
Patch22: kbd-%{version}-showconsolefont-info.diff
Patch23: kbd-%{version}-docu-X11R6-xorg.diff
Patch24: kbd-%{version}-el-locale-update.diff
Patch25: sv-latin1-keycode10.diff
Patch26: kbd-%{version}-setfont-no-cruft.diff
Patch27: kbd-%{version}-be-nice-to-kdm.diff
Patch28: bnc147581_jp106.diff
Patch29: kbd-%{version}-dumpkeys-C-opt.diff
Patch1: kbd-1.14.1-2d01989f.patch
Patch2: kbd-1.14.1-Makefile.patch
Patch3: kbd-1.14.1-prtscr_no_sigquit.patch
Patch4: kbd-1.14.1-dumpkeys-ppc.patch
Patch5: kbd-1.14.1-unicode_scripts.patch
Patch6: kbd-1.14.1-no-strip.patch
Patch7: kbd-1.14.1-docu-X11R6-xorg.patch
Patch8: kbd-1.14.1-sv-latin1-keycode10.patch
Patch9: kbd-1.14.1-setfont-no-cruft.patch
Patch10: kbd-1.14.1-dumpkeys-C-opt.patch
Patch11: kbd-1.14.1-defkeymap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
BuildRequires: bison flex
@ -88,16 +70,11 @@ Authors:
--------
Andries Brouwer <aeb@cwi.nl>
%define kbdrate_in_util %(rpm -ql util 2>/dev/null | grep -s /sbin/kbdrate && echo "1" || echo "0"; exit 0)
%define kbd /usr/share/kbd
%prep
%if %{kbdrate_in_util}
echo "kbdrate is in util"
%endif
%setup -q -a 1 -a 2 -n kbd-%{version}
%patch -p1 -E
# choose-tty.diff went upstream, 27.2.2004, jw
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@ -106,26 +83,8 @@ Authors:
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch10
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24
%patch25 -p1
%patch26 -p1
# %patch27 -p1 # obsoleted. #302010
%patch28 -p1
%patch29 -p0
%build
for i in `find data/keymaps/mac -type f` ; do
@ -133,7 +92,12 @@ sed -i -f %{S:42} $i
done
# bugzilla #33301, but noclobber.
(cd data/keymaps/i386/qwerty; test -f se-latin1.map || cp sv-latin1.map se-latin1.map)
./configure --prefix=/ --datadir=%{kbd} --mandir=%{_mandir}
./configure \
--prefix=/ \
--datadir=%{kbd} \
--mandir=%{_mandir} \
--enable-nls \
--localedir=/usr/share/locale
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Os"
gcc $RPM_OPT_FLAGS -o testutf8 $RPM_SOURCE_DIR/testutf8.c
gcc $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c
@ -272,7 +236,6 @@ install -m 644 %SOURCE12 $RPM_BUILD_ROOT/%{_mandir}/man8/
%config /etc/init.d/kbd
/var/adm/fillup-templates/sysconfig.console
/var/adm/fillup-templates/sysconfig.keyboard
%dir %{kbd}
%{kbd}
/sbin/rckbd
/sbin/fbtest
@ -303,24 +266,9 @@ install -m 644 %SOURCE12 $RPM_BUILD_ROOT/%{_mandir}/man8/
/bin/showkey
/bin/unicode_start
/bin/unicode_stop
%if ! %{kbdrate_in_util}
/bin/kbdrate
%doc %{_mandir}/man8/kbdrate.8.gz
%endif
/bin/testutf8
%doc %{_mandir}/man1/chvt.1.gz
%doc %{_mandir}/man1/deallocvt.1.gz
%doc %{_mandir}/man1/dumpkeys.1.gz
%doc %{_mandir}/man1/kbd_mode.1.gz
%doc %{_mandir}/man1/loadkeys.1.gz
%doc %{_mandir}/man1/psfaddtable.1.gz
%doc %{_mandir}/man1/psfgettable.1.gz
%doc %{_mandir}/man1/psfstriptable.1.gz
%doc %{_mandir}/man1/psfxtable.1.gz
%doc %{_mandir}/man1/setleds.1.gz
%doc %{_mandir}/man1/setmetamode.1.gz
%doc %{_mandir}/man1/showkey.1.gz
%doc %{_mandir}/man1/fgconsole.1.gz
%doc %{_mandir}/man1/*
%doc %{_mandir}/man5/keymaps.5.gz
%ifnarch sparc m68k
%doc %{_mandir}/man8/getkeycodes.8.gz
@ -334,15 +282,69 @@ install -m 644 %SOURCE12 $RPM_BUILD_ROOT/%{_mandir}/man8/
%endif
%doc %{_mandir}/man8/setfont.8.gz
%doc %{_mandir}/man8/fbtest.8.gz
%doc %{_mandir}/man1/openvt.1.gz
%doc %{_mandir}/man1/unicode_start.1.gz
%doc %{_mandir}/man1/unicode_stop.1.gz
%doc %{_mandir}/man8/kbdrate.8.gz
%doc %{_mandir}/man8/clrunimap.8.gz
%doc %{_mandir}/man8/getunimap.8.gz
%doc %{_mandir}/man8/mk_modmap.8.gz
%doc %{_mandir}/man8/setlogcons.8.gz
%doc %{_mandir}/man8/setvesablank.8.gz
%doc %{_mandir}/man8/vcstime.8.gz
%clean
rm -rf $RPM_BUILD_ROOT
#rm -rf $RPM_BUILD_DIR/kbd-%{version}
%changelog
* Wed Aug 20 2008 mmarek@suse.cz
- updated to 1.14.1
* Programs
- unicode_{start,stop}: To run loadkeys is allowed only to
root.
- mapscrn: Add '.acm' suffix for compatibility with
console-tools
- fix findfile so that it does not find directories
- kbdrate: fix for sparc
* Keymaps:
- Add Norwegian dvorak keymap.
- Add turkish F (trf) keyboard map.
- Fix turkish Q (trq) keyboard map (Ozgur Murat Homurlu).
- Move qwerty/cz.map -> qwertz/cz.map.
- include/*euro.map: Change 'currency' to 'euro' symbol.
- Add OLPC (One Laptop Per Child) keymaps
- Add more romanian keymaps (Vitezslav Crhonek)
- Add another ukrainian keymap
- Add Belarusian (Belarus) keymaps
- Add Kazakh keymap
- Add Kyrgyz keymap
- Add Bashkir (Russia) keymap
- Add Tatar keymaps
- Add more russian keymaps
* Fonts:
- Add unicode fonts (UniCyrExt_8x16.psf, UniCyr_8x14.psf,
UniCyr_8x16.psf, UniCyr_8x8.psf)
- Add Lat2-Terminus16 font
- Fix sun12x22 font unicode mapping table (Vitezslav Crhonek)
* translation updates
- dropped upstreamed patches:
kbd-1.12-Meta-Tab.diff
kbd-1.12-be-nice-to-kdm.diff
kbd-1.12-cz-us-qwertz.diff
kbd-1.12-dumpkeys-full.diff
kbd-1.12-handle-small-table.diff
kbd-1.12-happy-abuild.diff
kbd-1.12-kbd_mode.diff
kbd-1.12-loadkeys-C-opt.diff
kbd-1.12-loadkeys-repstdout.diff
kbd-1.12-mac-de.diff
kbd-1.12-mac-dk.diff
kbd-1.12-nohang-kbdrate2.diff
kbd-1.12-nounicode-nontty.diff
kbd-1.12-setfont-fpclose.diff
kbd-1.12-showconsolefont-info.diff
kbd-1.12-swiss.diff
kbd-1.12.diff
piofont_debug.diff
- dropped bnc147581_jp106.diff because it was not needed
(bnc#147581)
* Mon Aug 18 2008 mrueckert@suse.de
- remove outdated options in the fillup_and_insserv call
* Mon Aug 18 2008 werner@suse.de

18
piofont_debug.diff
View File

@ -1,18 +0,0 @@
--- kbd-1.12/src/kdfontop.c.orig 2004-10-01 13:44:47.788404680 +0000
+++ kbd-1.12/src/kdfontop.c 2004-10-01 13:46:09.349005584 +0000
@@ -268,6 +268,7 @@
if (i == 0)
return 0;
if (errno != ENOSYS && errno != EINVAL) {
+ fprintf(stderr, "%s: putfont: %d,%dx%d:failed: %d\n", progname, count, width, height, i);
perror("putfont: PIO_FONTX");
return -1;
}
@@ -276,6 +277,7 @@
/* This will load precisely 256 chars, independent of count */
i = ioctl(fd, PIO_FONT, buf);
if (i) {
+ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", progname, count, width, height, i);
perror("putfont: PIO_FONT");
return -1;
}

25
repack_kbd.sh
View File

@ -7,26 +7,13 @@
tmpdir=`mktemp -d`
in=$1
in="$1"
case "$in" in
*.tar.gz)
tar zxf $in -C $tmpdir
;;
*.tgz)
tar zxf $in -C $tmpdir
;;
*.tar.bz2)
tar jxf $in -C $tmpdir
;;
*.tar)
tar xf $in -C $tmpdir
;;
*)
echo "hmm, '$in' is not a tar ball?"
rmdir $tmpdir
exit 1
esac
# recent gnu tar can autodetect gzip / bzip2
if ! tar xf "$in" -C $tmpdir; then
rm -rf $tmpdir
exit 1
fi
echo removing files...
find $tmpdir -iname \*agafari\* | tee /dev/tty | xargs rm