Changeset db14638 for x

Timestamp:

08/16/2003 04:29:31 AM (21 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.0, 6.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, v5_0, v5_0-pre1, v5_1, v5_1-pre1, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

d8e25d6c

Parents:

207a6b9

Message:

Added XFree86 patch file and moved fontconfig to X libraries

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

Location:

x

Files:

• installing/xfree86/xfree86-inst.xml (modified) (1 diff)
• installing/xfree86/xfree86-intro.xml (modified) (3 diffs)
• lib/fontconfig.xml (moved) (moved from general/genlib/fontconfig.xml ) (1 diff)
• lib/lib.xml (modified) (2 diffs)
• x.ent (modified) (2 diffs)

x/installing/xfree86/xfree86-inst.xml

@@ -57 +57 @@
 is recommended for customizing the installation. Start from 
 the <filename>xc</filename> directory.</para>
+
+<note><para>The <filename>host.def</filename> file is a c file, not the 
+usual configuration file.  If you make any changes, be sure the comment characters
+(<userinput>/*</userinput> and <userinput>*/</userinput>) 
+are balanced.  Most of the entries in the file below are
+commented out with the default settings shown.
+</para></note>
 
 <para><screen><userinput>cat &gt; config/cf/host.def &lt;&lt; "EOF"

x/installing/xfree86/xfree86-intro.xml

@@ -16 +16 @@
 application interface (API).</para>
 
-<screen>XFree86 depends on:
-<xref linkend="freetype2"/>, <xref linkend="fontconfig"/>, <xref linkend="expat"/> and <xref linkend="libpng"/></screen>
+<para><screen>XFree86 depends on:
+<xref linkend="libpng"/></screen></para>
+
+<para>The following packages are included in the XFree86 package, however they
+are updated more often than the XFree86 package and are highly recommended:
+<screen><xref linkend="expat"/>, <xref linkend="freetype2"/> and <xref linkend="fontconfig"/></screen>
+</para>
+
+<note><para>If you choose to not install these separate packages, the 
+<filename>host.def</filename> file below will have to be modified to 
+instruct XFree86 build them.</para></note>
+
 
 <para>There are several files that need to be fetched from the download location:
@@ -27 +37 @@
 X430src-6.tgz  7886 KB   
 X430src-7.tgz  9099 KB</screen></para>
+
+<para>You should also download the patch file:
+<ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.3.0/fixes/4.3.0-4.3.0.1.diff.gz" /></para>
 
 <para>The first three packages are the XFree86 programs, the fourth and fifth are fonts, 
@@ -45 +58 @@
 not download them.
 </para>
+
+<para>The fixes subdirectory also has a SUMS.md5sum and this can be checked against
+the patch file:
+<screen>md5sum 4.3.0-4.3.0.1.diff.gz</screen></para>
+
+<para>After unpacking the <filename>X430src-?.tgz</filename> files, change to the 
+<filename>xc</filename> directory and run:
+<screen>bunzip2 4.3.0-4.3.0.1.diff.gz &amp;&amp;
+patch -Np1 -i 4.3.0-4.3.0.1.diff</screen></para>
+
 </sect2>

x/lib/fontconfig.xml

@@ -5 +5 @@
 &fontconfig-intro;
 &fontconfig-inst;
+&fontconfig-config;
 &fontconfig-desc;
 

x/lib/lib.xml

@@ -3 +3 @@
 <title>X Libraries</title>
 
-&lesstif;
 &freetype2;
+&fontconfig;
 &qt;
 &GTK;
@@ -10 +10 @@
 &ATK;
 &GTK2;
+&lesstif;
 &startup-notification;
 

x/x.ent

@@ -10 +10 @@
 <!ENTITY x-lib SYSTEM "lib/lib.xml">
 <!ENTITY % freetype SYSTEM "lib/freetype2/freetype2.ent">
+<!ENTITY % fontconfig SYSTEM "lib/fontconfig/fontconfig.ent">
 <!ENTITY % lesstif SYSTEM "lib/lesstif/lesstif.ent">
 <!ENTITY % qt SYSTEM "lib/qt/qt.ent">
@@ -18 +19 @@
 <!ENTITY % startup-notification SYSTEM "lib/notification/startup-notification.ent">
 %freetype;
+%fontconfig;
 %lesstif;
 %qt;