Changeset 2a56e15

Timestamp:

02/04/2023 08:06:33 AM (15 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

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:

c945f8f

Parents:

075cb1e

Message:

Remove the sed in xkeyboard-config

This sed is used to change the command for symlinking xorg to
base in /usr/share/X11/xkb/rules. But the default for the xorg
symlinks is false, and those symlinks have been deprecated since
2005...
Prompted by a question of r1c0n3r0 on #lfs-support
Also add the explanation for --buildtype

File:

• x/installing/xkeyboard-config.xml (modified) (2 diffs)

x/installing/xkeyboard-config.xml

@@ -89 +89 @@
     </para>
 
-<screen><userinput>sed -i -E 's/(ln -s)/\1f/' rules/meson.build &amp;&amp;
-
-mkdir build &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
@@ -111 +109 @@
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                href="../../xincludes/meson-buildtype-release.xml"/>
+<!-- the default for the xorg symlinks is false. So the change to
+     the symlink command is not needed. Note that those symlinks have
+     been deprecated since 2005...
     <para>
       <command>sed ... rules/meson.build</command>: Make sure
       a symlink is created even if it already exists.
     </para>
-<!--
     <para>
       <parameter>- -with-xkb-rules-symlink=xorg</parameter>: By default, the