diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2009-07-20 23:10:36 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-07-20 23:10:36 +0000 |
| commit | 012c1a3779cbe116d00d73563fe4b30eb2bd7b0e (patch) | |
| tree | 77511a03f54a911ba0f225375942e6ba05184293 /gnome-base/gdm/files | |
| parent | old (diff) | |
| download | gentoo-2-012c1a3779cbe116d00d73563fe4b30eb2bd7b0e.tar.gz gentoo-2-012c1a3779cbe116d00d73563fe4b30eb2bd7b0e.tar.bz2 gentoo-2-012c1a3779cbe116d00d73563fe4b30eb2bd7b0e.zip | |
Fix libxklavier-4 support.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gdm/files')
| -rw-r--r-- | gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch b/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch new file mode 100644 index 000000000000..6f665b7660cc --- /dev/null +++ b/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch @@ -0,0 +1,50 @@ +From 90267c7f7afc73b27193632ec4af2c5360fab85a Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 21 Jul 2009 00:56:37 +0200 +Subject: [PATCH] Add support for libxklavier-4 + +--- + configure.ac | 10 +++++++--- + gui/simple-greeter/gdm-layouts.c | 4 ++++ + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d4a44d5..068e45c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -114,9 +114,13 @@ AC_ARG_ENABLE([libxklavier], + have_libxklavier=no + if test "x$enable_libxklavier" = "xyes"; then + PKG_CHECK_MODULES(LIBXKLAVIER, +- libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION, +- have_libxklavier=yes, +- have_libxklavier=no) ++ libxklavier >= 4, ++ [AC_DEFINE(HAVE_XKL_4, [1], [lixklavier-4 support]) ++ have_libxklavier=yes], ++ [PKG_CHECK_MODULES(LIBXKLAVIER, ++ libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION, ++ have_libxklavier=yes, ++ have_libxklavier=no)]) + if test "x$have_libxklavier" = "xyes" ; then + AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier]) + fi +diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c +index dc35094..97e1e08 100644 +--- a/gui/simple-greeter/gdm-layouts.c ++++ b/gui/simple-greeter/gdm-layouts.c +@@ -52,7 +52,11 @@ init_xkl (void) + engine = xkl_engine_get_instance (GDK_DISPLAY ()); + xkl_engine_backup_names_prop (engine); + config_registry = xkl_config_registry_get_instance (engine); ++#if HAVE_XKL_4 ++ xkl_config_registry_load (config_registry, FALSE); ++#else + xkl_config_registry_load (config_registry); ++#endif + + initial_config = xkl_config_rec_new (); + if (!xkl_config_rec_get_from_backup (initial_config, engine)) { +-- +1.6.3.3 + |