Author: dj
Date: 2008-06-19 19:37:37 -0600 (Thu, 19 Jun 2008)
New Revision: 7490
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/installing/x7lib.xml
trunk/BOOK/x/installing/xorg7.xml
Log:
Merge 6.3 branch changes from r7489.
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2008-06-20 00:28:34 UTC (rev 7489)
+++ trunk/BOOK/general.ent 2008-06-20 01:37:37 UTC (rev 7490)
@@ -3,7 +3,7 @@
$Date$
-->
-<!ENTITY day "09"> <!-- Always 2 digits -->
+<!ENTITY day "19"> <!-- Always 2 digits -->
<!ENTITY month "06"> <!-- Always 2 digits -->
<!ENTITY year "2008">
<!ENTITY copyrightdate "2001-&year;">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2008-06-20 00:28:34 UTC
(rev 7489)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2008-06-20 01:37:37 UTC
(rev 7490)
@@ -41,6 +41,17 @@
-->
<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>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml 2008-06-20 00:28:34 UTC (rev 7489)
+++ trunk/BOOK/x/installing/x7lib.xml 2008-06-20 01:37:37 UTC (rev 7490)
@@ -86,8 +86,9 @@
<bridgehead renderas="sect4">Required</bridgehead>
<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>
<para role="optional"><xref linkend="libxcb"/></para>
@@ -119,11 +120,11 @@
<screen><userinput>case $(basename "$PWD") in
libX11-&libX11-version; )
- patch -Np1 -i ../libX11-&libX11-version;-badargs-1.patch &&
+ patch -Np1 -i ../../libX11-&libX11-version;-badargs-1.patch &&
sed -i 's/_XGet/XGet/' modules/im/ximcp/imDefLkup.c
;;
libXfont-&libXfont-version; )
- patch -Np1 -i ../libXfont-&libXfont-version;-pcf_parser-1.patch &&
+ patch -Np1 -i ../../libXfont-&libXfont-version;-pcf_parser-1.patch
&&
sed -i 's/(ft_isdigit/(isdigit/' src/FreeType/fttools.c
;;
esac &&
Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml 2008-06-20 00:28:34 UTC (rev 7489)
+++ trunk/BOOK/x/installing/xorg7.xml 2008-06-20 01:37:37 UTC (rev 7490)
@@ -77,11 +77,20 @@
packages.</para>
</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
section=proto
version=&xorg7-version;
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
