From 2bf4636ccab9ff668f3015f6ce11961731fd4bfd47ae69f18e72ca5a93d0f6f3 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 13 Mar 2023 13:56:50 +0000 Subject: [PATCH] Accepting request 1068128 from home:michals - Update to version 2.5.1 - Add Irish keyboard map - Add PinePhone keyboard keymap - Added braces to IT keyboard map - Add Euro at Portuguese keyboards - Fix incorrect acentuation pt-latin9 - fa.map: drop high codepoint character that chokes loadkeys - data/keymaps/i386/neo: use Delete instead of Backspace - Fix documentation for a few program options - Fix some memory leaks - Update translations - autogen.sh missing from release tarball, copy from git - Remove upstreamed patches - 0001-libkfont-Initialize-kfont_context-options.patch - kbd-1.15.2-dumpkeys-C-opt.patch - kbd-2.0.2-comment-typo-qwerty.patch OBS-URL: https://build.opensuse.org/request/show/1068128 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=156 --- ...ont-Initialize-kfont_context-options.patch | 36 ------- autogen.sh | 99 +++++++++++++++++++ kbd-1.15.2-docu-X11R6-xorg.patch | 12 +-- kbd-1.15.2-dumpkeys-C-opt.patch | 25 ----- kbd-1.15.2-unicode_scripts.patch | 4 +- kbd-2.0.2-comment-typo-qwerty.patch | 10 -- kbd-2.0.2-doshell-reference.patch | 4 +- kbd-2.0.2-euro-unicode.patch | 12 +-- kbd-2.4.0-repack.tar.xz | 3 - kbd-2.5.1-repack.tar.xz | 3 + kbd.changes | 20 ++++ kbd.spec | 33 +++---- kbdsettings-nox86.patch | 4 +- 13 files changed, 151 insertions(+), 114 deletions(-) delete mode 100644 0001-libkfont-Initialize-kfont_context-options.patch create mode 100644 autogen.sh delete mode 100644 kbd-1.15.2-dumpkeys-C-opt.patch delete mode 100644 kbd-2.0.2-comment-typo-qwerty.patch delete mode 100644 kbd-2.4.0-repack.tar.xz create mode 100644 kbd-2.5.1-repack.tar.xz diff --git a/0001-libkfont-Initialize-kfont_context-options.patch b/0001-libkfont-Initialize-kfont_context-options.patch deleted file mode 100644 index 38086b8..0000000 --- a/0001-libkfont-Initialize-kfont_context-options.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 501efd7b873e1462da986f763398ea8d98df2767 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Fri, 14 Jan 2022 15:22:24 +0100 -Subject: [PATCH] libkfont: Initialize kfont_context->options - -kfont_init did not set the options member, so it had essentially random -content. This made setfont behave weirdly. - -Switch to calloc for good measure to avoid issues like this. - -Signed-off-by: Fabian Vogt ---- - src/libkfont/context.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/libkfont/context.c b/src/libkfont/context.c -index 9ce0975351be..d5a766606489 100644 ---- a/src/libkfont/context.c -+++ b/src/libkfont/context.c -@@ -143,11 +143,12 @@ kfont_init(const char *prefix, struct kfont_context **ctx) - { - struct kfont_context *p; - -- if (!(p = malloc(sizeof(*p)))) -+ if (!(p = calloc(1, sizeof(*p)))) - return -EX_OSERR; - - p->progname = prefix; - p->verbose = 0; -+ p->options = 0; - p->log_fn = log_stderr; - p->mapdirpath = mapdirpath; - p->mapsuffixes = mapsuffixes; --- -2.34.0 - diff --git a/autogen.sh b/autogen.sh new file mode 100644 index 0000000..006713b --- /dev/null +++ b/autogen.sh @@ -0,0 +1,99 @@ +#!/bin/sh -efu + +OPT= +[ "${1-}" != '-f' ] || OPT=--force + +fatal() +{ + printf >&2 '%s\n' "$*" + exit 1 +} + +setvars() +{ + local varname="$1"; shift + eval "prog_$varname=\"\$1\""; shift + eval "version_matcher_$varname=\"\$1\""; shift + eval "version_pattern_$varname=\"\$1\""; shift + eval "args_$varname=\"\$@\"" +} + +getvars() +{ + eval "prog=\"\$prog_$1\"" + eval "version_matcher=\"\${version_matcher_$1:-gnu_version_matcher}\"" + eval "version_pattern=\"\$version_pattern_$1\"" + eval "args=\"\$args_$1\"" +} + +get_version() +{ + "$prog" --version /dev/null | head -1 | "$version_matcher" +} + +gnu_version_matcher() +{ + sed -n -e 's/^.* \([0-9]\+\(\.[0-9]\+\)*\)$/\1/p' +} + +vars= +register() +{ + setvars "$@" + vars="$vars $1" +} + +foreach() +{ + local varname + for varname in $vars; do + getvars "$varname" + "$@" + done +} + +check_program() +{ + which "$prog" >/dev/null 2>&1 || + fatal "ERROR: You must have $varname installed to build the kbd." + + if [ -n "$version_pattern" ]; then + local version="$(get_version "$varname")" + [ -n "${version##$version_pattern}" ] || + return 0 + fatal "You must have $varname version >= $version_pattern, but you have $version ." + fi +} + +show_version() +{ + printf ' %10s: version ' "$prog" + get_version "$varname" +} + +execute() +{ + eval "set -- \$args_$varname" + printf 'RUN: %s\n' "$prog $*" + "$prog" "$@" || exit 1 +} + +register autopoint "${AUTOPOINT:-autopoint}" '' '' $OPT -f +register libtoolize "${LIBTOOLIZE:-libtoolize}" '' '' $OPT --install --copy --automake +register aclocal "${ACLOCAL:-aclocal}" '' '' $OPT -I m4 +register autoconf "${AUTOCONF:-autoconf}" '' '' $OPT -I m4 +register autoheader "${AUTOHEADER:-autoheader}" '' '' $OPT -I m4 +register automake "${AUTOMAKE:-automake}" '' '' --force-missing --add-missing --copy + +printf '\n%s' 'Checking build-system utilities: ' +foreach check_program +printf 'OK\n' + +printf '\n%s\n' 'Generating build-system with:' +foreach show_version +printf '\n' + +rm -rf autom4te.cache +foreach execute + +printf '\n%s\n\n' "Now type '${0%/*}/configure' and 'make' to compile." diff --git a/kbd-1.15.2-docu-X11R6-xorg.patch b/kbd-1.15.2-docu-X11R6-xorg.patch index eec8de5..c2f9075 100644 --- a/kbd-1.15.2-docu-X11R6-xorg.patch +++ b/kbd-1.15.2-docu-X11R6-xorg.patch @@ -1,5 +1,5 @@ ---- docs/doc/kbd.FAQ-15.html.orig 2012-02-27 13:27:11.000000000 +0300 -+++ docs/doc/kbd.FAQ-15.html 2013-07-30 18:56:43.697000005 +0300 +--- a/docs/doc/kbd.FAQ-15.html.orig 2012-02-27 13:27:11.000000000 +0300 ++++ b/docs/doc/kbd.FAQ-15.html 2013-07-30 18:56:43.697000005 +0300 @@ -188,7 +188,7 @@

XFree86 also supports Slow Keys, Repeat Keys, Bounce Keys and an audible bell. xkbcomp can be used to generate a .xkm file @@ -9,8 +9,8 @@ Unfortunately, the exact process is still undocumented.

---- docs/doc/kbd.FAQ.txt.orig 2012-02-27 13:27:11.000000000 +0300 -+++ docs/doc/kbd.FAQ.txt 2013-07-30 18:57:41.150000005 +0300 +--- a/docs/doc/kbd.FAQ.txt.orig 2012-02-27 13:27:11.000000000 +0300 ++++ b/docs/doc/kbd.FAQ.txt 2013-07-30 18:57:41.150000005 +0300 @@ -1253,7 +1253,7 @@ 1. The Linux keyboard driver mechanism, used in conjunction with loadkeys. @@ -20,8 +20,8 @@ See also Andrew D. Balsa's comments at http://wauug.erols.com/~balsa/linux/deadkeys/index.html. ---- docs/doc/kbd.FAQ-8.html.orig 2012-02-27 13:27:11.000000000 +0300 -+++ docs/doc/kbd.FAQ-8.html 2013-07-30 18:58:23.978000004 +0300 +--- a/docs/doc/kbd.FAQ-8.html.orig 2012-02-27 13:27:11.000000000 +0300 ++++ b/docs/doc/kbd.FAQ-8.html 2013-07-30 18:58:23.978000004 +0300 @@ -154,7 +154,7 @@
  1. The Linux keyboard driver mechanism, used in conjunction with loadkeys.
    2. diff --git a/kbd-1.15.2-dumpkeys-C-opt.patch b/kbd-1.15.2-dumpkeys-C-opt.patch deleted file mode 100644 index 90fafe8..0000000 --- a/kbd-1.15.2-dumpkeys-C-opt.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: docs/man/man1/dumpkeys.1.in -=================================================================== ---- docs/man/man1/dumpkeys.1.in.orig -+++ docs/man/man1/dumpkeys.1.in -@@ -6,6 +6,7 @@ dumpkeys \- dump keyboard translation ta - .B dumpkeys - [ - .\".B \-1Vdfhiklnstv -+.RI [ \-C\ '' | \-\-console='' ] - .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. - .LP -+The affected console device can be specified using the -+.I -C -+(or -+.I --console -+) option. This option supports exactly one device name. -+.LP - .SH FILES - .TP - .I @DATADIR@/keymaps diff --git a/kbd-1.15.2-unicode_scripts.patch b/kbd-1.15.2-unicode_scripts.patch index cf84829..37b7f49 100644 --- a/kbd-1.15.2-unicode_scripts.patch +++ b/kbd-1.15.2-unicode_scripts.patch @@ -1,5 +1,5 @@ ---- src/unicode_start -+++ src/unicode_start +--- a/src/unicode_start ++++ b/src/unicode_start @@ -72,6 +72,17 @@ # have a Unicode map attached, or explicitly specified, e.g., # by giving `def.uni' as a second argument. diff --git a/kbd-2.0.2-comment-typo-qwerty.patch b/kbd-2.0.2-comment-typo-qwerty.patch deleted file mode 100644 index 42e88f0..0000000 --- a/kbd-2.0.2-comment-typo-qwerty.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: data/keymaps/mac/include/mac-qwerty-layout.inc -=================================================================== ---- data/keymaps/mac/include/mac-qwerty-layout.inc.orig 2012-02-27 11:27:11.000000000 +0100 -+++ data/keymaps/mac/include/mac-qwerty-layout.inc 2014-08-22 08:47:46.799078582 +0200 -@@ -1,4 +1,4 @@ --# qwertz-layout -+# qwerty-layout - keycode 12 = q - keycode 13 = w - keycode 14 = e diff --git a/kbd-2.0.2-doshell-reference.patch b/kbd-2.0.2-doshell-reference.patch index e56db7e..5e4e125 100644 --- a/kbd-2.0.2-doshell-reference.patch +++ b/kbd-2.0.2-doshell-reference.patch @@ -1,7 +1,7 @@ Index: docs/man/man1/openvt.1 =================================================================== ---- docs/man/man1/openvt.1.orig 2013-08-27 22:45:33.000000000 +0200 -+++ docs/man/man1/openvt.1 2014-09-12 11:48:08.465988937 +0200 +--- a/docs/man/man1/openvt.1.orig 2013-08-27 22:45:33.000000000 +0200 ++++ b/docs/man/man1/openvt.1 2014-09-12 11:48:08.465988937 +0200 @@ -92,5 +92,4 @@ .SH "SEE ALSO" diff --git a/kbd-2.0.2-euro-unicode.patch b/kbd-2.0.2-euro-unicode.patch index f16f907..43acb83 100644 --- a/kbd-2.0.2-euro-unicode.patch +++ b/kbd-2.0.2-euro-unicode.patch @@ -1,7 +1,7 @@ Index: data/keymaps/i386/include/euro.map =================================================================== ---- data/keymaps/i386/include/euro.map.orig 2012-02-27 11:27:10.000000000 +0100 -+++ data/keymaps/i386/include/euro.map 2014-09-25 12:31:37.594749095 +0200 +--- a/data/keymaps/i386/include/euro.map.orig 2012-02-27 11:27:10.000000000 +0100 ++++ b/data/keymaps/i386/include/euro.map 2014-09-25 12:31:37.594749095 +0200 @@ -2,5 +2,5 @@ # [Say: "loadkeys euro" to get Euro and cent with Alt on the positions # where many keyboards have E and C. @@ -11,8 +11,8 @@ Index: data/keymaps/i386/include/euro.map alt keycode 46 = cent Index: data/keymaps/i386/include/euro1.map =================================================================== ---- data/keymaps/i386/include/euro1.map.orig 2012-02-27 11:27:10.000000000 +0100 -+++ data/keymaps/i386/include/euro1.map 2014-09-25 12:31:20.218749689 +0200 +--- a/data/keymaps/i386/include/euro1.map.orig 2012-02-27 11:27:10.000000000 +0100 ++++ b/data/keymaps/i386/include/euro1.map 2014-09-25 12:31:20.218749689 +0200 @@ -2,5 +2,5 @@ # [Say: "loadkeys euro1" to get Euro and cent with AltGr (right alt) # on the positions where many keyboards have 5 and C. @@ -22,8 +22,8 @@ Index: data/keymaps/i386/include/euro1.map altgr keycode 46 = cent Index: data/keymaps/i386/include/euro2.map =================================================================== ---- data/keymaps/i386/include/euro2.map.orig 2012-02-27 11:27:10.000000000 +0100 -+++ data/keymaps/i386/include/euro2.map 2014-09-25 12:31:52.098748600 +0200 +--- a/data/keymaps/i386/include/euro2.map.orig 2012-02-27 11:27:10.000000000 +0100 ++++ b/data/keymaps/i386/include/euro2.map 2014-09-25 12:31:52.098748600 +0200 @@ -2,5 +2,5 @@ # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt) # on the positions where many keyboards have E and C. diff --git a/kbd-2.4.0-repack.tar.xz b/kbd-2.4.0-repack.tar.xz deleted file mode 100644 index b85d49d..0000000 --- a/kbd-2.4.0-repack.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42a138b498f633cb4eebbfbd2970bff3949a6119337c222ee94b78a99b9b65be -size 807180 diff --git a/kbd-2.5.1-repack.tar.xz b/kbd-2.5.1-repack.tar.xz new file mode 100644 index 0000000..9cc68b6 --- /dev/null +++ b/kbd-2.5.1-repack.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcc23ee4f8d0822be08c6d9554122ab39ee7ac0270112dfa29f2ac1914652b7b +size 1531780 diff --git a/kbd.changes b/kbd.changes index 4ca3d12..e16b91e 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Feb 27 19:06:36 UTC 2023 - Michal Suchanek + +- Update to version 2.5.1 + - Add Irish keyboard map + - Add PinePhone keyboard keymap + - Added braces to IT keyboard map + - Add Euro at Portuguese keyboards + - Fix incorrect acentuation pt-latin9 + - fa.map: drop high codepoint character that chokes loadkeys + - data/keymaps/i386/neo: use Delete instead of Backspace + - Fix documentation for a few program options + - Fix some memory leaks + - Update translations + - autogen.sh missing from release tarball, copy from git + - Remove upstreamed patches + - 0001-libkfont-Initialize-kfont_context-options.patch + - kbd-1.15.2-dumpkeys-C-opt.patch + - kbd-2.0.2-comment-typo-qwerty.patch + ------------------------------------------------------------------- Sat Dec 31 12:29:16 UTC 2022 - Stefan Dirsch diff --git a/kbd.spec b/kbd.spec index ede549b..1e3efde 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,7 +1,7 @@ # # spec file for package kbd # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ %define legacy_folders amiga,atari,i386,include,mac,ppc,sun Name: kbd -Version: 2.4.0 +Version: 2.5.1 Release: 0 Summary: Keyboard and Font Utilities # git: git://git.altlinux.org/people/legion/packages/kbd.git @@ -39,6 +39,7 @@ Source3: README.SUSE Source4: vlock.pamd Source8: sysconfig.console Source9: sysconfig.keyboard +Source10: autogen.sh Source11: fbtest.c Source12: fbtest.8 Source15: cz-map.patch @@ -51,12 +52,9 @@ Source44: xml2lst.pl Source45: genmap4systemd.sh Patch0: kbd-1.15.2-prtscr_no_sigquit.patch # PATCH-FIX-UPSTREAM -Patch1: 0001-libkfont-Initialize-kfont_context-options.patch Patch2: kbd-1.15.2-unicode_scripts.patch Patch3: kbd-1.15.2-docu-X11R6-xorg.patch Patch4: kbd-1.15.2-sv-latin1-keycode10.patch -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 Patch11: kbd-2.0.2-euro-unicode.patch Patch12: kbd-2.0.2-fix-bashisms.patch @@ -113,26 +111,16 @@ Please note that %{name}-legacy is not helpful without kbd. cp -fp %{SOURCE8} . cp -fp %{SOURCE9} . +cp -fp %{SOURCE10} . cp -fp %{SOURCE44} . cp -fp %{SOURCE45} . cp -fp %{SOURCE20} . cp -fp %{SOURCE21} . cp -fp %{SOURCE22} . -%patch0 -p1 -%patch1 -p1 -%patch2 -%patch3 -%patch4 -p1 -%patch6 -%patch9 -%patch10 -%patch11 -%patch12 -p1 -%patch13 -p1 -%ifnarch %{ix86} x86_64 -%patch14 -p0 +%autopatch -p1 +%ifarch %{ix86} x86_64 +%patch14 -p1 -R %endif -%patch15 -p1 %build for i in `find data/keymaps/mac -type f` ; do @@ -150,6 +138,7 @@ pushd data/keymaps/i386 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 +chmod 755 autogen.sh ./autogen.sh %configure \ --disable-silent-rules \ @@ -194,7 +183,7 @@ mkdir -p $DOC/doc/ install -m 644 docs/doc/keysyms.h.info docs/doc/kbd.FAQ.txt docs/doc/kbd.FAQ*.html docs/doc/README* docs/doc/TODO $DOC/doc/ install -m 644 docs/doc/as400.kbd docs/doc/console.docs docs/doc/repeat/set_kbd_repeat-2 $DOC/doc/ echo "See %{_datadir}/i18/charmaps for a description of char maps" >$DOC/doc/README.charmaps -install -m 644 ChangeLog CREDITS README $DOC/ +install -m 644 CREDITS README $DOC/ install -m 644 %{SOURCE3} $DOC/ rm -f $K/consolefonts/README* $K/consolefonts/ERRORS.gz if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then @@ -410,9 +399,9 @@ test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vl %files -f %{name}.lang #config(noreplace) /etc/sysconfig/console -%license LICENSE +%license COPYING %doc %{_defaultdocdir}/kbd -#doc CHANGES README CREDITS +#doc CREDITS README %{_fillupdir}/sysconfig.console %{_fillupdir}/sysconfig.keyboard %{kbd} diff --git a/kbdsettings-nox86.patch b/kbdsettings-nox86.patch index cf162d6..10036d2 100644 --- a/kbdsettings-nox86.patch +++ b/kbdsettings-nox86.patch @@ -1,5 +1,5 @@ ---- sysconfig.keyboard -+++ sysconfig.keyboard +--- a/sysconfig.keyboard ++++ b/sysconfig.keyboard @@ -15,12 +15,12 @@ # Keyboard repeat rate (2.0 - 30.0) KBD_RATE=""