Changeset 60181f9b

Timestamp:

01/29/2022 08:33:55 PM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.1, 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/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f948b30

Parents:

2232977b (diff), 69f58f5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Location:

gnome/platform

Files:

• gnome-settings-daemon.xml (modified) (1 diff)
• mutter.xml (modified) (3 diffs)

gnome/platform/gnome-settings-daemon.xml

@@ -135 +135 @@
 
     <para>
-      First fix building with recent versions of
-      <application>meson</application>
+      First, fix building with recent versions of
+      <application>meson</application>:
     </para>
 

gnome/platform/mutter.xml

@@ -158 +158 @@
 cd    build &&
 
-meson --prefix=/usr --buildtype=debugoptimized -Dtests=false .. &&
+meson --prefix=/usr --buildtype=release -Dtests=false .. &&
 ninja</userinput></screen>
 
@@ -173 +173 @@
 
     <para>
-      The test suite requires an external program called
-      <command>xvfb-run</command>. If you wish to run the tests, you should
+      The test suite requires debug functions enabled in the build, and
+      an external program called <command>xvfb-run</command>.
+      If you wish to run the tests, you should
       download and install it before running <command>meson</command>.
       You can obtain it from
       <ulink url="&sources-anduin-http;/mutter/xvfb-run">xvfb-run</ulink>, and
       install it in <filename class="directory">/usr/bin</filename>.
-      You should also remove the <parameter>-Dtests=false</parameter> from
-      the <command>meson</command> command. To run the tests, issue:
+      <command>xvfb-run</command> needs <command>Xvfb</command> at runtime,
+      and <command>Xvfb</command> can be installed from either
+      <xref linkend='xorg-server'/> or <xref linkend='xwayland'/>.
+      You should also replace the
+      <parameter>--buildtype=release -Dtests=false</parameter> in
+      the <command>meson</command> command, with
+      <parameter>--buildtype=debugoptimized -Dtests=true</parameter>.
+      To run the tests, issue:
       <command>dbus-run-session ninja test</command>. Note that the tests
       require an active X session to run correctly, and that
@@ -197 +204 @@
     <title>Command Explanations</title>
 
-    <para>
-      <parameter>--buildtype=debugoptimized</parameter>: Override the
-      default buildtype (<quote>debug</quote>), which would produce
-      unoptimized binaries.  The test suite of this package needs debug
-      to be enabled.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>