From 53b76055a8957b6f63ffa5dfe2369dbebf5a4fb0ceb1529c7e2f664b5d3dcceb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 12 Apr 2021 12:11:20 +0000 Subject: [PATCH] Accepting request 882720 from home:qzhao:branches:GNOME:Factory Add libgnomekbd-avoid-coredump-on-ibus-engines.patch: avoid libgnomekbd crash when working with ibus(bnc#1160963, glgo#GNOME/libgnomekbd!6). OBS-URL: https://build.opensuse.org/request/show/882720 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgnomekbd?expand=0&rev=83 --- libgnomekbd-avoid-coredump-on-ibus-engines.patch | 12 ++++++++++++ libgnomekbd.changes | 6 ++++++ libgnomekbd.spec | 6 ++++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 libgnomekbd-avoid-coredump-on-ibus-engines.patch diff --git a/libgnomekbd-avoid-coredump-on-ibus-engines.patch b/libgnomekbd-avoid-coredump-on-ibus-engines.patch new file mode 100644 index 0000000..a963c0a --- /dev/null +++ b/libgnomekbd-avoid-coredump-on-ibus-engines.patch @@ -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 diff --git a/libgnomekbd.changes b/libgnomekbd.changes index ff80d94..c313ec7 100644 --- a/libgnomekbd.changes +++ b/libgnomekbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 2 12:03:02 UTC 2021 - Cliff Zhao + +- 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 diff --git a/libgnomekbd.spec b/libgnomekbd.spec index e53a39c..a5b82bd 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -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