Changeset 0a18d81 for x/installing/xkeyboard-config.xml

Timestamp:

02/09/2022 12:47:33 AM (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:

cf63c3d

Parents:

0894002

Message:

Package updates.
Update to LVM2.2.03.15.
Update to gpgme-1.17.0.
Update to imlib2-1.8.0.
Update to xkeyboard-config-2.35.

File:

• x/installing/xkeyboard-config.xml (modified) (3 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        "54049980498775f34d473ccf81e49338">
+  <!ENTITY xkeyboard-config-size          "852 KB">
+  <!ENTITY xkeyboard-config-buildsize     "14 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
 ]>
@@ -92 +92 @@
     </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 +108 @@
     </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>