From a0ed916d8c383999cbad525d6e73f9d3e54f8ed9 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Sun, 8 May 2022 22:33:36 +0200
Subject: [PATCH] update to mutter-42.1

---
 gnome.ent                          |  2 +-
 gnome/platform/mutter.xml          | 22 ++++++++--------------
 introduction/welcome/changelog.xml |  4 ++++
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/gnome.ent b/gnome.ent
index 6286a7ad22..f2aaf5bb26 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -67,7 +67,7 @@
 <!ENTITY gnome-keyring-version             "40.0">
 <!ENTITY gnome-settings-daemon-version     "42.1">
 <!ENTITY gnome-control-center-version      "42.1">
-<!ENTITY mutter-version                    "42.0">
+<!ENTITY mutter-version                    "42.1">
 <!ENTITY gnome-shell-version               "42.1">
 <!ENTITY gnome-shell-extensions-version    "42.1">
 <!ENTITY gnome-session-version             "42.0">
diff --git a/gnome/platform/mutter.xml b/gnome/platform/mutter.xml
index fb362ad814..0741b90d19 100644
--- a/gnome/platform/mutter.xml
+++ b/gnome/platform/mutter.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-42;/mutter-&mutter-version;.tar.xz">
   <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-42;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "9141c8037f71b6676d28107c7bcee26f">
+  <!ENTITY mutter-md5sum        "59303bc585dd0e61632bf15440b6e343">
   <!ENTITY mutter-size          "2.6 MB">
-  <!ENTITY mutter-buildsize     "176 MB (with tests)">
-  <!ENTITY mutter-time          "0.9 SBU (Using parallelism=4, add 0.6 SBU for tests)">
+  <!ENTITY mutter-buildsize     "177 MB (with tests)">
+  <!ENTITY mutter-time          "0.9 SBU (Using parallelism=4, add 1.0 SBU for tests)">
 ]>
 
 <sect1 id="mutter" xreflabel="Mutter-&mutter-version;">
@@ -70,7 +70,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -80,7 +80,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
+    -->
     <bridgehead renderas="sect3">Mutter Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -137,14 +137,14 @@
 
   <sect2 role="installation">
     <title>Installation of Mutter</title>
-
+    <!--
     <para>
       First, apply a patch that fixes annoying bugs found after GNOME 42
       release:
     </para>
 
 <screen><userinput>patch -Np1 -i ../mutter-&mutter-version;-consolidated_fixes-1.patch</userinput></screen>
-
+-->
     <para>
       Install <application>Mutter</application> by running the following
       commands:
@@ -185,12 +185,6 @@ ninja</userinput></screen>
       system, so it is better to run the tests after installing the package.
     </para>
 
-    <!-- "catchsegv" from glibc is needed, but it's removed in 2.35
-    <para>
-      The test suite for this package does not work on systems using glibc-2.35
-      and later.
-    </para>
-    -->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
@@ -201,7 +195,7 @@ ninja</userinput></screen>
       The tests can now be run: issue
       <command>dbus-run-session ninja test</command>. Note that the tests
       require an active X session to run correctly, and that
-      <filename>native-headless</filename> is known to fail.
+      <filename>native-unit</filename> is known to fail.
     </para>
   </sect2>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 6e15cb9113..1686f1e1d1 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>May 6th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to mutter-42.1. Fixes
+          <ulink url="&blfs-ticket-root;16524">#16524</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Update to gnome-shell-extensions-42.1. Part of
           <ulink url="&blfs-ticket-root;16524">#16524</ulink>.</para>