Changeset 75725c9

Timestamp:

09/07/2014 06:49:26 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14686, systemd-13485

Children:

486c27a

Parents:

7e0c7d9

Message:

Merged firefox update from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14215 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• xsoft/graphweb/firefox.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <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

packages.ent

@@ -557 +557 @@
 <!-- Chapter 35 -->
 <!ENTITY seamonkey-version            "2.26.1">
-<!ENTITY firefox-version              "&xulrunner-version;">
+<!ENTITY firefox-version              "32.0">
 
 <!-- Chapter 36 -->

xsoft/graphweb/firefox.xml

@@ -9 +9 @@
   <!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">
 ]>
 
@@ -258 +258 @@
       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>
@@ -309 +310 @@
   <sect2 role="commands">
     <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>