1
0

Accepting request 161140 from home:dimstar:branches:GNOME:Factory

Update to 3.8.0

OBS-URL: https://build.opensuse.org/request/show/161140
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=157
This commit is contained in:
Dominique Leuenberger 2013-03-26 20:11:59 +00:00 committed by Git OBS Bridge
parent 59d105b1f7
commit d9aa80755d
5 changed files with 34 additions and 12 deletions

View File

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

View File

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

View File

@ -2,7 +2,7 @@ Index: plugins/media-keys/gsd-media-keys-manager.c
===================================================================
--- plugins/media-keys/gsd-media-keys-manager.c.orig
+++ plugins/media-keys/gsd-media-keys-manager.c
@@ -1082,6 +1082,7 @@ do_sound_action (GsdMediaKeysManager *ma
@@ -1187,6 +1187,7 @@ do_sound_action (GsdMediaKeysManager *ma
{
GvcMixerStream *stream;
gboolean old_muted, new_muted;
@ -10,7 +10,7 @@ Index: plugins/media-keys/gsd-media-keys-manager.c
guint old_vol, new_vol, norm_vol_step;
gboolean sound_changed;
@@ -1103,7 +1104,11 @@ do_sound_action (GsdMediaKeysManager *ma
@@ -1215,7 +1216,11 @@ do_sound_action (GsdMediaKeysManager *ma
switch (type) {
case MUTE_KEY:
@ -27,7 +27,7 @@ Index: data/gnome-settings-daemon.convert
===================================================================
--- data/gnome-settings-daemon.convert.orig
+++ data/gnome-settings-daemon.convert
@@ -61,6 +61,7 @@ volume-down = /apps/gnome_settings_daemo
@@ -57,6 +57,7 @@ volume-down = /apps/gnome_settings_daemo
volume-mute = /apps/gnome_settings_daemon/keybindings/volume_mute
volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
www = /apps/gnome_settings_daemon/keybindings/www
@ -39,9 +39,9 @@ Index: data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
===================================================================
--- data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.orig
+++ data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
@@ -193,5 +193,10 @@
<_summary>Command</_summary>
<_description>Command to run when the binding is invoked</_description>
@@ -175,6 +175,11 @@
<_summary>Magnifier zoom out</_summary>
<_description>Binding for the magnifier to zoom out</_description>
</key>
+ <key name="toggle-mute" type="b">
+ <default>true</default>
@ -49,4 +49,5 @@ Index: data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+ <_description>Toggle the sound mixer's mute status when then mute button is pressed.</_description>
+ </key>
</schema>
</schemalist>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Tue Mar 26 10:15:41 UTC 2013 - dimstar@opensuse.org
- Update to version 3.8.0:
+ Color:
- Set the default profile locale to be en_US, not EN_us.
+ Cursor:
- Fix crash with X.org prior to 1.14, requires a matching
gnome-desktop release as well.
+ Power:
- Fix state problems if gnome-shell crashes or is killed within
the screensaver.
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 25 21:40:18 UTC 2013 - dimstar@opensuse.org
- Fix gnome-settings-daemon-bnc462640-mute-action.patch: At some
point the schema changed and even though the patch applied, it
was at the wrong point in the schema.
-------------------------------------------------------------------
Tue Mar 19 20:07:51 UTC 2013 - dimstar@opensuse.org

View File

@ -27,13 +27,13 @@
%define with_smartcard 0
Name: gnome-settings-daemon
Version: 3.7.92
Version: 3.8.0
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+
Group: System/GUI/GNOME
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.7/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.8/%{name}-%{version}.tar.xz
# PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff
Patch2: gnome-settings-daemon-system-proxy-configuration.diff
# PATCH-NEEDS-REBASE gnome-settings-daemon-apport-monitor.patch bnc439203 jblunck@novell.com -- Add apport monitoring plugin. (was PATCH-FEATURE-UPSTREAM)