Accepting request 1071152 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1071152 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=116factory
Dominique Leuenberger
3 months ago
committed by
Git OBS Bridge
commit
dc57994289
@ -1,36 +0,0 @@
|
||||
From 501efd7b873e1462da986f763398ea8d98df2767 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
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 <fvogt@suse.de>
|
||||
---
|
||||
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
|
||||
|
||||
@ -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 2>/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."
|
||||
@ -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\ '<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.
|
||||
.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
|
||||
@ -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
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:42a138b498f633cb4eebbfbd2970bff3949a6119337c222ee94b78a99b9b65be
|
||||
size 807180
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dcc23ee4f8d0822be08c6d9554122ab39ee7ac0270112dfa29f2ac1914652b7b
|
||||
size 1531780
|
||||
Loading…
Reference in New Issue