Accepting request 884644 from GNOME:Factory

Add libgnomekbd-avoid-coredump-on-ibus-engines.patch: avoid libgnomekbd crash when working with ibus(bnc#1160963, glgo#GNOME/libgnomekbd!6). (forwarded request 882720 from qzhao)

OBS-URL: https://build.opensuse.org/request/show/884644
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgnomekbd?expand=0&rev=58
This commit is contained in:
Dominique Leuenberger 2021-04-14 08:09:28 +00:00 committed by Git OBS Bridge
commit 5f724bb3f7
3 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,12 @@
diff -Nura libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-display.c libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-display.c
--- libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-display.c 2019-02-07 06:18:56.000000000 +0800
+++ libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-display.c 2021-04-02 19:56:19.587280314 +0800
@@ -81,7 +81,7 @@
dlg = gkbd_keyboard_drawing_dialog_new ();
registry = xkl_config_registry_get_instance (engine);
xkl_config_registry_load (registry, TRUE);
- if (layout != NULL) {
+ if (layout != NULL && strcmp(layout, "default")) {
gkbd_keyboard_drawing_dialog_set_layout (dlg, registry,
layout);
} else

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 2 12:03:02 UTC 2021 - Cliff Zhao <qzhao@suse.com>
- Add libgnomekbd-avoid-coredump-on-ibus-engines.patch: avoid libgnomekbd
crash when working with ibus(bnc#1160963, glgo#GNOME/libgnomekbd!6).
-------------------------------------------------------------------
Sat Jan 25 14:16:39 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,7 +1,7 @@
#
# spec file for package libgnomekbd
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -25,6 +25,8 @@ License: LGPL-2.1-or-later
Group: System/GUI/GNOME
URL: https://gitlab.gnome.org/GNOME/libgnomekbd
Source0: https://download.gnome.org/sources/libgnomekbd/3.26/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM libgnomekbd-avoid-coredump-on-ibus-engines.patch bnc#1160963, glgo#GNOME/libgnomekbd!6 qzhao@suse.com -- To avoid crash when working with ibus.
Patch0: libgnomekbd-avoid-coredump-on-ibus-engines.patch
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: intltool
@ -86,7 +88,7 @@ applications that want to make use of libgnomekbd.
%lang_package
%prep
%autosetup
%autosetup -p1
translation-update-upstream
%build