diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-04-04 10:47:42 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-04-04 10:47:42 +0000 |
| commit | b9458750cc49aec6e5c6b53630ed15d307ec8f76 (patch) | |
| tree | 984361718307a8b045eb75661fda6637a03c8bd4 /main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch | |
| parent | e95180ba46174d61b8a5c96417b4418c7986ac30 (diff) | |
| download | aports-b9458750cc49aec6e5c6b53630ed15d307ec8f76.tar.bz2 aports-b9458750cc49aec6e5c6b53630ed15d307ec8f76.tar.xz | |
main/xfce4-setting: rebuild against libxklavier-5
Diffstat (limited to 'main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch')
| -rw-r--r-- | main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch b/main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch new file mode 100644 index 000000000..142932c89 --- /dev/null +++ b/main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch @@ -0,0 +1,27 @@ +diff -ur xfce4-settings-4.7.1.orig/configure.ac xfce4-settings-4.7.1/configure.ac +--- xfce4-settings-4.7.1.orig/configure.ac 2010-01-23 13:48:05.000000000 +0200 ++++ xfce4-settings-4.7.1/configure.ac 2010-02-15 14:20:55.000000000 +0200 +@@ -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)); |