Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2020-10-03 18:53:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbd" Sat Oct 3 18:53:50 2020 rev:102 rq:838620 version:2.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-09-23 13:01:11.901883207 +0200 +++ /work/SRC/openSUSE:Factory/.kbd.new.4249/kbd.changes 2020-10-03 18:53:52.245373347 +0200 @@ -1,0 +2,45 @@ +Fri Sep 25 10:28:40 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Do not package libtswrap.so.0: it's only used by the test suite + in a LD_PRELOAD fashion. + +------------------------------------------------------------------- +Thu Sep 24 00:08:45 UTC 2020 - Stanislav Brabec <[email protected]> + +- Update to version 2.3.0: + * Added libkfont library (internal yet). + * Added Canadian Multilingual Standard keyboard map. + * Added us1 that maps Right Alt to AltGr and Shift+Tab to + Alt+Tab. + * The dead_macron is used instead of macron in fi.map. + * Added retries when switching to the console (chvt, openvt). + * Added option -d to double size of font (setfont). + * Added long options, help messages. + * Added solar24x32 font. + * Updated eurlatgr font. + * Fixed problems with formatting man pages. + * Fixed search path error (boo#1176854). +- Refresh partially upstreamed kbd-1.15.2-dumpkeys-C-opt.patch +- Drop upstreamed libkeymap-Fix-mk_mapname-for-the-plain-map.patch +- Refresh kbd-1.15.2-setfont-no-cruft.patch and + kbd-1.15.5-loadkeys-search-path.patch + +------------------------------------------------------------------- +Tue Sep 22 08:45:57 UTC 2020 - Guillaume GARDET <[email protected]> + +- Refresh patch to fix build on non-x86 architecture broken + by previous commit: + * kbdsettings-nox86.patch + +------------------------------------------------------------------- +Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec <[email protected]> + +- Make kbdsettings working in both bash and dash (boo#1175040). + +------------------------------------------------------------------- +Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec <[email protected]> + +- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps + (boo#1176302). + +------------------------------------------------------------------- Old: ---- kbd-2.2.0-repack.tar.xz libkeymap-Fix-mk_mapname-for-the-plain-map.patch New: ---- kbd-2.3.0-repack.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.TdrfPH/_old 2020-10-03 18:53:54.097375753 +0200 +++ /var/tmp/diff_new_pack.TdrfPH/_new 2020-10-03 18:53:54.101375758 +0200 @@ -24,16 +24,16 @@ %define legacy_folders amiga,atari,i386,include,mac,ppc,sun Name: kbd -Version: 2.2.0 +Version: 2.3.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: http://kbd-project.org/ -# repack_kbd.sh on ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.xz +# 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 +# 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 @@ -56,7 +56,6 @@ Patch3: kbd-1.15.2-docu-X11R6-xorg.patch Patch4: kbd-1.15.2-sv-latin1-keycode10.patch Patch5: kbd-1.15.2-setfont-no-cruft.patch -# TODO: no ideas how to port it. Patch6: kbd-1.15.2-dumpkeys-C-opt.patch Patch9: kbd-2.0.2-comment-typo-qwerty.patch Patch10: kbd-2.0.2-doshell-reference.patch @@ -69,7 +68,7 @@ Patch14: kbdsettings-nox86.patch # PATCH-FIX-SLE kbd-unicode-fxxx.patch [email protected] bsc1085432 -- Do not cause error on UNICODE characters >= 0xF000 (e. g. ligature fi) Patch15: kbd-unicode-fxxx.patch -Patch16: libkeymap-Fix-mk_mapname-for-the-plain-map.patch +BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: check-devel @@ -77,6 +76,7 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc >= 4.6 +BuildRequires: libtool BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: suse-module-tools @@ -134,7 +134,6 @@ %patch14 -p0 %endif %patch15 -p1 -%patch16 -p1 %build for i in `find data/keymaps/mac -type f` ; do @@ -152,12 +151,14 @@ 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 popd +./autogen.sh %configure \ --disable-silent-rules \ --datadir=%{kbd} \ --enable-nls \ --localedir=%{_datadir}/locale \ - --enable-optional-progs + --enable-optional-progs \ + --disable-static make %{?_smp_mflags} gcc %{optflags} -o fbtest $RPM_SOURCE_DIR/fbtest.c %ifarch %{ix86} x86_64 @@ -188,6 +189,9 @@ # Now call kbd install echo "# Now call kbd install DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir}" make DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir} install +# This is an internal library, these files have no use outside kbd. +rm %{buildroot}%{_libdir}/libtswrap.la +rm %{buildroot}%{_libdir}/libtswrap.so* # ln -s iso01-12x22.psfu $K/consolefonts/suse12x22.psfu install -m 644 data/consolefonts/README* $DOC/fonts/ mkdir -p $DOC/doc/ ++++++ kbd-1.15.2-dumpkeys-C-opt.patch ++++++ --- /var/tmp/diff_new_pack.TdrfPH/_old 2020-10-03 18:53:54.197375883 +0200 +++ /var/tmp/diff_new_pack.TdrfPH/_new 2020-10-03 18:53:54.197375883 +0200 @@ -2,14 +2,14 @@ =================================================================== --- docs/man/man1/dumpkeys.1.in.orig +++ docs/man/man1/dumpkeys.1.in -@@ -4,6 +4,7 @@ - dumpkeys \- dump keyboard translation tables - .SH SYNOPSIS +@@ -6,6 +6,7 @@ dumpkeys \- dump keyboard translation ta .B dumpkeys -+.RI [ \-C\ '<vc>' | \-\-console='<vc>' ] [ .\".B \-1Vdfhiklnstv ++.RI [ \-C\ '<vc>' | \-\-console='<vc>' ] .B \-h \-\-help \-i \-\-short\-info \-l \-s \-\-long\-info + .B \-n \-\-numeric \-f \-\-full\-table \-1 \-\-separate-lines + .BI \-S shape @@ -212,6 +213,12 @@ loadkeys how to interpret the keymap. (F .B \-V \-\-version Prints version number and exits. @@ -21,62 +21,5 @@ +) option. This option supports exactly one device name. +.LP .SH FILES - .PD 0 - .TP 20 -Index: src/dumpkeys.c -=================================================================== ---- src/dumpkeys.c.orig -+++ src/dumpkeys.c -@@ -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, _( -@@ -55,7 +57,7 @@ usage(int rc) - - int main(int argc, char *argv[]) - { -- const char *short_opts = "hilvsnf1tkdS:c:V"; -+ const char *short_opts = "hilvsnf1tkdS:C:c:V"; - const struct option long_opts[] = { - { "help", no_argument, NULL, 'h' }, - { "short-info", no_argument, NULL, 'i' }, -@@ -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' }, -+ { "console", required_argument, NULL, 'C' }, - { "verbose", no_argument, NULL, 'v' }, - { "version", no_argument, NULL, 'V' }, - { NULL, 0, NULL, 0 } -@@ -82,6 +85,7 @@ int main(int argc, char *argv[]) - char funcs_only = 0; - char keys_only = 0; - char diac_only = 0; -+ char * console = NULL; - - struct lk_ctx *ctx; - -@@ -135,6 +139,9 @@ int main(int argc, char *argv[]) - } - printf("charset \"%s\"\n", optarg); - break; -+ case 'C': -+ console = optarg; -+ break; - case 'V': - print_version_and_exit(); - break; -@@ -150,7 +157,7 @@ int main(int argc, char *argv[]) - if (optind < argc) - usage(EX_USAGE); - -- if ((fd = getfd(NULL)) < 0) -+ if ((fd = getfd(console)) < 0) - kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); - - /* check whether the keyboard is in Unicode mode */ + .TP + .I @DATADIR@/keymaps ++++++ kbd-1.15.2-setfont-no-cruft.patch ++++++ --- /var/tmp/diff_new_pack.TdrfPH/_old 2020-10-03 18:53:54.209375898 +0200 +++ /var/tmp/diff_new_pack.TdrfPH/_new 2020-10-03 18:53:54.209375898 +0200 @@ -1,10 +1,10 @@ -Index: kbd-2.2.0/src/kdfontop.c +Index: kbd-2.3.0/src/libkfont/kdfontop.c =================================================================== ---- 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; - } +--- kbd-2.3.0.orig/src/libkfont/kdfontop.c ++++ kbd-2.3.0/src/libkfont/kdfontop.c +@@ -321,6 +321,23 @@ kfont_put_font(struct kfont_context *ctx + if (ret <= 0) + return ret; +#if 1 + // We no longer try PIO_FONT* calls. @@ -19,16 +19,16 @@ + // 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", get_progname(), count, width, height, i); ++ fprintf(stderr, "%s: putfont: %d,%dx%d: failed: %d\n", get_progname(), count, width, height, ret); + perror("putfont: KDFONTOP"); + return -1; +#else /* Second attempt: PIO_FONTX */ - cfd.charcount = count; - cfd.charheight = height; -@@ -191,4 +208,5 @@ int putfont(int fd, unsigned char *buf, - return -1; - } - return 0; + ret = put_font_piofontx(ctx, fd, buf, count, width, height); + if (ret <= 0) +@@ -328,4 +345,5 @@ kfont_put_font(struct kfont_context *ctx + + /* Third attempt: PIO_FONT */ + return put_font_piofont(ctx, fd, buf, count, width, height); +#endif } ++++++ kbd-1.15.5-loadkeys-search-path.patch ++++++ --- /var/tmp/diff_new_pack.TdrfPH/_old 2020-10-03 18:53:54.225375919 +0200 +++ /var/tmp/diff_new_pack.TdrfPH/_new 2020-10-03 18:53:54.225375919 +0200 @@ -1,20 +1,20 @@ -Index: kbd-2.2.0/src/loadkeys.c +Index: kbd-2.3.0/src/loadkeys.c =================================================================== ---- 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" +--- kbd-2.3.0.orig/src/loadkeys.c ++++ kbd-2.3.0/src/loadkeys.c +@@ -27,6 +27,8 @@ --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.2.0/src/paths.h + static const char *const dirpath1[] = { + "", ++ DATADIR "/" XKBKEYMAPDIR "/", ++ DATADIR "/" LEGACYKEYMAPDIR "/**", + DATADIR "/" KEYMAPDIR "/**", + KERNDIR "/", + NULL +Index: kbd-2.3.0/src/paths.h =================================================================== ---- kbd-2.2.0.orig/src/paths.h -+++ kbd-2.2.0/src/paths.h +--- kbd-2.3.0.orig/src/paths.h ++++ kbd-2.3.0/src/paths.h @@ -5,6 +5,8 @@ * The following five subdirectories are defined: */ ++++++ kbd-2.2.0-repack.tar.xz -> kbd-2.3.0-repack.tar.xz ++++++ ++++ 287331 lines of diff (skipped) ++++++ kbdsettings ++++++ --- /var/tmp/diff_new_pack.TdrfPH/_old 2020-10-03 18:53:54.913376805 +0200 +++ /var/tmp/diff_new_pack.TdrfPH/_new 2020-10-03 18:53:54.913376805 +0200 @@ -7,11 +7,12 @@ for i in NUM SCR CAPS; do conf=$(eval echo KBD_${i}LOCK) - [ -z ${!conf} ] && continue - param=$(echo ${i,,} | sed 's/scr/scroll/') + eval confval=\"\$$conf\" + [ -z "$confval" ] && continue + param=$(echo $i | tr A-Z a-z | sed 's/scr/scroll/') for tty in ${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}; do - case "${!conf}" in + case "$confval" in yes) if [ $param = "num" ]; then touch /run/numlock-on @@ -35,11 +36,11 @@ /usr/bin/setleds -D -$param < /dev/$tty fi else - echo "Value ${!conf} invalid for $conf" + echo "Value $confval invalid for $conf" fi ;; *) - echo "error: unknown value ${!conf} in $conf" + echo "error: unknown value $confval in $conf" ;; esac done ++++++ kbdsettings-nox86.patch ++++++ --- /var/tmp/diff_new_pack.TdrfPH/_old 2020-10-03 18:53:54.921376815 +0200 +++ /var/tmp/diff_new_pack.TdrfPH/_new 2020-10-03 18:53:54.921376815 +0200 @@ -15,11 +15,11 @@ - /usr/bin/setleds -D -$param < /dev/$tty - fi - else -- echo "Value ${!conf} invalid for $conf" +- echo "Value $confval invalid for $conf" - fi - ;; *) - echo "error: unknown value ${!conf} in $conf" + echo "error: unknown value $confval in $conf" ;; --- sysconfig.keyboard +++ sysconfig.keyboard
