Author: cjg
Date: Sat Sep  6 23:49:26 2014
New Revision: 14215

Log:
Merged firefox update from trunk.

Modified:
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/packages.ent
   branches/systemd/xsoft/graphweb/firefox.xml

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sat Sep  6 23:32:23 
2014        (r14214)
+++ branches/systemd/introduction/welcome/changelog.xml Sat Sep  6 23:49:26 
2014        (r14215)
@@ -47,6 +47,10 @@
       <para>September 6th, 2014</para>
       <itemizedlist>
         <listitem>
+          <para>[ken] - Update to firefox-32.0. Fixes
+          <ulink url="&blfs-ticket-root;5460">#5460</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[cjg] - Update to LLVM-3.5.0. Fixes
           <ulink url="&blfs-ticket-root;5475">#5475</ulink>.</para>
         </listitem>

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Sat Sep  6 23:32:23 2014        (r14214)
+++ branches/systemd/packages.ent       Sat Sep  6 23:49:26 2014        (r14215)
@@ -556,7 +556,7 @@
 
 <!-- Chapter 35 -->
 <!ENTITY seamonkey-version            "2.26.1">
-<!ENTITY firefox-version              "&xulrunner-version;">
+<!ENTITY firefox-version              "32.0">
 
 <!-- Chapter 36 -->
 <!ENTITY balsa-version                "2.5.1">

Modified: branches/systemd/xsoft/graphweb/firefox.xml
==============================================================================
--- branches/systemd/xsoft/graphweb/firefox.xml Sat Sep  6 23:32:23 2014        
(r14214)
+++ branches/systemd/xsoft/graphweb/firefox.xml Sat Sep  6 23:49:26 2014        
(r14215)
@@ -8,11 +8,11 @@
            
"http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";>
   <!ENTITY firefox-download-ftp
            
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";>
-  <!ENTITY firefox-md5sum        "499b70a9f08a2291d528e87eaf8804a3">
-  <!ENTITY firefox-size          "141 MB">
+  <!ENTITY firefox-md5sum        "859d0b6fe2d36b6959cf08cee4c783cc">
+  <!ENTITY firefox-size          "143 MB">
   <!-- measured on LFS-7.5, x86_64 -->
-  <!ENTITY firefox-buildsize     "5.0 GB (62 MB installed) (or 963 MB and 7.0 
MB if using Xulrunner)">
-  <!ENTITY firefox-time          "48 SBU (0.3 SBU if using Xulrunner)">
+  <!ENTITY firefox-buildsize     "5.2 GB (65 MB installed)">
+  <!ENTITY firefox-time          "54 SBU">
 ]>
 
 <sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
@@ -257,8 +257,9 @@
       Compile <application>Firefox</application> by issuing the following
       commands:
     </para>
-      
-<screen><userinput>make -f client.mk</userinput></screen>
+
+<screen><userinput>test $(uname -m) = "i686" &amp;&amp; sed -i 
's/enable-optimize/disable-optimize/' mozconfig || true &amp;&amp;
+make -f client.mk</userinput></screen>
 
     <para>
       This package does not come with a test suite.
@@ -310,6 +311,13 @@
     <title>Command Explanations</title>
 
     <para>
+      <command>test $(uname -m) = "i686" &amp;&amp; sed ...</command>:
+      On this version of firefox, an old bug has reappeared in 32-bit builds.
+      With optimization, the install fails with a Python error.  This
+      command will fix i686 builds and preserve the optimization on x86_64.
+    </para>
+
+    <para>
       <command>make -f client.mk ...</command>: Mozilla products are packaged 
to
       allow the use of a configuration file which can be used to pass the
       configuration settings to the <command>configure</command> command.
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to