diff --git a/gnome-settings-daemon-3.10.2.tar.xz b/gnome-settings-daemon-3.10.2.tar.xz deleted file mode 100644 index c154dae..0000000 --- a/gnome-settings-daemon-3.10.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264 -size 1648652 diff --git a/gnome-settings-daemon-3.12.0.1.tar.xz b/gnome-settings-daemon-3.12.0.1.tar.xz new file mode 100644 index 0000000..4190121 --- /dev/null +++ b/gnome-settings-daemon-3.12.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c21cfcee008da6935ed7f7e814a788a951ba67cc728e43f888b174701cd96847 +size 1632872 diff --git a/gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch b/gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch deleted file mode 100644 index f087f37..0000000 --- a/gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 408e7889063f08427a11a08d8c122a66dcab6ecc Mon Sep 17 00:00:00 2001 -From: Ryan Lortie -Date: Thu, 14 Nov 2013 16:54:27 +0000 -Subject: xsettings: export Gtk/ShellShowsDesktop setting - -Export a property for whether the desktop icons are shown or not. This -will allow Gtk to decide if we should show the 'Desktop' item in the -places sidebar, according to if the user has enabled their desktop icons -or not. We use the value of the GSettings key 'show-desktop-icons' from -'org.gnome.desktop.background'. - -https://bugzilla.gnome.org/show_bug.cgi?id=712302 ---- -diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c -index cad40d0..91bc00d 100644 ---- a/plugins/xsettings/gsd-xsettings-manager.c -+++ b/plugins/xsettings/gsd-xsettings-manager.c -@@ -48,6 +48,7 @@ - #define GNOME_XSETTINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_XSETTINGS_MANAGER, GnomeXSettingsManagerPrivate)) - - #define MOUSE_SETTINGS_SCHEMA "org.gnome.settings-daemon.peripherals.mouse" -+#define BACKGROUND_SETTINGS_SCHEMA "org.gnome.desktop.background" - #define INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface" - #define SOUND_SETTINGS_SCHEMA "org.gnome.desktop.sound" - #define PRIVACY_SETTINGS_SCHEMA "org.gnome.desktop.privacy" -@@ -355,6 +356,8 @@ static TranslationEntry translations [] = { - { "org.gnome.settings-daemon.peripherals.mouse", "double-click", "Net/DoubleClickTime", translate_int_int }, - { "org.gnome.settings-daemon.peripherals.mouse", "drag-threshold", "Net/DndDragThreshold", translate_int_int }, - -+ { "org.gnome.desktop.background", "show-desktop-icons", "Gtk/ShellShowsDesktop", translate_bool_int }, -+ - { "org.gnome.desktop.interface", "gtk-color-palette", "Gtk/ColorPalette", translate_string_string }, - { "org.gnome.desktop.interface", "font-name", "Gtk/FontName", translate_string_string }, - { "org.gnome.desktop.interface", "gtk-key-theme", "Gtk/KeyThemeName", translate_string_string }, -@@ -965,6 +968,8 @@ gnome_xsettings_manager_start (GnomeXSettingsManager *manager, - g_hash_table_insert (manager->priv->settings, - MOUSE_SETTINGS_SCHEMA, g_settings_new (MOUSE_SETTINGS_SCHEMA)); - g_hash_table_insert (manager->priv->settings, -+ BACKGROUND_SETTINGS_SCHEMA, g_settings_new (BACKGROUND_SETTINGS_SCHEMA)); -+ g_hash_table_insert (manager->priv->settings, - INTERFACE_SETTINGS_SCHEMA, g_settings_new (INTERFACE_SETTINGS_SCHEMA)); - g_hash_table_insert (manager->priv->settings, - SOUND_SETTINGS_SCHEMA, g_settings_new (SOUND_SETTINGS_SCHEMA)); --- -cgit v0.9.2 diff --git a/gnome-settings-daemon-upower-backport.patch b/gnome-settings-daemon-upower-backport.patch deleted file mode 100644 index 4ace82e..0000000 --- a/gnome-settings-daemon-upower-backport.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Mike Gorse -Date: Tue Dec 10 14:36:49 CST 2013 -Subject: [PATCH] Support new libupower-glib API - -Support upower 0.99. Based on commits 88de07 and 3ebfd1 from upstream. ---- - plugins/power/gsd-power-manager.c | 6 +++--- -diff -ur gnome-settings-daemon-3.10.2.orig/plugins/power/gsd-power-manager.c gnome-settings-daemon-3.10.2/plugins/power/gsd-power-manager.c ---- gnome-settings-daemon-3.10.2.orig/plugins/power/gsd-power-manager.c 2013-11-12 12:33:05.000000000 -0600 -+++ gnome-settings-daemon-3.10.2/plugins/power/gsd-power-manager.c 2013-12-10 14:21:08.857851976 -0600 -@@ -991,16 +991,6 @@ - guint i; - GPtrArray *array = NULL; - UpDevice *device; -- gboolean ret; -- GError *error = NULL; -- -- /* get devices from UPower */ -- ret = up_client_enumerate_devices_sync (manager->priv->up_client, NULL, &error); -- if (!ret) { -- g_warning ("failed to get device list: %s", error->message); -- g_error_free (error); -- return FALSE; -- } - - engine_recalculate_state (manager); - -@@ -1031,13 +1021,22 @@ - } - - static void --engine_device_removed_cb (UpClient *client, UpDevice *device, GsdPowerManager *manager) -+engine_device_removed_cb (UpClient *client, const char *object_path, GsdPowerManager *manager) - { -- gboolean ret; -- ret = g_ptr_array_remove (manager->priv->devices_array, device); -- if (!ret) -- return; -- engine_recalculate_state (manager); -+ gboolean ret = FALSE; -+ guint i; -+ -+ for (i = 0; i < manager->priv->devices_array->len; i++) { -+ UpDevice *device = g_ptr_array_index (manager->priv->devices_array, i); -+ -+ if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0) { -+ g_ptr_array_remove_index (manager->priv->devices_array, i); -+ ret = TRUE; -+ break; -+ } -+ } -+ if (ret) -+ engine_recalculate_state (manager); - } - - static void -@@ -2172,7 +2172,7 @@ - } - - static void --up_client_changed_cb (UpClient *client, GsdPowerManager *manager) -+lid_state_changed_cb (UpClient *client, GParamSpec *pspec, GsdPowerManager *manager) - { - gboolean tmp; - -@@ -3276,8 +3276,8 @@ - G_CALLBACK (engine_device_removed_cb), manager); - g_signal_connect (manager->priv->up_client, "device-changed", - G_CALLBACK (engine_device_changed_cb), manager); -- g_signal_connect_after (manager->priv->up_client, "changed", -- G_CALLBACK (up_client_changed_cb), manager); -+ g_signal_connect_after (manager->priv->up_client, "notify::lid-is-closed", -+ G_CALLBACK (lid_state_changed_cb), manager); - g_signal_connect (manager->priv->up_client, "notify::on-battery", - G_CALLBACK (up_client_on_battery_cb), manager); - diff --git a/gnome-settings-daemon-upower-fix.patch b/gnome-settings-daemon-upower-fix.patch deleted file mode 100644 index 323a8b6..0000000 --- a/gnome-settings-daemon-upower-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: gnome-settings-daemon-3.10.2/plugins/power/gsd-power-manager.c -=================================================================== ---- gnome-settings-daemon-3.10.2.orig/plugins/power/gsd-power-manager.c -+++ gnome-settings-daemon-3.10.2/plugins/power/gsd-power-manager.c -@@ -909,7 +909,7 @@ device_perhaps_recall (GsdPowerManager * - static void - engine_device_add (GsdPowerManager *manager, UpDevice *device) - { -- gboolean recall_notice; -+ gboolean recall_notice = FALSE; - GsdPowerManagerWarning warning; - UpDeviceState state; - UpDeviceKind kind; -@@ -936,6 +936,7 @@ engine_device_add (GsdPowerManager *mana - - if (kind == UP_DEVICE_KIND_BATTERY) { - g_debug ("updating because we added a device"); -+ g_ptr_array_add (manager->priv->devices_array, g_object_ref (device)); - engine_update_composite_device (manager); - - /* reset those values for the composite device */ -@@ -1014,8 +1015,6 @@ engine_coldplug (GsdPowerManager *manage - static void - engine_device_added_cb (UpClient *client, UpDevice *device, GsdPowerManager *manager) - { -- /* add to list */ -- g_ptr_array_add (manager->priv->devices_array, g_object_ref (device)); - engine_device_add (manager, device); - engine_check_recall (manager, device); - diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 3e177a3..5ac14e0 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,125 @@ +------------------------------------------------------------------- +Wed Mar 26 19:51:14 UTC 2014 - zaitor@opensuse.org + +- Update to version 3.12.0.1: + + Fix a long delay on session logout (bgo#727049). + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 24 15:38:17 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.12.0: + + Common: Fix initialization of GsdDeviceMapper. + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 18 14:28:50 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.92: + + Common: Avoid GsdDeviceMapper blocking on startup. + + Power: Fix idle time being reset when notifications come in. + + XSettings: + - Avoid Hi-DPI getting setup for: + . non-primary screens. + . HDMI outputs (except 4K monitors). + . low resolutions. + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 4 19:38:57 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.91: + + Mouse, Common: Hardening for BadDevice errors. + +------------------------------------------------------------------- +Tue Feb 18 22:35:44 UTC 2014 - zaitor@opensuse.org + +- Update to version 3.11.90: + + Date & Time: Require a newer Geoclue. + + Keyboard: Move X11 specific code from gnome-desktop to here. + + Wacom, XRandR: + - Add explicit input device to display output mapping and apply + rotation and mapping to the input devices when the display + output changes. + - Use "input-tablet" icon for notifications. + + Rfkill: Avoid spurious warning on startup. + + Updates: Update for UPower API changes. + + Smartcard: + - Detect explicit cancellation. + - Filter out spurious errors. + + Wacom: Add OLED handling over Bluetooth. + +------------------------------------------------------------------- +Fri Feb 7 03:11:05 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.5: + + We no longer quit when gnome-session tells all registered + clients to stop so that applications still running don't lose + their theme and icons briefly before the session ends. + + Date & Time: + - Specify the accuracy level for geoclue. + - Provide desktop id to geoclue so that authorization works. + + Media-keys: + - Remove the default shortcut to toggle the screen reader since + it conflicts with the "panel main menu" shortcut. + + Wacom: + - Check for calibration state on startup/device-added. + +------------------------------------------------------------------- +Fri Feb 7 03:11:03 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.3: + + Media-keys: Fix "show battery" key handling. + + Rfkill: + - Apply permissions for rfkill devices to the local user. + - Add Bluetooth killswitch support. + - Don't autostart ModemManager. + + Wacom: + - Skip GSD_WACOM_SET_ALL_MONITORS on the switch monitor pad + action. + - Rotate OLED labels on left-handed setups. + - Show OSD when remapping device to a monitor through the pad + bindings. + - Maintain per-device calibration notifications. + +------------------------------------------------------------------- +Fri Feb 7 03:11:02 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.2: + + Media keys: + - All Power key in more places. + - Fix interaction with multiple MPRIS clients. + - Make Pause key work for MPRIS clients. + + Remote display: + - Don't disable animations unless we are on a remote display. + + XSettings: + - Fix a possible crash on exit. + - Export a GtkShellShowsDesktop setting. +- Drop + gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch: + fixed upstream. + +------------------------------------------------------------------- +Fri Feb 7 03:11:01 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.1: + + Power: + - Remove battery recall support code. + - Update for new UPower API. + - Remove org.gnome.SettingsDaemon.Power D-Bus interface + (deprecated by the new UPower). + - Fix brightness keys when there's less than 20 brightness + steps. + + Remote display: + - Merge plugin functionality into the XSettings plugin; we + shouldn't modify GSettings on startup. + + RFKill: + - Handle rfkill for WWAN modems. +- Disable gnome-settings-daemon-notify-idle-resumed.patch for now: + needs rebase. +- Drop gnome-settings-daemon-upower-backport.patch: fixed upstream. +- Drop gnome-settings-daemon-upower-fix.patch: fixed upstream. + ------------------------------------------------------------------- Thu Feb 6 15:03:34 UTC 2014 - lpechacek@suse.cz diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 0b0e73e..0e1f194 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -34,27 +34,21 @@ %endif Name: gnome-settings-daemon -Version: 3.10.2 +Version: 3.12.0.1 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.10/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-settings-daemon/3.12/%{name}-%{version}.tar.xz # PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff Patch2: gnome-settings-daemon-system-proxy-configuration.diff # 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-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings Patch17: gnome-settings-daemon-stop-reload-proxy-settings.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 +# PATCH-NEEDS-REBASE 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 (WAS: PATCH-FEATURE-UPSTREAM) Patch19: gnome-settings-daemon-notify-idle-resumed.patch -# PATCH-FIX-UPSTREAM gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch bgo#712302 zaitor@opensuse.org -- Stop showing desktopfolder in nautilus sidebar when using gnome-shell. -Patch20: gnome-settings-daemon-export-Gtk_ShellShowsDesktop-setting.patch -# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-upower-backport.patch mgorse@suse.com -- Update for libupower-glib API changes. -Patch21: gnome-settings-daemon-upower-backport.patch -# PATCH-FIX-OPENSUSE gnome-settings-daemon-upower-fix.patch bnc#861365 lpechacek@suse.cz -- Fixup gnome-settings-daemon-upower-backport.patch -Patch22: gnome-settings-daemon-upower-fix.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gnome-common @@ -69,10 +63,10 @@ BuildRequires: polkit BuildRequires: pkgconfig(colord) >= 1.0.2 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1 -BuildRequires: pkgconfig(geoclue-2.0) +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.9.0 +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.11.1 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.9.91 BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.8 BuildRequires: pkgconfig(gudev-1.0) @@ -147,10 +141,8 @@ translation-update-upstream #%%patch2 -p0 %patch10 -p0 %patch17 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 +# Needs rebase +#patch19 -p1 %build autoreconf -f -i @@ -172,9 +164,6 @@ make %{?jobs:-j%jobs} V=1 %install %makeinstall -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %suse_update_desktop_file gnome-settings-daemon %find_lang %{name} %{?no_lang_C} @@ -225,7 +214,6 @@ rm -rf %{buildroot} %{_libdir}/gnome-settings-daemon-3.0/liborientation.so %{_libdir}/gnome-settings-daemon-3.0/libpower.so %{_libdir}/gnome-settings-daemon-3.0/libprint-notifications.so -%{_libdir}/gnome-settings-daemon-3.0/libremote-display.so %{_libdir}/gnome-settings-daemon-3.0/librfkill.so %{_libdir}/gnome-settings-daemon-3.0/libscreensaver-proxy.so %if %{with_smartcard} @@ -267,6 +255,7 @@ rm -rf %{buildroot} %{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper %{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so %endif +%{_udevrulesdir}/61-gnome-settings-daemon-rfkill.rules %files lang -f %{name}.lang