Changeset 79ed1d1 for xsoft

Timestamp:

07/25/2014 10:46:43 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

4a62790c

Parents:

ae4accb

Message:

Merge trunk.

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

Location:

xsoft

Files:

• graphweb/firefox.xml (modified) (2 diffs)
• other/thunderbird.xml (modified) (4 diffs)

xsoft/graphweb/firefox.xml

@@ -11 +11 @@
   <!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        "ac7e8c801ded4e6195182bf54c81acb6">
-  <!ENTITY firefox-size          "137 MB">
-  <!ENTITY firefox-buildsize     "3.7 GB (77 MB installed) (or 943 MB and 6.0 MB if using Xulrunner)">
-  <!ENTITY firefox-time          "44 SBU (0.3 SBU if using Xulrunner)">
+  <!ENTITY firefox-md5sum        "499b70a9f08a2291d528e87eaf8804a3">
+  <!ENTITY firefox-size          "141 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)">
 ]>
 
@@ -103 +104 @@
         they can be out of date or contain security
         holes.
+      </para>
+    </note>
+
+    <note>
+      <para>
+        With <application>Firefox-31.0</application> and later versions, you
+        must have installed <application>Openssl</application> before
+        <application>Python 2</application>, or the build system will quickly
+        fail with output including "ImportError: cannot import name
+        HTTPSHandler". If you are in any doubt about this (e.g. upgrading
+        from an older version of Firefox), check if
+        <filename>/usr/lib/python2.7/lib-dynload/_ssl.so</filename> exists.
+        If it does not, reinstall <xref linkend="python2"/> (after
+        installing <xref linkend="openssl"/>  - the latest version of any
+        <emphasis>currently maintained</emphasis> version of Openssl should
+        be satisfactory if already installed - if that package has not already
+        been installed).
       </para>
     </note>

xsoft/other/thunderbird.xml

@@ -9 +9 @@
   <!ENTITY thunderbird-download-ftp
            "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
-  <!ENTITY thunderbird-md5sum            "3e5d44c7e716e132601a40e865a13ef8">
-  <!ENTITY thunderbird-size              "134 MB">
-  <!ENTITY thunderbird-buildsize         "3.8 GB (58 MB installed)">
-  <!ENTITY thunderbird-time              "64 SBU">
+  <!ENTITY thunderbird-md5sum            "195ea7d3887eb49402ea7b3875b7ce15">
+  <!ENTITY thunderbird-size              "164 MB">
+  <!ENTITY thunderbird-buildsize         "3.7 GB (68 MB installed)">
+  <!ENTITY thunderbird-time              "45 SBU">
 ]>
 
@@ -112 +112 @@
       <xref linkend="gst-plugins-good"/> and
       <xref linkend="gst-ffmpeg"/>,
-      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
       <xref linkend="libnotify"/>,
       <xref linkend="openjdk"/>,
       <xref linkend="startup-notification"/>,
-      <xref linkend="wget"/> and
-      <xref linkend="wireless_tools"/>
+      <xref linkend="wget"/>,
+      <xref linkend="wireless_tools"/>, and
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
     </para>
 
@@ -210 +210 @@
 
     <para>
+      First, a bug needs to be fixed. Notice that thunderbuild needs to match
+      the value used in mozconfig (above) for the object directory (MOZ_OBJDIR):
+    </para>
+
+<screen><userinput>mkdir -vp mozilla/thunderbuild</userinput></screen>
+
+    <para>
       Compile <application>Thunderbird</application> by issuing the following
       commands:
@@ -251 +258 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>mkdir -vp mozilla/thunderbuild</command>: fixes a build failure
+      of Makefile at the beginning of build, where a file cannot be found.
+    </para>
 
     <para>