Accepting request 897533 from GNOME:Factory

Add libgnomekbd_avoid_implicit_definition.patch: Add string.h into include files to avoid inplicit definition warning in building. This change is to meet the needs of the inspection of maintaince build checking script(bnc#1160963, bnc#1034390, glgo#GNOME/libgnomekbd!7) (forwarded request 897262 from qzhao)

OBS-URL: https://build.opensuse.org/request/show/897533
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgnomekbd?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2021-06-10 22:17:41 +00:00 committed by Git OBS Bridge
commit 7c92280648
4 changed files with 43 additions and 0 deletions

View File

@ -0,0 +1,12 @@
diff -Nura libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-drawing.c libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-drawing.c
--- libgnomekbd-3.26.1/libgnomekbd/gkbd-keyboard-drawing.c 2021-06-03 11:27:52.595837755 +0800
+++ libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-drawing.c 2021-06-03 11:29:45.775631415 +0800
@@ -2748,7 +2748,7 @@
XklConfigRegistry * registry,
const gchar * full_layout)
{
- const gchar *layout_name = "?";
+ const gchar *layout_name = "default";
XklConfigItem *xki = xkl_config_item_new ();
gchar *layout = NULL, *variant = NULL;

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Jun 1 17:24:30 UTC 2021 - Cliff Zhao <qzhao@suse.com>
- Add libgnomekbd_avoid_implicit_definition.patch: Add string.h into
include files to avoid inplicit definition warning in building.
This change is to meet the needs of the inspection of maintaince
build checking script(bnc#1160963, bnc#1034390,
glgo#GNOME/libgnomekbd!7)
-------------------------------------------------------------------
Mon May 24 15:13:24 UTC 2021 - Cliff Zhao <qzhao@suse.com>
- Add libgnomekbd-set-default-indicator.patch: set the common
keyboard layout indicator as "default" to avoid misleading
(bnc#1034390).
-------------------------------------------------------------------
Fri Apr 2 12:03:02 UTC 2021 - Cliff Zhao <qzhao@suse.com>

View File

@ -27,6 +27,10 @@ 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
# PATCH-FIX-OPENSUSE libgnomekbd-set-default-indicator.patch bnc#1034390 qzhao@suse.com -- set the common keyboard layout indicator as default to avoid misleading.
Patch1: libgnomekbd-set-default-indicator.patch
# PATCH-FIX-UPSTREAM libgnomekbd_avoid_implicit_definition.patch bnc#1160963 bnc#1034390 glgo#GNOME/libgnomekbd!7 qzhao@suse.com -- To avoid inplicit definition warning in building.
Patch2: libgnomekbd_avoid_implicit_definition.patch
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: intltool

View File

@ -0,0 +1,11 @@
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 2021-06-04 01:33:53.695366014 +0800
+++ libgnomekbd-3.26.1_new/libgnomekbd/gkbd-keyboard-display.c 2021-06-04 01:35:00.459249300 +0800
@@ -18,6 +18,7 @@
*/
#include <stdlib.h>
+#include <string.h>
#include <libintl.h>
#include <config.h>