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

Accepting request 291597 from GNOME:Next

Browse Source 
resub

OBS-URL: https://build.opensuse.org/request/show/291597
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=212
This commit is contained in:
Dominique Leuenberger 2015-03-19 14:37:09 +00:00 committed by Git OBS Bridge
parent 3950570660
commit d6397db451
5 changed files with 97 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

30
gnome-settings-daemon-notify-idle-resumed.patch
View File

@ -1,6 +1,7 @@
diff -ur gnome-settings-daemon-3.12.2.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in gnome-settings-daemon-3.12.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
--- gnome-settings-daemon-3.12.2.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in 2014-05-05 08:49:57.000000000 -0500
+++ gnome-settings-daemon-3.12.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in 2014-05-21 15:33:58.701265397 -0500
Index: gnome-settings-daemon-3.15.90/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.15.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
@@ -66,5 +66,10 @@
<summary>Battery critical low action</summary>
<description>The action to take when the battery is critically low.</description>
@ -12,10 +13,11 @@ diff -ur gnome-settings-daemon-3.12.2.orig/data/org.gnome.settings-daemon.plugin
+ </key>
</schema>
</schemalist>
diff -ur gnome-settings-daemon-3.12.2.orig/plugins/power/gsd-power-manager.c gnome-settings-daemon-3.12.2/plugins/power/gsd-power-manager.c
--- gnome-settings-daemon-3.12.2.orig/plugins/power/gsd-power-manager.c 2014-05-05 09:50:10.000000000 -0500
+++ gnome-settings-daemon-3.12.2/plugins/power/gsd-power-manager.c 2014-05-21 15:56:20.240296067 -0500
@@ -144,6 +144,7 @@
Index: gnome-settings-daemon-3.15.90/plugins/power/gsd-power-manager.c
===================================================================
--- gnome-settings-daemon-3.15.90.orig/plugins/power/gsd-power-manager.c
+++ gnome-settings-daemon-3.15.90/plugins/power/gsd-power-manager.c
@@ -143,6 +143,7 @@ struct GsdPowerManagerPrivate
NotifyNotification *notification_ups_discharging;
NotifyNotification *notification_low;
NotifyNotification *notification_sleep_warning;
@ -23,15 +25,15 @@ diff -ur gnome-settings-daemon-3.12.2.orig/plugins/power/gsd-power-manager.c gno
GsdPowerActionType sleep_action_type;
gboolean battery_is_low; /* laptop battery low, or UPS discharging */
@@ -169,6 +170,7 @@
gboolean inhibit_suspend_taken;
@@ -169,6 +170,7 @@ struct GsdPowerManagerPrivate
guint inhibit_lid_switch_timer_id;
gboolean is_virtual_machine;
+ GsdPowerActionType last_idle_power_action;
gboolean is_tablet;
+ GsdPowerActionType last_idle_power_action;
/* Idles */
GnomeIdleMonitor *idle_monitor;
@@ -1375,6 +1377,49 @@
@@ -1440,6 +1442,49 @@ is_session_active (GsdPowerManager *mana
}
static void
@ -81,7 +83,7 @@ diff -ur gnome-settings-daemon-3.12.2.orig/plugins/power/gsd-power-manager.c gno
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
{
gboolean ret = FALSE;
@@ -1466,6 +1511,7 @@
@@ -1531,6 +1576,7 @@ idle_set_mode (GsdPowerManager *manager,
action_type = g_settings_get_enum (manager->priv->settings,
"sleep-inactive-ac-type");
}
@ -89,7 +91,7 @@ diff -ur gnome-settings-daemon-3.12.2.orig/plugins/power/gsd-power-manager.c gno
do_power_action_type (manager, action_type);
/* turn on screen and restore user-selected brightness level */
@@ -2219,6 +2265,12 @@
@@ -2285,6 +2331,12 @@ handle_suspend_actions (GsdPowerManager
static void
handle_resume_actions (GsdPowerManager *manager)
{
@ -102,7 +104,7 @@ diff -ur gnome-settings-daemon-3.12.2.orig/plugins/power/gsd-power-manager.c gno
/* ensure we turn the panel back on after resume */
backlight_enable (manager);
@@ -2228,6 +2280,7 @@
@@ -2294,6 +2346,7 @@ handle_resume_actions (GsdPowerManager *
/* set up the delay again */
inhibit_suspend (manager);

66
gnome-settings-daemon.changes
View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Wed Mar 18 08:06:34 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.92:
+ Cursor: Plugin removed, its functionality was moved to mutter.
+ Keyboard: Remove the special handling of settings under GDM.
+ Power: Make sure to set an error when GDBus set_property fails.
+ Wacom:
- Remove use of removed "display" settings key.
- Remove handling of moved "display" key.
- Add fake Huion H610 Pro for tests.
+ Updated translations.
- Drop pkgconfig(xfixes) BuildRequires: no longer needed after the
removal of the cursor plugin.
-------------------------------------------------------------------
Wed Mar 4 08:44:11 UTC 2015 - zaitor@opensuse.org
- Update to version 3.15.91:
+ Fix build with some build systems.
+ Use proper quotes in Housekeeping plugin.
+ Fix possible crashes in the Wacom plugin.
+ Fix a regression in XSettings caused by recent glib changes.
+ Updated translations.
-------------------------------------------------------------------
Tue Feb 17 14:24:01 UTC 2015 - dimstar@opensuse.org
- Update to version 3.15.90:
+ When disabling the backlight, also suspend on tablets.
+ Don't use colons in screenshot filenames.
+ Fix multiple Settings button being added to notifications.
+ Fix text wrapping in housekeeping dialogues.
+ Use the backlight helper on Linux unconditionally.
+ Avoid turning off the backlight altogether on some Linux
systems.
- Rebase gnome-settings-daemon-notify-idle-resumed.patch.
- Toggle with_wayland to 1: enable building the wayland backend.
-------------------------------------------------------------------
Sat Jan 24 07:15:31 UTC 2015 - badshah400@gmail.com
- Update to version 3.15.4:
+ Added GsdDeviceManager with X11 and udev (for native wayland
sessions) backends.
+ Most keyboard, mouse, touchpad and wacom settings schemas
moved to gsettings-desktop-schemas. User settings migration
is done automatically at startup.
+ The moved settings are now applied by mutter >= 3.15.4.
+ Media-keys:
- Adjust to ShellKeyGrabber changes (requires
gnome-shell >= 3.15.4 at run time).
- Make power-actions non-interactive based on mode.
+ XSettings: Export the session bus ID as an xsetting.
- Disable wayland backend by passing --disable-wayland flag
to configure; enabling wayland backend causes builds to
fail.
-------------------------------------------------------------------
Thu Dec 18 02:09:55 UTC 2014 - zaitor@opensuse.org
- Update to version 3.15.1:
+ Add scroll wheel emulation in trackballs.
+ Disable touchscreens when the screen is turned off.
+ Show backlight OSD on the monitor which it affects.
-------------------------------------------------------------------
Thu Nov 13 18:29:23 UTC 2014 - zaitor@opensuse.org

19
gnome-settings-daemon.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-settings-daemon
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 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,14 +30,16 @@
%define with_wacom 1
%endif
%define with_wayland 1
Name: gnome-settings-daemon
Version: 3.14.2
Version: 3.15.92
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.14/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.15/%{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
@ -60,8 +62,8 @@ 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.9.91
BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.8
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.15.4
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.1
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(gweather-3.0) >= 3.9.5
BuildRequires: pkgconfig(kbproto)
@ -86,7 +88,6 @@ BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
BuildRequires: pkgconfig(upower-glib) >= 0.99.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xkbfile)
BuildRequires: pkgconfig(xtst)
@ -137,6 +138,11 @@ autoreconf -f -i
%configure\
%if %{with_systemd}
--enable-systemd \
%endif
%if %{with_wayland}
--enable-wayland \
%else
--disable-wayland \
%endif
--enable-gconf-bridge \
--disable-static \
@ -185,7 +191,6 @@ rm -rf %{buildroot}
%{_libdir}/gnome-settings-daemon-3.0/liba11y-settings.so
%{_libdir}/gnome-settings-daemon-3.0/libclipboard.so
%{_libdir}/gnome-settings-daemon-3.0/libcolor.so
%{_libdir}/gnome-settings-daemon-3.0/libcursor.so
%{_libdir}/gnome-settings-daemon-3.0/libdatetime.so
%{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so
%{_libdir}/gnome-settings-daemon-3.0/libkeyboard.so