Changeset 79ed1d1 for x

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:

x

Files:

• installing/mesalib-systemd.xml (modified) (2 diffs)
• lib/xulrunner.xml (modified) (2 diffs)

x/installing/mesalib-systemd.xml

@@ -88 +88 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libxml2"/>,
-      <xref linkend="xorg7-lib"/>, and
+      <xref linkend="xorg7-lib"/> and
       <xref linkend="libdrm"/>
     </para>
@@ -122 +121 @@
         for Radeon 3D drivers. For an explanation of gallium please see
         <ulink url="https://en.wikipedia.org/wiki/Gallium3D"></ulink>.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        The <application>libxml2</application>
-        <application>Python</application> module must have been built
-        during the installation of <application>libxml2</application>
-        or else <application>MesaLib</application> build will fail.
       </para>
     </note>

x/lib/xulrunner.xml

@@ -11 +11 @@
   <!ENTITY xulrunner-download-ftp
            "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY xulrunner-md5sum        "ac7e8c801ded4e6195182bf54c81acb6">
-  <!ENTITY xulrunner-size          "137 MB">
-  <!ENTITY xulrunner-buildsize     "3.5 GB (137 MB installed)">
-  <!ENTITY xulrunner-time          "42 SBU">
+  <!ENTITY xulrunner-md5sum        "499b70a9f08a2291d528e87eaf8804a3">
+  <!ENTITY xulrunner-size          "141 MB">
+  <!-- measured on LFS-7.5 x86_64 -->
+  <!ENTITY xulrunner-buildsize     "4.9 GB (103 MB installed)">
+  <!ENTITY xulrunner-time          "46 SBU">
 ]>
 
@@ -106 +107 @@
         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 Xulrunner), 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>