Changeset dc8a9549 for x/lib

Timestamp:

01/07/2011 09:25:26 PM (13 years ago)

Author:

Randy McMurchy <randy@…>

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:

6257285c

Parents:

8c60de56

Message:

Updated to Xulrunner-1.9.2.13/Firefox-3.6.13

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

File:

• x/lib/xulrunner.xml (modified) (18 diffs)

x/lib/xulrunner.xml

@@ -7 +7 @@
   <!ENTITY xulrunner-download-http "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!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        "80f4d83f23a7c45fc3f1904964ea2a5a">
-  <!ENTITY xulrunner-size          "50 MB">
-  <!ENTITY xulrunner-buildsize     "895 MB">
-  <!ENTITY xulrunner-time          "12 SBU">
+  <!-- md5sum and size should match firefox, but the buildsize and time will differ -->
+  <!ENTITY xulrunner-md5sum        "d7c90aed8209beefa74badf02e8eeae1">
+  <!ENTITY xulrunner-size          "51 MB">
+  <!ENTITY xulrunner-buildsize     "820 MB">
+  <!ENTITY xulrunner-time          "20 SBU">
 ]>
 
@@ -39 +39 @@
 
     &lfs67_checked;
+    <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -66 +67 @@
       <listitem>
         <para>Estimated disk space required: &xulrunner-buildsize; (using
-        recommended dependencies)</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xulrunner-time; (using recommended
+        all dependencies)</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &xulrunner-time; (using all
         dependencies)</para>
       </listitem>
@@ -79 +80 @@
         <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
+        (Required if using the included NSPR and NSS libraries as system versions for
         other packages)</para>
       </listitem>
@@ -98 +99 @@
     for some reason you haven't installed <application>libjpeg</application>,
     you should remove the <option>--with-system-jpeg</option> option from the
-    <filename>.mozconfig</filename> file created below.</para>
+    <filename>mozconfig</filename> file created below.</para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -112 +113 @@
     <xref linkend="libnotify"/>,
     <xref linkend="libpng"/> (patched for apng support),
-    <!-- Redundant as NSS requires this
-    <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"/>,
+    <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
     <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing the
     jemalloc code), and
@@ -132 +131 @@
 
     <para>The configuration of <application>Xulrunner</application> is
-    accomplished by creating a <filename>.mozconfig</filename> file containing
-    the desired configuration options. A default <filename>.mozconfig</filename>
+    accomplished by creating a <filename>mozconfig</filename> file containing
+    the desired configuration options. A default <filename>mozconfig</filename>
     is created below. To see the entire list of available configuration options
     (and an abbreviated description of each one), issue
@@ -141 +140 @@
     can find it at
     <ulink url="&files-anduin;/xulrunner-&xulrunner-version;-mozconfig"/>
-    (the file must be installed in the root of the source tree,
-    <!-- directory name changes depending on version of Xulrunner
-    <filename class='directory'>mozilla</filename> directory,--> and named
-    <filename>.mozconfig</filename> or <filename>mozconfig</filename>).</para>
-
-<screen><?dbfo keep-together="auto"?><userinput>cat &gt; .mozconfig &lt;&lt; "EOF"
+    (the file must be installed in the root of the source tree, and named
+    <filename>mozconfig</filename> or <filename>.mozconfig</filename>).</para>
+
+<screen><?dbfo keep-together="auto"?><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
 <literal># This file contains the options used in the Xulrunner build. You may
 # need to specify additional options for your specific build needs.
@@ -156 +153 @@
 # options, such as '--with-system-bz2', do not affect the build.
 
-# specify that we want to build xulrunner
-ac_add_options --enable-application=xulrunner
+# Specify that Xulrunner should be built. Note that this line is commented out
+# because it is redundant with the next setting.
+#ac_add_options --enable-application=xulrunner
+
+# Use the default settings specified in the source tree. The
+# --enable-application=xulrunner is set in this file.
+. $topsrcdir/xulrunner/config/mozconfig
 
 # Create an object directory and specify to build the package in that
@@ -165 +167 @@
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../xulrunner-build
 
-# Specify the installation prefix. If you would prefer Xulrunner
-# installed in a different prefix, modify the line below to fit
-# your needs (the config will always be written to /etc/gre.d)
+# Specify the installation prefix. If you would prefer Xulrunner installed in a
+# different prefix, modify the line below to fit your needs (the system.conf
+# configuration file will always be installed to /etc/gre.d).
 ac_add_options --prefix=/usr
 
-# apply a minimal level of optimization (-O)
+# Apply a minimal level of optimization (-O).
 ac_add_options --enable-optimize
 
@@ -187 +189 @@
 # 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.
+ac_add_options --enable-system-lcms
 
 # Comment this if you did not build libjpeg before GTK+-2.
@@ -205 +210 @@
 #ac_add_options --with-pthreads
 
-# zlib is included in LFS. Do not comment this line.
+# Zlib is included in LFS. Do not comment this line.
 ac_add_options --with-system-zlib
 
@@ -213 +218 @@
 ac_add_options --disable-accessibility
 
-# Uncomment this if you did not build curl.
+# Uncomment this if you did not build cURL.
 #ac_add_options --disable-crashreporter
 
-# Comment this if you have built dbus-glib.
+# 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
+# Comment this if you have Gnome-VFS and libgnomeui, and wish to
+# integrate Xulrunner into your Gnome desktop.
 ac_add_options --disable-gnomevfs
 
@@ -242 +247 @@
 ac_add_options --disable-tests
 
-# Disable the updater, which is not appropriate 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 causes the installed Firefox 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.
+ac_add_options --enable-official-branding
+
 # Use the anti-phishing measures (a blacklist of sites).
 ac_add_options --enable-safe-browsing
@@ -265 +276 @@
 #ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-&xulrunner-version;</literal>
 
-
 EOF</userinput></screen>
 
@@ -284 +294 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
+<!-- I really don't think we need the last command to installl symlinks to the
+     Xul libraries. Any package using Xul is going to use the pkgconfig file to
+     find the things it needs -->
 <screen role="root"><userinput>make -f client.mk install &amp;&amp;
+
 install -v -m755 -d /usr/lib/mozilla &amp;&amp;
 ln -sv              /usr/lib/xulrunner-&xulrunner-version;/plugins \
                     /usr/lib/mozilla &amp;&amp;
+
 chown -Rv root:root /usr/lib/xulrunner-* \
-                    /usr/bin/xulrunner &amp;&amp;
+                    /usr/share/idl/xulrunner-&xulrunner-version; \
+                    /usr/include/xulrunner-&xulrunner-version; &amp;&amp;
+                    
 ln -sfv             xulrunner-devel-&xulrunner-version;/lib/lib{xul,xpcom,mozjs}.so \
                     /usr/lib</userinput></screen>
 
-    <para>If you've elected to use the included NSPR and NSS, while still the
+    <para>If you 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>
@@ -302 +319 @@
 do
     ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib
-done</userinput></screen>
+done &amp;&amp;
+unset DL</userinput></screen>
 
   </sect2>
@@ -362 +380 @@
         class='directory'>/usr/lib/xulrunner-&xulrunner-version;</filename></seg>
         <seg>/etc/gre.d, /usr/include/xulrunner-&xulrunner-version;,
-        /usr/lib/xulrunner-&xulrunner-version;, and
-        /usr/lib/xulrunner-devel-&xulrunner-version;</seg>
+        /usr/lib/xulrunner-&xulrunner-version;,
+        /usr/lib/xulrunner-devel-&xulrunner-version;, and
+        /usr/share/idl/xulrunner-&xulrunner-version;</seg>
       </seglistitem>
     </segmentedlist>