Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2020-03-08 22:23:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbd" Sun Mar 8 22:23:18 2020 rev:95 rq:781687 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-01-20 22:48:30.143183277 +0100 +++ /work/SRC/openSUSE:Factory/.kbd.new.26092/kbd.changes 2020-03-08 22:23:39.224059555 +0100 @@ -1,0 +2,17 @@ +Tue Mar 3 02:25:10 CET 2020 - sbra...@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. + +------------------------------------------------------------------- Old: ---- kbd-2.0.4-repack.tar.xz New: ---- kbd-2.2.0-repack.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.toC0Um/_old 2020-03-08 22:23:43.132061967 +0100 +++ /var/tmp/diff_new_pack.toC0Um/_new 2020-03-08 22:23:43.172061991 +0100 @@ -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 @@ %patch3 %patch4 -p1 %patch5 -p1 -# TODO: no ideas how to port it. %patch6 %patch9 %patch10 @@ -143,7 +144,7 @@ # 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 ++++++ kbd-1.15.2-dumpkeys-C-opt.patch ++++++ --- /var/tmp/diff_new_pack.toC0Um/_old 2020-03-08 22:23:44.144062591 +0100 +++ /var/tmp/diff_new_pack.toC0Um/_new 2020-03-08 22:23:44.144062591 +0100 @@ -27,16 +27,16 @@ =================================================================== --- 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 <vc>\n\ -+ --console=<vc> 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 <vc>\n" ++ " --console=<vc> 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 @@ 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 @@ { "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 @@ 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 @@ + 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) ++++++ kbd-1.15.2-setfont-no-cruft.patch ++++++ --- /var/tmp/diff_new_pack.toC0Um/_old 2020-03-08 22:23:44.152062596 +0100 +++ /var/tmp/diff_new_pack.toC0Um/_new 2020-03-08 22:23:44.152062596 +0100 @@ -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 @@ + // 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; ++++++ kbd-1.15.5-loadkeys-search-path.patch ++++++ --- /var/tmp/diff_new_pack.toC0Um/_old 2020-03-08 22:23:44.164062603 +0100 +++ /var/tmp/diff_new_pack.toC0Um/_new 2020-03-08 22:23:44.164062603 +0100 @@ -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: */ ++++++ kbd-2.0.4-repack.tar.xz -> kbd-2.2.0-repack.tar.xz ++++++ ++++ 126280 lines of diff (skipped)
