Changeset f575476 for x

Timestamp:

10/08/2012 08:56:35 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:

d18db05

Parents:

1497c445

Message:

Cairo 1.12.4.

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

File:

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

x/lib/cairo.xml

@@ -7 +7 @@
   <!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">
 ]>
@@ -89 +89 @@
         <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>
@@ -98 +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
@@ -111 +103 @@
     </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>
@@ -121 +113 @@
       <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>.
-    </para>
-
-    <note>
+      <ulink url="http://www.valgrind.org">Valgrind</ulink>
+    </para>
+
+    <!-- <note>
       <para>
         There is a reciprocal dependency with the
@@ -142 +134 @@
         currently unreliable, it is best to simply skip it at this time.
       </para>
-    </note>
+    </note> -->
 
     <para condition="html" role="usernotes">
@@ -157 +149 @@
     </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>
 
@@ -179 +177 @@
 
     <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.
-    </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>.
-    </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>.
-    </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).
+      <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>
+      <option>--enable-xcb</option>: This switch enables
+      <application>Cairo</application>'s XCB surface
+      which is required by some packages.
+    </para>
+
+    <para>
+      <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>
 
@@ -268 +248 @@
 
       <varlistentry id="libcairo">
-        <term><filename class='libraryfile'>libcairo.so</filename></term>
+        <term><filename class="libraryfile">libcairo.so</filename></term>
         <listitem>
           <para>