Bug#704272: Suspend does not work anymore
Hi Simon, On 04/21/2013 02:31 PM, Simon McVittie wrote: On Sat, 30 Mar 2013 at 21:18:20 +0100, Guido Günther wrote: since the update frpm 3.6 supending does not work anymore ... It seems systemd is too old in Debian to handle this. Replacing revert-suspend-break.patch with the one here seems to work (under both systemd from unstable, and sysvinit+consolekit from unstable). GNOME team, would you like me to upload this? Debdiff also attached. Without having looked closely at the patch: sure, that'd be much appreciated! And don't forget to commit your changes to the svn repo. Thanks, Emilio -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#704272: Suspend does not work anymore
On Sat, 30 Mar 2013 at 21:18:20 +0100, Guido Günther wrote:
since the update frpm 3.6 supending does not work anymore
...
It seems systemd is too old in Debian to handle this.
Replacing revert-suspend-break.patch with the one here seems to work
(under both systemd from unstable, and sysvinit+consolekit from unstable).
GNOME team, would you like me to upload this? Debdiff also attached.
S
diffstat for gnome-shell-3.8.1 gnome-shell-3.8.1
changelog | 11
patches/revert-suspend-break.patch | 83 +
2 files changed, 78 insertions(+), 16 deletions(-)
diff -Nru gnome-shell-3.8.1/debian/changelog gnome-shell-3.8.1/debian/changelog
--- gnome-shell-3.8.1/debian/changelog 2013-04-19 22:45:31.0 +0100
+++ gnome-shell-3.8.1/debian/changelog 2013-04-21 12:45:10.0 +0100
@@ -1,3 +1,14 @@
+gnome-shell (3.8.1-1smcv1) UNRELEASED; urgency=low
+
+ * Local build.
+ * Reinstate support for suspend via UPower using the user-menu, until
+our logind is new enough to take over (Closes: #704272)
+ * Delay suspend for 1 second in the hope that that's long enough to lock
+the screen (works around #645716, but only if you suspend via the
+user-menu)
+
+ -- Simon McVittie s...@debian.org Sun, 21 Apr 2013 12:42:57 +0100
+
gnome-shell (3.8.1-1) experimental; urgency=low
* New upstream release
diff -Nru gnome-shell-3.8.1/debian/patches/revert-suspend-break.patch gnome-shell-3.8.1/debian/patches/revert-suspend-break.patch
--- gnome-shell-3.8.1/debian/patches/revert-suspend-break.patch 2013-02-23 22:44:58.0 +
+++ gnome-shell-3.8.1/debian/patches/revert-suspend-break.patch 2013-04-21 12:42:35.0 +0100
@@ -1,18 +1,25 @@
-From b91d9c2867952520e685d689f75bc019befcaaf3 Mon Sep 17 00:00:00 2001
-From: Florian Müllner fmuell...@gnome.org
-Date: Sun, 03 Feb 2013 20:53:33 +
-Subject: loginManager: Make suspend() a NOP in the ConsoleKit path
+From 23a65607b011582e11be1ed4be5c309da14bf4d6 Mon Sep 17 00:00:00 2001
+From: Simon McVittie simon.mcvit...@collabora.co.uk
+Date: Sun, 21 Apr 2013 12:42:31 +0100
+Subject: [PATCH] Reinstate support for suspending via UPower
-UPower will remove its suspend support eventually, and g-s-d already
-depends on logind for power management.
+Debian's logind is currently too old to know how to suspend
+(Debian #704272).
-https://bugzilla.gnome.org/show_bug.cgi?id=693162
+Also delay suspend by 1 second, in the hope that this will avoid showing
+the old screen contents after resume (Debian #645716). With a newer
+logind, inhibiting suspend will fix this properly.
-Index: gnome-shell-3.7.90/js/misc/loginManager.js
-===
gnome-shell-3.7.90.orig/js/misc/loginManager.js 2013-02-23 15:17:56.532244380 -0500
-+++ gnome-shell-3.7.90/js/misc/loginManager.js 2013-02-23 15:19:29.800240480 -0500
-@@ -5,6 +5,7 @@
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704272
+---
+ js/misc/loginManager.js | 33 +
+ 1 file changed, 25 insertions(+), 8 deletions(-)
+
+diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js
+index ce4af41..280e478 100644
+--- a/js/misc/loginManager.js
b/js/misc/loginManager.js
+@@ -5,6 +5,7 @@ const Gio = imports.gi.Gio;
const Lang = imports.lang;
const Mainloop = imports.mainloop;
const Shell = imports.gi.Shell;
@@ -20,7 +27,15 @@
const Signals = imports.signals;
const SystemdLoginManagerIface = interface name='org.freedesktop.login1.Manager'
-@@ -137,12 +138,10 @@
+@@ -135,6 +136,7 @@ const LoginManagerSystemd = new Lang.Class({
+ '/org/freedesktop/login1');
+ this._proxy.connectSignal('PrepareForSleep',
+ Lang.bind(this, this._prepareForSleep));
++this._upClient = new UPowerGlib.Client();
+ },
+
+ // Having this function is a bit of a hack since the Systemd and ConsoleKit
+@@ -178,12 +180,10 @@ const LoginManagerSystemd = new Lang.Class({
},
canSuspend: function(asyncCallback) {
@@ -37,7 +52,23 @@
},
listSessions: function(asyncCallback) {
-@@ -199,6 +198,7 @@
+@@ -204,7 +204,14 @@ const LoginManagerSystemd = new Lang.Class({
+ },
+
+ suspend: function() {
+-this._proxy.SuspendRemote(true);
++this.emit('prepare-for-sleep', true);
++this.emit('prepare-for-sleep', false);
++ // hack: wait 1 second, by which time the screen will hopefully
++ // have finished locking
++Mainloop.timeout_add(1000, Lang.bind(this, function() {
++this._upClient.suspend_sync(null);
++return false;
++}));
+ },
+
+ inhibit: function(reason, callback) {
+@@ -240,6 +247,7 @@ const LoginManagerConsoleKit = new Lang.Class({
this._proxy = new ConsoleKitManager(Gio.DBus.system,
Bug#704272: Suspend does not work anymore
Hi, On Sat, Mar 30, 2013 at 10:33:58PM +0100, Emilio Pozuelo Monfort wrote: On 03/30/2013 09:18 PM, Guido Günther wrote: Package: gnome-shell Version: 3.8.0.1-1 Severity: normal Hi, since the update frpm 3.6 supending does not work anymore, I'm seeing: Mar 30 21:05:25 bogon dbus-daemon[1321]: dbus[1321]: [system] Rejected send message, 2 matched rules; type=method_call, sender=:1.362 (uid=1000 pid=23819 comm=/usr/bin/gnome-shell ) interf ace=org.freedesktop.login1.Manager member=Suspend error name=(unset) requested_reply=0 destination=:1.4 (uid=0 pid=1462 comm=/lib/systemd/systemd-logind ) It seems systemd is too old in Debian to handle this. Is there already some discussion going on whether we should fallback to another method or if whether a systemd upddate is the way forward? Yes. Michael is working on an updated systemd. There's also been comments on going back to the upower interface until then. I'm not sure what will happen first. Thanks for the update! Updating logind looks like a great way forward. Let me know if I can be of any help. Until then this works as a workaround: dbus-send --print-reply --session --dest=org.gnome.Shell /org/gnome/ScreenSaver org.gnome.ScreenSaver.Lock ; dbus-send --print-reply --system --dest=org.freedesktop.UPower /org/freedesktop/UPower org.freedesktop.UPower.Suspend Cheers, -- Guido -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#704272: Suspend does not work anymore
Package: gnome-shell Version: 3.8.0.1-1 Severity: normal Hi, since the update frpm 3.6 supending does not work anymore, I'm seeing: Mar 30 21:05:25 bogon dbus-daemon[1321]: dbus[1321]: [system] Rejected send message, 2 matched rules; type=method_call, sender=:1.362 (uid=1000 pid=23819 comm=/usr/bin/gnome-shell ) interf ace=org.freedesktop.login1.Manager member=Suspend error name=(unset) requested_reply=0 destination=:1.4 (uid=0 pid=1462 comm=/lib/systemd/systemd-logind ) It seems systemd is too old in Debian to handle this. Is there already some discussion going on whether we should fallback to another method or if whether a systemd upddate is the way forward? Cheers, -- Guido -- System Information: Debian Release: 7.0 APT prefers testing APT policy: (990, 'testing'), (50, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages gnome-shell depends on: ii dconf-gsettings-backend [gsettings-backend] 0.12.1-3 ii evolution-data-server3.7.92-1 ii gdm3 3.6.1-2 ii gir1.2-accountsservice-1.0 0.6.21-8 ii gir1.2-caribou-1.0 0.4.10-2 ii gir1.2-clutter-1.0 1.14.0-1 ii gir1.2-freedesktop 1.34.2-1 ii gir1.2-gconf-2.0 3.2.5-1+build1 ii gir1.2-gcr-3 3.6.0-1 ii gir1.2-gkbd-3.0 3.4.0.2-1 ii gir1.2-glib-2.0 1.34.2-1 ii gir1.2-gmenu-3.0 3.4.2-5 ii gir1.2-gnomebluetooth-1.03.6.0-1 ii gir1.2-gnomedesktop-3.0 3.8.0.1-2 ii gir1.2-gtk-3.0 3.8.0-1 ii gir1.2-ibus-1.0 1.4.99.20120917-3 ii gir1.2-mutter-3.03.8.0-1 ii gir1.2-networkmanager-1.00.9.6.4-1 ii gir1.2-nmgtk-1.0 0.9.8.0-1 ii gir1.2-pango-1.0 1.32.5-1 ii gir1.2-polkit-1.00.105-3 ii gir1.2-soup-2.4 2.40.1-1 ii gir1.2-telepathyglib-0.120.20.1-1 ii gir1.2-upowerglib-1.00.9.17-1 ii gjs 1.36.0-1 ii gnome-bluetooth 3.6.0-1 ii gnome-icon-theme-symbolic3.4.0-2 ii gnome-settings-daemon3.8.0-2 ii gnome-shell-common 3.8.0.1-1 ii gnome-themes-standard3.6.0.2-2 ii gsettings-desktop-schemas3.8.0-1 ii libatk-bridge2.0-0 2.7.3-1 ii libatk1.0-0 2.8.0-1 ii libc62.13-38 ii libcairo-gobject21.12.6-1 ii libcairo21.12.6-1 ii libcamel-1.2-43 3.7.92-1 ii libcanberra-gtk3-0 0.28-6 ii libcanberra0 0.28-6 ii libclutter-1.0-0 1.14.0-1 ii libcogl-pango12 1.14.0-1 ii libcogl121.14.0-1 ii libcroco30.6.8-1 ii libdbus-1-3 1.6.8-1 ii libdbus-glib-1-2 0.100.2-1 ii libecal-1.2-15 3.7.92-1 ii libedataserver-1.2-173.7.92-1 ii libegl1-mesa [libegl1-x11] 8.0.5-4 ii libgck-1-0 3.6.0-1 ii libgcr-3-1 3.6.0-1 ii libgdk-pixbuf2.0-0 2.28.0-1 ii libgirepository-1.0-11.34.2-1 ii libgjs0c [libgjs0-libmozjs185-1.0] 1.36.0-1 ii libglib2.0-0 2.36.0-2 ii libgnome-menu-3-03.4.2-5 ii libgstreamer1.0-01.0.5-1 ii libgtk-3-0 3.8.0-1 ii libical0 0.48-2 ii libjson-glib-1.0-0 0.14.2-1 ii libmozjs185-1.0 1.8.5-1.0.0+dfsg-4 ii libmutter0b 3.8.0-1 ii libnm-glib4 0.9.8.0-2 ii libnm-gtk0 0.9.8.0-1 ii libnm-util2 0.9.8.0-2 ii libnspr4 2:4.9.2-1 ii libnspr4-0d 2:4.9.2-1 ii libnss3 2:3.14.3-1 ii libnss3-1d
Bug#704272: Suspend does not work anymore
On 03/30/2013 09:18 PM, Guido Günther wrote: Package: gnome-shell Version: 3.8.0.1-1 Severity: normal Hi, since the update frpm 3.6 supending does not work anymore, I'm seeing: Mar 30 21:05:25 bogon dbus-daemon[1321]: dbus[1321]: [system] Rejected send message, 2 matched rules; type=method_call, sender=:1.362 (uid=1000 pid=23819 comm=/usr/bin/gnome-shell ) interf ace=org.freedesktop.login1.Manager member=Suspend error name=(unset) requested_reply=0 destination=:1.4 (uid=0 pid=1462 comm=/lib/systemd/systemd-logind ) It seems systemd is too old in Debian to handle this. Is there already some discussion going on whether we should fallback to another method or if whether a systemd upddate is the way forward? Yes. Michael is working on an updated systemd. There's also been comments on going back to the upower interface until then. I'm not sure what will happen first. Regards, Emilio -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
