From 37635f4779bc840724fc44185d2bf30a75f7d750faf0d80a253946f97c0678a8 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 5 Mar 2020 00:25:17 +0000 Subject: [PATCH] Accepting request 781285 from home:sbrabec:branches:new-gcc - Update to version 2.2.0... OBS-URL: https://build.opensuse.org/request/show/781285 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=121 --- kbd-1.15.2-dumpkeys-C-opt.patch | 30 +++++++++++++-------------- kbd-1.15.2-setfont-no-cruft.patch | 12 +++++------ kbd-1.15.5-loadkeys-search-path.patch | 16 +++++++------- kbd-2.0.4-repack.tar.xz | 3 --- kbd-2.2.0-repack.tar.xz | 3 +++ kbd.changes | 17 +++++++++++++++ kbd.spec | 11 +++++----- 7 files changed, 55 insertions(+), 37 deletions(-) delete mode 100644 kbd-2.0.4-repack.tar.xz create mode 100644 kbd-2.2.0-repack.tar.xz diff --git a/kbd-1.15.2-dumpkeys-C-opt.patch b/kbd-1.15.2-dumpkeys-C-opt.patch index 9e1eaea..baf0b96 100644 --- a/kbd-1.15.2-dumpkeys-C-opt.patch +++ b/kbd-1.15.2-dumpkeys-C-opt.patch @@ -27,16 +27,16 @@ Index: src/dumpkeys.c =================================================================== --- src/dumpkeys.c.orig +++ src/dumpkeys.c -@@ -45,6 +45,8 @@ valid options are:\n\ - -t --funcs-only display only the function key strings\n\ - -k --keys-only display only key bindings\n\ - -d --compose-only display only compose key combinations\n\ -+ -C \n\ -+ --console= Indicate the virtual console device to be used.\n\ - -c --charset=")); +@@ -41,6 +41,8 @@ usage(int rc) + " -t, --funcs-only display only the function key strings;\n" + " -k, --keys-only display only key bindings;\n" + " -d, --compose-only display only compose key combinations;\n" ++ " -C \n" ++ " --console= Indicate the virtual console device to be used;\n" + " -c, --charset=")); lk_list_charsets(stderr); - fprintf(stderr, _("\ -@@ -60,7 +62,7 @@ valid options are:\n\ + fprintf(stderr, _( +@@ -55,7 +57,7 @@ usage(int rc) int main(int argc, char *argv[]) { @@ -45,7 +45,7 @@ Index: src/dumpkeys.c const struct option long_opts[] = { { "help", no_argument, NULL, 'h' }, { "short-info", no_argument, NULL, 'i' }, -@@ -73,6 +75,7 @@ int main(int argc, char *argv[]) +@@ -68,6 +70,7 @@ int main(int argc, char *argv[]) { "keys-only", no_argument, NULL, 'k' }, { "compose-only", no_argument, NULL, 'd' }, { "charset", required_argument, NULL, 'c' }, @@ -53,7 +53,7 @@ Index: src/dumpkeys.c { "verbose", no_argument, NULL, 'v' }, { "version", no_argument, NULL, 'V' }, { NULL, 0, NULL, 0 } -@@ -87,6 +90,7 @@ int main(int argc, char *argv[]) +@@ -82,6 +85,7 @@ int main(int argc, char *argv[]) char funcs_only = 0; char keys_only = 0; char diac_only = 0; @@ -61,7 +61,7 @@ Index: src/dumpkeys.c struct lk_ctx *ctx; -@@ -143,6 +147,9 @@ int main(int argc, char *argv[]) +@@ -135,6 +139,9 @@ int main(int argc, char *argv[]) } printf("charset \"%s\"\n", optarg); break; @@ -70,10 +70,10 @@ Index: src/dumpkeys.c + break; case 'V': print_version_and_exit(); - case 'h': -@@ -154,7 +161,7 @@ int main(int argc, char *argv[]) + break; +@@ -150,7 +157,7 @@ int main(int argc, char *argv[]) if (optind < argc) - usage(); + usage(EX_USAGE); - if ((fd = getfd(NULL)) < 0) + if ((fd = getfd(console)) < 0) diff --git a/kbd-1.15.2-setfont-no-cruft.patch b/kbd-1.15.2-setfont-no-cruft.patch index b18da48..acb5c47 100644 --- a/kbd-1.15.2-setfont-no-cruft.patch +++ b/kbd-1.15.2-setfont-no-cruft.patch @@ -1,8 +1,8 @@ -Index: kbd-2.0.4/src/kdfontop.c +Index: kbd-2.2.0/src/kdfontop.c =================================================================== ---- kbd-2.0.4.orig/src/kdfontop.c -+++ kbd-2.0.4/src/kdfontop.c -@@ -168,6 +168,23 @@ int putfont(int fd, unsigned char *buf, +--- kbd-2.2.0.orig/src/kdfontop.c ++++ kbd-2.2.0/src/kdfontop.c +@@ -169,6 +169,23 @@ int putfont(int fd, unsigned char *buf, return 0; } @@ -19,14 +19,14 @@ Index: kbd-2.0.4/src/kdfontop.c + // 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); ++ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", get_progname(), count, width, height, i); + perror("putfont: KDFONTOP"); + return -1; +#else /* Second attempt: PIO_FONTX */ cfd.charcount = count; cfd.charheight = height; -@@ -190,4 +207,5 @@ int putfont(int fd, unsigned char *buf, +@@ -191,4 +208,5 @@ int putfont(int fd, unsigned char *buf, return -1; } return 0; diff --git a/kbd-1.15.5-loadkeys-search-path.patch b/kbd-1.15.5-loadkeys-search-path.patch index 3d3df54..7bb5edf 100644 --- a/kbd-1.15.5-loadkeys-search-path.patch +++ b/kbd-1.15.5-loadkeys-search-path.patch @@ -1,20 +1,20 @@ -Index: kbd-2.0.4/src/loadkeys.c +Index: kbd-2.2.0/src/loadkeys.c =================================================================== ---- kbd-2.0.4.orig/src/loadkeys.c -+++ kbd-2.0.4/src/loadkeys.c -@@ -27,7 +27,7 @@ +--- kbd-2.2.0.orig/src/loadkeys.c ++++ kbd-2.2.0/src/loadkeys.c +@@ -24,7 +24,7 @@ + #include "paths.h" #include "keymap.h" - static const char *progname = NULL; -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; +static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; static void __attribute__((noreturn)) -Index: kbd-2.0.4/src/paths.h +Index: kbd-2.2.0/src/paths.h =================================================================== ---- kbd-2.0.4.orig/src/paths.h -+++ kbd-2.0.4/src/paths.h +--- kbd-2.2.0.orig/src/paths.h ++++ kbd-2.2.0/src/paths.h @@ -5,6 +5,8 @@ * The following five subdirectories are defined: */ diff --git a/kbd-2.0.4-repack.tar.xz b/kbd-2.0.4-repack.tar.xz deleted file mode 100644 index fabd29a..0000000 --- a/kbd-2.0.4-repack.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30f7c9c7c9da7cf1afb53cf8cf33f626d2752a74768326b353c9190b67ecee41 -size 1046268 diff --git a/kbd-2.2.0-repack.tar.xz b/kbd-2.2.0-repack.tar.xz new file mode 100644 index 0000000..49957b3 --- /dev/null +++ b/kbd-2.2.0-repack.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c769445fb7342e032105ede63848f3d9c90bd380115d47b378fd3452655bc6c +size 1132436 diff --git a/kbd.changes b/kbd.changes index cd49c7c..4dbd0c9 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Mar 3 02:25:10 CET 2020 - sbrabec@suse.com + +- Update to version 2.2.0: + * setfont: Add option -d to double size of font. + * kbd_mode: Add -f option and deny dangerous mode switches + without it. + * Data files updates. + * Fix gcc warnings and error with gcc-10 (boo#1160273). + * Other fixes. + * For a full list of changes see: + https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git/log/ +- Update home page. +- Refresh patches: kbd-1.15.2-dumpkeys-C-opt.patch, + kbd-1.15.2-setfont-no-cruft.patch, + kbd-1.15.5-loadkeys-search-path.patch. + ------------------------------------------------------------------- Thu Jan 9 22:35:51 UTC 2020 - Stefan Brüns diff --git a/kbd.spec b/kbd.spec index 6b98711..9dfa4ab 100644 --- a/kbd.spec +++ b/kbd.spec @@ -22,14 +22,16 @@ %endif Name: kbd -Version: 2.0.4 +Version: 2.2.0 Release: 0 Summary: Keyboard and Font Utilities # git: git://git.altlinux.org/people/legion/packages/kbd.git License: GPL-2.0-or-later Group: System/Console -URL: ftp://ftp.altlinux.org/pub/people/legion/kbd/ -# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh +URL: http://kbd-project.org/ +# repack_kbd.sh on ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.xz +# or +# repack_kbd.sh on ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz Source: %{name}-%{version}-repack.tar.xz Source1: kbd_fonts.tar.bz2 Source2: suse-add.tar.bz2 @@ -120,7 +122,6 @@ cp -fp %{SOURCE22} . %patch3 %patch4 -p1 %patch5 -p1 -# TODO: no ideas how to port it. %patch6 %patch9 %patch10 @@ -143,7 +144,7 @@ pushd data/keymaps/i386 # bnc#435121 test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map # Rename conflicting keymaps, as Fedora do - test -f dvorak/no.map || mv dvorak/no.map dvorak/no-dvorak.map + #test -f dvorak/no.map || mv dvorak/no.map dvorak/no-dvorak.map test -f fgGIod/trf.map || mv fgGIod/trf.map fgGIod/trf-fgGIod.map test -f olpc/pt.map || mv olpc/pt.map olpc/pt-olpc.map test -f qwerty/cz.map || mv qwerty/cz.map qwerty/cz-qwerty.map