diff --git a/gnome-settings-daemon-3.18.2.tar.xz b/gnome-settings-daemon-3.18.2.tar.xz deleted file mode 100644 index 16a21b6..0000000 --- a/gnome-settings-daemon-3.18.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f -size 1626400 diff --git a/gnome-settings-daemon-3.19.90.tar.xz b/gnome-settings-daemon-3.19.90.tar.xz new file mode 100644 index 0000000..91591c7 --- /dev/null +++ b/gnome-settings-daemon-3.19.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02faf674b693d7b2a42e7fbedae911bf05fb4391e6ce25aabead5304448789ae +size 1612916 diff --git a/gnome-settings-daemon-bnc462640-mute-action.patch b/gnome-settings-daemon-bnc462640-mute-action.patch deleted file mode 100644 index a2338ab..0000000 --- a/gnome-settings-daemon-bnc462640-mute-action.patch +++ /dev/null @@ -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 @@ - Maximum length of screen recordings - The maximum length of single screen cast recordings in seconds or 0 for unlimited - -+ -+ true -+ <_summary>Toggle Mute -+ <_description>Toggle the sound mixer's mute status when then mute button is pressed. -+ - - - diff --git a/gnome-settings-daemon-dont-override-xim-presets.patch b/gnome-settings-daemon-dont-override-xim-presets.patch deleted file mode 100644 index 41cdb98..0000000 --- a/gnome-settings-daemon-dont-override-xim-presets.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Takashi Iwai -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 - ---- - 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); - } - } - diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index f5d0429..c21e392 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +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 conditionaly 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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 6f8d55b..f867e23 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -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,26 +30,24 @@ %endif Name: gnome-settings-daemon -Version: 3.18.2 +Version: 3.19.90 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 +Source: http://download.gnome.org/sources/gnome-settings-daemon/3.19/%{name}-%{version}.tar.xz +# 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 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 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 @@ -61,15 +59,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 +93,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,15 +126,17 @@ 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 +%endif %build +%if !0%{?is_opensuse} autoreconf -f -i +%endif %configure\ %if %{with wayland} --enable-wayland \ @@ -170,7 +172,6 @@ rm -rf %{buildroot} %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS %{_datadir}/gnome-settings-daemon/ -%{_datadir}/gnome-settings-daemon-3.0/ %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