From d67d72ea3b400cffe6754cc1902d943ebfea3d219a211c3b0aaae988ac866d6c Mon Sep 17 00:00:00 2001 From: Anna Maresova Date: Wed, 19 Jan 2022 13:05:23 +0000 Subject: [PATCH] Accepting request 946907 from home:favogt:branches:Base:System - Add patch to fix random doubling of font sizes (bsc#1194698): * 0001-libkfont-Initialize-kfont_context-options.patch OBS-URL: https://build.opensuse.org/request/show/946907 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=139 --- ...ont-Initialize-kfont_context-options.patch | 36 +++++++++++++++++++ kbd.changes | 6 ++++ kbd.spec | 5 ++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-libkfont-Initialize-kfont_context-options.patch diff --git a/0001-libkfont-Initialize-kfont_context-options.patch b/0001-libkfont-Initialize-kfont_context-options.patch new file mode 100644 index 0000000..38086b8 --- /dev/null +++ b/0001-libkfont-Initialize-kfont_context-options.patch @@ -0,0 +1,36 @@ +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/kbd.changes b/kbd.changes index 077d196..82529ef 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 17 08:06:01 UTC 2022 - Fabian Vogt + +- Add patch to fix random doubling of font sizes (bsc#1194698): + * 0001-libkfont-Initialize-kfont_context-options.patch + ------------------------------------------------------------------- Mon Oct 4 19:17:16 UTC 2021 - Stefan Dirsch diff --git a/kbd.spec b/kbd.spec index 2090e9b..8db66c2 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,7 +1,7 @@ # # spec file for package kbd # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,6 +50,8 @@ Source43: repack_kbd.sh 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 @@ -117,6 +119,7 @@ cp -fp %{SOURCE20} . cp -fp %{SOURCE21} . cp -fp %{SOURCE22} . %patch0 -p1 +%patch1 -p1 %patch2 %patch3 %patch4 -p1