Author: krejzi
Date: 2012-10-08 14:56:35 -0600 (Mon, 08 Oct 2012)
New Revision: 10722

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/cairo.xml
Log:
Cairo 1.12.4.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-10-08 06:05:45 UTC (rev 10721)
+++ trunk/BOOK/general.ent      2012-10-08 20:56:35 UTC (rev 10722)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "07">                   <!-- Always 2 digits -->
+<!ENTITY day          "08">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "October 7th, &year;">
+<!ENTITY releasedate  "October 8th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -562,7 +562,7 @@
 <!ENTITY atkmm-version                "2.22.6">
 <!ENTITY at-spi2-core-version         "2.6.0">
 <!ENTITY at-spi2-atk-version          "2.6.0">
-<!ENTITY cairo-version                "1.12.2">
+<!ENTITY cairo-version                "1.12.4">
 <!ENTITY cairomm-version              "1.10.0">
 <!ENTITY cogl-version                 "1.12.0">
 <!ENTITY clutter-version              "1.12.0">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2012-10-08 06:05:45 UTC 
(rev 10721)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2012-10-08 20:56:35 UTC 
(rev 10722)
@@ -44,6 +44,15 @@
 
 -->
     <listitem>
+      <para>October 8th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Cairo 1.12.4.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 7th, 2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/lib/cairo.xml
===================================================================
--- trunk/BOOK/x/lib/cairo.xml  2012-10-08 06:05:45 UTC (rev 10721)
+++ trunk/BOOK/x/lib/cairo.xml  2012-10-08 20:56:35 UTC (rev 10722)
@@ -6,9 +6,9 @@
 
   <!ENTITY cairo-download-http 
"http://cairographics.org/releases/cairo-&cairo-version;.tar.xz";>
   <!ENTITY cairo-download-ftp  " ">
-  <!ENTITY cairo-md5sum        "87649eb75789739d517c743e94879e51">
+  <!ENTITY cairo-md5sum        "a64bb8774a1e476e5cdd69e635794dfb">
   <!ENTITY cairo-size          "41 MB">
-  <!ENTITY cairo-buildsize     "178 MB">
+  <!ENTITY cairo-buildsize     "200 MB">
   <!ENTITY cairo-time          "1.1 SBU">
 ]>
 
@@ -88,7 +88,7 @@
       <listitem>
         <para>
           Required patch (if you intend to compile any Mozilla products):
-          <ulink 
url="&patch-root;/cairo-&cairo-version;-expose-snapshot-1.patch"/>
+          <ulink 
url="&patch-root;/cairo-&cairo-version;-expose_snapshot-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -97,22 +97,14 @@
 
     <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"/>
     </para>
 
-    <bridgehead renderas="sect4">Recommended (Required if building 
GTK+)</bridgehead>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="fontconfig"/>,
+      <xref linkend="fontconfig"/> and
       <xref linkend="xorg7-lib"/>
     </para>
 
@@ -120,28 +112,28 @@
     <para role="optional">
       <xref linkend="cogl"/>,
       <ulink url="http://www.directfb.org/";>DirectFB</ulink>,
-      <xref linkend="gs"/> (for testing the postscript backend),
-      <xref linkend="gtk2"/> (for testing the PDF backend),
+      <!-- <xref linkend="gs"/> (for testing the postscript backend),
+      <xref linkend="gtk2"/> (for testing the PDF backend), -->
       <xref linkend="gtk-doc"/>,
       <xref linkend="libdrm"/>,
-      <xref linkend="librsvg"/> (for testing the SVG backend),
+      <!-- <xref linkend="librsvg"/> (for testing the SVG backend),
       <ulink url="http://libspectre.freedesktop.org";>libspectre</ulink> (for
-      testing the PDF backend),
+      testing the PDF backend), -->
       <xref linkend="mesalib"/>,
-      <xref linkend="poppler"/> (for testing the PDF backend),
+      <!-- <xref linkend="poppler"/> (for testing the PDF backend) -->
       <xref linkend="qt"/>,
       <ulink url="http://code.google.com/p/skia/";>Skia</ulink> and
-      <ulink url="http://www.valgrind.org";>Valgrind</ulink>.
+      <ulink url="http://www.valgrind.org";>Valgrind</ulink>
     </para>
 
-    <note>
+    <!-- <note>
       <para>
         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>
+    </note> -->
 
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/cairo"/>
@@ -156,15 +148,21 @@
       commands:
     </para>
 
-<screen><userinput>sed -i 's#check-plt.sh ##' src/Makefile.in &amp;&amp;
-patch -p1 &lt; ../cairo-&cairo-version;-expose-snapshot-1.patch &amp;&amp;
-./configure --prefix=/usr --disable-static --enable-tee --enable-xcb &amp;&amp;
+<screen><userinput>patch -Np1 -i 
../cairo-&cairo-version;-expose_snapshot-1.patch &amp;&amp;
+./configure --prefix=/usr \
+            --enable-tee  \
+            --enable-xcb  \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>
+    <!-- <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. If you want to run
       the tests issue: <command>make -k check</command>.
+    </para> -->
+
+    <para>
+      This package does not have a working testsuite.
     </para>
 
     <para>
@@ -178,44 +176,26 @@
     <title>Command Explanations</title>
 
     <para>
-      <command>sed -i 's#check-plt.sh ##' src/Makefile.in</command>: This sed
-      disables running a test which is known to fail with the expose-snapshot
-      patch.
+      <option>--enable-tee</option>: This switch enables
+      <application>Cairo</application>'s experimental tee
+      surface which is required by some packages like
+      <application>Firefox</application>.
     </para>
 
     <para>
-      <command>patch -p1 &lt;
-      ../cairo-&cairo-version;-expose-snapshot-1.patch</command>: This patch
-      exposes some private functions that <application>Firefox</application>
-      relies on. Applying this patch allows <application>Firefox</application>
-      to use the system installed <application>Cairo</application>.
+      <option>--enable-xcb</option>: This switch enables
+      <application>Cairo</application>'s XCB surface
+      which is required by some packages.
     </para>
 
     <para>
-      <option>--enable-tee</option>: This is used by
-      <application>Firefox</application>. If you don't enable the Cairo's tee
-      surface backend you won't be able to build
-      <application>Firefox</application> with
-      <option>--enable-system-cairo</option>.
+      <option>--enable-gl</option>: This switch enables
+      <application>Cairo</application>'s experimental
+      <application>OpenGL</application> surface which
+      is required for <application>Wayland</application>
+      and some other packages that are not part of BLFS.
     </para>
 
-    <para>
-      <option>--enable-gl</option>: Enable <application>Cairo</application>'s
-      OpenGL backend.
-    </para>
-
-    <para>
-      <option>--enable-xcb</option>: Enable <application>Cairo</application>'s
-      libxcb backend.
-    </para>
-
-    <para>
-      <option>--enable-vg</option>: Enable the <application>Cairo</application>
-      <ulink url="http://en.wikipedia.org/wiki/OpenVG";>OpenVG</ulink> backend 
-      (requires <xref linkend="mesalib"/> installed, configured with
-      --enable-gallium-egl and --enable-openvg).
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 
@@ -267,7 +247,7 @@
       </varlistentry>
 
       <varlistentry id="libcairo">
-        <term><filename class='libraryfile'>libcairo.so</filename></term>
+        <term><filename class="libraryfile">libcairo.so</filename></term>
         <listitem>
           <para>
             contains the 2D graphics functions required for rendering to the

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to