rpm/gnome-settings-daemon
SHA256
1
0
Fork 0
forked from pool/gnome-settings-daemon
Code Pull Requests Activity

Accepting request 29501 from home:MBoman:branches:GNOME:Factory

Browse Source 
Copy from home:MBoman:branches:GNOME:Factory/gnome-settings-daemon via accept of submit request 29501 revision 5.
Request was accepted with message:
thanks

OBS-URL: https://build.opensuse.org/request/show/29501
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=47
This commit is contained in:
Vincent Untz 2010-01-15 01:30:42 +00:00 committed by Git OBS Bridge
parent 11ec3b6844
commit 142e9de3db
11 changed files with 152 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-settings-daemon-2.28.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1267ef7d4069189b6bd05b915586b5b323688a136d394e571d29991d59bbadb2
size 1174173

3
gnome-settings-daemon-2.29.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b16d4e1d6f7119fa1c1b4dcbcf5344795b410bd0b82784c88155efe444ddac4b
size 1185307

46
gnome-settings-daemon-activate-xkb-with-broken.patch
View File

@ -1,46 +0,0 @@
Index: gnome-settings-daemon-2.27.3/plugins/keyboard/gsd-keyboard-xkb.c
===================================================================
--- gnome-settings-daemon-2.27.3.orig/plugins/keyboard/gsd-keyboard-xkb.c
+++ gnome-settings-daemon-2.27.3/plugins/keyboard/gsd-keyboard-xkb.c
@@ -257,6 +257,20 @@ apply_xkb_settings (void)
gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
NULL);
+ if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
+ if (filter_xkb_config ()) {
+ if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
+ g_warning ("Could not activate the filtered XKB configuration");
+ activation_error ();
+ }
+ } else {
+ g_warning ("Could not activate the XKB configuration");
+ activation_error ();
+ }
+ } else
+ xkl_debug (100,
+ "Actual KBD configuration was not changed: redundant notification\n");
+
if (gdm_layout != NULL) {
/* If there are multiple layouts,
* try to find the one closest to the gdm layout
@@ -275,20 +289,6 @@ apply_xkb_settings (void)
}
}
- if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
- if (filter_xkb_config ()) {
- if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
- g_warning ("Could not activate the filtered XKB configuration");
- activation_error ();
- }
- } else {
- g_warning ("Could not activate the XKB configuration");
- activation_error ();
- }
- } else
- xkl_debug (100,
- "Actual KBD configuration was not changed: redundant notification\n");
-
if (group_to_activate != -1)
xkl_engine_lock_group (current_config.engine,
group_to_activate);

22
gnome-settings-daemon-add-layout-switcher.patch
View File

@ -1,9 +1,9 @@
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index cb969e3..3a5ed6c 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -137,6 +137,103 @@ apply_desktop_settings (void)
gkbd_desktop_config_activate (&current_config);
Index: plugins/keyboard/gsd-keyboard-xkb.c
===================================================================
--- plugins/keyboard/gsd-keyboard-xkb.c.orig 2010-01-13 02:51:57.000000000 +1100
+++ plugins/keyboard/gsd-keyboard-xkb.c 2010-01-13 16:44:53.000000000 +1100
@@ -461,6 +461,103 @@ show_hide_icon ()
}
}
+#define GROUP_SWITCHERS_GROUP "grp"
@ -104,11 +104,11 @@ index cb969e3..3a5ed6c 100644
+}
+
static gboolean
try_activating_xkb_config_if_new (GkbdKeyboardConfig *current_sys_kbd_config)
{
@@ -274,6 +371,8 @@ apply_xkb_settings (void)
g_slist_foreach (free_layouts, (GFunc) g_free, NULL);
try_activating_xkb_config_if_new (GkbdKeyboardConfig *
current_sys_kbd_config)
@@ -621,6 +718,8 @@ apply_xkb_settings (void)
g_slist_foreach (free_layouts,
(GFunc) g_free, NULL);
g_slist_free (free_layouts);
+
+ _maybe_add_layout_switcher (layouts, conf_client);

56
gnome-settings-daemon-apport-monitor.patch
View File

@ -10,11 +10,11 @@
plugins/apport/gsd-apport-plugin.h | 57 ++++++
9 files changed, 503 insertions(+)
Index: gnome-settings-daemon-2.25.3/configure.ac
Index: configure.ac
===================================================================
--- gnome-settings-daemon-2.25.3.orig/configure.ac
+++ gnome-settings-daemon-2.25.3/configure.ac
@@ -394,6 +394,7 @@ Makefile
--- configure.ac.orig 2010-01-13 16:44:52.000000000 +1100
+++ configure.ac 2010-01-13 16:44:52.000000000 +1100
@@ -348,6 +348,7 @@ Makefile
gnome-settings-daemon/Makefile
plugins/Makefile
plugins/a11y-keyboard/Makefile
@ -22,10 +22,10 @@ Index: gnome-settings-daemon-2.25.3/configure.ac
plugins/background/Makefile
plugins/clipboard/Makefile
plugins/common/Makefile
Index: gnome-settings-daemon-2.25.3/data/gnome-settings-daemon.schemas.in
Index: data/gnome-settings-daemon.schemas.in
===================================================================
--- gnome-settings-daemon-2.25.3.orig/data/gnome-settings-daemon.schemas.in
+++ gnome-settings-daemon-2.25.3/data/gnome-settings-daemon.schemas.in
--- data/gnome-settings-daemon.schemas.in.orig 2010-01-13 16:44:52.000000000 +1100
+++ data/gnome-settings-daemon.schemas.in 2010-01-13 16:44:52.000000000 +1100
@@ -26,6 +26,29 @@
</schema>
@ -56,10 +56,10 @@ Index: gnome-settings-daemon-2.25.3/data/gnome-settings-daemon.schemas.in
<key>/schemas/apps/gnome_settings_daemon/plugins/background/active</key>
<applyto>/apps/gnome_settings_daemon/plugins/background/active</applyto>
<owner>gnome-settings-daemon</owner>
Index: gnome-settings-daemon-2.25.3/plugins/Makefile.am
Index: plugins/Makefile.am
===================================================================
--- gnome-settings-daemon-2.25.3.orig/plugins/Makefile.am
+++ gnome-settings-daemon-2.25.3/plugins/Makefile.am
--- plugins/Makefile.am.orig 2010-01-13 16:44:52.000000000 +1100
+++ plugins/Makefile.am 2010-01-13 16:44:52.000000000 +1100
@@ -3,6 +3,7 @@ NULL =
SUBDIRS = \
common \
@ -68,10 +68,10 @@ Index: gnome-settings-daemon-2.25.3/plugins/Makefile.am
background \
clipboard \
dummy \
Index: gnome-settings-daemon-2.25.3/plugins/apport/Makefile.am
Index: plugins/apport/Makefile.am
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.25.3/plugins/apport/Makefile.am
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/apport/Makefile.am 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,32 @@
+plugin_LTLIBRARIES = libapport.la
+
@ -105,10 +105,10 @@ Index: gnome-settings-daemon-2.25.3/plugins/apport/Makefile.am
+DISTCLEANFILES = (plugin_DATA)
+
+@GSD_INTLTOOL_PLUGIN_RULE@
Index: gnome-settings-daemon-2.25.3/plugins/apport/apport.gnome-settings-plugin.in
Index: plugins/apport/apport.gnome-settings-plugin.in
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.25.3/plugins/apport/apport.gnome-settings-plugin.in
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/apport/apport.gnome-settings-plugin.in 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,8 @@
+[GNOME Settings Plugin]
+Module=apport
@ -118,10 +118,10 @@ Index: gnome-settings-daemon-2.25.3/plugins/apport/apport.gnome-settings-plugin.
+Authors=Nikolay Derkach
+Copyright=Copyright © 2008 Nikolay Derkach
+Website=
Index: gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-manager.c
Index: plugins/apport/gsd-apport-manager.c
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-manager.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/apport/gsd-apport-manager.c 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2008 Nikolay Derkach <nderkach@gmail.com>
@ -343,10 +343,10 @@ Index: gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-manager.c
+
+ return GSD_APPORT_MANAGER (manager_object);
+}
Index: gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-manager.h
Index: plugins/apport/gsd-apport-manager.h
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-manager.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/apport/gsd-apport-manager.h 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,58 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -406,10 +406,10 @@ Index: gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-manager.h
+G_END_DECLS
+
+#endif /* __GSD_APPORT_MANAGER_H */
Index: gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-plugin.c
Index: plugins/apport/gsd-apport-plugin.c
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-plugin.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/apport/gsd-apport-plugin.c 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,104 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -515,10 +515,10 @@ Index: gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-plugin.c
+
+ g_type_class_add_private (klass, sizeof (GsdApportPluginPrivate));
+}
Index: gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-plugin.h
Index: plugins/apport/gsd-apport-plugin.h
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.25.3/plugins/apport/gsd-apport-plugin.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/apport/gsd-apport-plugin.h 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,57 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *

8
gnome-settings-daemon-bnc427745-force-dpi.patch
View File

@ -1,8 +1,8 @@
Index: gnome-settings-daemon-2.23.92/plugins/xsettings/gsd-xsettings-manager.c
Index: plugins/xsettings/gsd-xsettings-manager.c
===================================================================
--- gnome-settings-daemon-2.23.92.orig/plugins/xsettings/gsd-xsettings-manager.c
+++ gnome-settings-daemon-2.23.92/plugins/xsettings/gsd-xsettings-manager.c
@@ -280,6 +280,7 @@ get_dpi_from_gconf_or_x_server (GConfCli
--- plugins/xsettings/gsd-xsettings-manager.c.orig 2009-09-21 20:24:02.000000000 +1000
+++ plugins/xsettings/gsd-xsettings-manager.c 2010-01-13 16:44:52.000000000 +1100
@@ -281,6 +281,7 @@ get_dpi_from_gconf_or_x_server (GConfCli
gconf_value_free (value);
} else {
dpi = get_dpi_from_x_server ();

16
gnome-settings-daemon-bnc462640-mute-action.patch
View File

@ -1,7 +1,7 @@
Index: gnome-settings-daemon-2.27.91/data/apps_gnome_settings_daemon_keybindings.schemas.in
Index: data/apps_gnome_settings_daemon_keybindings.schemas.in
===================================================================
--- gnome-settings-daemon-2.27.91.orig/data/apps_gnome_settings_daemon_keybindings.schemas.in
+++ gnome-settings-daemon-2.27.91/data/apps_gnome_settings_daemon_keybindings.schemas.in
--- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig 2010-01-13 02:51:57.000000000 +1100
+++ data/apps_gnome_settings_daemon_keybindings.schemas.in 2010-01-13 16:44:53.000000000 +1100
@@ -14,6 +14,17 @@
</schema>
@ -20,11 +20,11 @@ Index: gnome-settings-daemon-2.27.91/data/apps_gnome_settings_daemon_keybindings
<key>/schemas/apps/gnome_settings_daemon/keybindings/volume_mute</key>
<applyto>/apps/gnome_settings_daemon/keybindings/volume_mute</applyto>
<type>string</type>
Index: gnome-settings-daemon-2.27.91/plugins/media-keys/gsd-media-keys-manager.c
Index: plugins/media-keys/gsd-media-keys-manager.c
===================================================================
--- gnome-settings-daemon-2.27.91.orig/plugins/media-keys/gsd-media-keys-manager.c
+++ gnome-settings-daemon-2.27.91/plugins/media-keys/gsd-media-keys-manager.c
@@ -632,8 +632,10 @@ do_sound_action (GsdMediaKeysManager *ma
--- plugins/media-keys/gsd-media-keys-manager.c.orig 2010-01-13 02:51:57.000000000 +1100
+++ plugins/media-keys/gsd-media-keys-manager.c 2010-01-13 16:44:53.000000000 +1100
@@ -636,8 +636,10 @@ do_sound_action (GsdMediaKeysManager *ma
int type)
{
gboolean muted;
@ -35,7 +35,7 @@ Index: gnome-settings-daemon-2.27.91/plugins/media-keys/gsd-media-keys-manager.c
if (manager->priv->stream == NULL)
return;
@@ -654,7 +656,23 @@ do_sound_action (GsdMediaKeysManager *ma
@@ -658,7 +660,23 @@ do_sound_action (GsdMediaKeysManager *ma
switch (type) {
case MUTE_KEY:
muted = !muted;

55
gnome-settings-daemon-gdm-layout-variant.patch
View File

@ -1,55 +0,0 @@
commit 3d5189d3984980ec97d794f7bde6159bc97e1379
Author: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon Oct 19 18:59:07 2009 +0200
fix variant handling in $GDM_KEYBOARD_LAYOUT
gdm's configuration and $GDM_KEYBOARD_LAYOUT separates layout and
variant with a space, but GConf uses tabs. Convert spaces to tabs in
$GDM_KEYBOARD_LAYOUT to work with either format, for more robustness.
https://bugzilla.gnome.org/show_bug.cgi?id=596897
Index: gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c
===================================================================
--- gnome-settings-daemon-2.28.1.orig/plugins/keyboard/gsd-keyboard-xkb.c
+++ gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c
@@ -314,7 +314,8 @@ apply_xkb_settings (void)
GConfClient *conf_client;
GkbdKeyboardConfig current_sys_kbd_config;
int group_to_activate = -1;
- const char *gdm_layout;
+ char *gdm_layout;
+ char *s;
if (!inited_ok)
return;
@@ -326,8 +327,18 @@ apply_xkb_settings (void)
* We clear gdm_keyboard_layout early, so we don't risk
* recursion from gconf notification.
*/
- gdm_layout = gdm_keyboard_layout;
+ gdm_layout = g_strdup (gdm_keyboard_layout);
gdm_keyboard_layout = NULL;
+
+ /* gdm's configuration and $GDM_KEYBOARD_LAYOUT separates layout and
+ * variant with a space, but gconf uses tabs; so convert to be robust
+ * with both */
+ for (s = gdm_layout; s && *s; ++s) {
+ if (*s == ' ') {
+ *s = '\t';
+ }
+ }
+
if (gdm_layout != NULL) {
GSList *layouts;
GSList *found_node;
@@ -383,6 +394,8 @@ apply_xkb_settings (void)
gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
NULL);
+ g_free (gdm_layout);
+
if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
if (filter_xkb_config ()) {
if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {

76
gnome-settings-daemon-system-proxy-configuration.diff
View File

@ -22,10 +22,10 @@ GNOME's GConf keys.
create mode 100644 plugins/proxy/novell-sysconfig-proxy-helper
create mode 100644 plugins/proxy/proxy.gnome-settings-plugin.in
Index: gnome-settings-daemon-2.27.4/plugins/proxy/Makefile.am
Index: plugins/proxy/Makefile.am
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.27.4/plugins/proxy/Makefile.am
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/proxy/Makefile.am 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,57 @@
+NULL =
+
@ -84,10 +84,10 @@ Index: gnome-settings-daemon-2.27.4/plugins/proxy/Makefile.am
+ $(NULL)
+
+@GSD_INTLTOOL_PLUGIN_RULE@
Index: gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-manager.c
Index: plugins/proxy/gsd-proxy-manager.c
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-manager.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/proxy/gsd-proxy-manager.c 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,731 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -820,10 +820,10 @@ Index: gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-manager.c
+
+ return GSD_PROXY_MANAGER (manager_object);
+}
Index: gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-manager.h
Index: plugins/proxy/gsd-proxy-manager.h
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-manager.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/proxy/gsd-proxy-manager.h 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,57 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -882,10 +882,10 @@ Index: gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-manager.h
+G_END_DECLS
+
+#endif /* __GSD_PROXY_MANAGER_H */
Index: gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-plugin.c
Index: plugins/proxy/gsd-proxy-plugin.c
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-plugin.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/proxy/gsd-proxy-plugin.c 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,103 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -990,10 +990,10 @@ Index: gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-plugin.c
+
+ g_type_class_add_private (klass, sizeof (GsdProxyPluginPrivate));
+}
Index: gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-plugin.h
Index: plugins/proxy/gsd-proxy-plugin.h
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-plugin.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/proxy/gsd-proxy-plugin.h 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -1054,10 +1054,10 @@ Index: gnome-settings-daemon-2.27.4/plugins/proxy/gsd-proxy-plugin.h
+G_END_DECLS
+
+#endif /* __GSD_PROXY_PLUGIN_H__ */
Index: gnome-settings-daemon-2.27.4/plugins/proxy/novell-sysconfig-proxy-helper
Index: plugins/proxy/novell-sysconfig-proxy-helper
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.27.4/plugins/proxy/novell-sysconfig-proxy-helper
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/proxy/novell-sysconfig-proxy-helper 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,19 @@
+#!/bin/sh
+
@ -1078,10 +1078,10 @@ Index: gnome-settings-daemon-2.27.4/plugins/proxy/novell-sysconfig-proxy-helper
+echo "FTP_PROXY $FTP_PROXY"
+echo "GOPHER_PROXY $GOPHER_PROXY"
+echo "NO_PROXY $NO_PROXY"
Index: gnome-settings-daemon-2.27.4/plugins/proxy/proxy.gnome-settings-plugin.in
Index: plugins/proxy/proxy.gnome-settings-plugin.in
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.27.4/plugins/proxy/proxy.gnome-settings-plugin.in
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plugins/proxy/proxy.gnome-settings-plugin.in 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,8 @@
+[GNOME Settings Plugin]
+Module=proxy
@ -1091,10 +1091,10 @@ Index: gnome-settings-daemon-2.27.4/plugins/proxy/proxy.gnome-settings-plugin.in
+Authors=Rodrigo Moya <rodrigo@gnome-db.org>
+Copyright=
+Website=
Index: gnome-settings-daemon-2.27.4/data/system_proxy.schemas.in
Index: data/system_proxy.schemas.in
===================================================================
--- /dev/null
+++ gnome-settings-daemon-2.27.4/data/system_proxy.schemas.in
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ data/system_proxy.schemas.in 2010-01-13 16:44:52.000000000 +1100
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<gconfschemafile>
@ -1122,10 +1122,10 @@ Index: gnome-settings-daemon-2.27.4/data/system_proxy.schemas.in
+ </schema>
+ </schemalist>
+</gconfschemafile>
Index: gnome-settings-daemon-2.27.4/plugins/Makefile.am
Index: plugins/Makefile.am
===================================================================
--- gnome-settings-daemon-2.27.4.orig/plugins/Makefile.am
+++ gnome-settings-daemon-2.27.4/plugins/Makefile.am
--- plugins/Makefile.am.orig 2009-06-16 20:17:13.000000000 +1000
+++ plugins/Makefile.am 2010-01-13 16:44:52.000000000 +1100
@@ -12,6 +12,7 @@ SUBDIRS = \
keyboard \
media-keys \
@ -1134,11 +1134,11 @@ Index: gnome-settings-daemon-2.27.4/plugins/Makefile.am
sound \
typing-break \
xrandr \
Index: gnome-settings-daemon-2.27.4/configure.ac
Index: configure.ac
===================================================================
--- gnome-settings-daemon-2.27.4.orig/configure.ac
+++ gnome-settings-daemon-2.27.4/configure.ac
@@ -357,6 +357,7 @@ plugins/keyboard/Makefile
--- configure.ac.orig 2010-01-13 02:52:55.000000000 +1100
+++ configure.ac 2010-01-13 16:44:52.000000000 +1100
@@ -359,6 +359,7 @@ plugins/keyboard/Makefile
plugins/media-keys/Makefile
plugins/media-keys/cut-n-paste/Makefile
plugins/mouse/Makefile
@ -1146,11 +1146,11 @@ Index: gnome-settings-daemon-2.27.4/configure.ac
plugins/sound/Makefile
plugins/typing-break/Makefile
plugins/xrandr/Makefile
Index: gnome-settings-daemon-2.27.4/data/Makefile.am
Index: data/Makefile.am
===================================================================
--- gnome-settings-daemon-2.27.4.orig/data/Makefile.am
+++ gnome-settings-daemon-2.27.4/data/Makefile.am
@@ -10,6 +10,7 @@ schemas_in_files = \
--- data/Makefile.am.orig 2009-07-28 07:37:28.000000000 +1000
+++ data/Makefile.am 2010-01-13 16:44:52.000000000 +1100
@@ -11,6 +11,7 @@ schemas_in_files = \
desktop_gnome_keybindings.schemas.in \
apps_gnome_settings_daemon_xrandr.schemas.in \
desktop_gnome_peripherals_touchpad.schemas.in \
@ -1158,10 +1158,10 @@ Index: gnome-settings-daemon-2.27.4/data/Makefile.am
$(NULL)
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
Index: gnome-settings-daemon-2.27.4/data/gnome-settings-daemon.schemas.in
Index: data/gnome-settings-daemon.schemas.in
===================================================================
--- gnome-settings-daemon-2.27.4.orig/data/gnome-settings-daemon.schemas.in
+++ gnome-settings-daemon-2.27.4/data/gnome-settings-daemon.schemas.in
--- data/gnome-settings-daemon.schemas.in.orig 2009-06-16 20:17:13.000000000 +1000
+++ data/gnome-settings-daemon.schemas.in 2010-01-13 16:44:52.000000000 +1100
@@ -210,6 +210,30 @@
</schema>

53
gnome-settings-daemon.changes
View File

@ -1,3 +1,56 @@
-------------------------------------------------------------------
Wed Jan 13 06:22:25 CET 2010 - captain.magnus@opensuse.org
- Update to version 2.29.5:
+ Fix variant handling in $GDM_KEYBOARD_LAYOUT (bgo#596897)
+ Tighten check for XInput
+ Fix bluriness in level bar, and popup (bgo#567249)
+ Remove unused variable (bgo#599904)
+ Honour libexecdir when spawning gsd-locate-pointer
(bgo#599209)
+ Allow left-handed setting for touchpads
+ Use a rounded instead of curved rectangle
+ Improve the media keys overlay design (bgo#596136)
+ Add brightness to the media-keys popup (bgo#599677)
+ Fix for GSEAL goal (bgo#599861)
+ Avoid volumes going over 100% (bgo#600770)
+ Make OSD display more generic (bgo#600951)
+ Support loading -rtl and -ltr variants of icons (bgo#600984)
+ Relicense gsd-media-keys-window.[ch] to LGPL (bgo#600986)
+ Hide the status icon before unreffing it (bgo#601696)
+ Make eject behave better on OpenBSD (bgo#598573)
+ Export libexecdir in .pc file (bgo#596388)
+ Run gnome-color-manager apply program when the outputs change
+ Factor out function to get keycodes from keysym names
+ Handle the XF86RotateWindows hotkey by rotating a laptop's
display
+ Respond to monitor configuration changes when in charge
(bgo#601203)
+ Filter invalid layouts before looking for the index of one
passed by gdm (bgo#585868)
+ Add linsysfs to list of virtual filesystems (bgo#604396)
+ Remove sleep keybindings (bgo#170175)
+ Start an on-screen-display window (OSD)
+ Split the composited and non-composited code for the
expose-event handler
+ Use a hand-drawn frame instead of a GtkBuilder frame
+ Using GkbdStatus for the automatic notification icon
+ Implement popup menu for the notification icon
+ Add extra API required by GsdMediaKeysWindow
+ Add timed exit option
+ Fixes for new libxklavier
+ Translation updates
- Remove gnome-settings-daemon-activate-xkb-with-broken.patch.
Fixed upstream
- Remove gnome-settings-daemon-gdm-layout-variant.patch. Fixed
upstream
- Update the following patches to apply with fuzz=0:
gnome-settings-daemon-add-layout-switcher.patch,
gnome-settings-daemon-apport-monitor.patch,
gnome-settings-daemon-bnc427745-force-dpi.patch,
gnome-settings-daemon-bnc462640-mute-action.patch,
gnome-settings-daemon-system-proxy-configuration.diff
-------------------------------------------------------------------
Wed Dec 2 16:44:02 CET 2009 - vuntz@opensuse.org

20
gnome-settings-daemon.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-settings-daemon (Version 2.28.1)
# spec file for package gnome-settings-daemon (Version 2.29.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,7 +19,7 @@
Name: gnome-settings-daemon
%define _name gnome-settings-daemon
Version: 2.28.1
Version: 2.29.5
Release: 1
License: GPLv2+
Summary: Settings daemon for the GNOME desktop
@ -36,12 +36,8 @@ Patch8: gnome-settings-daemon-apport-monitor.patch
Patch10: gnome-settings-daemon-bnc462640-mute-action.patch
# PATCH-NEEDS-REBASE gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff bnc461755 federico@novell.com - Add the option of rotating a Wacom tablet when rotating the monitor with RANDR (was PATCH-FEATURE-OPENSUSE)
Patch11: gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff
# PATCH-FIX-UPSTREAM gnome-settings-daemon-activate-xkb-with-broken.patch bgo585868 vuntz@novell.com -- Make sure we activate the right layout when broken layouts are in gconf
Patch12: gnome-settings-daemon-activate-xkb-with-broken.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-add-layout-switcher.patch bgo603806 vuntz@opensuse.org -- Add a layout switching combo if needed; the real fix implies some API change in libgnomekbd (see upstream bug)
Patch13: gnome-settings-daemon-add-layout-switcher.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-gdm-layout-variant.patch vuntz@opensuse.org -- Taken from git
Patch14: gnome-settings-daemon-gdm-layout-variant.patch
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-desktop-devel
@ -92,15 +88,13 @@ contact the settings daemon via its DBus interface.
%prep
%setup -q -n %{_name}-%{version}
gnome-patch-translation-prepare
%patch2 -p1
%patch6 -p1
%patch8 -p1
%patch10 -p1
%patch2 -p0
%patch6 -p0
%patch8 -p0
%patch10 -p0
# PATCH-NEEDS-REBASE
#%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch13 -p0
gnome-patch-translation-update
%build