pool/gnome-settings-daemon
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=10

Browse Source
This commit is contained in:
OBS User unknown 2008-05-26 17:03:25 +00:00 committed by Git OBS Bridge
parent 9daf04c19a
commit 4a0e390f54
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnome-settings-daemon-bnc369263-broken-xkb-layout.patch Normal file
View File

@ -0,0 +1,29 @@
This is really only a workaround to unbreak things on startup. We need more
time to investigate what the real fix is, and we don't have enough time for
openSUSE 11.0.
Index: gnome-settings-daemon-2.22.1/plugins/keyboard/gsd-keyboard-manager.c
===================================================================
--- gnome-settings-daemon-2.22.1.orig/plugins/keyboard/gsd-keyboard-manager.c
+++ gnome-settings-daemon-2.22.1/plugins/keyboard/gsd-keyboard-manager.c
@@ -410,6 +410,7 @@ gsd_keyboard_manager_start (GsdKeyboardM
GError **error)
{
GConfClient *client;
+ char *program;
gnome_settings_profile_start (NULL);
@@ -430,6 +431,12 @@ gsd_keyboard_manager_start (GsdKeyboardM
apply_settings (client, 0, NULL, manager);
g_object_unref (client);
+ program = g_find_program_in_path ("setxkbmap");
+ if (program != NULL) {
+ g_spawn_command_line_async (program, NULL);
+ g_free (program);
+ }
+
gnome_settings_profile_end (NULL);
return TRUE;

8
gnome-settings-daemon.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon May 26 17:10:43 CEST 2008 - vuntz@suse.de
- Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to
unbreak corrupted keymaps on automatic login. This is only a
workaround for openSUSE 11.0, unfortunately, since nobody found
the right fix yet. Fix bnc#369263.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 6 12:59:34 CEST 2008 - rodrigo@suse.de Tue May 6 12:59:34 CEST 2008 - rodrigo@suse.de

10
gnome-settings-daemon.spec
View File

@ -17,13 +17,15 @@ BuildRequires: fdupes gnome-common gnome-desktop-devel gnome-patch-translation
License: GPL v2 or later License: GPL v2 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.22.1 Version: 2.22.1
Release: 13 Release: 19
Summary: Settings daemon for the GNOME desktop Summary: Settings daemon for the GNOME desktop
Source: %{_name}-%{version}.tar.bz2 Source: %{_name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.patch # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.patch
Patch2: %{name}-system-proxy-configuration.patch Patch2: %{name}-system-proxy-configuration.patch
# PATCH-FEATURE-UPSTREAM gnome-settings-daemon-1.2.diff -- Add support for RandR 1.2 to the daemon. federico@novell.com # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-1.2.diff -- Add support for RandR 1.2 to the daemon. federico@novell.com
Patch3: gnome-settings-daemon-randr-1.2.diff Patch3: gnome-settings-daemon-randr-1.2.diff
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bnc369263-broken-xkb-layout.patch bnc369263 bfo16105 vuntz@novell.com -- This is a hack to fix a major bug.
Patch4: gnome-settings-daemon-bnc369263-broken-xkb-layout.patch
Url: http://www.gnome.org Url: http://www.gnome.org
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -79,6 +81,7 @@ Authors:
#gnome-patch-translation-prepare #gnome-patch-translation-prepare
%patch2 %patch2
%patch3 -p1 %patch3 -p1
%patch4 -p1
#gnome-patch-translation-update #gnome-patch-translation-update
%build %build
@ -130,6 +133,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Mon May 26 2008 vuntz@suse.de
- Add gnome-settings-daemon-bnc369263-broken-xkb-layout.patch to
unbreak corrupted keymaps on automatic login. This is only a
workaround for openSUSE 11.0, unfortunately, since nobody found
the right fix yet. Fix bnc#369263.
* Tue May 06 2008 rodrigo@suse.de * Tue May 06 2008 rodrigo@suse.de
- Updated gnome-settings-daemon-system-proxy-configuration.patch - Updated gnome-settings-daemon-system-proxy-configuration.patch
to add a missing return in non-void function to add a missing return in non-void function