rpms/gnome-settings-daemon/devel fix-gdm-layout.patch, 1.2, 1.3 gnome-settings-daemon.spec, 1.64, 1.65 fix-gdm-layout-even-more.patch, 1.1, NONE gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch, 1.2, NONE keyboard-layout-variants.patch, 1.1, NONE
Matthias Clasen
mclasen at fedoraproject.org
Tue Oct 14 13:31:32 UTC 2008
- Previous message (by thread): rpms/texlive/F-9 texlive-lacheck.patch, NONE, 1.1 dvipsk-jpatch-pdvips.patch, 1.1, 1.2 texlive-2007-badscript.patch, 1.1, 1.2 texlive-2007-makej.patch, 1.1, 1.2 texlive-2007-tmpcleanup.patch, 1.1, 1.2 texlive-dviljktemp.patch, 1.1, 1.2 texlive-man-notetex.patch, 1.2, 1.3 texlive-source-t1lib.patch, 1.1, 1.2 texlive-texdoc.patch, 1.2, 1.3 texlive.spec, 1.39, 1.40
- Next message (by thread): rpms/mirrormanager/EL-5 .cvsignore, 1.3, 1.4 mirrormanager.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1005
Modified Files:
fix-gdm-layout.patch gnome-settings-daemon.spec
Removed Files:
fix-gdm-layout-even-more.patch
gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
keyboard-layout-variants.patch
Log Message:
drop a no longer needed patch
fix-gdm-layout.patch:
Index: fix-gdm-layout.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/fix-gdm-layout.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fix-gdm-layout.patch 12 Oct 2008 19:29:45 -0000 1.2
+++ fix-gdm-layout.patch 14 Oct 2008 13:31:31 -0000 1.3
@@ -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
---- 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 2008-10-12 15:11:51.000000000 -0400
-@@ -142,12 +142,38 @@ apply_xkb_settings (void)
+--- 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-14 09:27:09.000000000 -0400
+@@ -142,12 +142,39 @@ apply_xkb_settings (void)
{
GConfClient *conf_client;
GkbdKeyboardConfig current_sys_kbd_config;
+ int group_to_activate = -1;
-+ const char *gdm_layout;
++ const char *gdm_layout;
if (!inited_ok)
return;
@@ -22,10 +22,9 @@
+ gdm_keyboard_layout = NULL;
+ if (gdm_layout != NULL) {
+ GSList *layouts;
-+
+ layouts = gconf_client_get_list (conf_client,
+ GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
-+ GCONF_VALUE_STRING,
++ GCONF_VALUE_STRING,
+ NULL);
+ if (layouts == NULL) {
+ layouts = g_slist_append (layouts, g_strdup (gdm_layout));
@@ -35,12 +34,14 @@
+ layouts,
+ NULL);
+ }
++ g_slist_foreach (layouts, (GFunc)g_free, NULL);
++ g_slist_free (layouts);
+ }
+
gkbd_keyboard_config_init (¤t_sys_kbd_config,
conf_client,
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 (¤t_sys_kbd_config,
NULL);
@@ -74,7 +75,7 @@
+ size_t len = strlen (gdm_layout);
+ for (i = 0, l = current_kbd_config.layouts_variants; l; i++, l = l->next) {
+ 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;
+ break;
+ }
@@ -82,8 +83,8 @@
- gdm_keyboard_layout = NULL;
}
- /* Ignore model if using evdev, since evdev needs its own model
-@@ -206,6 +223,8 @@ apply_xkb_settings (void)
+ /* Activate - only if different! */
+@@ -199,6 +217,8 @@ apply_xkb_settings (void)
xkl_debug (100,
"Actual KBD configuration was not changed: redundant notification\n");
Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnome-settings-daemon.spec 12 Oct 2008 19:29:45 -0000 1.64
+++ gnome-settings-daemon.spec 14 Oct 2008 13:31:31 -0000 1.65
@@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.24.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@@ -31,7 +31,6 @@
BuildRequires: perl(XML::Parser)
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
Patch7: gnome-settings-daemon-2.23.91-fnf7-cycle.patch
@@ -59,7 +58,6 @@
%prep
%setup -q
-%patch2 -p1 -b .ignore-layout-if-using-evdev
%patch6 -p1 -b .drop-sample-cache
%patch7 -p1 -b .fnf7-cycle
%patch8 -p1 -b .fade
@@ -163,6 +161,10 @@
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
+* Tue Oct 14 2008 Matthias Clasen <mclasen at 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 at redhat.com> - 2.24.0-7
- Try harder not to override peoples configured keyboard layouts
--- fix-gdm-layout-even-more.patch DELETED ---
--- gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch DELETED ---
--- keyboard-layout-variants.patch DELETED ---
- Previous message (by thread): rpms/texlive/F-9 texlive-lacheck.patch, NONE, 1.1 dvipsk-jpatch-pdvips.patch, 1.1, 1.2 texlive-2007-badscript.patch, 1.1, 1.2 texlive-2007-makej.patch, 1.1, 1.2 texlive-2007-tmpcleanup.patch, 1.1, 1.2 texlive-dviljktemp.patch, 1.1, 1.2 texlive-man-notetex.patch, 1.2, 1.3 texlive-source-t1lib.patch, 1.1, 1.2 texlive-texdoc.patch, 1.2, 1.3 texlive.spec, 1.39, 1.40
- Next message (by thread): rpms/mirrormanager/EL-5 .cvsignore, 1.3, 1.4 mirrormanager.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list