Changeset 0ccfdd3a

Timestamp:

06/14/2014 01:17:16 AM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 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, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

ef362a75

Parents:

b4f8b750

Message:

Modify build instructions for firefox-30.0 and thunderbird-24.6.0.
Uncoment 'ac_add_options --enable-system-cairo' in xulrunner/firefox-30.0 and thunderbird-24.6.0. Thanks Armin K.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/xulrunner.xml (modified) (1 diff)
• xsoft/graphweb/firefox.xml (modified) (5 diffs)
• xsoft/other/thunderbird.xml (modified) (4 diffs)

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Modify build instructions for firefox-30.0 and
+          thunderbird-24.6.0. Uncoment 'ac_add_options --enable-system-cairo'
+          in xulrunner/firefox-30.0 and thunderbird-24.6.0. Thanks Armin K.
+          <ulink url="&blfs-ticket-root;5160">#5160</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Add fltk-1.3.2 to support tigervnc.</para>
         </listitem>

x/lib/xulrunner.xml

@@ -178 +178 @@
 ac_add_options --disable-pulseaudio
 
-# Uncomment this line if you compiled Cairo with --enable-tee switch and want
-# to use it instead of the bundled one:
-#ac_add_options --enable-system-cairo
+# Comment this line if you do not have Cairo installed (compiled with
+# --enable-tee switch) and want to use the bundled one:
+ac_add_options --enable-system-cairo
 
 # If you have not installed Yasm then uncomment this line:

xsoft/graphweb/firefox.xml

@@ -189 +189 @@
 ac_add_options --disable-pulseaudio
 
-# Uncomment this line if you compiled Cairo with --enable-tee switch and want
-# to use it instead of the bundled one:
-#ac_add_options --enable-system-cairo
+# Comment this line if you do not have Cairo installed (compiled with
+# --enable-tee switch) and want to use the bundled one:
+ac_add_options --enable-system-cairo
 
 # If you have not installed Yasm then uncomment this line:
@@ -257 +257 @@
     </para>
 
-    <para>
+<!--    <para>
       If you have <emphasis>not</emphasis> linked
       <application>Firefox</application> against an installed
@@ -264 +264 @@
 
 <screen><userinput>make -C firefox-build-dir/browser/installer</userinput></screen>
-
+-->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user, if you
@@ -272 +272 @@
     </para>
 
-<screen role="root"><userinput>rm -rf /usr/lib/firefox-&firefox-version; &amp;&amp;
+<!--<screen role="root"><userinput>rm -rf /usr/lib/firefox-&firefox-version; &amp;&amp;
 mkdir  /usr/lib/firefox-&firefox-version; &amp;&amp;
 
 tar -xvf firefox-build-dir/dist/firefox-&firefox-version;.en-US.linux-$(uname -m).tar.bz2 \
-    -C /usr/lib/firefox-&firefox-version; --strip-components=1 &amp;&amp;
+    -C /usr/lib/firefox-&firefox-version; -\-strip-components=1 &amp;&amp;
 chown -R -v root:root /usr/lib/firefox-&firefox-version; &amp;&amp;
 
-ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;
+ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;-->
+<screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
 
 mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
@@ -314 +315 @@
       <command>make</command> uses the <filename>client.mk</filename> file to
       get initial configuration and setup parameters.
-    </para>
-
-    <para>
-      <command>make -C firefox-build-dir/browser/installer</command>: this
-      creates a <application>Firefox</application> tarball similar to the ones
-      you can download from Mozilla.
-    </para>
-
-    <para>
-      <command>tar -xfv firefox-build-dir/dist ...</command>: This untars
-      <application>Firefox</application> in /usr/lib. The
-      <option>--strip-components=1</option> option removes the leading
-      'firefox' directory from the filenames, allowing us to untar it
-      into a versioned directory.
     </para>
 

xsoft/other/thunderbird.xml

@@ -162 +162 @@
 #ac_add_options --enable-startup-notification
 
-# Uncomment this line if you compiled Cairo with --enable-tee switch and want
-# to use it instead of the bundled one:
-#ac_add_options --enable-system-cairo
+# Comment this line if you do not have Cairo installed (compiled with
+# --enable-tee switch) and want to use the bundled one:
+ac_add_options --enable-system-cairo
 
 # If you have not installed Yasm then uncomment this line:
@@ -219 +219 @@
     <note><para>
       If you are compiling <application>Thunderbird</application> in chroot,
-      prepend <envar>SHELL=/bin/bash</envar> to the first make command below.
+      prepend <envar>SHELL=/bin/bash</envar> to the <!--first -->make command below.
     </para></note>
 
-<screen><userinput>make -f client.mk &amp;&amp;
-make -C thunderbuild/mail/installer</userinput></screen>
+<screen><userinput>make -f client.mk &amp;&amp;<!--
+make -C thunderbuild/mail/installer--></userinput></screen>
 
     <para>
@@ -234 +234 @@
     </para>
 
-<screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
+<!--<screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
 tar -xvf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2 \
-    -C /usr/lib/thunderbird-&thunderbird-version; --strip-components=1 &amp;&amp;
-ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>
-
-    <para>
-      The above instructions just install the parts you need to run
+    -C /usr/lib/thunderbird-&thunderbird-version; -\-strip-components=1 &amp;&amp;
+ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>-->
+
+<screen role="root"><userinput>make -f client.mk install INSTALL_SDK=</userinput></screen>
+
+    <para>
+      The above instruction just installs the parts you need to run
       <application>Thunderbird</application>. Alternatively, if you want to
       install the full <application>Thunderbird</application> development
@@ -261 +263 @@
     </para>
 
-    <para>
-      <command>make -C thunderbuild/mail/installer</command>: this runs make in
-      the <filename class="directory">thunderbuild/mail/installer</filename>
-      folder. This gathers together all the parts of
-      <application>Thunderbird</application> and compresses them into a tarball.
-    </para>
-
-    <para>
-      <command>tar -xfv thunderbuild/mozilla/dist ...</command>: This untars
-      <application>Thunderbird</application>, the <option>-C</option> option
-      uncompresses the files in
-      <filename class="directory">/usr/lib/thunderbird-&thunderbird-version;</filename>.
-      The <option>--strip-components=1</option> option removes the leading
-      'thunderbird' directory from the filenames, allowing us to untar it into a
-      versioned directory.
-    </para>
   </sect2>