From 18b6c5672504a2b54ce4e39e852e2e12e10a1b03 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 27 Dec 2008 07:17:01 +0000
Subject: [PATCH] Updated to fontconfig-2.6.0.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7673 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/graphlib/fontconfig.xml    | 29 +++++++++--------------------
 introduction/welcome/changelog.xml |  3 +++
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/general.ent b/general.ent
index 37beb7b814..bd74ea871d 100644
--- a/general.ent
+++ b/general.ent
@@ -149,7 +149,7 @@ $Date$
 <!ENTITY lcms-version                 "1.17">
 <!ENTITY libmng-version               "1.0.10">
 <!ENTITY freetype2-version            "2.3.7">
-<!ENTITY fontconfig-version           "2.4.2">
+<!ENTITY fontconfig-version           "2.6.0">
 <!ENTITY libart_lgpl-version          "2.3.19">
 <!ENTITY librsvg-version              "2.16.1">
 <!-- <!ENTITY imlib-version                "1.9.15"> -->
diff --git a/general/graphlib/fontconfig.xml b/general/graphlib/fontconfig.xml
index cbd13eec33..7a0523e1fb 100644
--- a/general/graphlib/fontconfig.xml
+++ b/general/graphlib/fontconfig.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY fontconfig-download-http "http://fontconfig.org/release/fontconfig-&fontconfig-version;.tar.gz">
   <!ENTITY fontconfig-download-ftp  "&gentoo-ftp-repo;/fontconfig-&fontconfig-version;.tar.gz">
-  <!ENTITY fontconfig-md5sum        "f035852f521b54677f2b5c9e2f6d54a4">
-  <!ENTITY fontconfig-size          "1.2 MB">
-  <!ENTITY fontconfig-buildsize     "11.3 MB">
+  <!ENTITY fontconfig-md5sum        "b54ec1d4ddd836313fdbc0cd5299d6d">
+  <!ENTITY fontconfig-size          "1.3 MB">
+  <!ENTITY fontconfig-buildsize     "15.1 MB">
   <!ENTITY fontconfig-time          "0.2 SBU">
 ]>
 
@@ -54,16 +54,13 @@
       </listitem>
     </itemizedlist>
 
-    <!-- Since fontconfig is at 2.4.x, obviously it's more current
-         than 2.3.92. Uncomment when 2.4.9x is released
     <note>
       <para>The numbering system of <application>Fontconfig</application> is
       unusual. The beta versions of the package are numbered with a 9x in the
-      last portion of the release number. This means that 2.3.92 is a beta
+      last portion of the release number. This means that 2.6.92 is a beta
       release and the most current release is of the form
       &fontconfig-version;</para>
     </note>
-    -->
 
     <bridgehead renderas="sect3">Fontconfig Dependencies</bridgehead>
 
@@ -104,15 +101,7 @@ make</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 doc/*.3 /usr/share/man/man3 &amp;&amp;
-install -v -m644 doc/*.5 /usr/share/man/man5 &amp;&amp;
-install -v -m755 \
-        -d /usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-devel &amp;&amp;
-install -v -m644 doc/*.{html,pdf,txt} \
-        /usr/share/doc/fontconfig-&fontconfig-version; &amp;&amp;
-install -v -m644 doc/fontconfig-devel/* \
-        /usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-devel</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
 
@@ -123,14 +112,14 @@ install -v -m644 doc/fontconfig-devel/* \
     the system font cache files in <filename
     class='directory'>/var/cache/fontconfig</filename>.</para>
 
-    <para><parameter>--disable-docs</parameter>: This switch avoids building
-    the documentation (the release tarball includes pre-generated
-    documentation).</para>
-
     <para><parameter>--without-add-fonts</parameter>: This switch disables
     the automatic search for X Window System fonts which, if found, may
     confuse some applications.</para>
 
+    <para><parameter>--disable-docs</parameter>: This switch avoids building
+    the documentation (the release tarball includes pre-generated
+    documentation).</para>
+
     <para><parameter>--with-docdir=/usr/share/doc/fontconfig-&fontconfig-version;</parameter>:
     Though this parameter seems counter-intuitive following the preceding
     parameter to the <command>configure</command> command, it is used so that
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 6986986946..edf3e73637 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -53,6 +53,9 @@
     <listitem>
       <para>December 26th, 2008</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Updated to fontconfig-2.6.0.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Updated to libmng-1.0.10.</para>
         </listitem>