rpms/gnome-settings-daemon
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drop a no longer needed patch

Browse Source
This commit is contained in:
Matthias Clasen 2008-10-14 13:31:31 +00:00
parent ef224b3e46
commit 058960744a
5 changed files with 16 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fix-gdm-layout-even-more.patch
View File

@ -1,33 +0,0 @@
diff -up gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gdm-layout-even-more gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gdm-layout-even-more 2008-10-10 21:52:55.000000000 -0400
+++ gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c 2008-10-10 22:25:28.000000000 -0400
@@ -162,14 +162,27 @@ apply_xkb_settings (void)
/* With GDM the user can already set a layout from the login
* screen. Try to keep that setting */
if (gdm_keyboard_layout != NULL) {
+ /* if there is just a single layout,
+ * just override it (it is probably the X server default)
+ */
+ if (current_kbd_config.layouts_variants &&
+ current_kbd_config.layouts_variants->next == NULL) {
+ g_free (current_kbd_config.layouts_variants->data);
+ g_slist_free (current_kbd_config.layouts_variants);
+ current_kbd_config.layouts_variants = NULL;
+ }
if (current_kbd_config.layouts_variants == NULL) {
- current_kbd_config.layouts_variants = g_slist_append (NULL, (char *) gdm_keyboard_layout);
+ current_kbd_config.layouts_variants = g_slist_append (NULL, g_strdup (gdm_keyboard_layout));
gconf_client_set_list (conf_client,
GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
GCONF_VALUE_STRING,
current_kbd_config.layouts_variants,
NULL);
- } else {
+ }
+ else {
+ /* if there are multiple layouts,
+ * try to find the one closest to the gdm layout
+ */
GSList *l;
int i;
size_t len = strlen (gdm_keyboard_layout);

21
fix-gdm-layout.patch
View File

@ -1,12 +1,12 @@
diff -up gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gdm-layout gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c diff -up gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gdm-layout gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gdm-layout 2008-10-12 14:45:57.000000000 -0400 --- gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gdm-layout 2008-10-14 09:26:57.000000000 -0400
+++ gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c 2008-10-12 15:11:51.000000000 -0400 +++ gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c 2008-10-14 09:27:09.000000000 -0400
@@ -142,12 +142,38 @@ apply_xkb_settings (void) @@ -142,12 +142,39 @@ apply_xkb_settings (void)
{ {
GConfClient *conf_client; GConfClient *conf_client;
GkbdKeyboardConfig current_sys_kbd_config; GkbdKeyboardConfig current_sys_kbd_config;
+ int group_to_activate = -1; + int group_to_activate = -1;
+ const char *gdm_layout; + const char *gdm_layout;
if (!inited_ok) if (!inited_ok)
return; return;
@ -22,10 +22,9 @@ diff -up gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gd
+ gdm_keyboard_layout = NULL; + gdm_keyboard_layout = NULL;
+ if (gdm_layout != NULL) { + if (gdm_layout != NULL) {
+ GSList *layouts; + GSList *layouts;
+
+ layouts = gconf_client_get_list (conf_client, + layouts = gconf_client_get_list (conf_client,
+ GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS, + GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
+ GCONF_VALUE_STRING, + GCONF_VALUE_STRING,
+ NULL); + NULL);
+ if (layouts == NULL) { + if (layouts == NULL) {
+ layouts = g_slist_append (layouts, g_strdup (gdm_layout)); + layouts = g_slist_append (layouts, g_strdup (gdm_layout));
@ -35,12 +34,14 @@ diff -up gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gd
+ layouts, + layouts,
+ NULL); + NULL);
+ } + }
+ g_slist_foreach (layouts, (GFunc)g_free, NULL);
+ g_slist_free (layouts);
+ } + }
+ +
gkbd_keyboard_config_init (&current_sys_kbd_config, gkbd_keyboard_config_init (&current_sys_kbd_config,
conf_client, conf_client,
xkl_engine); xkl_engine);
@@ -158,29 +184,20 @@ apply_xkb_settings (void) @@ -158,29 +185,20 @@ apply_xkb_settings (void)
gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config, gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
NULL); NULL);
@ -74,7 +75,7 @@ diff -up gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gd
+ size_t len = strlen (gdm_layout); + size_t len = strlen (gdm_layout);
+ for (i = 0, l = current_kbd_config.layouts_variants; l; i++, l = l->next) { + for (i = 0, l = current_kbd_config.layouts_variants; l; i++, l = l->next) {
+ char *lv = l->data; + char *lv = l->data;
+ if (strncmp (lv, gdm_layout, len) == 0 && (lv[len] == '\0' || lv[len] == '\t')) { ++ if (strncmp (lv, gdm_layout, len) == 0 && (lv[len] == '\0' || lv[len] == '\t')) {
+ group_to_activate = i; + group_to_activate = i;
+ break; + break;
+ } + }
@ -82,8 +83,8 @@ diff -up gnome-settings-daemon-2.24.0/plugins/keyboard/gsd-keyboard-xkb.c.fix-gd
- gdm_keyboard_layout = NULL; - gdm_keyboard_layout = NULL;
} }
/* Ignore model if using evdev, since evdev needs its own model /* Activate - only if different! */
@@ -206,6 +223,8 @@ apply_xkb_settings (void) @@ -199,6 +217,8 @@ apply_xkb_settings (void)
xkl_debug (100, xkl_debug (100,
"Actual KBD configuration was not changed: redundant notification\n"); "Actual KBD configuration was not changed: redundant notification\n");

16
gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
View File

@ -1,16 +0,0 @@
--- gnome-settings-daemon-2.23.2/plugins/keyboard/gsd-keyboard-xkb.c.ignore-layout-if-using-evdev 2008-05-14 00:42:44.000000000 -0400
+++ gnome-settings-daemon-2.23.2/plugins/keyboard/gsd-keyboard-xkb.c 2008-05-14 19:25:17.000000000 -0400
@@ -181,6 +181,13 @@ apply_xkb_settings (void)
gdm_keyboard_layout = NULL;
}
+ /* Ignore model if using evdev, since evdev needs its own model
+ */
+ if (strcmp (initial_sys_kbd_config.model, "evdev") == 0) {
+ g_free (current_kbd_config.model);
+ current_kbd_config.model = g_strdup ("evdev");
+ }
+
/* Activate - only if different! */
if (!gkbd_keyboard_config_equals
(&current_kbd_config, &current_sys_kbd_config)) {

8
gnome-settings-daemon.spec
View File

@ -1,6 +1,6 @@
Name: gnome-settings-daemon Name: gnome-settings-daemon
Version: 2.24.0 Version: 2.24.0
Release: 7%{?dist} Release: 8%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons Group: System Environment/Daemons
@ -31,7 +31,6 @@ BuildRequires: gettext
BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::Parser)
BuildRequires: autoconf, automake, libtool, intltool BuildRequires: autoconf, automake, libtool, intltool
Patch2: gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
Patch6: gnome-settings-daemon-2.23.4-drop-sample-cache.patch Patch6: gnome-settings-daemon-2.23.4-drop-sample-cache.patch
Patch7: gnome-settings-daemon-2.23.91-fnf7-cycle.patch Patch7: gnome-settings-daemon-2.23.91-fnf7-cycle.patch
@ -59,7 +58,6 @@ developing applications that use %{name}.
%prep %prep
%setup -q %setup -q
%patch2 -p1 -b .ignore-layout-if-using-evdev
%patch6 -p1 -b .drop-sample-cache %patch6 -p1 -b .drop-sample-cache
%patch7 -p1 -b .fnf7-cycle %patch7 -p1 -b .fnf7-cycle
%patch8 -p1 -b .fade %patch8 -p1 -b .fade
@ -163,6 +161,10 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc %{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog %changelog
* Tue Oct 14 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-8
- Drop a patch that is no longer needed with the evdev ruleset
in xkeyboard-config
* Sun Oct 12 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-7 * Sun Oct 12 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-7
- Try harder not to override peoples configured keyboard layouts - Try harder not to override peoples configured keyboard layouts

13
keyboard-layout-variants.patch
View File

@ -1,13 +0,0 @@
--- gnome-settings-daemon-2.23.91/plugins/keyboard/gsd-keyboard-xkb.c 2008-09-05 18:49:58.000000000 -0400
+++ hacked/plugins/keyboard/gsd-keyboard-xkb.c 2008-09-05 18:48:11.000000000 -0400
@@ -172,7 +172,9 @@
GSList *l;
int i;
for (i = 0, l = current_kbd_config.layouts_variants; l; i++, l = l->next) {
- if (strcmp (gdm_keyboard_layout, l->data) == 0) {
+ char *lv = l->data;
+ size_t len = strlen (gdm_keyboard_layout);
+ if (strncmp (lv, gdm_keyboard_layout, len) == 0 && (lv[len] == '\0' || lv[len] == '\t')) {
xkl_engine_lock_group (current_config.engine, i);
break;
}