1 files changed, 43 insertions, 0 deletions
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch
new file mode 100644
index 000000000000..b652c58dffc8
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch
@@ -0,0 +1,43 @@
+From d6c2ab27173cdcab49f152fa190c5594b661f107 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 21 Jul 2009 00:30:10 +0200
+Subject: [PATCH] Add support for libxklavier-4
+
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=278450
+---
+ capplets/keyboard/gnome-keyboard-properties-xkb.c |    4 ++++
+ configure.in                                      |    2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/capplets/keyboard/gnome-keyboard-properties-xkb.c b/capplets/keyboard/gnome-keyboard-properties-xkb.c
+index a0171ac..4cfe305 100644
+--- a/capplets/keyboard/gnome-keyboard-properties-xkb.c
++++ b/capplets/keyboard/gnome-keyboard-properties-xkb.c
+@@ -155,7 +155,11 @@ setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset)
+ 
+ 	engine = xkl_engine_get_instance (GDK_DISPLAY ());
+ 	config_registry = xkl_config_registry_get_instance (engine);
++#ifdef HAVE_XKL_4
++	xkl_config_registry_load (config_registry, FALSE);
++#else
+ 	xkl_config_registry_load (config_registry);
++#endif
+ 
+ 	gkbd_keyboard_config_init (&initial_config, xkb_gconf_client,
+ 				   engine);
+diff --git a/configure.in b/configure.in
+index 515f053..3f7eae2 100644
+--- a/configure.in
++++ b/configure.in
+@@ -180,6 +180,8 @@ CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
+ dnl ==============
+ dnl gswitchit
+ dnl ==============
++PKG_CHECK_MODULES(LIBXKLAVIER, [libxklavier >= 4],
++	[AC_DEFINE(HAVE_XKL_4, [1], [libxklavier-4 support])])
+ PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4.1 libxklavier >= 3.6])
+ AC_SUBST(LIBGNOMEKBD_CFLAGS)
+ AC_SUBST(LIBGNOMEKBD_LIBS)
+-- 
+1.6.3.3
+