Changeset c5b7d1fa


Ignore:
Timestamp:
04/05/2006 05:28:06 AM (18 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
18b36d1a
Parents:
a0e439d
Message:

corrected svn ci collision

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5804 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    ra0e439d rc5b7d1fa  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[dj] - Added sed to correct glibc header problem in
     49          xorg-server.</para>
     50        </listitem>
     51        <listitem>
    4852          <para>[bdubbs] - Added Wireless Tools.</para>
    4953        </listitem>
  • x/installing/xorg7.xml

    ra0e439d rc5b7d1fa  
    339339      <title>Installation of Xorg Data</title>
    340340
    341       <para>First, install the xbitmap package by running the following
    342       commands:</para>
     341      <para>First, configure the xbitmap package by running the following
     342      command:</para>
    343343
    344344<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
    345345
    346       <para>Now as the <systemitem class="username">root</systemitem>
     346      <para>Now install as the <systemitem class="username">root</systemitem>
    347347      user:</para>
    348348
     
    362362make</userinput></screen>
    363363
    364       <para>As the <systemitem class="username">root</systemitem>
    365       user:</para>
     364      <para>Install the packages as the
     365      <systemitem class="username">root</systemitem> user:</para>
    366366
    367367<screen><userinput role="root">make install</userinput></screen>
     
    515515        <application>Xorg-server</application>.</para>
    516516      </note>
     517
     518<!-- To be removed if/when proposed glibc patch is added to LFS SVN-->
     519      <para>Execute the following sed command to work around a broken
     520      <application>glibc</application> header file:</para>
     521
     522<screen><userinput>sed -i.bak '/CONFIG_H/i #include &lt;linux/types.h&gt;' \
     523        hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
     524<!-- End remove -->
    517525
    518526      <para>Install the server by running the following commands:</para>
Note: See TracChangeset for help on using the changeset viewer.