Changeset 185b3090 for gnome/platform/mutter.xml

Timestamp:

04/10/2022 07:23:34 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

a5ebc7a2

Parents:

f0214829

Message:

Update to mutter-42.0

File:

• gnome/platform/mutter.xml (modified) (7 diffs)

gnome/platform/mutter.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-41;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-41;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "49766d24a63cb9ca3f6bf20c188ca9a5">
+  <!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-size          "2.6 MB">
-  <!ENTITY mutter-buildsize     "75 MB">
-  <!ENTITY mutter-time          "0.6 SBU (Using parallelism=4)">
+  <!ENTITY mutter-buildsize     "176 MB (with tests)">
+  <!ENTITY mutter-time          "0.9 SBU (Using parallelism=4, add 0.6 SBU for tests)">
 ]>
 
@@ -72 +72 @@
     </itemizedlist>
 
-<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Required download:
-          <ulink url="&sources-anduin-http;/mutter/xvfb-run"/>
+          Recommended patch:
+          <ulink url="&patch-root;/mutter-&mutter-version;-consolidated_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">Mutter Dependencies</bridgehead>
@@ -141 +139 @@
     <title>Installation of Mutter</title>
 
-<!--
-    <para>
-      First, install an additional tool that is required by meson as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
- <screen role="root"><userinput remap="pre">install -v -m755 ../xvfb-run /usr/bin</userinput></screen>
- -->
+    <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>
@@ -171 +167 @@
     </para>
     -->
-    <!--
     <para>
       The test suite requires debug functions enabled in the build, and
@@ -184 +179 @@
       <xref linkend='xorg-server'/> or <xref linkend='xwayland'/>.
       You should also replace the
-      <parameter>- -buildtype=release -Dtests=false</parameter> in
+      <parameter>--buildtype=release -Dtests=false</parameter> in
       the <command>meson</command> command, with
-      <parameter>- -buildtype=debugoptimized -Dtests=true</parameter>.
-      To run the tests, issue:
+      <parameter>--buildtype=debugoptimized -Dtests=true</parameter>.
+      The test suite requires the mutter schema to be installed on the
+      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>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+    <para>
+      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.
-    </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>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
   </sect2>
 
@@ -216 +213 @@
     <para>
       <parameter>-Dtests=false</parameter>: Prevents building the tests,
-      and removes a hard requirement on <command>catchsegv</command> or
-      <command>xvfb-run</command>.
+      and removes a hard requirement on <command>xvfb-run</command>.
     </para>
 
@@ -242 +238 @@
         </seg>
         <seg>
-          libmutter-9.so
+          libmutter-10.so
         </seg>
         <seg>
-          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-9
+          /usr/{lib,include,libexec/installed-tests,share/{,installed-tests}}/mutter-10
         </seg>
       </seglistitem>