* [gentoo-commits] gentoo-x86 commit in gnome-base/gdm/files: gdm-2.26.1-libxklavier4.patch
@ 2009-07-20 23:10 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2009-07-20 23:10 UTC (permalink / raw
To: gentoo-commits
eva 09/07/20 23:10:36
Added: gdm-2.26.1-libxklavier4.patch
Log:
Fix libxklavier-4 support.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.1 gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch?rev=1.1&content-type=text/plain
Index: gdm-2.26.1-libxklavier4.patch
===================================================================
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in gnome-base/gdm/files: gdm-2.26.1-libxklavier4.patch
@ 2010-09-30 15:51 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2010-09-30 15:51 UTC (permalink / raw
To: gentoo-commits
eva 10/09/30 15:51:45
Removed: gdm-2.26.1-libxklavier4.patch
Log:
Allow use of upower in place of devicekit-power. Clean up old revisions.
(Portage version: 2.2_rc88/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-30 15:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-30 15:51 [gentoo-commits] gentoo-x86 commit in gnome-base/gdm/files: gdm-2.26.1-libxklavier4.patch Gilles Dartiguelongue (eva)
-- strict thread matches above, loose matches on Subject: below --
2009-07-20 23:10 Gilles Dartiguelongue (eva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox