Changeset 2082307d

Timestamp:

09/06/2009 06:18:18 AM (15 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

1b46c878

Parents:

2d007c58

Message:

Updated to Xulrunner-1.9.1.2 and Firefox-3.5.2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8008 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/xulrunner.xml (modified) (12 diffs)
• xsoft/graphweb/firefox.xml (modified) (12 diffs)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "06">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2009">
@@ -483 +483 @@
 <!ENTITY goffice-version              "0.6.1">
 <!-- The xulrunner version also appears in the firefox mozconfig as a literal -->
-<!ENTITY xulrunner-version            "1.9.0.7">
+<!ENTITY xulrunner-version            "1.9.1.2">
 
 <!-- Chapter 27 -->
@@ -643 +643 @@
 <!-- Chapter 36 -->
 <!ENTITY seamonkey-version            "1.1.9">
-<!ENTITY firefox-version              "3.0.7">
+<!ENTITY firefox-version              "3.5.2">
 <!ENTITY galeon-version               "2.0.1">
 

introduction/welcome/changelog.xml

@@ -42 +42 @@
 -->
     <listitem>
+      <para>September 6th, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to Xulrunner-1.9.1.2 and Firefox-3.5.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>September 5th, 2009</para>
       <itemizedlist>

x/lib/xulrunner.xml

@@ -8 +8 @@
   <!ENTITY xulrunner-download-ftp  "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;-source.tar.bz2">
   <!-- md5sum and size should match firefox, but the buildize and time will differ -->
-  <!ENTITY xulrunner-md5sum        "9875c9237b532009df8e91c3785539a3">
-  <!ENTITY xulrunner-size          "35.3 MB">
-  <!ENTITY xulrunner-buildsize     "663 MB">
-  <!ENTITY xulrunner-time          "13.2 SBU">
+  <!ENTITY xulrunner-md5sum        "136867f95c86f3988b7f825e874b85de">
+  <!ENTITY xulrunner-size          "45 MB">
+  <!ENTITY xulrunner-buildsize     "318 MB">
+  <!ENTITY xulrunner-time          "11 SBU">
 ]>
 
@@ -37 +37 @@
     <application>Yelp</application> can use it.</para>
 
-   <note>
-    <para>If you later build a newer version of <application>xulrunner</application>
-    to pick up the latest security fixes, you <emphasis>must</emphasis> update the
-    symlinks (including for nss, nspr if you are using the versions in
-    <application>xulrunner</application>) and rebuild every application which uses
-    gecko, including upgrading <application>firefox</application> if you have installed
-    that.</para>
-   </note>
-
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -57 +48 @@
         <application>xulrunner</application> appears at the same time. At other
         times it appears several days later or not at all. So far in the
-        <application>firefox-3.0</application> series, every new release has
+        <application>firefox-3.x</application> series, every new release has
         created xulrunner libraries with a corresponding new version. Whenever
         a separate xulrunner tarball has been released, it has been bitwise
@@ -71 +62 @@
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &xulrunner-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xulrunner-time;</para>
+        <para>Estimated disk space required: &xulrunner-buildsize; (using
+        recommended dependencies)</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &xulrunner-time; (using recommended
+        dependencies)</para>
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Optional patch: <ulink
+        url="&patch-root;/firefox-&firefox-version;-provide_system_nspr_nss-1.patch"/>
+        (Required if using the included NSPR and NSS libs as system versions for
+        other packages)</para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Xulrunner Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/>,
-    <xref linkend="libidl"/>
-    <xref linkend="pango"/>
+    <para role="required"><xref linkend="alsa-lib"/>
+    <xref linkend="gtk2"/>,
+    <xref linkend="libidl"/>,
+    <xref linkend="pango"/>,
     <xref linkend="python"/>, and
     <xref linkend="zip"/></para>
@@ -92 +96 @@
     you should remove the <option>--with-system-jpeg</option> option from the
     <filename>.mozconfig</filename> file created below.</para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="sqlite"/> (internal sqlite is
+    incompatable with existing or future installations)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -101 +109 @@
     <xref linkend="lcms"/>,
     <xref linkend="libpng"/> (patched for apng support),
-    <xref linkend="sqlite"/>,
+    <xref linkend="nspr"/> (recommended if you build any other Mozilla.org
+    packages),
+    <xref linkend="nss"/> (recommended if you build any other Mozilla.org
+    packages),
     <xref linkend="startup-notification"/>.
     <xref linkend="unzip"/>,
@@ -116 +127 @@
     <title>Installation of Xulrunner</title>
 
-  <!-- FIXME : I assume current OOo can't use xulrunner ?
-    lines near the bottom of the file. If you are going to build the
-    <application>OpenOffice</application> package and you want to use this
-    <application>Xulrunner</application> installation as the default
-    <application>Mozilla</application> source, ensure you uncomment the
-        + substitutions to stop the comment breaking the syntax
-    <option>++enable-ldap+/option+ option in the file created below. -->
     <para>The configuration of <application>Xulrunner</application> is
     accomplished by creating a <filename>.mozconfig</filename> file containing
@@ -128 +132 @@
     is created below. To see the entire list of available configuration options
     (and an abbreviated description of each one), issue
-    <command>./configure --help</command>.  If you are going to use
-    system-installed versions of the <application>NSS</application> and
-    <application>NSPR</application> libraries, ensure you uncomment the two
-    lines near the bottom of the file.
-    You should review the entire file and comment or uncomment options as
-    necessary. If you would prefer to download the file instead of creating
-    it by typing or cut-and-pasting, you can find it at <ulink
-    url="&files-anduin;/xulrunner-&xulrunner-version;-mozconfig"/>
+    <command>./configure --help</command>. You should review the entire file
+    and comment or uncomment options as necessary. If you would prefer to
+    download the file instead of creating it by typing or cut-and-pasting, you
+    can find it at
+    <ulink url="&files-anduin;/xulrunner-&xulrunner-version;-mozconfig"/>
     (the file must be installed in the root of the source tree
     <filename class='directory'>mozilla</filename> directory, and named
@@ -169 +170 @@
 # These options are used so that the Xulrunner binaries are linked to
 # the system-installed copies of the specified libraries instead of
-# the source tree code which may not be the most recent versions (or,
-# for cairo, may contain additional patches) : with the exception of
-# libsqlite3, the libraries are statically linked - using the shipped
-# version of libsqlite3 has been reported to cause problems with other
-# applications which were using sqlite3.
-
-# (the --enable-system options)
-# comment this if you want to use whatever patched version of cairo
+# the source tree code which may not be the most recent versions.
+# With the exception of libsqlite3, the libraries are statically linked.
+
+# (Options to use system installed libraries)
+# Using the shipped version of libsqlite3 has been reported to cause
+# problems with other applications which were using sqlite3.
+# Only comment this line if you know excatly what you are doing!
+ac_add_options --enable-system-sqlite
+
+# Comment this only if you want to use whatever patched version of cairo
 # is in the shipped mozilla tree, together with the system headers.
 ac_add_options --enable-system-cairo
 
-# comment this if you have not installed lcms
+# Comment this if you have not installed lcms.
 ac_add_options --enable-system-lcms
 
-# comment this if you have not installed sqlite
-ac_add_options --enable-system-sqlite
-
-# (the --with-system options)
-# comment this if you did not build libjpeg before gtk+-2
+# Comment this if you did not build libjpeg before GTK+-2.
 ac_add_options --with-system-jpeg
 
 # These two options enable support for building Xulrunner with
 # system-installed versions of the Network Security Services (NSS)
-# and Netscape Portable Runtime (NSPR) libraries. Uncomment both
-# lines to enable support for system-installed NSS/NSPR instead of
-# building the versions shipped with xulrunner.
-#ac_add_options --with-system-nspr
-#ac_add_options --with-system-nss
-
-# comment this if you have not built png with the apng patch
+# and Netscape Portable Runtime (NSPR) libraries. Comment them if
+# you wish to use the included copies (not recommended).
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+
+# Comment this if you have not built png with the apng patch.
 ac_add_options --with-system-png
 
 # The pthreads option is only used when building nspr
-# so you can comment this if you enable --with-system-nspr
-ac_add_options --with-pthreads
-
-# zlib is in LFS
+# Uncomment this if you build the included nspr.
+#ac_add_options --with-pthreads
+
+# zlib is included in LFS. Do not comment this line.
 ac_add_options --with-system-zlib
 
-# (options to disable parts of the package)
+# (Options to disable parts of the package)
 # This option is used to disable the a11y support in the Xulrunner
 # binaries. Comment out this option if you require a11y support.
 ac_add_options --disable-accessibility
 
-# uncomment this if you did not build curl
-#ac_add_options --disable-crashreporter
-
-# comment this if you have built dbus-glib
-ac_add_options --disable-dbus
-
-# comment this if you have gnome-vfs and libgnomeui, and wish to
+# Uncomment this if you did not build curl.
+ac_add_options --disable-crashreporter
+
+# Comment this if you have built dbus-glib.
+#ac_add_options --disable-dbus
+
+# Comment this if you have gnome-vfs and libgnomeui, and wish to
 # integrate xulrunner into your gnome desktop
 ac_add_options --disable-gnomevfs
@@ -249 +247 @@
 # compiling the OpenOffice package from source code using this copy
 # of Xulrunner for your Mozilla support.
-# This has NOT been tested, current versions of OpenOffice are
-# assumed not to compile against this version of xulrunner!
+#
+# This has NOT been tested, the current status of OpenOffice
+# and xulrunner is unknown! (Remove this comment before release)
 #
 ###################################################################
 #ac_add_options --enable-ldap
 
-# Use the anti-phishing measures (a blacklist of sites)
+# Use the anti-phishing measures (a blacklist of sites).
 ac_add_options --enable-safe-browsing
 
@@ -269 +268 @@
 #ac_add_options --enable-xinerama
 
-# ('with' options)
 # This option identifies the default binary directory of the Xulrunner
 # installation and is used to locate Xulrunner's installed files. This
-# option is not required for end-user browsing, and is only used for
-# development purposes.
+# option is is only used for development purposes.
 #ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-&xulrunner-version;</literal>
 
 EOF</userinput></screen>
+
+    <para>If you did not install <xref linkend="nspr"/> and 
+    <xref linkend="nss"/>, then apply the patch with the following
+    command:</para>
+
+<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-provide_system_nss_nspr-1.patch</userinput></screen>
 
     <para>Compile <application>Xulrunner</application> by issuing the
@@ -290 +293 @@
 
 <screen role="root"><userinput>make -f client.mk install &amp;&amp;
-for DL in \
+mkdir /usr/lib/mozilla &amp;&amp;
+ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins \
+    /usr/lib/mozilla/plugins</userinput></screen>
+
+    <para>If you've elected to use the included NSPR and NSS, while still the 
+    <systemitem class="username">root</systemitem> user, complete the
+    installation with the following commands:</para>
+
+<screen role="root"><userinput>for DL in \
     libnss3.so libnssutil3.so libsmime3.so libssl3.so libsoftokn3.so \
-    libplds4.so libplc4.so libnspr4.so ; do
-        ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib/$DL
-done &amp;&amp;
-ln -sv mozilla-nspr.pc /usr/lib/pkgconfig/nspr.pc &amp;&amp;
-mkdir /usr/lib/mozilla &amp;&amp;
-ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins /usr/lib/mozilla/plugins</userinput></screen>
+    libplds4.so libplc4.so libnspr4.so
+do
+    ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib/$DL
+done</userinput></screen>
 
   </sect2>

xsoft/graphweb/firefox.xml

@@ -7 +7 @@
   <!ENTITY firefox-download-http "http://releases.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        "9875c9237b532009df8e91c3785539a3">
-  <!ENTITY firefox-size          "35.3 MB">
-  <!ENTITY firefox-buildsize     "674 MB (stand-alone) or 408MB (on xulrunner)">
-  <!ENTITY firefox-time          "13.4 SBU (stand-alone) or 0.3 SBU (on xulrunner)">
+  <!ENTITY firefox-md5sum        "136867f95c86f3988b7f825e874b85de">
+  <!ENTITY firefox-size          " MB">
+  <!ENTITY firefox-buildsize     "322 MB (stand-alone) or 291 MB (on xulrunner)">
+  <!ENTITY firefox-time          "11 SBU (stand-alone) or 0.2 SBU (on xulrunner)">
 ]>
 
@@ -33 +33 @@
     based on the <application>Mozilla</application> codebase.</para>
 
-    <para>With the introduction of firefox-3, the <application>pkgconfig</application>
-    files for the Gecko engine (and for <application>nss</application> and
-    <application>nspr</application>) are not installed.  This means that applications
-    such as <application>Epiphany</application> can no longer be built against firefox,
-    and must instead be built against xulrunner (which is actually the same code, but
-    built in a different way).  If you wish to build other packages which use Gecko (for
-    the moment, probably only gnome-2.24 or later versions will recognize xulrunner),
-    build <xref linkend="xulrunner"/> first.</para>
+    <para>With the introduction of firefox-3.x, the
+    <application>pkgconfig</application> files for the Gecko engine (and for
+    <application>nss</application> and <application>nspr</application>) are not
+    installed.  This means that applications such as
+    <application>Epiphany</application> can no longer be built against firefox,
+    and must instead be built against xulrunner (which is actually the same
+    code, but built in a different way).  If you wish to build other packages
+    which use Gecko (for the moment, probably only gnome-2.24 or later versions
+    will recognize xulrunner), build <xref linkend="xulrunner"/> first.</para>
 
    <tip>
-    <para>Firefox is updated frequently as new vulnerabilities are found.  Consult
+    <para>Firefox is updated frequently as new vulnerabilities are found.
+    Consult
     <ulink url="http://www.mozilla.org/security/known-vulnerabilities/">mozilla security</ulink>
-    for details of what is fixed in newer releases.  The editors cannot guess what
-    will differ in newer versions: it should be straightforward to upgrade within the
-    same series (3.0), but it is always possible that newer versions will have increased
-    dependencies, or that something using the nss or gecko libraries will break.  If you
-    update, begin by updating <application>xulrunner</application> if you use that, then
-    update firefox (ensuring the libxul-sdk option points to the new version).</para>
+    for details of what is fixed in newer releases.  The editors cannot guess
+    what will differ in newer versions: it should be straightforward to upgrade
+    within the same series (3.5), but it is always possible that newer versions
+    will have increased dependencies, or that something using the nss or gecko
+    libraries will break.  If you update, begin by updating
+    <application>xulrunner</application> if you use that, then update firefox
+   (ensuring the libxul-sdk option points to the new version).</para>
    </tip>
 
@@ -75 +78 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Optional patch: <ulink
+        url="&patch-root;/firefox-&firefox-version;-provide_system_nspr_nss-1.patch"/>
+        (Required if using the included NSPR and NSS libs as system versions for
+        other packages)</para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Firefox Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="optional"><xref linkend="xulrunner"/> which shares all these
+    <para role="recommended"><xref linkend="xulrunner"/> which shares all these
     dependencies, or for a standalone firefox the following Required and
     Optional dependencies:</para>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/>,
+    <para role="required"><xref linkend="alsa-lib"/>,
+    <xref linkend="gtk2"/>,
     <xref linkend="libidl"/>
     <xref linkend="pango"/>
@@ -103 +117 @@
     <xref linkend="lcms"/>,
     <xref linkend="libpng"/> (patched for apng support),
+    <xref linkend="nspr"/>,
+    <xref linkend="nss"/>,
+    <xref linkend="startup-notification"/>.
     <xref linkend="sqlite"/>,
-    <xref linkend="startup-notification"/>.
     <xref linkend="unzip"/>,
     <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing the
@@ -123 +139 @@
     is created below. To see the entire list of available configuration options
     (and an abbreviated description of each one), issue
-    <command>./configure --help</command>.  If you are going to use
-    system-installed versions of the <application>NSS</application> and
-    <application>NSPR</application> libraries, ensure you uncomment the two
-    lines near the bottom of the file. If you are going to build the
-    <application>OpenOffice</application> package and you want to use this
-    <application>Firefox</application> installation as the default
-    <application>Mozilla</application> source, ensure you uncomment the
-    <option>--enable-ldap</option> option in the file created below.
-    If you are building against <application>Xulrunner</application> you
-    must uncomment the 'xulrunner' item.
+    <command>./configure --help</command>. If you are not building against
+    <application>Xulrunner</application> you must comment the 'xulrunner' items.
     You may also wish to review the entire file and uncomment any other desired
     options. If you would prefer to download the file instead of creating it by
@@ -143 +151 @@
 
 <screen><?dbfo keep-together="auto"?><userinput>cat &gt; .mozconfig &lt;&lt; "EOF"
-<literal># This file contains the options used to build firefox on top
-# of xulrunner. If you do not wish to build xulrunner, make the changes
-# noted for a 'standalone browser'. You may need to specify additional
-# options for your specific build needs (if you are building 'standalone')
+<literal># This file contains the options used in the Firefox build. You may
+# need to specify additional options for your specific build needs.
 # Use the information provided by running './configure --help' to
 # help you determine if you need to add any additional options.
 # Some additional options can be added by uncommenting the examples
 # in this file or adding options by inserting a line containing
-# 'ac_add_options --some-option-you-need'.
-
-# build the browser
+# 'ac_add_options --some-option-you-need'.  Be aware that some accepted
+# options, such as '--with-system-bz2', do not affect the build.
+
+# specify that we want to build firefox
 ac_add_options --enable-application=browser
 
@@ -165 +172 @@
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../firefox-build
 
-# Specify the installation prefix. If you would prefer Firefox
+# Specify the installation prefix. If you would prefer Xulrunner
 # installed in a different prefix, modify the line below to fit
-# your needs. You may also need to modify some of the instructions in
-# the BLFS book to point to your desired prefix.
+# your needs (the config will always be written to /etc/gre.d)
 ac_add_options --prefix=/usr
 
-# Compile with a minimal level of optimization
+# apply a minimal level of optimization (-O)
 ac_add_options --enable-optimize
 
-# (the --enable-system options)
-# comment this if you want to use whatever patched version of cairo
-# is in the shipped mozilla tree, together with the system headers
+# These options are used so that the Xulrunner binaries are linked to
+# the system-installed copies of the specified libraries instead of
+# the source tree code which may not be the most recent versions.
+# With the exception of libsqlite3, the libraries are statically linked.
+
+# (Options to use system installed libraries)
+# Using the shipped version of libsqlite3 has been reported to cause
+# problems with other applications which were using sqlite3.
+# Only comment this line if you know excatly what you are doing!
+ac_add_options --enable-system-sqlite
+
+# Comment this only if you want to use whatever patched version of cairo
+# is in the shipped mozilla tree, together with the system headers.
 ac_add_options --enable-system-cairo
 
-# comment this if you have not installed lcms - firefox will use
-# its own copy
+# Comment this if you have not installed lcms.
 ac_add_options --enable-system-lcms
 
-# comment this if you have not installed sqlite, firefox will use
-# its own old copy
-ac_add_options --enable-system-sqlite
-
-# (the --with-system options)
-# comment this if you did not build libjpeg before gtk+-2
+# Comment this if you did not build libjpeg before GTK+-2.
 ac_add_options --with-system-jpeg
 
-# These two options enable support for building Firefox with
+# These two options enable support for building Xulrunner with
 # system-installed versions of the Network Security Services (NSS)
-# and Netscape Portable Runtime (NSPR) libraries. We build these
-# as part of xulrunner, so we can use them here.  For a standalone
-# firefox you might want to comment these.
+# and Netscape Portable Runtime (NSPR) libraries. Comment them if
+# you wish to use the included copies (not recommended).
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 
-# comment this if you have not installed png with the apng patch
+# Comment this if you have not built png with the apng patch.
 ac_add_options --with-system-png
 
-# uncomment this if you are building nspr as part of firefox
+# The pthreads option is only used when building nspr
+# Uncomment this if you build the included nspr.
 #ac_add_options --with-pthreads
 
-# zlib is in LFS
+# zlib is included in LFS. Do not comment this line.
 ac_add_options --with-system-zlib
 
-# (options to disable parts of the package)
-# This option is used to disable the a11y support in the Firefox
+# (Options to disable parts of the package)
+# This option is used to disable the a11y support in the Xulrunner
 # binaries. Comment out this option if you require a11y support.
 ac_add_options --disable-accessibility
 
-# uncomment this if you did not build curl
-#ac_add_options --disable-crashreporter
-
-# comment this if you have built dbus-glib
-ac_add_options --disable-dbus
-
-# comment this if you have gnome-vfs and libgnomeui, and wish to
-# integrate firefox into your gnome desktop
+# Uncomment this if you did not build curl.
+ac_add_options --disable-crashreporter
+
+# Comment this if you have built dbus-glib.
+#ac_add_options --disable-dbus
+
+# Comment this if you have gnome-vfs and libgnomeui, and wish to
+# integrate xulrunner into your gnome desktop
 ac_add_options --disable-gnomevfs
 
 # This option is added so that the Mozilla Installer program is not
 # built or installed. The program is not required for a BLFS
-# installation of Firefox.
+# installation of Xulrunner.
 ac_add_options --disable-installer
 
-# The mochitest is a separate test feature and has caused problems
-# in the past.
+# If you enable javaxpcom, you must have a java compiler installed.
+ac_add_options --disable-javaxpcom
+
+# mochitest often causes problems
 ac_add_options --disable-mochitest
 
@@ -236 +248 @@
 ac_add_options --disable-tests
 
-# The updater is not useful if you build from source.
+# Disable the updater, which is not appropriate if you build from source
 ac_add_options --disable-updater
 
 # (options to add extra parts of the package)
 # This option is used to enable source tree included LDAP support in
-# the Firefox binaries.
+# the Xulrunner binaries.
 ###################################################################
 #
 # NOTE: You must uncomment this option if there is any chance of
 # compiling the OpenOffice package from source code using this copy
-# of Firefox for your Mozilla support.
-# This has NOT been tested, current versions of OpenOffice are
-# assumed not to compile against this version of xulrunner!
+# of Xulrunner for your Mozilla support.
+#
+# This has NOT been tested, the current status of OpenOffice
+# and xulrunner is unknown! (Remove this comment before release)
 #
 ###################################################################
 #ac_add_options --enable-ldap
 
-# This option causes the installed binaries to have the official
-# Firefox name embedded in them. Due to license restrictions, you
-# may not distribute binaries created using this option.  It also
-# means you get a popup EULA when you first run firefox.
-# If you disable this, the browser will call itself Minefield.
-ac_add_options --enable-official-branding
-
-# use the anti-phishing blacklist
+# Use the anti-phishing measures (a blacklist of sites).
 ac_add_options --enable-safe-browsing
 
@@ -271 +277 @@
 
 # Uncomment this option if you desire support for dual-monitor
-# display of Firefox using the X-Window Xinerama libraries.
+# display using the X-Window Xinerama libraries.
 #ac_add_options --enable-xinerama
 
-# ('with' options)
-# This option identifies the default binary directory of the Firefox
-# installation and is used to locate Firefox's installed files. This
-# option is not required for end-user browsing, and is only used for
-# development purposes.
-#ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox-&firefox-version;</literal>
-
-# Point to the xulrunner libraries - comment this for a standalone browser
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;
-
+# This option identifies the default binary directory of the Xulrunner
+# installation and is used to locate Xulrunner's installed files. This
+# option is is only used for development purposes.
+#ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox-&firefox-version;
+
+# Point to the xulrunner libraries - comment these for a standalone browser
+ac_add_options --with-system-libxul
+ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;</literal>
 EOF</userinput></screen>
+
+    <para>If you did not install <xref linkend="xulrunner"/> or 
+    <xref linkend="nspr"/> and <xref linkend="nss"/>, then apply the patch
+    with the following command:</para>
+
+<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-provide_system_nss_nspr-1.patch</userinput></screen>
 
     <para>Compile <application>Firefox</application> by issuing the
@@ -303 +313 @@
 
 <screen role="root"><userinput>ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins \
- /usr/lib/firefox-&firefox-version;/plugins</userinput></screen>
+    /usr/lib/firefox-&firefox-version;/plugins</userinput></screen>
+
+    <para>If you've elected to use the included NSPR and NSS, while still the
+    <systemitem class="username">root</systemitem> user, complete the
+    installation with the following commands:</para>
+
+<screen role="root"><userinput>for DL in \
+    libnss3.so libnssutil3.so libsmime3.so libssl3.so libsoftokn3.so \
+    libplds4.so libplc4.so libnspr4.so
+do
+    ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib/$DL
+done</userinput></screen>
 
   </sect2>
@@ -320 +341 @@
     the package.</para>
 
-    <!--<para><command>install -v -m755 -d .../chrome/icons/default</command> and
-    <command>ln -v -s ../../../icons/default.xpm ...</command>: These two
-    commands are used to create a symlink in the required directory so that
-    the proper icon is displayed in the taskbar and when
-    <application>Firefox</application> windows are minimized.</para> -->
-
     <para><command>ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins
     /usr/lib/firefox-&firefox-version;/plugins</command>:
@@ -333 +348 @@
 
    <tip>
-    <para>If you upgrade firefox, ensure that any additional plugins are moved to
-    the plugin directory of the new version.</para>
+    <para>If you upgrade firefox, ensure that any additional plugins are moved
+    to the plugin directory of the new version.</para>
    </tip>