Changeset de930747 for xsoft/graphweb

Timestamp:

05/02/2012 10:23:49 AM (12 years ago)

Author:

Andrew Benton <andy@…>

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:

9cf2b10b

Parents:

cc7670a

Message:

Removed Xulrunner

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

Location:

xsoft/graphweb

Files:

• firefox.xml (modified) (11 diffs)
• seamonkey.xml (modified) (2 diffs)

xsoft/graphweb/firefox.xml

@@ -12 +12 @@
   <!ENTITY firefox-size          "75 MB">
   <!ENTITY firefox-buildsize     "2.8 GB (31 MB installed)">
-  <!ENTITY firefox-time          "24 SBU (or 0.3 SBU if you're building against
-    an installed Xulrunner)">
+  <!ENTITY firefox-time          "24 SBU">
 ]>
 
@@ -103 +102 @@
       <xref linkend="libnotify"/>,
       <xref linkend="nspr"/>, <xref linkend="nss"/>,
-      <xref linkend="xulrunner"/> (linking against an installed xulrunner makes
-      Firefox about 32 MB smaller, which is trivial compared to the size of
-      xulrunner),
       <xref linkend="wireless_tools"/>,
       <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
@@ -148 +144 @@
 ac_add_options --disable-libnotify
 
-# 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:
 # ac_add_options --enable-startup-notification
@@ -162 +154 @@
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
-ac_add_options --enable-official-branding
-ac_add_options --prefix=/usr
-
-# The rest of these options have no effect if you're
-# building against an already installed xulrunner:
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
@@ -173 +160 @@
 ac_add_options --disable-tests
 ac_add_options --disable-updater
+ac_add_options --enable-official-branding
 ac_add_options --enable-shared
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
+ac_add_options --prefix=/usr
 ac_add_options --with-pthreads
 ac_add_options --with-system-jpeg
@@ -191 +180 @@
 sed -i '/sys\/time\.h/a#include &lt;unistd.h&gt;' ipc/chromium/src/base/time_posix.cc &amp;&amp;
 sed -i 's# ""##' browser/base/Makefile.in &amp;&amp;
-make -f client.mk</userinput></screen>
+make -f client.mk &amp;&amp;
+make -C firefox-build-dir/browser/installer</userinput></screen>
 
     <para>
@@ -198 +188 @@
 
     <para>
-      If you have <emphasis>not</emphasis> linked
-      <application>Firefox</application> against an installed
-      <application>Xulrunner</application>:
-    </para>
-
-<screen><userinput>make -C firefox-build-dir/browser/installer</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user, if you
-      have <emphasis>not</emphasis> linked <application>Firefox</application>
-      against an installed <application>Xulrunner</application>, install the
-      package:
+      Now, as the <systemitem class="username">root</systemitem> user install
+      <application>Firefox</application>:
     </para>
 
@@ -221 +201 @@
 
     <para>
-      If you <emphasis>have</emphasis> linked against an already installed
-      <application>Xulrunner</application>, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C firefox-build-dir install &amp;&amp;
-rm /usr/bin/firefox &amp;&amp;
-cat &gt; /usr/bin/firefox &lt;&lt; "EOF" &amp;&amp;
-#!/bin/bash
-/usr/lib/xulrunner-&xulrunner-version;/xulrunner /usr/lib/firefox-&firefox-version;/application.ini "${@}"
-EOF
-chmod 755 /usr/bin/firefox &amp;&amp;
-mkdir -p /usr/lib/mozilla/plugins &amp;&amp;
-ln -sv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &amp;&amp;
-chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
+      The above instructions just install the parts you need to run
+      <application>Firefox</application>. Alternatively, if you want to install
+      the full <application>Firefox</application> development environment (Note,
+      this installs more than half a gigabyte of extra files and so is not
+      recommended) as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C firefox-build-dir install</userinput></screen>
   </sect2>
 
@@ -274 +247 @@
       <option>--strip-components=1</option> option removes the leading
       'firefox' directory from the filenames, allowing us to untar it
-      into a versioned directory. Untaring it (instead of running make install)
-      prevents it installing
-      <filename class="directory">/usr/lib/firefox-devel-&firefox-version;</filename>
-      which contains about 430 MB of files. If you need any of those files,
-      they're in <xref linkend="xulrunner"/>
-    </para>
-
-    <para>
-      <command>make -C firefox-build-dir install</command>: This runs
-      <command>make install</command> in firefox-build-dir.
+      into a versioned directory.
     </para>
 
@@ -305 +269 @@
       default, we make the symbolic link to keep all the plugins installed in
       one folder.
+    </para>
+
+    <para>
+      <command>make -C firefox-build-dir install</command>: This runs
+      <command>make install</command> in
+      <filename class="directory">firefox-build-dir</filename>.
     </para>
   </sect2>
@@ -372 +342 @@
         <listitem>
           <para>
-            is a gtk2 internet browser that uses the Gecko rendering engine.
+            is a <application>Gtk 2</application> internet browser that uses the
+            Gecko rendering engine.
           </para>
           <indexterm zone="firefox firefox-prog">

xsoft/graphweb/seamonkey.xml

@@ -219 +219 @@
 ln -svf ../mozilla/plugins /usr/lib/seamonkey-&seamonkey-version; &&
 cp -v moz-build-dir/mozilla/dist/man/man1/seamonkey.1 /usr/share/man/man1</userinput></screen>
+
+    <para>
+      The above instructions just install the parts you need to run
+      <application>Seamonkey</application>. Alternatively, if you want to
+      install the full <application>Seamonkey</application> development
+      environment (Note, this installs more than half a gigabyte of extra files
+      and so is not recommended) as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C moz-build-dir install</userinput></screen>
   </sect2>
 
@@ -359 +370 @@
         <listitem>
           <para>
-            is Mozilla browser/email/newsgroup/chat client suite.
+            is the Mozilla browser/email/newsgroup/chat client suite.
           </para>
           <indexterm zone="seamonkey seamonkey-prog">