diff options
Diffstat (limited to 'gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch')
| -rw-r--r-- | gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch | 44 |
1 files changed, 0 insertions, 44 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 deleted file mode 100644 index 29b03302ddd3..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 69e112aa566f08a782cbb8544bde43eed029081c 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 - ---- - capplets/keyboard/gnome-keyboard-properties-xkb.c | 4 ++++ - configure.in | 4 +++- - 2 files changed, 7 insertions(+), 1 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..b552d4f 100644 ---- a/configure.in -+++ b/configure.in -@@ -180,7 +180,9 @@ CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS" - dnl ============== - dnl gswitchit - dnl ============== --PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4.1 libxklavier >= 3.6]) -+PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4.1 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 - |