Changes in x/installing/xkeyboard-config.xml [fe8c1a6:3f2db3a6]

File:

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

x/installing/xkeyboard-config.xml

@@ -6 +6 @@
 
   <!ENTITY xkeyboard-config-download-http
-  "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
+  "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.xz">
   <!ENTITY xkeyboard-config-download-ftp
-  "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-md5sum        "59eee0166c214c692d084e27ba33ec56">
-  <!ENTITY xkeyboard-config-size          "1.7 MB">
-  <!ENTITY xkeyboard-config-buildsize     "21 MB">
+  "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.xz">
+  <!ENTITY xkeyboard-config-md5sum        "eb133127bcf9da2df2dd4a0a9c92e387">
+  <!ENTITY xkeyboard-config-size          "860 KB">
+  <!ENTITY xkeyboard-config-buildsize     "14 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
 ]>
@@ -18 +18 @@
   <?dbhtml filename="xkeyboard-config.html"?>
 
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
 
   <title>XKeyboardConfig-&xkeyboard-config-version;</title>
@@ -36 +33 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92 +89 @@
     </para>
 
-<screen><userinput>./configure $XORG_CONFIG --with-xkb-rules-symlink=xorg &amp;&amp;
-make</userinput></screen>
+<screen><userinput>sed -i -E 's/(ln -s)/\1f/' rules/meson.build &amp;&amp;
+
+mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=$XORG_PREFIX --buildtype=release .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
@@ -103 +105 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
-
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <parameter>--with-xkb-rules-symlink=xorg</parameter>: By default, the
+      <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
       XKB rules installed are named "base". This creates symlinks named
       "xorg" to those rules, which is the default name used by Xorg.
     </para>
+-->
 
   </sect2>
-
   <sect2 role="content">
     <title>Contents</title>