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

Accepting request 47377 from Base:System

Browse Source 
Copy from Base:System/kbd based on submit request 47377 from user anicka

OBS-URL: https://build.opensuse.org/request/show/47377
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=41
This commit is contained in:
OBS User autobuild 2010-09-13 11:25:19 +00:00 committed by Git OBS Bridge
commit d5041c1bf5
17 changed files with 206 additions and 1692 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1459
kbd-1.14.1-2d01989f.patch
View File

File diff suppressed because it is too large Load Diff

58
kbd-1.14.1-Makefile.patch
View File

@ -1,58 +0,0 @@
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)

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

@ -1,15 +0,0 @@
---
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; \

3
kbd-1.14.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43ff08968d189b2cdddbea00797a75f3a6d6b79f100e22ea2663d5d968448c09
size 789357

0
kbd-1.12-chvt-userwait.patch → kbd-1.15.2-chvt-userwait.patch
View File

8
kbd-1.14.1-defkeymap.patch → kbd-1.15.2-defkeymap.patch
View File

@ -3,9 +3,11 @@ Revert commit 743cbc3ca11301598ad7da503b2238041082bb75
src/paths.h | 4 ++-- src/paths.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
--- kbd-1.14.1.orig/src/paths.h Index: kbd-1.15.2/src/paths.h
+++ kbd-1.14.1/src/paths.h ===================================================================
@@ -16,10 +16,10 @@ --- kbd-1.15.2.orig/src/paths.h
+++ kbd-1.15.2/src/paths.h
@@ -18,10 +18,10 @@
* Default keymap, and where the kernel copy of it lives. * Default keymap, and where the kernel copy of it lives.
*/ */
#ifdef __sparc__ #ifdef __sparc__

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

22
kbd-1.14.1-dumpkeys-C-opt.patch → kbd-1.15.2-dumpkeys-C-opt.patch
View File

@ -1,5 +1,7 @@
--- man/man1/dumpkeys.1.in Index: man/man1/dumpkeys.1.in
+++ man/man1/dumpkeys.1.in 2008-06-04 18:26:00.885947236 +0200 ===================================================================
--- man/man1/dumpkeys.1.in.orig
+++ man/man1/dumpkeys.1.in
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
dumpkeys \- dump keyboard translation tables dumpkeys \- dump keyboard translation tables
.SH SYNOPSIS .SH SYNOPSIS
@ -21,8 +23,10 @@
.SH FILES .SH FILES
.PD 0 .PD 0
.TP 20 .TP 20
--- src/dumpkeys.c Index: src/dumpkeys.c
+++ src/dumpkeys.c 2008-06-04 18:20:51.762445784 +0200 ===================================================================
--- src/dumpkeys.c.orig
+++ src/dumpkeys.c
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
static int fd; static int fd;
static int verbose; static int verbose;
@ -31,7 +35,7 @@
int keymap_index[MAX_NR_KEYMAPS]; /* inverse of good_keymap */ int keymap_index[MAX_NR_KEYMAPS]; /* inverse of good_keymap */
int good_keymap[MAX_NR_KEYMAPS], keymapnr, allocct; int good_keymap[MAX_NR_KEYMAPS], keymapnr, allocct;
@@ -560,6 +561,8 @@ valid options are:\n\ @@ -582,6 +583,8 @@ valid options are:\n\
--funcs-only display only the function key strings\n\ --funcs-only display only the function key strings\n\
--keys-only display only key bindings\n\ --keys-only display only key bindings\n\
--compose-only display only compose key combinations\n\ --compose-only display only compose key combinations\n\
@ -40,7 +44,7 @@
-c --charset=")); -c --charset="));
list_charsets(stderr); list_charsets(stderr);
fprintf(stderr, _("\ fprintf(stderr, _("\
@@ -571,7 +574,7 @@ valid options are:\n\ @@ -593,7 +596,7 @@ valid options are:\n\
int int
main (int argc, char *argv[]) { main (int argc, char *argv[]) {
@ -49,7 +53,7 @@
const struct option long_opts[] = { const struct option long_opts[] = {
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ "short-info", no_argument, NULL, 'i' }, { "short-info", no_argument, NULL, 'i' },
@@ -584,6 +587,7 @@ main (int argc, char *argv[]) { @@ -606,6 +609,7 @@ main (int argc, char *argv[]) {
{ "keys-only", no_argument, NULL, 'k' }, { "keys-only", no_argument, NULL, 'k' },
{ "compose-only",no_argument, NULL, 'd' }, { "compose-only",no_argument, NULL, 'd' },
{ "charset", required_argument, NULL, 'c' }, { "charset", required_argument, NULL, 'c' },
@ -57,7 +61,7 @@
{ "verbose", no_argument, NULL, 'v' }, { "verbose", no_argument, NULL, 'v' },
{ "version", no_argument, NULL, 'V' }, { "version", no_argument, NULL, 'V' },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
@@ -642,6 +646,9 @@ main (int argc, char *argv[]) { @@ -665,6 +669,9 @@ main (int argc, char *argv[]) {
usage(); usage();
printf("charset \"%s\"\n", optarg); printf("charset \"%s\"\n", optarg);
break; break;
@ -67,7 +71,7 @@
case 'V': case 'V':
print_version_and_exit(); print_version_and_exit();
case 'h': case 'h':
@@ -653,7 +660,7 @@ main (int argc, char *argv[]) { @@ -676,7 +683,7 @@ main (int argc, char *argv[]) {
if (optind < argc) if (optind < argc)
usage(); usage();

14
kbd-1.14.1-dumpkeys-ppc.patch → kbd-1.15.2-dumpkeys-ppc.patch
View File

@ -16,9 +16,11 @@ XXX: this has been reverted upstream with the comment:
src/dumpkeys.c | 17 +++++++++++++++++ src/dumpkeys.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+) 1 file changed, 17 insertions(+)
--- kbd-1.14.1.orig/src/dumpkeys.c Index: kbd-1.15.2/src/dumpkeys.c
+++ kbd-1.14.1/src/dumpkeys.c ===================================================================
@@ -166,6 +166,10 @@ valid_type(int t) { --- kbd-1.15.2.orig/src/dumpkeys.c
+++ kbd-1.15.2/src/dumpkeys.c
@@ -165,6 +165,10 @@ valid_type(int t) {
ke.kb_index = 0; ke.kb_index = 0;
ke.kb_table = 0; ke.kb_table = 0;
ke.kb_value = K(t, 0); ke.kb_value = K(t, 0);
@ -29,7 +31,7 @@ XXX: this has been reverted upstream with the comment:
status = (ioctl(fd, KDSKBENT, (unsigned long)&ke) == 0); status = (ioctl(fd, KDSKBENT, (unsigned long)&ke) == 0);
return status; return status;
} }
@@ -248,8 +252,13 @@ static void @@ -269,8 +273,13 @@ static void
show_short_info(void) { show_short_info(void) {
int i; int i;
@ -43,7 +45,7 @@ XXX: this has been reverted upstream with the comment:
printf(_("max number of actions bindable to a key: %d\n"), printf(_("max number of actions bindable to a key: %d\n"),
MAX_NR_KEYMAPS); MAX_NR_KEYMAPS);
get_keymaps(); get_keymaps();
@@ -361,7 +370,11 @@ dump_keys(char table_shape, char numeric @@ -383,7 +392,11 @@ dump_keys(char table_shape, char numeric
for (j = 0; j < MAX_NR_KEYMAPS; j++) { for (j = 0; j < MAX_NR_KEYMAPS; j++) {
int ja = (j | M_ALT); int ja = (j | M_ALT);
if (j != ja && keymap_index[j] >= 0 && keymap_index[ja] >= 0) if (j != ja && keymap_index[j] >= 0 && keymap_index[ja] >= 0)
@ -55,7 +57,7 @@ XXX: this has been reverted upstream with the comment:
int buf0, buf1, type; int buf0, buf1, type;
buf0 = get_bind(i, j); buf0 = get_bind(i, j);
@@ -389,7 +402,11 @@ dump_keys(char table_shape, char numeric @@ -411,7 +424,11 @@ dump_keys(char table_shape, char numeric
not_alt_is_meta: not_alt_is_meta:
no_shorthands: no_shorthands:

146
kbd-1.14.1-prtscr_no_sigquit.patch → kbd-1.15.2-prtscr_no_sigquit.patch
View File

@ -26,8 +26,10 @@ XXX: reverted upstream
data/keymaps/i386/qwertz/sk-prog-qwertz.map | 1 + data/keymaps/i386/qwertz/sk-prog-qwertz.map | 1 +
24 files changed, 27 insertions(+), 4 deletions(-) 24 files changed, 27 insertions(+), 4 deletions(-)
--- kbd-1.14.1.orig/data/keymaps/i386/azerty/fr-latin9.map Index: kbd-1.15.2/data/keymaps/i386/azerty/fr-latin9.map
+++ kbd-1.14.1/data/keymaps/i386/azerty/fr-latin9.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/azerty/fr-latin9.map
+++ kbd-1.15.2/data/keymaps/i386/azerty/fr-latin9.map
@@ -418,6 +418,7 @@ keycode 100 = AltGr @@ -418,6 +418,7 @@ keycode 100 = AltGr
# La touche Ctrl+Pause = Attn = 101 a un code pour elle-même # La touche Ctrl+Pause = Attn = 101 a un code pour elle-même
# #
@ -36,8 +38,10 @@ XXX: reverted upstream
keycode 102 = Home keycode 102 = Home
--- kbd-1.14.1.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map Index: kbd-1.15.2/data/keymaps/i386/fgGIod/tr_f-latin5.map
+++ kbd-1.14.1/data/keymaps/i386/fgGIod/tr_f-latin5.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map
+++ kbd-1.15.2/data/keymaps/i386/fgGIod/tr_f-latin5.map
@@ -217,6 +217,7 @@ keycode 99 = VoidSymbol @@ -217,6 +217,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -46,8 +50,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/bg-cp1251.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/bg-cp1251.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/bg-cp1251.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/bg-cp1251.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/bg-cp1251.map
@@ -312,6 +312,7 @@ keycode 99 = Control_backslash @@ -312,6 +312,7 @@ keycode 99 = Control_backslash
altgr alt keycode 99 = Control_backslash altgr alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -56,8 +62,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/bg_bds-cp1251.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/bg_bds-cp1251.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/bg_bds-cp1251.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/bg_bds-cp1251.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/bg_bds-cp1251.map
@@ -638,6 +638,7 @@ keycode 98 = KP_Divide @@ -638,6 +638,7 @@ keycode 98 = KP_Divide
keycode 99 = Control_backslash keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -66,8 +74,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/br-abnt.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/br-abnt.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/br-abnt.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/br-abnt.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/br-abnt.map
@@ -197,6 +197,7 @@ keycode 99 = VoidSymbol @@ -197,6 +197,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -76,8 +86,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/by.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/by.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/by.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/by.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/by.map
@@ -529,6 +529,7 @@ keycode 99 = VoidSymbol Control_backsl @@ -529,6 +529,7 @@ keycode 99 = VoidSymbol Control_backsl
Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash
keycode 100 = Alt keycode 100 = Alt
@ -86,8 +98,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up Up Up \ keycode 103 = Up Up Up \
KeyboardSignal Up Up \ KeyboardSignal Up Up \
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz-cp1250.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/cz-cp1250.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/cz-cp1250.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/cz-cp1250.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/cz-cp1250.map
@@ -138,6 +138,7 @@ keycode 99 = VoidSymbol @@ -138,6 +138,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -96,8 +110,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/cz-lat2-prog.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/cz-lat2-prog.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/cz-lat2-prog.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/cz-lat2-prog.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/cz-lat2-prog.map
@@ -141,6 +141,7 @@ keycode 99 = VoidSymbol @@ -141,6 +141,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -106,8 +122,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 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 Index: kbd-1.15.2/data/keymaps/i386/qwerty/cz-lat2.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/cz-lat2.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/cz-lat2.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/cz-lat2.map
@@ -138,6 +138,7 @@ keycode 99 = VoidSymbol @@ -138,6 +138,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -116,8 +134,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 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 Index: kbd-1.15.2/data/keymaps/i386/qwerty/cz.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/cz.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/cz.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/cz.map
@@ -1086,13 +1086,13 @@ keycode 99 = dead_acute dead_acute @@ -1086,13 +1086,13 @@ keycode 99 = dead_acute dead_acute
keycode 100 = AltGr keycode 100 = AltGr
# #
@ -136,8 +156,10 @@ XXX: reverted upstream
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ VoidSymbol VoidSymbol 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 Index: kbd-1.15.2/data/keymaps/i386/qwerty/defkeymap.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/defkeymap.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/defkeymap.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/defkeymap.map
@@ -222,6 +222,7 @@ keycode 99 = VoidSymbol @@ -222,6 +222,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -146,8 +168,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/defkeymap_V1.0.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/defkeymap_V1.0.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/defkeymap_V1.0.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/defkeymap_V1.0.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/defkeymap_V1.0.map
@@ -185,6 +185,7 @@ keycode 99 = VoidSymbol @@ -185,6 +185,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -156,8 +180,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/lt.baltic.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/lt.baltic.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/lt.baltic.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/lt.baltic.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/lt.baltic.map
@@ -171,6 +171,7 @@ keycode 99 = VoidSymbol @@ -171,6 +171,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -166,8 +192,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/lt.l4.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/lt.l4.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/lt.l4.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/lt.l4.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/lt.l4.map
@@ -463,6 +463,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr @@ -463,6 +463,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -176,8 +204,10 @@ XXX: reverted upstream
string F102 = "\033[7$" string F102 = "\033[7$"
keycode 102 = Find # =Home keycode 102 = Find # =Home
shift keycode 102 = F102 shift keycode 102 = F102
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/lt.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/lt.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/lt.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/lt.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/lt.map
@@ -462,6 +462,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr @@ -462,6 +462,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -186,8 +216,10 @@ XXX: reverted upstream
string F102 = "\033[7$" string F102 = "\033[7$"
keycode 102 = Find # =Home keycode 102 = Find # =Home
shift keycode 102 = F102 shift keycode 102 = F102
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/pl2.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/pl2.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/pl2.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/pl2.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/pl2.map
@@ -242,6 +242,7 @@ keycode 99 = VoidSymbol @@ -242,6 +242,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -196,8 +228,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/sk-prog-qwerty.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/sk-prog-qwerty.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/sk-prog-qwerty.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/sk-prog-qwerty.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/sk-prog-qwerty.map
@@ -122,6 +122,7 @@ keycode 99 = VoidSymbol @@ -122,6 +122,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -206,8 +240,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua-utf-ws.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/ua-utf-ws.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/ua-utf-ws.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/ua-utf-ws.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/ua-utf-ws.map
@@ -1526,6 +1526,7 @@ ctrll keycode 100 = CtrlR_Lock @@ -1526,6 +1526,7 @@ ctrll keycode 100 = CtrlR_Lock
ctrlr keycode 100 = CtrlR_Lock ctrlr keycode 100 = CtrlR_Lock
ctrll ctrlr keycode 100 = CtrlR_Lock ctrll ctrlr keycode 100 = CtrlR_Lock
@ -216,8 +252,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua-utf.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/ua-utf.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/ua-utf.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/ua-utf.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/ua-utf.map
@@ -1516,6 +1516,7 @@ ctrll keycode 100 = CtrlR_Lock @@ -1516,6 +1516,7 @@ ctrll keycode 100 = CtrlR_Lock
ctrlr keycode 100 = CtrlR_Lock ctrlr keycode 100 = CtrlR_Lock
ctrll ctrlr keycode 100 = CtrlR_Lock ctrll ctrlr keycode 100 = CtrlR_Lock
@ -226,8 +264,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua-ws.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/ua-ws.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/ua-ws.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/ua-ws.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/ua-ws.map
@@ -1521,6 +1521,7 @@ keycode 99 = VoidSymbol @@ -1521,6 +1521,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = Alt keycode 100 = Alt
@ -236,8 +276,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/ua.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/ua.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/ua.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/ua.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/ua.map
@@ -1515,6 +1515,7 @@ ctrll keycode 100 = CtrlR_Lock @@ -1515,6 +1515,7 @@ ctrll keycode 100 = CtrlR_Lock
ctrlr keycode 100 = CtrlR_Lock ctrlr keycode 100 = CtrlR_Lock
ctrll ctrlr keycode 100 = CtrlR_Lock ctrll ctrlr keycode 100 = CtrlR_Lock
@ -246,8 +288,10 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwerty/us-acentos.map Index: kbd-1.15.2/data/keymaps/i386/qwerty/us-acentos.map
+++ kbd-1.14.1/data/keymaps/i386/qwerty/us-acentos.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/us-acentos.map
+++ kbd-1.15.2/data/keymaps/i386/qwerty/us-acentos.map
@@ -194,6 +194,7 @@ keycode 99 = VoidSymbol @@ -194,6 +194,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
@ -256,18 +300,22 @@ XXX: reverted upstream
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior keycode 104 = Prior
--- kbd-1.14.1.orig/data/keymaps/i386/qwertz/cz-us-qwertz.map Index: kbd-1.15.2/data/keymaps/i386/qwertz/cz-us-qwertz.map
+++ kbd-1.14.1/data/keymaps/i386/qwertz/cz-us-qwertz.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwertz/cz-us-qwertz.map
+++ kbd-1.15.2/data/keymaps/i386/qwertz/cz-us-qwertz.map
@@ -135,6 +135,7 @@ control keycode 99 = Control_backslash @@ -135,6 +135,7 @@ control keycode 99 = Control_backslash
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr
keycode 101 = Break keycode 101 = Break
+ control keycode 101 = Control_c +control keycode 101 = Control_c
keycode 102 = Find keycode 102 = Find
keycode 103 = Up keycode 103 = Up
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 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 Index: kbd-1.15.2/data/keymaps/i386/qwertz/sk-prog-qwertz.map
+++ kbd-1.14.1/data/keymaps/i386/qwertz/sk-prog-qwertz.map ===================================================================
--- kbd-1.15.2.orig/data/keymaps/i386/qwertz/sk-prog-qwertz.map
+++ kbd-1.15.2/data/keymaps/i386/qwertz/sk-prog-qwertz.map
@@ -122,6 +122,7 @@ keycode 99 = VoidSymbol @@ -122,6 +122,7 @@ keycode 99 = VoidSymbol
alt keycode 99 = Control_backslash alt keycode 99 = Control_backslash
keycode 100 = AltGr keycode 100 = AltGr

0
kbd-1.14.1-setfont-no-cruft.patch → kbd-1.15.2-setfont-no-cruft.patch
View File

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

22
kbd-1.14.1-unicode_scripts.patch → kbd-1.15.2-unicode_scripts.patch
View File

@ -1,13 +1,11 @@
--- --- src/unicode_start
src/unicode_start | 27 ++++++++++++++++++++++++++- +++ src/unicode_start
1 file changed, 26 insertions(+), 1 deletion(-) @@ -72,6 +72,17 @@
# have a Unicode map attached, or explicitly specified, e.g.,
# by giving `def.uni' as a second argument.
--- kbd-1.14.1.orig/src/unicode_start +DEFAULT_UNICODE_FONT='LatArCyrHeb-16'
+++ kbd-1.14.1/src/unicode_start +# Also drdos8x16 is a good candidate.
@@ -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 +# 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, +# on the console, which makes YaST2 unusable. To be able to use bold,
@ -16,14 +14,14 @@
+# the default font written to /etc/sysconfig/console by YaST2 +# the default font written to /etc/sysconfig/console by YaST2
+# is currently always a font with 256 glyphs and a Unicode map +# is currently always a font with 256 glyphs and a Unicode map
+# which is suitable for the language used during the installation. +# which is suitable for the language used during the installation.
+
case "$#" in case "$#" in
2) 2)
@@ -83,7 +91,24 @@ case "$#" in setfont "$1" -u "$2"
@@ -80,6 +91,24 @@
setfont "$1" setfont "$1"
;; ;;
0) 0)
- setfont "$DEFAULT_UNICODE_FONT"
+ if [ -f /etc/sysconfig/console ] ; then + if [ -f /etc/sysconfig/console ] ; then
+ . /etc/sysconfig/console + . /etc/sysconfig/console
+ fi + fi

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

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

32
kbd-remove-kbio.diff
View File

@ -1,32 +0,0 @@
---
src/kbdrate.c | 1 -
src/setleds.c | 4 ----
2 files changed, 5 deletions(-)
Index: kbd-1.14.1/src/kbdrate.c
===================================================================
--- kbd-1.14.1.orig/src/kbdrate.c
+++ kbd-1.14.1/src/kbdrate.c
@@ -77,7 +77,6 @@ beats rebuilding the kernel!
#ifdef __sparc__
#include <asm/param.h>
-#include <asm/kbio.h>
#endif
#ifndef KDKBDREP
Index: kbd-1.14.1/src/setleds.c
===================================================================
--- kbd-1.14.1.orig/src/setleds.c
+++ kbd-1.14.1/src/setleds.c
@@ -14,10 +14,6 @@
#include "nls.h"
#include "version.h"
-#ifdef __sparc__
-#include <asm/kbio.h>
-#endif
-
static void
usage(void)
{

23
kbd.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Sep 7 14:48:34 CEST 2010 - anicka@suse.cz
- build optional binaries (bnc#637453)
-------------------------------------------------------------------
Mon Sep 6 17:27:40 CEST 2010 - anicka@suse.cz
- update to 1.15.2
* Use automake to build translations.
* loadkeys -u: Switch to Unicode mode, if necessary
* Never handle plain ASCII characters as Unicode
* Enable UNUMBERs in compose definitions
* Use automake.
* Add --enable-strip configure option.
* unicode_start: Without any arguments utility will only set
unicode mode.
* Add qwerty/cz.map keymap.
- remove upstreamed and obsolete patches (-remove-kbio, -Makefile,
-2d01989f, -no-strip)
- retain original behavior of unicode_start script
- remove manpages for programs that are not installed
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 27 02:18:05 CEST 2010 - sndirsch@suse.de Thu May 27 02:18:05 CEST 2010 - sndirsch@suse.de

53
kbd.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package kbd (Version 1.14.1) # spec file for package kbd (Version 1.15.2)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -23,8 +23,8 @@ Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/
License: GPLv2+ License: GPLv2+
Group: System/Console Group: System/Console
AutoReqProv: on AutoReqProv: on
Version: 1.14.1 Version: 1.15.2
Release: 26 Release: 1
Summary: Keyboard and Font Utilities Summary: Keyboard and Font Utilities
Source: kbd-%{version}.tar.bz2 Source: kbd-%{version}.tar.bz2
Source1: kbd_fonts.tar.bz2 Source1: kbd_fonts.tar.bz2
@ -41,19 +41,15 @@ Source12: fbtest.8
Source13: guess_encoding.pl Source13: guess_encoding.pl
Source42: convert-kbd-mac.sed Source42: convert-kbd-mac.sed
Source43: repack_kbd.sh Source43: repack_kbd.sh
Patch1: kbd-1.14.1-2d01989f.patch Patch0: kbd-%{version}-prtscr_no_sigquit.patch
Patch2: kbd-1.14.1-Makefile.patch Patch1: kbd-%{version}-dumpkeys-ppc.patch
Patch3: kbd-1.14.1-prtscr_no_sigquit.patch Patch2: kbd-%{version}-unicode_scripts.patch
Patch4: kbd-1.14.1-dumpkeys-ppc.patch Patch3: kbd-%{version}-docu-X11R6-xorg.patch
Patch5: kbd-1.14.1-unicode_scripts.patch Patch4: kbd-%{version}-sv-latin1-keycode10.patch
Patch6: kbd-1.14.1-no-strip.patch Patch5: kbd-%{version}-setfont-no-cruft.patch
Patch7: kbd-1.14.1-docu-X11R6-xorg.patch Patch6: kbd-%{version}-dumpkeys-C-opt.patch
Patch8: kbd-1.14.1-sv-latin1-keycode10.patch Patch7: kbd-%{version}-defkeymap.patch
Patch9: kbd-1.14.1-setfont-no-cruft.patch Patch8: kbd-%{version}-chvt-userwait.patch
Patch10: kbd-1.14.1-dumpkeys-C-opt.patch
Patch11: kbd-1.14.1-defkeymap.patch
Patch12: kbd-remove-kbio.diff
Patch13: kbd-1.12-chvt-userwait.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq PreReq: %fillup_prereq %insserv_prereq
BuildRequires: bison flex BuildRequires: bison flex
@ -78,19 +74,15 @@ Authors:
%prep %prep
%setup -q -a 1 -a 2 -n kbd-%{version} %setup -q -a 1 -a 2 -n kbd-%{version}
%patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1
%patch10
%patch11 -p1
%patch -P 12 -p1
%patch13 -p1
%build %build
for i in `find data/keymaps/mac -type f` ; do for i in `find data/keymaps/mac -type f` ; do
@ -108,7 +100,8 @@ popd
--datadir=%{kbd} \ --datadir=%{kbd} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--enable-nls \ --enable-nls \
--localedir=/usr/share/locale --localedir=/usr/share/locale \
--enable-optional-progs
make CFLAGS="$RPM_OPT_FLAGS -Os" make CFLAGS="$RPM_OPT_FLAGS -Os"
gcc $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c gcc $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c
# fix lat2-16.psfu (bnc#340579) # fix lat2-16.psfu (bnc#340579)
@ -116,7 +109,6 @@ font=data/consolefonts/lat2a-16.psfu
./src/psfxtable -i $font -it data/unimaps/lat2u.uni \ ./src/psfxtable -i $font -it data/unimaps/lat2u.uni \
-o t.psfu -o t.psfu
mv t.psfu $font mv t.psfu $font
rm -r data/{consolefonts,partialfonts}_Z
make make
%install %install
@ -147,7 +139,7 @@ mkdir -p $DOC/doc/
install -m 644 doc/keysyms.h.info doc/kbd.FAQ.txt doc/kbd.FAQ*.html doc/README* doc/TODO $DOC/doc/ install -m 644 doc/keysyms.h.info doc/kbd.FAQ.txt doc/kbd.FAQ*.html doc/README* doc/TODO $DOC/doc/
install -m 644 doc/as400.kbd doc/console.docs doc/repeat/set_kbd_repeat-2 $DOC/doc/ install -m 644 doc/as400.kbd doc/console.docs doc/repeat/set_kbd_repeat-2 $DOC/doc/
echo "See /usr/share/i18/charmaps for a description of char maps" >$DOC/doc/README.charmaps echo "See /usr/share/i18/charmaps for a description of char maps" >$DOC/doc/README.charmaps
install -m 644 COPYING CHANGES CREDITS README $DOC/ install -m 644 COPYING ChangeLog CREDITS README $DOC/
install -m 644 %SOURCE3 $DOC/ install -m 644 %SOURCE3 $DOC/
rm -f $K/consolefonts/README* $K/consolefonts/ERRORS.gz rm -f $K/consolefonts/README* $K/consolefonts/ERRORS.gz
if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then
@ -290,6 +282,15 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
/bin/kbdrate /bin/kbdrate
/bin/testutf8 /bin/testutf8
/bin/guess_encoding /bin/guess_encoding
/bin/clrunimap
/bin/getunimap
/bin/outpsfheader
/bin/screendump
/bin/setlogcons
/bin/setpalette
/bin/setvesablank
/bin/spawn_console
/bin/spawn_login
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*
%doc %{_mandir}/man5/keymaps.5.gz %doc %{_mandir}/man5/keymaps.5.gz
%ifnarch %sparc m68k %ifnarch %sparc m68k