Accepting request 329042 from GNOME:Next

Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/329042
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=226
This commit is contained in:
Dominique Leuenberger 2015-09-04 11:32:40 +00:00 committed by Git OBS Bridge
parent 276259e0f1
commit 6db527e1ba
5 changed files with 58 additions and 19 deletions

View File

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

View File

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

View File

@ -1,10 +1,10 @@
Index: gnome-settings-daemon-3.15.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in Index: gnome-settings-daemon-3.17.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
=================================================================== ===================================================================
--- gnome-settings-daemon-3.15.90.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in --- gnome-settings-daemon-3.17.2.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+++ gnome-settings-daemon-3.15.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in +++ gnome-settings-daemon-3.17.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
@@ -66,5 +66,10 @@ @@ -66,5 +66,10 @@
<summary>Battery critical low action</summary> <summary>Enable the ALS sensor</summary>
<description>The action to take when the battery is critically low.</description> <description>If the ambient light sensor functionality is enabled.</description>
</key> </key>
+ <key name="notify-idle-resumed" type="b"> + <key name="notify-idle-resumed" type="b">
+ <default>true</default> + <default>true</default>
@ -13,11 +13,11 @@ Index: gnome-settings-daemon-3.15.90/data/org.gnome.settings-daemon.plugins.powe
+ </key> + </key>
</schema> </schema>
</schemalist> </schemalist>
Index: gnome-settings-daemon-3.15.90/plugins/power/gsd-power-manager.c Index: gnome-settings-daemon-3.17.2/plugins/power/gsd-power-manager.c
=================================================================== ===================================================================
--- gnome-settings-daemon-3.15.90.orig/plugins/power/gsd-power-manager.c --- gnome-settings-daemon-3.17.2.orig/plugins/power/gsd-power-manager.c
+++ gnome-settings-daemon-3.15.90/plugins/power/gsd-power-manager.c +++ gnome-settings-daemon-3.17.2/plugins/power/gsd-power-manager.c
@@ -143,6 +143,7 @@ struct GsdPowerManagerPrivate @@ -148,6 +148,7 @@ struct GsdPowerManagerPrivate
NotifyNotification *notification_ups_discharging; NotifyNotification *notification_ups_discharging;
NotifyNotification *notification_low; NotifyNotification *notification_low;
NotifyNotification *notification_sleep_warning; NotifyNotification *notification_sleep_warning;
@ -25,7 +25,7 @@ Index: gnome-settings-daemon-3.15.90/plugins/power/gsd-power-manager.c
GsdPowerActionType sleep_action_type; GsdPowerActionType sleep_action_type;
gboolean battery_is_low; /* laptop battery low, or UPS discharging */ gboolean battery_is_low; /* laptop battery low, or UPS discharging */
@@ -169,6 +170,7 @@ struct GsdPowerManagerPrivate @@ -183,6 +184,7 @@ struct GsdPowerManagerPrivate
guint inhibit_lid_switch_timer_id; guint inhibit_lid_switch_timer_id;
gboolean is_virtual_machine; gboolean is_virtual_machine;
gboolean is_tablet; gboolean is_tablet;
@ -33,7 +33,7 @@ Index: gnome-settings-daemon-3.15.90/plugins/power/gsd-power-manager.c
/* Idles */ /* Idles */
GnomeIdleMonitor *idle_monitor; GnomeIdleMonitor *idle_monitor;
@@ -1440,6 +1442,49 @@ is_session_active (GsdPowerManager *mana @@ -1477,6 +1479,49 @@ is_session_active (GsdPowerManager *mana
} }
static void static void
@ -83,7 +83,7 @@ Index: gnome-settings-daemon-3.15.90/plugins/power/gsd-power-manager.c
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode) idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
@@ -1531,6 +1576,7 @@ idle_set_mode (GsdPowerManager *manager, @@ -1568,6 +1613,7 @@ idle_set_mode (GsdPowerManager *manager,
action_type = g_settings_get_enum (manager->priv->settings, action_type = g_settings_get_enum (manager->priv->settings,
"sleep-inactive-ac-type"); "sleep-inactive-ac-type");
} }
@ -91,7 +91,7 @@ Index: gnome-settings-daemon-3.15.90/plugins/power/gsd-power-manager.c
do_power_action_type (manager, action_type); do_power_action_type (manager, action_type);
/* turn on screen and restore user-selected brightness level */ /* turn on screen and restore user-selected brightness level */
@@ -2285,6 +2331,12 @@ handle_suspend_actions (GsdPowerManager @@ -2340,6 +2386,12 @@ handle_suspend_actions (GsdPowerManager
static void static void
handle_resume_actions (GsdPowerManager *manager) handle_resume_actions (GsdPowerManager *manager)
{ {
@ -104,7 +104,7 @@ Index: gnome-settings-daemon-3.15.90/plugins/power/gsd-power-manager.c
/* ensure we turn the panel back on after resume */ /* ensure we turn the panel back on after resume */
backlight_enable (manager); backlight_enable (manager);
@@ -2294,6 +2346,7 @@ handle_resume_actions (GsdPowerManager * @@ -2349,6 +2401,7 @@ handle_resume_actions (GsdPowerManager *
/* set up the delay again */ /* set up the delay again */
inhibit_suspend (manager); inhibit_suspend (manager);

View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Mon Aug 17 18:32:23 UTC 2015 - zaitor@opensuse.org
- Update to version 3.17.90:
+ Date & Time: Fix auto-timezone changes not getting applied
after changed.
+ Orientation: Fix screen lock not getting applied.
+ Print notifications: Fix setting of page size.
+ Wacom: Fix some settings not getting applied after changed.
+ XSettings: Fix some settings not getting applied after changed.
+ Updated translations.
-------------------------------------------------------------------
Thu Jul 23 07:17:36 UTC 2015 - zaitor@opensuse.org
- Update to version 3.17.3:
+ Make device type presence checks work on libinput and wayland
+ Fix orientation setting on startup.
-------------------------------------------------------------------
Thu Jul 23 07:17:36 UTC 2015 - dimstar@opensuse.org
- Update to version 3.17.2:
+ Orientation: Get accelerometer information from
iio-sensor-proxy.
+ Power:
- Add automatic screen brightness support, using
iio-sensor-proxy.
- Remove critical-battery-action key as it's not used anymore
with UPower 1.0.
- Fix a crash when reading invalid backlight values.
+ Print notifications: Don't show error for job in progress.
+ Wacom:
- Fix possible crash when Bamboo tablet is plugged at login
time.
- Fix possible double-frees.
+ Updated translations.
- Rebase gnome-settings-daemon-notify-idle-resumed.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 21 20:13:15 UTC 2015 - zaitor@opensuse.org Tue Jul 21 20:13:15 UTC 2015 - zaitor@opensuse.org

View File

@ -30,13 +30,13 @@
%endif %endif
Name: gnome-settings-daemon Name: gnome-settings-daemon
Version: 3.16.3 Version: 3.17.90
Release: 0 Release: 0
Summary: Settings daemon for the GNOME desktop Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://www.gnome.org Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.16/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gnome-settings-daemon/3.17/%{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 # 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 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 # 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