From afb079cefd3d364d3ec06db76492ac18eec6e452 Mon Sep 17 00:00:00 2001
From: Andrew Benton <andy@linuxfromscratch.org>
Date: Sun, 22 Apr 2012 19:09:59 +0000
Subject: [PATCH] Adding a sed to the Cairo page to disable running
 check-plt.sh, a test that fails with the expose-snapshot patch

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9979 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 x/lib/cairo.xml            | 9 ++++++++-
 x/lib/xulrunner.xml        | 2 +-
 xsoft/graphweb/firefox.xml | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml
index e43ff39e5a..01ddc97cd2 100644
--- a/x/lib/cairo.xml
+++ b/x/lib/cairo.xml
@@ -154,7 +154,8 @@
       commands:
     </para>
 
-<screen><userinput>patch -p1 &lt; ../cairo-&cairo-version;-expose-snapshot-1.patch &amp;&amp;
+<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;
 make</userinput></screen>
@@ -178,6 +179,12 @@ make</userinput></screen>
   <sect2 role="commands">
     <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.
+    </para>
+
     <para>
       <command>patch -p1 &lt;
       ../cairo-&cairo-version;-expose-snapshot-1.patch</command>: This patch
diff --git a/x/lib/xulrunner.xml b/x/lib/xulrunner.xml
index 156b7d0ee8..6765bddcbe 100644
--- a/x/lib/xulrunner.xml
+++ b/x/lib/xulrunner.xml
@@ -11,7 +11,7 @@
   <!-- md5sum and size should match firefox, but the buildsize and time will differ -->
   <!ENTITY xulrunner-md5sum        "80c3e5927274de7f181fb5f931ac5fd4">
   <!ENTITY xulrunner-size          "75 MB">
-  <!ENTITY xulrunner-buildsize     "2.6 GB (440 MB installed)">
+  <!ENTITY xulrunner-buildsize     "3.4 GB (538 MB installed)">
   <!ENTITY xulrunner-time          "22 SBU">
 ]>
 
diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index 2335237043..ccb8db5650 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -10,7 +10,7 @@
   "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!ENTITY firefox-md5sum        "80c3e5927274de7f181fb5f931ac5fd4">
   <!ENTITY firefox-size          "75 MB">
-  <!ENTITY firefox-buildsize     "3 GB (33 MB installed)">
+  <!ENTITY firefox-buildsize     "2.8 GB (31 MB installed)">
   <!ENTITY firefox-time          "24 SBU (or 0.3 SBU if you're building against
     an installed Xulrunner)">
 ]>