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

Accepting request 376857 from GNOME:Factory

Browse Source 
Update to 3.20.0 (forwarded request 376692 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/376857
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=121
This commit is contained in:
Dominique Leuenberger 2016-03-29 12:36:30 +00:00 committed by Git OBS Bridge
commit 713e6a0db7
8 changed files with 2210 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-settings-daemon-3.18.2.tar.xz
View File

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

3
gnome-settings-daemon-3.20.0.tar.xz Normal file
View File

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

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

@ -1,53 +0,0 @@
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
@@ -1211,6 +1211,7 @@ do_sound_action (GsdMediaKeysManager *ma
{
GvcMixerStream *stream;
gboolean old_muted, new_muted;
+ gboolean toggle_mute;
guint old_vol, new_vol, norm_vol_step;
gboolean sound_changed;
@@ -1239,7 +1240,11 @@ do_sound_action (GsdMediaKeysManager *ma
switch (type) {
case MUTE_KEY:
- new_muted = !old_muted;
+ toggle_mute = g_settings_get_boolean (manager->priv->settings, "toggle-mute");
+ if (toggle_mute)
+ new_muted = !old_muted;
+ else
+ new_muted = TRUE;
break;
case VOLUME_DOWN_KEY:
if (old_vol <= norm_vol_step) {
Index: data/gnome-settings-daemon.convert
===================================================================
--- data/gnome-settings-daemon.convert.orig
+++ data/gnome-settings-daemon.convert
@@ -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
+toggle-mute = /apps/gnome_settings_daemon/toggle_mute
[org.gnome.settings-daemon.plugins.mouse]
active = /apps/gnome_settings_daemon/plugins/mouse/active
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
@@ -185,6 +185,11 @@
<summary>Maximum length of screen recordings</summary>
<description>The maximum length of single screen cast recordings in seconds or 0 for unlimited</description>
</key>
+ <key name="toggle-mute" type="b">
+ <default>true</default>
+ <_summary>Toggle Mute</_summary>
+ <_description>Toggle the sound mixer's mute status when then mute button is pressed.</_description>
+ </key>
</schema>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">

41
gnome-settings-daemon-bnc873545-hide-warnings.patch Normal file
View File

@ -0,0 +1,41 @@
From fd0df3003ba7c0ae4d04a8314358db7f82dd2ab1 Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Tue, 6 May 2014 16:13:04 +0800
Subject: [PATCH] hide warnings
---
plugins/color/gsd-color-profiles.c | 2 ++
plugins/color/gsd-color-state.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/plugins/color/gsd-color-profiles.c b/plugins/color/gsd-color-profiles.c
index 2b01faa..05a728a 100644
--- a/plugins/color/gsd-color-profiles.c
+++ b/plugins/color/gsd-color-profiles.c
@@ -71,7 +71,9 @@ gcm_session_client_connect_cb (GObject *source_object,
/* is there an available colord instance? */
ret = cd_client_get_has_server (profiles->priv->client);
if (!ret) {
+ /* hide this warning for SLES
g_warning ("There is no colord server available");
+ */
return;
}
diff --git a/plugins/color/gsd-color-state.c b/plugins/color/gsd-color-state.c
index 04823e4..20e8a2b 100644
--- a/plugins/color/gsd-color-state.c
+++ b/plugins/color/gsd-color-state.c
@@ -1297,7 +1297,9 @@ gcm_session_client_connect_cb (GObject *source_object,
/* is there an available colord instance? */
ret = cd_client_get_has_server (state->priv->client);
if (!ret) {
+ /* hide this warning for SLES
g_warning ("There is no colord server available");
+ */
goto out;
}
--
1.7.12.4

49
gnome-settings-daemon-dont-override-xim-presets.patch
View File

@ -1,49 +0,0 @@
From: Takashi Iwai <tiwai@suse.de>
Subject: Don't override preset xim setups
References: boo#947576
When $QT_IM_MODULE or $XMODIFIERS has been already set beforehand,
we should honor it and not override brutally. This makes GNOME as
a good citizen coping with other IMs more smoothly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
gnome-settings-daemon/gnome-settings-daemon-localeexec.in | 4 ++--
gnome-settings-daemon/main.c | 11 +++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
--- a/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
+++ b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
@@ -13,8 +13,8 @@ if [ -n "$REGION" ]; then
fi
if [ -x @prefix@/bin/ibus-daemon ]; then
- export QT_IM_MODULE=ibus
- export XMODIFIERS=@im=ibus
+ test -z "$QT_IM_MODULE" && export QT_IM_MODULE=ibus
+ test -z "$XMODIFIERS" && export XMODIFIERS=@im=ibus
fi
exec @libexecdir@/gnome-settings-daemon
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -255,9 +255,16 @@ is_program_in_path (const char *binary)
static void
set_legacy_ibus_env_vars (GDBusProxy *proxy)
{
+ const char *p;
if (is_program_in_path ("ibus-daemon")) {
- set_session_env (proxy, "QT_IM_MODULE", "ibus");
- set_session_env (proxy, "XMODIFIERS", "@im=ibus");
+ p = getenv ("QT_IM_MODULE");
+ if (!p || !*p)
+ p = "ibus";
+ set_session_env (proxy, "QT_IM_MODULE", p);
+ p = getenv ("XMODIFIERS");
+ if (!p || !*p)
+ p = "@im=ibus";
+ set_session_env (proxy, "XMODIFIERS", p);
}
}

2015
gnome-settings-daemon-revert-libinput-mandatory.patch Normal file
View File

File diff suppressed because it is too large Load Diff

118
gnome-settings-daemon.changes
View File

@ -1,3 +1,121 @@
-------------------------------------------------------------------
Mon Mar 21 15:09:07 UTC 2016 - dimstar@opensuse.org
- Update to version 3.20.0:
+ Fix cancellation handling and possible crashes in all plugins.
-------------------------------------------------------------------
Fri Mar 18 17:53:18 UTC 2016 - fezhang@suse.com
- Add gnome-settings-daemon-bnc873545-hide-warnings.patch: Hide the
warnings when failed to find a colord instance on SLES
(bnc873545).
-------------------------------------------------------------------
Thu Mar 17 09:53:38 UTC 2016 - dimstar@opensuse.org
- Update to version 3.19.92:
+ XSettings: Export Gtk/KeynavUseCaret accessibility setting.
+ Remote display: Remove Spice special-casing now that it can do
accelerated rendering.
-------------------------------------------------------------------
Fri Mar 4 12:57:15 UTC 2016 - fcrozat@suse.com
- Add gnome-settings-daemon-revert-libinput-mandatory.patch: do not
force libinput driver on SLE.
- Re-add "hotplug-command" helper when building for SLE.
-------------------------------------------------------------------
Thu Mar 3 21:57:28 UTC 2016 - zaitor@opensuse.org
- Update to version 3.19.91:
+ Media keys:
- Fix a typo in the "Airplane" string.
- Fix a number of possible crashers when plugging in audio
devices on some machines.
- Add debug output to a number of custom shortcuts related
functions.
+ Housekeeping: Don't remove X11 sockets, breaking sandboxed X11
applications.
+ Updated translations.
-------------------------------------------------------------------
Wed Mar 2 14:33:56 UTC 2016 - fcrozat@suse.com
- Add BuildRequires pkgconfig(alsa) and --enable-alsa to configure
to ensure audio device selection feature is properly enabled.
-------------------------------------------------------------------
Tue Feb 16 20:35:11 UTC 2016 - zaitor@opensuse.org
- Update to version 3.19.90:
+ Fixed a few leaks, crashes and endless loops.
+ Media keys:
- Fix orientation keybindings/keys not working.
- Added support to ask users which kind of headset was plugged
in.
+ Updated translations.
-------------------------------------------------------------------
Sun Feb 14 23:05:02 UTC 2016 - zaitor@opensuse.org
- Add xf86-input-libinput Recommends and apply conditionally on
openSUSE: gnome-settings-daemon only support configuration of
libinput based pointer drivers since version 3.19.5.
-------------------------------------------------------------------
Fri Feb 12 15:07:00 UTC 2016 - zaitor@opensuse.org
- Change gnome-settings-daemon-notify-idle-resumed.patch to
PATCH-FEATURE-SLE, and only apply it and run autoreconf when
building for SLE. It is not needed in openSUSE.
- Drop gnome-settings-daemon-bnc462640-mute-action.patch: People
expect mute to always toogle now, so drop this patch.
- No longer obsolete resapplet, not been in use since before 2008.
-------------------------------------------------------------------
Wed Jan 20 15:13:46 UTC 2016 - dimstar@opensuse.org
- Update to version 3.19.5:
+ Remove "hotplug-command" helper
+ Media keys:
- Add support for Killswitch media keys
- Add labels for the rfkill OSD
+ Mouse: Remove support for non-libinput mouse configurations.
+ Power: Don't try to automatically set brightness on inactive
sessions.
+ Rfkill: Fix a problem when the system has a platform rfkill
device for Bluetooth and the Bluetooth adapter's rfkill support
somehow got blocked.
+ Sharing: Port to the new libnm NetworkManager library; required
NM version bumped to 1.0.
+ Updated translations.
- Replace pkgconfig(libnm-glib) and pkgconfig(libnm-util)
BuildRequires with pkgconfig(libnm): following upstreams changes.
-------------------------------------------------------------------
Sun Dec 20 12:04:15 UTC 2015 - zaitor@opensuse.org
- Update to version 3.19.4:
+ Mouse:
- Force 2-finger scroll by default if available.
- Migrate scroll-method key to new edge-scrolling-enabled key.
- Changes from version 3.19.3:
+ Export the cursor theme through XSettings.
+ Use the convenience Geoclue library for the automatic timezone
setting.
+ Don't overwrite existing XIM configurations.
+ Fix application of left-handed mode, keep-aspect and area
settings for Wacom tablets.
+ Change default font hinting to slight (see git log for
details).
+ Re-add a way to configure the power button for desktops and
laptops (tablets and VMs have hard-coded defaults).
+ Always expand power notifications.
- Drop gnome-settings-daemon-dont-override-xim-presets.patch: Fixed
upstream.
-------------------------------------------------------------------
Tue Nov 10 16:00:08 UTC 2015 - zaitor@opensuse.org

52
gnome-settings-daemon.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-settings-daemon
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -30,30 +30,33 @@
%endif
Name: gnome-settings-daemon
Version: 3.18.2
Version: 3.20.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.18/%{name}-%{version}.tar.xz
# PATCH-FEATURE-UPSTREAM gnome-settings-daemon-bnc462640-mute-action.patch bnc462640 bgo572365 vuntz@novell.com -- Mute button should always mute sound instead of toggling mute status
Patch10: gnome-settings-daemon-bnc462640-mute-action.patch
# PATCH-FEATURE-UPSTREAM gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
Patch19: gnome-settings-daemon-notify-idle-resumed.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-dont-override-xim-presets.patch boo#947576 bgo#757013 tiwai@suse.com -- Don't overwrite XIM presets
Patch20: gnome-settings-daemon-dont-override-xim-presets.patch
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.20/%{name}-%{version}.tar.xz
# PATCH-FEATURE-SLE gnome-settings-daemon-revert-libinput-mandatory.patch fcrozat@suse.com -- ensure libinput is not mandatory
Patch20: gnome-settings-daemon-revert-libinput-mandatory.patch
# PATCH-FEATURE-SLE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
Patch21: gnome-settings-daemon-notify-idle-resumed.patch
# PATCH-FIX-SLE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES
Patch22: gnome-settings-daemon-bnc873545-hide-warnings.patch
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: gnome-common
# Disabled because of the non-rebased patches
%if !0%{?is_opensuse}
# Disabled because of the non-rebased patch
#BuildRequires: gnome-patch-translation
BuildRequires: intltool
BuildRequires: translation-update-upstream
%endif
BuildRequires: intltool
BuildRequires: update-desktop-files
BuildRequires: xsltproc
# For directory ownership; it's fine to BuildRequire it since it's also a Requires
BuildRequires: polkit
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(colord) >= 1.0.2
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1
@ -61,15 +64,14 @@ BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.2
BuildRequires: pkgconfig(geocode-glib-1.0) >= 3.10.0
BuildRequires: pkgconfig(glib-2.0) >= 2.37.7
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.11.1
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.15.4
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.1
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.19.3
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(gweather-3.0) >= 3.9.5
BuildRequires: pkgconfig(kbproto)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libnm-glib) >= 0.9.9.1
BuildRequires: pkgconfig(libnm-util) >= 0.9.9.1
BuildRequires: pkgconfig(libnm) >= 1.0
BuildRequires: pkgconfig(libnotify) >= 0.7.3
BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0
@ -96,7 +98,10 @@ Requires: polkit
Recommends: %{name}-lang
# For housekeeping plugin, that uses the nautilus dbus service
Recommends: nautilus
Obsoletes: resapplet
%if 0%{?is_opensuse}
# g-s-d only support configurtion of libinput based pointer drivers now.
Recommends: xf86-input-libinput
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
@ -126,21 +131,28 @@ contact the settings daemon via its DBus interface.
%lang_package
%prep
%setup -q
%if !0%{?is_opensuse}
translation-update-upstream
# Disabled because of the non-rebased patches
# Disabled because of the non-rebased patch
#gnome-patch-translation-prepare
%patch10 -p0
%patch19 -p1
%patch20 -p1
%patch21 -p1
%endif
%if 0%{?sles_version} > 0
%patch22 -p1
%endif
%build
%if !0%{?is_opensuse}
autoreconf -f -i
%endif
%configure\
%if %{with wayland}
--enable-wayland \
%else
--disable-wayland \
%endif
--enable-alsa \
--disable-static \
--libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \
%{nil}
@ -170,7 +182,9 @@ rm -rf %{buildroot}
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS
%{_datadir}/gnome-settings-daemon/
%if !0%{?is_opensuse}
%{_datadir}/gnome-settings-daemon-3.0/
%endif
%dir %{_libexecdir}/gnome-settings-daemon-3.0/
%{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon
%{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon-localeexec