Changeset a2912ff for x/lib/cairo.xml

Timestamp:

07/24/2012 04:17:44 PM (12 years ago)

Author:

Krejzi <krejzi@…>

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:

3af204c

Parents:

2ba0c1a

Message:

XML Polishing, Part 2. Set libpng (again) as required for Cairo, since it requires too many switches if it is not present, thus making it realy required.

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

File:

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

x/lib/cairo.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY cairo-download-http
-    "http://cairographics.org/releases/cairo-&cairo-version;.tar.xz">
+  <!ENTITY cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.xz">
   <!ENTITY cairo-download-ftp  " ">
   <!ENTITY cairo-md5sum        "87649eb75789739d517c743e94879e51">
@@ -14 +13 @@
 ]>
 
-<sect1 id="cairo" xreflabel="cairo-&cairo-version;">
+<sect1 id="cairo" xreflabel="Cairo-&cairo-version;">
   <?dbhtml filename="cairo.html"?>
 
@@ -22 +21 @@
   </sect1info>
 
-  <title>cairo-&cairo-version;</title>
+  <title>Cairo-&cairo-version;</title>
 
   <indexterm zone="cairo">
-    <primary sortas="a-cairo">cairo</primary>
+    <primary sortas="a-Cairo">Cairo</primary>
   </indexterm>
 
@@ -99 +98 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <!-- Just a note: png is REQUIRED, since something that isn't REQUIRED
+      does not need bunch of DISABLE switches. You are breaking the package
+      for those that don't want to install recommended deps, and I've seen
+      lot of people like that. Leave it, it is not a big dep, and I suspect
+      that someone will install cairo just to test gobject-introspection, since
+      I doubt someone will need that unless building gnome stuff, and it is 
+      really wrong way of thinking that someone might need cairo JUST to test
+      introspection. No offense. -->
+      <xref linkend="libpng"/>,
       <xref linkend="glib2"/> and
       <xref linkend="pixman"/>
@@ -106 +114 @@
     <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"/>.
+      <xref linkend="xorg7-lib"/>
     </para>
 
@@ -134 +138 @@
       <para>
         There is a reciprocal dependency with the
-        <application>Gtk 2</application>, <application>Librsvg</application> and
+        <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.
@@ -160 +164 @@
     <para>
       Note that the tests take a long time to run, many of them fail for unknown
-      reasons and it has been known to cause a kernel panic. <!-- I suspect that
-      the panic was due to a bug in the xf86-video-ati driver but I can't be
-      sure as the system locked up hard. cairo-1.12.0 has exposed bugs in other
-      parts of Xorg https://bugs.freedesktop.org/show_bug.cgi?id=47266 Andy
-      2012-04-22 --> If you want to run the tests issue:
-      <command>make -k check</command>.
+      reasons and it has been known to cause a kernel panic. If you want to run
+      the tests issue: <command>make -k check</command>.
     </para>
 
@@ -221 +221 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -241 +242 @@
         </seg>
         <seg>
-          /usr/include/cairo, /usr/lib/cairo and
+          /usr/include/cairo,
+          /usr/lib/cairo and
           /usr/share/gtk-doc/html/cairo
         </seg>
@@ -304 +306 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>