Changeset eb148eb

Timestamp:

12/20/2011 06:55:26 PM (12 years ago)

Author:

Andrew Benton <andy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 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/inkscape-core-mods, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

5c79a939

Parents:

d4e85467

Message:

assorted firefox and xulrunner tweaks

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

Files:

• x/lib/xulrunner.xml (modified) (7 diffs)
• xsoft/graphweb/firefox.xml (modified) (7 diffs)

x/lib/xulrunner.xml

@@ -5 +5 @@
   %general-entities;
 
+  <!--
   <!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-http " ">
   <!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 buildsize and time will differ -->
   <!ENTITY xulrunner-md5sum        "d8d0c8c79660752b02d9e9ab69a68f94">
   <!ENTITY xulrunner-size          "70.8 MB">
-  <!ENTITY xulrunner-buildsize     "2.6 GB">
+  <!ENTITY xulrunner-buildsize     "2.6 GB (440 MB installed)">
   <!ENTITY xulrunner-time          "22 SBU">
 ]>
@@ -72 +75 @@
     <application>libpng</application> (patched for apng support) should have
     been installed before <application>gdk-pixbuf</application> and should
-    exist on your system. If for some strange reason you haven't installed
+    exist on your system. If for some strange reason you haven&apos;t installed
     them, you should remove the <option>--with-system-jpeg</option> and
     <option>--with-system-png</option> options from the
@@ -156 +159 @@
     following commands:</para>
 
-<screen><userinput>sed -i '/Version/aRequires: nspr &gt;= 4.8.9' xulrunner/installer/libxul-embedding.pc.in &amp;&amp;
+<screen><userinput>sed -i '/Version/aRequires: nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in &amp;&amp;
 make -f client.mk</userinput></screen>
 
@@ -166 +169 @@
 <screen role="root"><userinput>make -C xulrunner-build-dir install &amp;&amp;
 mkdir -p /usr/lib/mozilla &amp;&amp;
+rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
 ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
 chown -Rv root:root /usr/{include,lib,share/idl}/xulrunner-*</userinput></screen>
@@ -200 +204 @@
     <para><command>for DL in ...</command>: The NSPR and NSS libraries shipped
     with this package are installed into
-    <filename class='directory'>/usr/lib/xulrunner-&xulrunner-version;</filename>
+    <filename class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>
     which means they will not be found at runtime.  By using symbolic links from
     <filename class="directory">/usr/lib</filename> the libraries will be found
@@ -208 +212 @@
     <para><command>ln -sv ../mozilla/plugins ...</command>: Some packages will
     install browser plugins into
-    <filename class='directory'>/usr/lib/mozilla/plugins</filename>.
+    <filename class="directory">/usr/lib/mozilla/plugins</filename>.
     Creating this symlink <application>Xulrunner</application> keeps additional
     plugins in a common directory.</para>
@@ -230 +234 @@
         <seg>Numerous libraries, browser components, plugins, extensions, and
         helper modules installed in <filename
-        class='directory'>/usr/lib/xulrunner-&xulrunner-version;</filename></seg>
+        class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename></seg>
         <seg>/etc/gre.d, /usr/include/xulrunner-&xulrunner-version;,
         /usr/lib/xulrunner-&xulrunner-version;,

xsoft/graphweb/firefox.xml

@@ -12 +12 @@
   <!ENTITY firefox-md5sum        "d8d0c8c79660752b02d9e9ab69a68f94">
   <!ENTITY firefox-size          "70.8 MB">
-  <!ENTITY firefox-buildsize     "3 GB (or 495 MB if you're building against an
-    installed Xulrunner)">
-  <!ENTITY firefox-time          "24 SBU (or 0.3 SBU if you're building against
+  <!ENTITY firefox-buildsize     "3 GB (33 MB installed)">
+  <!ENTITY firefox-time          "24 SBU (or 0.3 SBU if you&apos;re building against
     an installed Xulrunner)">
 ]>
@@ -71 +70 @@
     <application>libpng</application> (patched for apng support) should have
     been installed before <application>gdk-pixbuf</application> and should
-    exist on your system. If for some strange reason you haven't installed
+    exist on your system. If for some strange reason you haven&apos;t installed
     them, you should remove the <option>--with-system-jpeg</option> and
     <option>--with-system-png</option> options from the
@@ -129 +128 @@
 ac_add_options --disable-libnotify
 
-# If you have installed nss and nspr uncomment these two lines:
-# ac_add_options --with-system-nspr
-# ac_add_options --with-system-nss
-
 # If you have installed xulrunner uncomment these two lines:
 # ac_add_options --with-system-libxul
 # ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;
 
-# Uncomment these if you have installed them:
+# Uncomment these if you have installed them and
+# you&apos;re not using an already installed xulrunner:
+# ac_add_options --with-system-nspr
+# ac_add_options --with-system-nss
 # ac_add_options --enable-system-sqlite
 # ac_add_options --enable-system-lcms
@@ -147 +145 @@
 ac_add_options --prefix=/usr
 
-# The rest of these options have no effect if you're
+# The rest of these options have no effect if you&apos;re
 # building against an already installed xulrunner:
 ac_add_options --enable-pthreads
@@ -191 +189 @@
 chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
 
-    <para>If you have installed <application>Firefox</application> linked
-    against an already installed <application>Xulrunner</application>, as the
+    <para>If you <emphasis>have</emphasis> linked against an already installed
+    <application>Xulrunner</application>, as the
     <systemitem class="username">root</systemitem> user:</para>
 
@@ -229 +227 @@
     into a versioned directory. Untaring it (instead of running make install)
     prevents it installing /usr/lib/firefox-devel-&firefox-version; which
-    contains about 430 MB of files. If you need any of those files, they're in
-    <xref linkend="xulrunner"/></para>
+    contains about 430 MB of files. If you need any of those files,
+    they&apos;re in <xref linkend="xulrunner"/></para>
 
     <para><command>make -C firefox-build-dir install</command>: This runs
@@ -272 +270 @@
         <seg>Numerous libraries, browser components, plugins, extensions, and
         helper modules installed in <filename
-        class='directory'>/usr/lib/firefox-&firefox-version;</filename>.</seg>
+        class="directory">/usr/lib/firefox-&firefox-version;</filename>.</seg>
         <seg>/usr/lib/firefox-&firefox-version;</seg>
       </seglistitem>