Update to 3.35.3
This commit is contained in:
Kalev Lember
parent
fa083d460f
commit
c61fb6c97b
1
.gitignore
vendored
1
.gitignore
vendored
@ -108,3 +108,4 @@ gnome-session-2.31.6.tar.bz2
|
||||
/gnome-session-3.34.0.tar.xz
|
||||
/gnome-session-3.34.1.tar.xz
|
||||
/gnome-session-3.34.2.tar.xz
|
||||
/gnome-session-3.35.3.tar.xz
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 16f3e738f1e831c3af0f2b0718260601298af0ed Mon Sep 17 00:00:00 2001
|
||||
From: Iain Lane <iainl@gnome.org>
|
||||
Date: Tue, 10 Dec 2019 12:37:31 +0000
|
||||
Subject: [PATCH 1/2] binary: Log a critical when our SIGTERM/SIGINT handler
|
||||
fails to log out
|
||||
|
||||
---
|
||||
gnome-session/main.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gnome-session/main.c b/gnome-session/main.c
|
||||
index c9488823..152e60ed 100644
|
||||
--- a/gnome-session/main.c
|
||||
+++ b/gnome-session/main.c
|
||||
@@ -103,12 +103,17 @@ on_name_lost (GDBusConnection *connection,
|
||||
static gboolean
|
||||
term_or_int_signal_cb (gpointer data)
|
||||
{
|
||||
+ g_autoptr(GError) error = NULL;
|
||||
GsmManager *manager = (GsmManager *)data;
|
||||
|
||||
/* let the fatal signals interrupt us */
|
||||
g_debug ("Caught SIGINT/SIGTERM, shutting down normally.");
|
||||
|
||||
- gsm_manager_logout (manager, GSM_MANAGER_LOGOUT_MODE_FORCE, NULL);
|
||||
+ gsm_manager_logout (manager, GSM_MANAGER_LOGOUT_MODE_FORCE, &error);
|
||||
+
|
||||
+ if (error != NULL) {
|
||||
+ g_critical ("Failed to log out: %s", error->message);
|
||||
+ }
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From 04d1eb2d2fdf8341b684ea6430d51ee1534f2e5d Mon Sep 17 00:00:00 2001
|
||||
From: Iain Lane <iainl@gnome.org>
|
||||
Date: Tue, 10 Dec 2019 13:01:38 +0000
|
||||
Subject: [PATCH 2/2] binary: Allow quitting early on SIGTERM/SIGINT
|
||||
|
||||
Now we're started by systemd, we also need to handle being *stopped* by
|
||||
systemd too. systemd sends us a SIGTERM to ask us to quit, but we refuse
|
||||
to exit on SIGTERM if we're not fully running. That's a problem if the
|
||||
SIGTERM is sent early in startup. For example, if gnome-shell has exited
|
||||
due to Wayland not being supported, and we're trying to fall back to
|
||||
Xorg, the session will not be running at this point, but we want to be
|
||||
able to kill everything in order to try again with Xorg.
|
||||
|
||||
Fix this by looking at the `GError` returned by `gsm_manager_logout()`,
|
||||
and directly quitting if we're not in the running phase yet.
|
||||
---
|
||||
gnome-session/main.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gnome-session/main.c b/gnome-session/main.c
|
||||
index 152e60ed..01f56667 100644
|
||||
--- a/gnome-session/main.c
|
||||
+++ b/gnome-session/main.c
|
||||
@@ -109,9 +109,12 @@ term_or_int_signal_cb (gpointer data)
|
||||
/* let the fatal signals interrupt us */
|
||||
g_debug ("Caught SIGINT/SIGTERM, shutting down normally.");
|
||||
|
||||
- gsm_manager_logout (manager, GSM_MANAGER_LOGOUT_MODE_FORCE, &error);
|
||||
+ if (!gsm_manager_logout (manager, GSM_MANAGER_LOGOUT_MODE_FORCE, &error)) {
|
||||
+ if (g_error_matches (error, GSM_MANAGER_ERROR, GSM_MANAGER_ERROR_NOT_IN_RUNNING)) {
|
||||
+ gsm_quit ();
|
||||
+ return FALSE;
|
||||
+ }
|
||||
|
||||
- if (error != NULL) {
|
||||
g_critical ("Failed to log out: %s", error->message);
|
||||
}
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
%endif
|
||||
|
||||
Name: gnome-session
|
||||
Version: 3.34.2
|
||||
Release: 3%{?dist}
|
||||
Version: 3.35.3
|
||||
Release: 1%{?dist}
|
||||
Summary: GNOME session manager
|
||||
|
||||
License: GPLv2+
|
||||
URL: http://www.gnome.org
|
||||
Source0: http://download.gnome.org/sources/gnome-session/3.34/%{name}-%{version}.tar.xz
|
||||
Source0: http://download.gnome.org/sources/gnome-session/3.35/%{name}-%{version}.tar.xz
|
||||
|
||||
# Blacklist NV30: https://bugzilla.redhat.com/show_bug.cgi?id=745202
|
||||
Patch1: gnome-session-3.3.92-nv30.patch
|
||||
@ -31,11 +31,6 @@ Patch6: 0002-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
|
||||
Patch10: 0001-data-Add-drop-in-to-configure-launched-applications.patch
|
||||
Patch11: 0002-autostart-app-Place-launched-applications-into-a-sys.patch
|
||||
|
||||
# Still a few discussions upstream, but this appears sane and reasonably safe
|
||||
# https://gitlab.gnome.org/GNOME/gnome-session/merge_requests/35
|
||||
Patch20: 0001-binary-Log-a-critical-when-our-SIGTERM-SIGINT-handle.patch
|
||||
Patch21: 0002-binary-Allow-quitting-early-on-SIGTERM-SIGINT.patch
|
||||
|
||||
BuildRequires: meson
|
||||
BuildRequires: gcc
|
||||
BuildRequires: pkgconfig(egl)
|
||||
@ -140,6 +135,9 @@ Desktop file to add GNOME on wayland to display manager session menu.
|
||||
%{_userunitdir}/gnome-launched-.scope.d/override.conf
|
||||
|
||||
%changelog
|
||||
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.35.3-1
|
||||
- Update to 3.35.3
|
||||
|
||||
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.34.2-3
|
||||
- Rebuilt for libgnome-desktop soname bump
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gnome-session-3.34.2.tar.xz) = 23388420ee117596b73ac057d2376857db726fb727fdeff4e4f420e7742622e81baef439adb04d8659a6979e5b7043c72ea334c1179974950476489a8c397182
|
||||
SHA512 (gnome-session-3.35.3.tar.xz) = 6b196df9e62544d5315133c0d2a6040af6bd43fd43b0bc6379a8f640859a1a57bb79885a6c219f4864eef8db9d47ab38d6418f92d5b3e2903095cc61c3cfdb1d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user