From 06314d4761c5912e43eee855e5633fb43f99d6fa Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Sat, 9 Apr 2022 21:53:37 +0200
Subject: [PATCH] Update to gnome-session-42.0

---
 gnome.ent                          |  2 +-
 gnome/platform/gnome-session.xml   | 17 +++++------------
 introduction/welcome/changelog.xml |  4 ++++
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/gnome.ent b/gnome.ent
index d93b33ae20..a9ac57051a 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -68,7 +68,7 @@
 <!ENTITY mutter-version                    "41.4">
 <!ENTITY gnome-shell-version               "41.4">
 <!ENTITY gnome-shell-extensions-version    "41.2">
-<!ENTITY gnome-session-version             "41.3">
+<!ENTITY gnome-session-version             "42.0">
 <!ENTITY gdm-version                       "42.0">
 <!ENTITY gnome-user-docs-version           "41.2">
 <!-- Icons moved to packages.ent, since they're now in the Icons chapter.-->
diff --git a/gnome/platform/gnome-session.xml b/gnome/platform/gnome-session.xml
index bfa9d740ab..c66d95a0b7 100644
--- a/gnome/platform/gnome-session.xml
+++ b/gnome/platform/gnome-session.xml
@@ -5,12 +5,12 @@
   %general-entities;
 
   <!ENTITY gnome-session-download-http
-           "&gnome-download-http;/gnome-session/&gnome-41;/gnome-session-&gnome-session-version;.tar.xz">
+           "&gnome-download-http;/gnome-session/&gnome-42;/gnome-session-&gnome-session-version;.tar.xz">
   <!ENTITY gnome-session-download-ftp
-           "&gnome-download-ftp;/gnome-session/&gnome-41;/gnome-session-&gnome-session-version;.tar.xz">
-  <!ENTITY gnome-session-md5sum        "f0ccb8a21871a7dce3c3b104fe33a31a">
-  <!ENTITY gnome-session-size          "476 KB">
-  <!ENTITY gnome-session-buildsize     "16 MB">
+           "&gnome-download-ftp;/gnome-session/&gnome-42;/gnome-session-&gnome-session-version;.tar.xz">
+  <!ENTITY gnome-session-md5sum        "ab47b2cd924fb74d4dbc2edab886c32a">
+  <!ENTITY gnome-session-size          "474 KB">
+  <!ENTITY gnome-session-buildsize     "12 MB">
   <!ENTITY gnome-session-time          "0.1 SBU">
 ]>
 
@@ -111,13 +111,6 @@
 
 <screen><userinput>sed 's@/bin/sh@/bin/sh -l@' -i gnome-session/gnome-session.in</userinput></screen>
 
-<!-- Not needed with 40.1.1
-    <para revision="systemd">
-      Adapt gnome-session to changes in systemd-247:
-    </para>
-
-<screen revision="systemd"><userinput remap="pre">echo 'Slice=-.slice' >> data/gnome-session-restart-dbus.service.in</userinput></screen>
--->
 
     <para revision="sysv">
       Adapt meson.build so that gnome-session can build without systemd:
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 057446d58f..f0d887ce8d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>April 9th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to gnome-session-42.0. Fixes
+          <ulink url="&blfs-ticket-root;16306">#16306</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Update to gdm-42.0. Fixes
           <ulink url="&blfs-ticket-root;16305">#16305</ulink>.</para>