diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-02-15 12:18:34 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-15 12:18:34 +0000 |
| commit | ac1d2ed78d9f02e759fa8f7f7b8be7d53abee22c (patch) | |
| tree | ac018c6420ad9f685d0537ed52d855e65ba5589a /xfce-base/xfce4-settings/files | |
| parent | Import to gentoo from perl-experimental (diff) | |
| download | gentoo-2-ac1d2ed78d9f02e759fa8f7f7b8be7d53abee22c.tar.gz gentoo-2-ac1d2ed78d9f02e759fa8f7f7b8be7d53abee22c.tar.bz2 gentoo-2-ac1d2ed78d9f02e759fa8f7f7b8be7d53abee22c.zip | |
Version bump.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/xfce4-settings/files')
| -rw-r--r-- | xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch new file mode 100644 index 000000000000..2eecdfd98e40 --- /dev/null +++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch @@ -0,0 +1,26 @@ +--- configure.ac ++++ configure.ac +@@ -142,6 +142,8 @@ + [libxklavier], [Keyboard layout selection]) + XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0], + [libxklavier], [Keyboard layout selection]) ++XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0], ++ [libxklavier], [Keyboard layout selection]) + + dnl ************************************ + dnl *** Xsettings daemon is optional *** +diff -ur xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c +--- xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c 2010-01-23 13:48:05.000000000 +0200 ++++ xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c 2010-02-15 14:23:24.000000000 +0200 +@@ -395,7 +395,11 @@ + + #ifdef HAVE_LIBXKLAVIER + /* Stop xklavier engine */ ++#ifdef HAVE_LIBXKLAVIER5 ++ xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE); ++#else + xkl_engine_stop_listen (settings->priv->xkl_engine); ++#endif /* HAVE_LIBXKLAVIER5 */ + #endif /* HAVE_LIBXKLAVIER */ + + g_object_unref (G_OBJECT (settings->priv->provider)); |