Changeset e004bec

Timestamp:

06/20/2008 01:37:37 AM (16 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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:

42205811

Parents:

f48fe3c

Message:

Merge 6.3 branch changes from r7489.

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

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/installing/x7lib.xml (modified) (2 diffs)
• x/installing/xorg7.xml (modified) (1 diff)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">

introduction/welcome/changelog.xml

@@ -41 +41 @@
 
 -->
+    <listitem>
+      <para>June 19th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Merge 6.3 branch changes from r7489 - Clarified Xorg 
+          installation text, corrected Xorg patch paths, and added libXdmcp
+          as a required dependency of Xorg Libs.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>June 9th, 2008</para>

x/installing/x7lib.xml

@@ -87 +87 @@
     <para role="required"><xref linkend="ed"/>,
     <xref linkend="fontconfig"/>,
-    <xref linkend="pkgconfig"/>, and
-    <xref linkend="xorg7-proto"/></para>
+    <xref linkend="pkgconfig"/>,
+    <xref linkend="xorg7-proto"/>, and
+    <xref linkend="libXdmcp"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -120 +121 @@
 <screen><userinput>case $(basename "$PWD") in
 libX11-&libX11-version; )
-    patch -Np1 -i ../libX11-&libX11-version;-badargs-1.patch &amp;&amp;
+    patch -Np1 -i ../../libX11-&libX11-version;-badargs-1.patch &amp;&amp;
     sed -i 's/_XGet/XGet/' modules/im/ximcp/imDefLkup.c
     ;;
 libXfont-&libXfont-version; )
-    patch -Np1 -i ../libXfont-&libXfont-version;-pcf_parser-1.patch &amp;&amp;
+    patch -Np1 -i ../../libXfont-&libXfont-version;-pcf_parser-1.patch &amp;&amp;
     sed -i 's/(ft_isdigit/(isdigit/' src/FreeType/fttools.c
     ;;

x/installing/xorg7.xml

@@ -78 +78 @@
   </note>
 
+<!--
   <para>Additionally, because of the large number of repetitive commands,
   you are encouraged to script the build.  For most sections, you can use
   a script with commands similar to the following, to compile and install
   all packages in a wget file list:</para>
+-->
+
+  <para>Additionally, because of the large number of repetitive commands,
+  you are encouraged to partially automate the build.  The commands below
+  (or similar) can be entered at the command line to compile each group of 
+  packages (proto, utils, libs, apps, drivers).  The wiki links on each
+  group's page contain specific commands to compile the entire group of
+  packages, based on the content of the wget files.</para>
 
 <screen>bash -e #exit on all errors