Changeset 4db1ba6 for x/lib/cairo.xml

Timestamp:

05/01/2012 12:08:46 PM (12 years ago)

Author:

Andrew Benton <andy@…>

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:

4c2be438

Parents:

178e985

Message:

fixed Cairo's dependencies

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

File:

• x/lib/cairo.xml (modified) (13 diffs)

x/lib/cairo.xml

@@ -29 +29 @@
 
   <sect2 role="package">
-    <title>Introduction to cairo</title>
+    <title>Introduction to Cairo</title>
 
     <para>
@@ -36 +36 @@
       <application>X</application> Window System, win32, image buffers,
       PostScript, PDF and SVG. Experimental backends include OpenGL, Quartz and
-      XCB file output. cairo is designed to produce consistent output on all
+      XCB file output. <application>Cairo</application> is designed to produce consistent output on all
       output media while taking advantage of display hardware acceleration when
       available (e.g., through the X Render Extension). The
@@ -89 +89 @@
       <listitem>
         <para>
-          Required patch:
+          Required patch (if you intend to compile any Mozilla products):
           <ulink url="&patch-root;/cairo-&cairo-version;-expose-snapshot-1.patch"/>
         </para>
@@ -95 +95 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">cairo Dependencies</bridgehead>
-
-    <!-- Cairo is here only because GTK+ and friends, so I'll make Xorg Libraries
-    a dependency here -->
+    <bridgehead renderas="sect3">Cairo Dependencies</bridgehead>
+
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="fontconfig"/>,
-      <xref linkend="libpng"/>,
       <xref linkend="pixman"/>,
       <xref linkend="pkgconfig"/> and 
-      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="fontconfig"/>,
+      <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
+      <xref linkend="xorg7-lib"/>.
     </para>
 
@@ -128 +133 @@
     <note>
       <para>
-        There is a reciprocal dependency with cairo and libdrm. Best practice is
-        to install cairo without the OpenGL backend, and return to re-install
-        cairo after the full Xorg installation has been completed. Also note
-        that the GTK, Poppler and librsvg packages are also reciprocal. As the
-        test suite is currently unreliable, it is best to simply skip it at this
-        time.
+        There is a reciprocal dependency with the
+        <application>Gtk 2</application>, <application>Librsvg</application> and
+        <application>Poppler</application> packages. As the test suite is
+        currently unreliable, it is best to simply skip it at this time.
       </para>
     </note>
@@ -143 +146 @@
 
   <sect2 role="installation">
-    <title>Installation of cairo</title>
+    <title>Installation of Cairo</title>
 
     <para>
@@ -234 +237 @@
         </seg>
         <seg>
-          libcairo.{so,a}, libcairo-gobject.{so,a} and
-          libcairo-script-interpreter.{so,a}
+          libcairo.so, libcairo-gobject.so and
+          libcairo-script-interpreter.so
         </seg>
         <seg>
@@ -263 +266 @@
 
       <varlistentry id="libcairo">
-        <term><filename class='libraryfile'>libcairo.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libcairo.so</filename></term>
         <listitem>
           <para>
@@ -270 +273 @@
           </para>
           <indexterm zone="cairo libcairo">
-            <primary sortas="c-libcairo">libcairo.{so,a}</primary>
+            <primary sortas="c-libcairo">libcairo.so</primary>
           </indexterm>
         </listitem>
@@ -276 +279 @@
 
       <varlistentry id="libcairo-gobject">
-        <term><filename class='libraryfile'>libcairo-gobject.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libcairo-gobject.so</filename></term>
         <listitem>
           <para>
@@ -284 +287 @@
           </para>
           <indexterm zone="cairo libcairo-gobject">
-            <primary sortas="c-libcairo-gobject">libcairo-gobject.{so,a}</primary>
+            <primary sortas="c-libcairo-gobject">libcairo-gobject.so</primary>
           </indexterm>
         </listitem>
@@ -290 +293 @@
 
       <varlistentry id="libcairo-script-interpreter">
-        <term><filename class='libraryfile'>libcairo-script-interpreter.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libcairo-script-interpreter.so</filename></term>
         <listitem>
           <para>
@@ -297 +300 @@
           </para>
           <indexterm zone="cairo libcairo-script-interpreter">
-            <primary sortas="c-libcairo-script-interpreter">libcairo-script-interpreter.{so,a}</primary>
+            <primary sortas="c-libcairo-script-interpreter">libcairo-script-interpreter.so</primary>
           </indexterm>
         </listitem>