Accepting request 41707 from GNOME:Factory

Copy from GNOME:Factory/libgnomekbd based on submit request 41707 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/41707
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgnomekbd?expand=0&rev=29

libgnomekbd-fix-crash.patch

@@ -0,0 +1,45 @@
+commit 4f9c7b401e948756fbe76a56a7619052f8acae42
+Author: Sergey V. Udaltsov <svu@gnome.org>
+Date:   Wed May 5 00:36:04 2010 +0100
+
+    Do not crash on kbd plug in
+    
+    There is funny race condition in X - when _XKB_RULES_NAMES is already
+    loaded from sysconfig while actual XKB config is still not changed (from
+    user config). This commit should fix
+    https://bugzilla.gnome.org/show_bug.cgi?id=617643
+
+diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
+index 5def369..f6064fa 100644
+--- a/libgnomekbd/gkbd-indicator.c
++++ b/libgnomekbd/gkbd-indicator.c
+@@ -318,7 +318,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine,
+ 				    gchar ** short_group_names,
+ 				    gchar ** full_group_names)
+ {
+-	char *layout_name;
++	char *layout_name = NULL;
+ 	if (group < g_strv_length (short_group_names)) {
+ 		if (xkl_engine_get_features (engine) &
+ 		    XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
+@@ -352,7 +352,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine,
+ 	}
+ 
+ 	if (layout_name == NULL)
+-		layout_name = g_strdup ("??");
++		layout_name = g_strdup ("");
+ 
+ 	return layout_name;
+ }
+diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
+index 90731af..efcad6a 100644
+--- a/libgnomekbd/gkbd-status.c
++++ b/libgnomekbd/gkbd-status.c
+@@ -152,6 +152,7 @@ gkbd_status_render_cairo (cairo_t * cr, int group)
+ 	cairo_font_options_t *fo;
+ 	static GHashTable *ln2cnt_map = NULL;
+ 
++	xkl_debug (160, "Rendering cairo for group %d\n", group);
+ 	if (globals.ind_cfg.background_color != NULL &&
+ 	    globals.ind_cfg.background_color[0] != 0) {
+ 		if (sscanf

libgnomekbd-proper-notification-name.patch

@@ -0,0 +1,23 @@
+commit 8dbeec103124f9de1ed515ef50ff79eff3ecd52c
+Author: Sergey V. Udaltsov <svu@gnome.org>
+Date:   Sun Apr 25 23:59:53 2010 +0100
+
+    Provide the proper place in NA by using the name
+    
+    The name "keyboard" is known to the NA applet - so it positions the icon
+    properly, on the right side, after all apps
+
+diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
+index efcad6a..5e62ae9 100644
+--- a/libgnomekbd/gkbd-status.c
++++ b/libgnomekbd/gkbd-status.c
+@@ -632,6 +632,9 @@ gkbd_status_init (GkbdStatus * gki)
+ 
+ 	gki->priv = g_new0 (GkbdStatusPrivate, 1);
+ 
++	/* This should give NA a hint about the order */
++	gtk_status_icon_set_name (GTK_STATUS_ICON(gki), "keyboard");
++
+ 	xkl_debug (100, "Initiating the widget startup process for %p\n",
+ 		   gki);
+ 

libgnomekbd.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jun 17 14:07:08 CEST 2010 - vuntz@opensuse.org
+
+- Add two patches from git:
+  + libgnomekbd-fix-crash.patch: fix a crash in
+    gnome-settings-daemon that can ruin your session in some
+    circumstances (after unlocking screensaver, for example)
+  + libgnomekbd-proper-notification-name.patch: make sure the
+    notification icon is properly positioned in the notification
+    area.
+
 -------------------------------------------------------------------
 Thu Apr 29 14:31:31 CEST 2010 - dimstar@opensuse.org
 

libgnomekbd.spec

@@ -19,12 +19,16 @@
 
 Name:           libgnomekbd
 Version:        2.30.1
-Release:        1
+Release:        2
 License:        LGPLv2.1+
 Summary:        GNOME Keyboard Library
 Url:            http://www.gnome.org/
 Group:          System/GUI/GNOME
 Source:         %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM libgnomekbd-fix-crash.patch bgo617643 vuntz@opensuse.org -- Fix a crash that can kill gnome-settings-daemon, taken from git
+Patch0:         libgnomekbd-fix-crash.patch
+# PATCH-FIX-UPSTREAM libgnomekbd-proper-notification-name.patch vuntz@opensuse.org -- Make sure the notification icon is properly sorted
+Patch1:         libgnomekbd-proper-notification-name.patch
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
 BuildRequires:  gtk2-devel
@@ -56,6 +60,8 @@ GNOME keyboard library, utility and applet.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static --with-pic