From 75d341a1cc0fdc51c00b65a0ac6395ef267f0542 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Tue, 8 May 2012 11:41:02 +0000
Subject: [PATCH] Fix librsvg instructions (again), I don't like putting dots
 at dependencies block, sorry. Recheck Cairo deps, same as for gdk-pixbuf -
 without image loaders library is useless and explicitly disabling those could
 lead someone straight to hell.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10127 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/graphlib/librsvg.xml | 23 ++++++++++++-----------
 x/lib/cairo.xml              |  9 +++++----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/general/graphlib/librsvg.xml b/general/graphlib/librsvg.xml
index 16f9496832..8262c34ebd 100644
--- a/general/graphlib/librsvg.xml
+++ b/general/graphlib/librsvg.xml
@@ -65,13 +65,13 @@
     <para role="required">
       <xref linkend="gdk-pixbuf"/>,
       <xref linkend="libcroco"/> and
-      <xref linkend="pango"/>.
+      <xref linkend="pango"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="gtk2"/> and
-      <xref linkend="gtk3"/>.
+      <xref linkend="gtk3"/>
     </para>
 
     <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
@@ -118,6 +118,9 @@ make</userinput></screen>
       Gobject-Introspection.
     </para>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
     <para>
       <option>--disable-introspection</option>: Add this option if you've not
       installed Gobject Introspection.
@@ -129,10 +132,8 @@ make</userinput></screen>
     </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
   </sect2>
 
   <sect2 role="content">
@@ -200,15 +201,15 @@ make</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libpixbufloader-svg.so">
-        <term><filename class='libraryfile'>libpixbufloader-svg.so.so</filename></term>
+      <varlistentry id="libpixbufloader-svg">
+        <term><filename class='libraryfile'>libpixbufloader-svg.so</filename></term>
         <listitem>
           <para>
-            is the Gdk Pixbuf plugin that allows Gtk+ to render Scalable Vector
-            Graphics images.
+            is the Gdk Pixbuf plugin that allows Gtk+ applications to render Scalable 
+            Vector Graphics images.
           </para>
-          <indexterm zone="librsvg libpixbufloader-svg.so">
-            <primary sortas="c-libpixbufloader-svg.so">libpixbufloader-svg.so.so</primary>
+          <indexterm zone="librsvg libpixbufloader-svg">
+            <primary sortas="c-libpixbufloader-svg">libpixbufloader-svg.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml
index f53e7c0613..659413a123 100644
--- a/x/lib/cairo.xml
+++ b/x/lib/cairo.xml
@@ -98,17 +98,18 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="libpng"/>, <!-- I would not dare not to use this one -->
       <xref linkend="pixman"/> and 
       <xref linkend="pkgconfig"/>.
     </para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <bridgehead renderas="sect4">Recommended (Required if building GTK+)</bridgehead>
     <para role="recommended">
-      <xref linkend="fontconfig"/>,
+      <xref linkend="fontconfig"/> and <!--
       <xref linkend="libpng"/> (if you want to build
       <application>Cairo</application> without <application>Libpng</application>
-      you will need to add --disable-png --disable-svg to the configure options
-      and remove --enable-tee) and
+      you will need to add --disable-png --disable-svg to the configure options 
+      and remove --enable-tee) and -->
       <xref linkend="xorg7-lib"/>.
     </para>