|
16219
|
1 |
diff -up gnome-settings-daemon-2.27.5/config.h.in.orig gnome-settings-daemon-2.27.5/config.h.in
|
|
|
2 |
--- gnome-settings-daemon-2.27.5/config.h.in.orig 2009-07-27 23:26:58.000000000 +0100
|
|
|
3 |
+++ gnome-settings-daemon-2.27.5/config.h.in 2009-08-07 10:19:58.717269427 +0100
|
|
|
4 |
@@ -108,3 +108,7 @@
|
|
11506
|
5 |
|
|
|
6 |
/* Define to 1 if the X Window System is missing or not being used. */
|
|
|
7 |
#undef X_DISPLAY_MISSING
|
|
|
8 |
+
|
|
|
9 |
+/* Defined when gswitchit is detected */
|
|
|
10 |
+#undef HAVE_GSWITCHIT
|
|
|
11 |
+
|
|
|
12 |
|
|
15621
|
13 |
--- gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-manager.c.ori 2009-04-15 07:07:26.999526943 +0100
|
|
|
14 |
+++ gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-manager.c 2009-04-15 07:08:43.002715791 +0100
|
|
|
15 |
@@ -36,6 +36,7 @@
|
|
|
16 |
#include <gdk/gdk.h>
|
|
|
17 |
#include <gdk/gdkx.h>
|
|
|
18 |
#include <gtk/gtk.h>
|
|
|
19 |
+#include <gconf/gconf-client.h>
|
|
|
20 |
|
|
|
21 |
#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
|
|
|
22 |
# include <X11/extensions/xf86misc.h>
|
|
|
23 |
@@ -48,7 +49,9 @@
|
|
|
24 |
#include "gnome-settings-profile.h"
|
|
|
25 |
#include "gsd-keyboard-manager.h"
|
|
|
26 |
|
|
|
27 |
+#ifdef HAVE_GSWITCHIT
|
|
|
28 |
#include "gsd-keyboard-xkb.h"
|
|
|
29 |
+#endif
|
|
|
30 |
#include "gsd-xmodmap.h"
|
|
|
31 |
|
|
|
32 |
#define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
|
|
17569
|
33 |
diff -ruN gnome-settings-daemon-2.29.6.orig/configure.ac gnome-settings-daemon-2.29.6/configure.ac
|
|
|
34 |
--- gnome-settings-daemon-2.29.6.orig/configure.ac 2010-02-02 21:06:07.411263241 +0000
|
|
|
35 |
+++ gnome-settings-daemon-2.29.6/configure.ac 2010-02-02 21:06:43.656906338 +0000
|
|
|
36 |
@@ -220,9 +220,19 @@
|
|
|
37 |
AC_SUBST(XF86MISC_LIBS)
|
|
|
38 |
AC_CHECK_X_HEADERS([X11/extensions/XKB.h])
|
|
|
39 |
|
|
|
40 |
-PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 2.29.5 libgnomekbd >= 2.29.5 libxklavier >= 5.0])
|
|
|
41 |
-AC_SUBST(LIBGNOMEKBDUI_CFLAGS)
|
|
|
42 |
-AC_SUBST(LIBGNOMEKBDUI_LIBS)
|
|
|
43 |
+AC_ARG_ENABLE(gswitchit,
|
|
|
44 |
+ AC_HELP_STRING([--disable-gswitchit],
|
|
|
45 |
+ [Do not build with gswitchit support]),,
|
|
|
46 |
+ enable_gswitchit=yes)
|
|
|
47 |
+
|
|
|
48 |
+if test x$enable_libxklavier = xyes; then
|
|
|
49 |
+ PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4 libxklavier >= 4.0])
|
|
|
50 |
+ AC_SUBST(LIBGNOMEKBD_CFLAGS)
|
|
|
51 |
+ AC_SUBST(LIBGNOMEKBD_LIBS)
|
|
|
52 |
+
|
|
|
53 |
+ AC_DEFINE([HAVE_GSWITCHIT], 1, [Defined when gswitchit is detected])
|
|
|
54 |
+fi
|
|
|
55 |
+AM_CONDITIONAL(HAVE_GSWITCHIT, [test $enable_gswitchit = yes])
|
|
|
56 |
|
|
|
57 |
dnl ---------------------------------------------------------------------------
|
|
|
58 |
dnl - Housekeeping plugin stuff
|
|
|
59 |
diff -ruN gnome-settings-daemon-2.29.6.orig/plugins/Makefile.am gnome-settings-daemon-2.29.6/plugins/Makefile.am
|
|
|
60 |
--- gnome-settings-daemon-2.29.6.orig/plugins/Makefile.am 2010-02-02 22:25:29.229272945 +0000
|
|
|
61 |
+++ gnome-settings-daemon-2.29.6/plugins/Makefile.am 2010-02-02 22:25:39.768885880 +0000
|
|
|
62 |
@@ -9,7 +9,6 @@
|
|
|
63 |
font \
|
|
|
64 |
housekeeping \
|
|
|
65 |
keybindings \
|
|
|
66 |
- keyboard \
|
|
|
67 |
media-keys \
|
|
|
68 |
mouse \
|
|
|
69 |
sound \
|
|
17793
|
70 |
diff -ruN gnome-settings-daemon-2.30.0.orig/plugins/keyboard/gsd-keyboard-manager.c gnome-settings-daemon-2.30.0/plugins/keyboard/gsd-keyboard-manager.c
|
|
|
71 |
--- gnome-settings-daemon-2.30.0.orig/plugins/keyboard/gsd-keyboard-manager.c 2010-04-03 22:37:07.453732740 +0100
|
|
|
72 |
+++ gnome-settings-daemon-2.30.0/plugins/keyboard/gsd-keyboard-manager.c 2010-04-03 22:39:28.378882891 +0100
|
|
|
73 |
@@ -397,9 +397,11 @@
|
|
|
74 |
|
|
|
75 |
gconf_client_add_dir (client, GSD_KEYBOARD_KEY, GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
|
|
|
76 |
|
|
|
77 |
+#ifdef HAVE_GSWITCHIT
|
|
|
78 |
/* Essential - xkb initialization should happen before */
|
|
|
79 |
gsd_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) gsd_load_modmap_files, NULL);
|
|
|
80 |
gsd_keyboard_xkb_init (client, manager);
|
|
|
81 |
+#endif
|
|
|
82 |
|
|
|
83 |
#ifdef HAVE_X11_EXTENSIONS_XKB_H
|
|
|
84 |
numlock_xkb_init (manager);
|