From f80658e2f51ee2d0958b6c088a04d4b4846fa382 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 05 2015 13:24:56 +0000 Subject: import gnome-settings-daemon-3.8.6.1-12.el7 --- diff --git a/SOURCES/0001-media-keys-Add-XF86AudioMicMute-as-a-mic-mute-key.patch b/SOURCES/0001-media-keys-Add-XF86AudioMicMute-as-a-mic-mute-key.patch new file mode 100644 index 0000000..becdac6 --- /dev/null +++ b/SOURCES/0001-media-keys-Add-XF86AudioMicMute-as-a-mic-mute-key.patch @@ -0,0 +1,26 @@ +From 3a8beaaf380a483ce33363031d8d276c371d7af1 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 21 May 2013 09:06:08 +0200 +Subject: [PATCH] media-keys: Add XF86AudioMicMute as a mic mute key + +As recently added in: +https://bugs.freedesktop.org/show_bug.cgi?id=54171 +--- + plugins/media-keys/shortcuts-list.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h +index 69da940..813eae0 100644 +--- a/plugins/media-keys/shortcuts-list.h ++++ b/plugins/media-keys/shortcuts-list.h +@@ -104,6 +104,7 @@ static struct { + { VOLUME_DOWN_KEY, "volume-down", NULL, NULL, SHELL_KEYBINDING_MODE_ALL }, + { VOLUME_UP_KEY, "volume-up", NULL, NULL, SHELL_KEYBINDING_MODE_ALL }, + { MIC_MUTE_KEY, NULL, N_("Microphone Mute"), "F20", SHELL_KEYBINDING_MODE_ALL }, ++ { MIC_MUTE_KEY, NULL, N_("Microphone Mute"), "XF86AudioMicMute", SHELL_KEYBINDING_MODE_ALL }, + { MUTE_QUIET_KEY, NULL, N_("Quiet Volume Mute"), "XF86AudioMute", SHELL_KEYBINDING_MODE_ALL }, + { VOLUME_DOWN_QUIET_KEY, NULL, N_("Quiet Volume Down"), "XF86AudioLowerVolume", SHELL_KEYBINDING_MODE_ALL }, + { VOLUME_UP_QUIET_KEY, NULL, N_("Quiet Volume Up"), "XF86AudioRaiseVolume", SHELL_KEYBINDING_MODE_ALL }, +-- +2.1.0 + diff --git a/SOURCES/0001-remote-display-Stop-watching-the-D-Bus-name-on-stop.patch b/SOURCES/0001-remote-display-Stop-watching-the-D-Bus-name-on-stop.patch new file mode 100644 index 0000000..9c81e1f --- /dev/null +++ b/SOURCES/0001-remote-display-Stop-watching-the-D-Bus-name-on-stop.patch @@ -0,0 +1,31 @@ +From ede9c19215951d6161a8d5a018149be6637662b6 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 25 Sep 2014 12:11:43 +0200 +Subject: [PATCH 1/3] remote-display: Stop watching the D-Bus name on stop + +So that we don't get called out when the plugin is stopped. + +https://bugzilla.redhat.com/show_bug.cgi?id=1145144 +--- + plugins/remote-display/gsd-remote-display-manager.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/plugins/remote-display/gsd-remote-display-manager.c b/plugins/remote-display/gsd-remote-display-manager.c +index 031c5d1..b58b467 100644 +--- a/plugins/remote-display/gsd-remote-display-manager.c ++++ b/plugins/remote-display/gsd-remote-display-manager.c +@@ -206,6 +206,11 @@ gsd_remote_display_manager_stop (GsdRemoteDisplayManager *manager) + { + g_debug ("Stopping remote_display manager"); + ++ if (manager->priv->vino_watch_id > 0) { ++ g_bus_unwatch_name (manager->priv->vino_watch_id); ++ manager->priv->vino_watch_id = 0; ++ } ++ + if (manager->priv->cancellable != NULL) { + g_cancellable_cancel (manager->priv->cancellable); + g_clear_object (&manager->priv->cancellable); +-- +2.1.0 + diff --git a/SOURCES/0002-remote-display-Stop-plugin-when-exiting.patch b/SOURCES/0002-remote-display-Stop-plugin-when-exiting.patch new file mode 100644 index 0000000..94bac46 --- /dev/null +++ b/SOURCES/0002-remote-display-Stop-plugin-when-exiting.patch @@ -0,0 +1,49 @@ +From 9765a98a1063ef9bfc0a7cfee566e534384c601c Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 25 Sep 2014 12:12:47 +0200 +Subject: [PATCH 2/3] remote-display: Stop plugin when exiting + +Make sure that the plugin is stopped when it's disposed of. + +https://bugzilla.redhat.com/show_bug.cgi?id=1145144 +--- + plugins/remote-display/gsd-remote-display-manager.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/plugins/remote-display/gsd-remote-display-manager.c b/plugins/remote-display/gsd-remote-display-manager.c +index b58b467..104678b 100644 +--- a/plugins/remote-display/gsd-remote-display-manager.c ++++ b/plugins/remote-display/gsd-remote-display-manager.c +@@ -224,8 +224,29 @@ gsd_remote_display_manager_stop (GsdRemoteDisplayManager *manager) + } + + static void ++gsd_remote_display_manager_finalize (GObject *object) ++{ ++ GsdRemoteDisplayManager *manager; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (GSD_IS_REMOTE_DISPLAY_MANAGER (object)); ++ ++ manager = GSD_REMOTE_DISPLAY_MANAGER (object); ++ ++ g_return_if_fail (manager->priv != NULL); ++ ++ gsd_remote_display_manager_stop (manager); ++ ++ G_OBJECT_CLASS (gsd_remote_display_manager_parent_class)->finalize (object); ++} ++ ++static void + gsd_remote_display_manager_class_init (GsdRemoteDisplayManagerClass *klass) + { ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ ++ object_class->finalize = gsd_remote_display_manager_finalize; ++ + g_type_class_add_private (klass, sizeof (GsdRemoteDisplayManagerPrivate)); + } + +-- +2.1.0 + diff --git a/SOURCES/0003-remote-display-Initialise-cancellable.patch b/SOURCES/0003-remote-display-Initialise-cancellable.patch new file mode 100644 index 0000000..55416f3 --- /dev/null +++ b/SOURCES/0003-remote-display-Initialise-cancellable.patch @@ -0,0 +1,27 @@ +From 272fae4221bc375fefb43810179aaff85b45b3ac Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 25 Sep 2014 12:14:42 +0200 +Subject: [PATCH 3/3] remote-display: Initialise ->cancellable + +At least once, right? + +https://bugzilla.redhat.com/show_bug.cgi?id=1145144 +--- + plugins/remote-display/gsd-remote-display-manager.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/remote-display/gsd-remote-display-manager.c b/plugins/remote-display/gsd-remote-display-manager.c +index 104678b..9b58220 100644 +--- a/plugins/remote-display/gsd-remote-display-manager.c ++++ b/plugins/remote-display/gsd-remote-display-manager.c +@@ -167,6 +167,7 @@ gsd_remote_display_manager_start (GsdRemoteDisplayManager *manager, + gnome_settings_profile_start (NULL); + + manager->priv->desktop_settings = g_settings_new ("org.gnome.desktop.interface"); ++ manager->priv->cancellable = g_cancellable_new (); + + /* Check if spice is used: + * https://bugzilla.gnome.org/show_bug.cgi?id=680195#c7 +-- +2.1.0 + diff --git a/SPECS/gnome-settings-daemon.spec b/SPECS/gnome-settings-daemon.spec index 7d045d1..df0d890 100644 --- a/SPECS/gnome-settings-daemon.spec +++ b/SPECS/gnome-settings-daemon.spec @@ -1,6 +1,6 @@ Name: gnome-settings-daemon Version: 3.8.6.1 -Release: 9%{?dist}.1 +Release: 12%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -23,8 +23,14 @@ Patch6: translations.patch Patch7: 0001-keyboard-Apply-num-lock-to-newly-connected-keyboards.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1081093 Patch8: 0001-power-Check-that-the-output-is-connected-when-determ.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1096064 +# https://bugzilla.redhat.com/show_bug.cgi?id=1029612 Patch9: input-device-mapping.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1108934 +Patch10: 0001-media-keys-Add-XF86AudioMicMute-as-a-mic-mute-key.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1145144 +Patch11: 0001-remote-display-Stop-watching-the-D-Bus-name-on-stop.patch +Patch12: 0002-remote-display-Stop-plugin-when-exiting.patch +Patch13: 0003-remote-display-Initialise-cancellable.patch Requires: control-center-filesystem Requires: colord @@ -99,6 +105,10 @@ The %{name}-updates package contains the updates plugin for %{name} %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 autoreconf -i -f @@ -275,9 +285,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml %changelog -* Mon May 12 2014 Carlos Garnacho - 3.8.6.1-9.1 +* Tue Sep 30 2014 Matthias Clasen 3.8.6.1-12 +- Fix a crash in the remote-display plugin +Resolves: #1145144 + +* Fri Sep 05 2014 Bastien Nocera 3.8.6.1-11 +- Add support for XF86AudioMicMute +Resolves: #1108934 + +* Wed May 7 2014 Carlos Garnacho - 3.8.6.1-10 - Fix mapping of touchscreens and other tablet devices -Resolves: #1096064 +Resolves: #1029612 * Fri May 2 2014 Rui Matos - 3.8.6.1-9 - Check that the output is connected when determining if it's ON