Changeset 1770d64

Timestamp:

02/11/2023 07:14:16 AM (17 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

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

Children:

972a985

Parents:

f719350

Message:

xwayland: Add --buildtype=release, and ...

Adjust the description of man page Xserver.1: technically both Xorg and
Xwayland are in the category of "X server". The reason we don't install
it here is not "it's not a part of this package", but we don't want to
overwrite a man page from another package.

Remove the creation of /etc/X11/xorg.conf.d: "Xorg" is "another X
server" so technically Xwayland (and other packages except Xorg and the
Xorg drivers) should have nothing to do with it. In my last build
/etc/X11/xorg.conf.d is empty.

File:

• x/installing/xwayland.xml (modified) (5 diffs)

x/installing/xwayland.xml

@@ -117 +117 @@
 
 meson --prefix=$XORG_PREFIX         \
+      --buildtype=release           \
       -Dxkb_output_dir=/var/lib/xkb \
       ..                            &&
@@ -178 +179 @@
 
 <screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
-mkdir -pv /etc/X11/xorg.conf.d &amp;&amp;
 cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
 <literal>/tmp/.X11-unix dir 1777 root root</literal>
 EOF</userinput></screen>
 
-<screen role="root" revision="systemd"><userinput>ninja install &amp;&amp;
-mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
+<screen role="root" revision="systemd"><userinput>ninja install</userinput></screen>
 
     <para>
@@ -202 +201 @@
       <command>sed -i '/install_man/,$d' meson.build</command>: Prevents
       installing a manual page for <command>Xserver</command>,
-      which is not part of this package.
-    </para>
+      which is also provided by <xref linkend='xorg-server'/>.  Remove this
+      command if <xref linkend='xorg-server'/> is not installed and you
+      don't plan to install it later.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
 <!--
     <para>
@@ -211 +215 @@
       install the X server.
     </para>
--->
+
     <para>
       <command>mkdir -pv /etc/X11/xorg.conf.d</command>: This directory is
@@ -218 +222 @@
       creating it.
     </para>
-
+-->
     <para revision="sysv">
       <command>cat &gt;&gt; /etc/sysconfig/createfiles...</command>: This