Accepting request 180546 from home:dimstar:branches:GNOME:Factory
Update to 3.9.3 OBS-URL: https://build.opensuse.org/request/show/180546 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=164
This commit is contained in:
Git OBS Bridge
parent
b9dbba74a3
commit
f4a5159ce7
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f332bb91e635a7cc288309084cb2105dcab54f64f1647e76e6a465c99a1cd1be
|
||||
size 1585224
|
||||
3
gnome-settings-daemon-3.9.3.tar.xz
Normal file
3
gnome-settings-daemon-3.9.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c43fde7af2c2adf9e845dcac4836c229772bbf25aaa91c1e05839b5072d233e3
|
||||
size 1579636
|
||||
@ -1,26 +0,0 @@
|
||||
From 6fa0b3df3054ba8f29885d1584cc5f6605375880 Mon Sep 17 00:00:00 2001
|
||||
From: Rui Matos <tiagomatos@gmail.com>
|
||||
Date: Thu, 30 May 2013 11:40:37 +0200
|
||||
Subject: [PATCH] keyboard: Fix build without IBus
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=701249
|
||||
---
|
||||
plugins/keyboard/gsd-keyboard-manager.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
|
||||
index b15d355..b4131ef 100644
|
||||
--- a/plugins/keyboard/gsd-keyboard-manager.c
|
||||
+++ b/plugins/keyboard/gsd-keyboard-manager.c
|
||||
@@ -1489,7 +1489,9 @@ handle_dbus_method_call (GDBusConnection *connection,
|
||||
/* This can only happen if there's an
|
||||
* ibus_bus_set_global_engine_async() call
|
||||
* going on. */
|
||||
+#ifdef HAVE_IBUS
|
||||
g_cancellable_cancel (priv->ibus_cancellable);
|
||||
+#endif
|
||||
g_clear_pointer (&priv->invocation, set_input_source_return);
|
||||
priv->pending_ops = 0;
|
||||
}
|
||||
--
|
||||
1.8.1.4
|
||||
@ -1,7 +1,7 @@
|
||||
Index: gnome-settings-daemon-3.7.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
|
||||
Index: gnome-settings-daemon-3.9.3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-3.7.90.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
|
||||
+++ gnome-settings-daemon-3.7.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
|
||||
--- gnome-settings-daemon-3.9.3.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
|
||||
+++ gnome-settings-daemon-3.9.3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
|
||||
@@ -106,5 +106,10 @@
|
||||
<_summary>If we should show the recalled battery warning for a broken battery</_summary>
|
||||
<_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description>
|
||||
@ -13,11 +13,11 @@ Index: gnome-settings-daemon-3.7.90/data/org.gnome.settings-daemon.plugins.power
|
||||
+ </key>
|
||||
</schema>
|
||||
</schemalist>
|
||||
Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
|
||||
Index: gnome-settings-daemon-3.9.3/plugins/power/gsd-power-manager.c
|
||||
===================================================================
|
||||
--- gnome-settings-daemon-3.7.90.orig/plugins/power/gsd-power-manager.c
|
||||
+++ gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
|
||||
@@ -186,6 +186,7 @@ struct GsdPowerManagerPrivate
|
||||
--- gnome-settings-daemon-3.9.3.orig/plugins/power/gsd-power-manager.c
|
||||
+++ gnome-settings-daemon-3.9.3/plugins/power/gsd-power-manager.c
|
||||
@@ -183,6 +183,7 @@ struct GsdPowerManagerPrivate
|
||||
NotifyNotification *notification_low;
|
||||
NotifyNotification *notification_sleep_warning;
|
||||
NotifyNotification *notification_logout_warning;
|
||||
@ -25,7 +25,7 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
|
||||
GsdPowerActionType sleep_action_type;
|
||||
gboolean battery_is_low; /* laptop battery low, or UPS discharging */
|
||||
|
||||
@@ -212,6 +213,7 @@ struct GsdPowerManagerPrivate
|
||||
@@ -208,6 +209,7 @@ struct GsdPowerManagerPrivate
|
||||
gboolean inhibit_suspend_taken;
|
||||
guint inhibit_lid_switch_timer_id;
|
||||
gboolean is_virtual_machine;
|
||||
@ -33,7 +33,7 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
|
||||
|
||||
/* Idles */
|
||||
GnomeIdleMonitor *idle_monitor;
|
||||
@@ -2452,6 +2454,49 @@ is_session_active (GsdPowerManager *mana
|
||||
@@ -2339,6 +2341,49 @@ is_session_active (GsdPowerManager *mana
|
||||
}
|
||||
|
||||
static void
|
||||
@ -83,7 +83,7 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
|
||||
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
|
||||
{
|
||||
gboolean ret = FALSE;
|
||||
@@ -2544,6 +2589,8 @@ idle_set_mode (GsdPowerManager *manager,
|
||||
@@ -2431,6 +2476,8 @@ idle_set_mode (GsdPowerManager *manager,
|
||||
action_type = g_settings_get_enum (manager->priv->settings,
|
||||
"sleep-inactive-ac-type");
|
||||
}
|
||||
@ -92,7 +92,7 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
|
||||
do_power_action_type (manager, action_type);
|
||||
|
||||
/* turn on screen and restore user-selected brightness level */
|
||||
@@ -2590,7 +2637,6 @@ idle_set_mode (GsdPowerManager *manager,
|
||||
@@ -2477,7 +2524,6 @@ idle_set_mode (GsdPowerManager *manager,
|
||||
}
|
||||
manager->priv->kbd_brightness_pre_dim = -1;
|
||||
}
|
||||
@ -100,8 +100,8 @@ Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3364,6 +3410,12 @@ handle_resume_actions (GsdPowerManager *
|
||||
notify_close_if_showing (manager->priv->notification_ups_discharging);
|
||||
@@ -3252,6 +3298,12 @@ handle_resume_actions (GsdPowerManager *
|
||||
notify_close_if_showing (&manager->priv->notification_ups_discharging);
|
||||
main_battery_or_ups_low_changed (manager, FALSE);
|
||||
|
||||
+ if (manager->priv->last_idle_power_action == GSD_POWER_ACTION_SUSPEND ||
|
||||
|
||||
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 21 19:23:51 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.9.3:
|
||||
+ Color:
|
||||
- Bump colord dependency.
|
||||
+ Daemon:
|
||||
- Fix possible crash on start when calling setenv() after
|
||||
starting threads.
|
||||
+ Keyboard:
|
||||
- Don't show on the bus before we're fully initialised.
|
||||
+ Power:
|
||||
- Fix non-transient notifications sticking around.
|
||||
- Simplify composite battery as advertised in the D-Bus API.
|
||||
+ Updates:
|
||||
- Make sure only one notification appears.
|
||||
+ Wacom:
|
||||
- Fix calling for calibration from the notification.
|
||||
- Add configure button to the OSD window.
|
||||
- Rebase gnome-settings-daemon-notify-idle-resumed.patch.
|
||||
- Drop gnome-settings-daemon-disabled-ibus.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 30 07:09:49 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
%define with_smartcard 0
|
||||
|
||||
Name: gnome-settings-daemon
|
||||
Version: 3.9.2
|
||||
Version: 3.9.3
|
||||
Release: 0
|
||||
Summary: Settings daemon for the GNOME desktop
|
||||
License: GPL-2.0+
|
||||
@ -51,8 +51,6 @@ Patch15: gnome-packagekit-BNC383261.patch
|
||||
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
|
||||
Patch19: gnome-settings-daemon-notify-idle-resumed.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-settings-daemon-disabled-ibus.patch bgo#701249 dimstar@opensuse.org -- Fix build with ibus disabled.
|
||||
Patch20: gnome-settings-daemon-disabled-ibus.patch
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gnome-common
|
||||
@ -64,7 +62,7 @@ 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(colord) >= 0.1.32
|
||||
BuildRequires: pkgconfig(colord) >= 0.1.34
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.35.3
|
||||
@ -147,7 +145,6 @@ translation-update-upstream
|
||||
#%%patch15 -p0
|
||||
%patch17 -p1
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
|
||||
%build
|
||||
autoreconf -f -i
|
||||
@ -198,6 +195,7 @@ rm -rf %{buildroot}
|
||||
%{_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
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-list-wacom
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer
|
||||
|
||||
Loading…
Reference in New Issue
Block a user