Changeset 07c39524 for xsoft/graphweb


Ignore:
Timestamp:
10/29/2014 06:58:34 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
krejzi/svn
Children:
ea4381c
Parents:
18fa498
Message:

Firefox-33.0.2 update.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/krejzi@14782 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • xsoft/graphweb/firefox.xml

    r18fa498 r07c39524  
    55  %general-entities;
    66
    7 <!--  <!ENTITY firefox-download-http
    8            "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">-->
    97  <!ENTITY firefox-download-http
    108           "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
    119  <!ENTITY firefox-download-ftp
    1210           "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
    13   <!ENTITY firefox-md5sum        "5a1c4b0b2349e3db94b45bd3f03f9288">
     11  <!ENTITY firefox-md5sum        "385ad037451f141b68515c73cad01704">
    1412  <!ENTITY firefox-size          "148 MB">
    15   <!ENTITY firefox-buildsize     "4.1 GB (100 MB installed)">
    16   <!ENTITY firefox-time          "12 SBU (using parallelism=8)">
     13  <!ENTITY firefox-buildsize     "4.9 GB (66 MB installed)">
     14  <!ENTITY firefox-time          "60 SBU">
    1715]>
    1816
    … …  
    8179      <xref linkend="alsa-lib"/>,
    8280      <xref linkend="gtk2"/>,
    83       <xref linkend="zip"/>, and
    84       <xref linkend="unzip"/>
     81      <xref linkend="unzip"/> and
     82      <xref linkend="zip"/>
    8583    </para>
    8684
    … …  
    9896    <note>
    9997      <para>
    100         If you don't install recommended dependencies, then internal copies of
    101         those packages will be used. They might be tested to work, but they can
    102         be out of date or contain security holes.
     98        If you don't install recommended dependencies,
     99        then internal copies of those packages will
     100        be used. They might be tested to work, but
     101        they can be out of date or contain security
     102        holes.
    103103      </para>
    104104    </note>
    … …  
    107107      <para>
    108108        With <application>Firefox-31.0</application> and later versions, you
    109         must have installed <application>Openssl</application> before
    110         <application>Python 2</application> or the build system will quickly
     109        must have installed <application>OpenSSL</application> before
     110        <application>Python 2</application>, or the build system will quickly
    111111        fail with output including "ImportError: cannot import name
    112112        HTTPSHandler". If you are in any doubt about this (e.g. upgrading
    … …  
    114114        <filename>/usr/lib/python2.7/lib-dynload/_ssl.so</filename> exists.
    115115        If it does not, reinstall <xref linkend="python2"/> (after
    116         installing <xref linkend="openssl"/>.  The latest version of any
     116        installing <xref linkend="openssl"/>  - the latest version of any
    117117        <emphasis>currently maintained</emphasis> version of Openssl should
    118         be satisfactory if already installed.
     118        be satisfactory if already installed - if that package has not already
     119        been installed).
    119120      </para>
    120121    </note>
    … …  
    136137      <xref linkend="startup-notification"/>,
    137138      <xref linkend="wget"/>,
    138       <xref linkend="wireless_tools"/>, and
     139      <xref linkend="wireless_tools"/> and
    139140      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
    140141    </para>
    … …  
    149150
    150151    <para>
    151       The configuration of <application>Firefox</application> is accomplished
    152       by creating a <filename>mozconfig</filename> file containing the desired
    153       configuration options. A default <filename>mozconfig</filename> is
    154       created below. To see the entire list of available configuration options
    155       (and an abbreviated description of each one), issue <command>./configure
     152      The configuration of <application>Firefox</application> is accomplished by
     153      creating a <filename>mozconfig</filename> file containing the desired
     154      configuration options. A default <filename>mozconfig</filename> is created
     155      below. To see the entire list of available configuration options (and an
     156      abbreviated description of each one), issue <command>./configure
    156157      --help</command>. You may also wish to review the entire file and
    157       uncomment any other desired options.  Create the file by issuing the
    158       following command:
     158      uncomment any other desired options.
     159      Create the file by issuing the following command:
    159160    </para>
    160161
    … …  
    210211ac_add_options --disable-tests
    211212
    212 ac_add_options --enable-optimize
    213213ac_add_options --enable-strip
    214214ac_add_options --enable-install-strip
    … …  
    238238    </para>
    239239
    240     <note><para>
    241       If you are compiling <application>Firefox</application> in chroot, make
    242       sure you have <envar>$SHELL</envar> environment variable set or prepend
    243       <envar>SHELL=/bin/sh</envar> to the first make command below.
    244     </para></note>
    245 
    246 <screen><userinput>test $(uname -m) = "i686" &amp;&amp; sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &amp;&amp;
    247 make -f client.mk</userinput></screen>
     240<screen><userinput>make -f client.mk</userinput></screen>
    248241
    249242    <para>
    … …  
    252245
    253246    <para>
    254       Now, as the <systemitem class="username">root</systemitem> user:
     247      Install <application>Firefox</application> by running the following
     248      commands as the <systemitem class="username">root</systemitem> user:
    255249    </para>
    256250
    … …  
    258252
    259253mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
    260 ln -sfv ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser</userinput></screen>
     254ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version;</userinput></screen>
     255
     256    <para>
     257      The above instruction just installs the parts you need to run
     258      <application>Firefox</application>. Alternatively, if you want to
     259      install the full <application>Firefox</application> development
     260      environment, run the following command as the
     261      <systemitem class="username">root</systemitem> user:
     262    </para>
     263
     264<screen role="root"><userinput>make -C firefox-build-dir install</userinput></screen>
    261265
    262266  </sect2>
    … …  
    264268  <sect2 role="commands">
    265269    <title>Command Explanations</title>
    266 
    267     <para>
    268       <command>test $(uname -m) = "i686" &amp;&amp; sed ...</command>:
    269       On this version of firefox, an old bug has reappeared in 32-bit builds.
    270       With optimization, the install fails with a Python error.  This
    271       command will fix i686 builds and preserve the optimization on x86_64.
    272     </para>
    273270
    274271    <para>
    … …  
    280277    </para>
    281278
    282      <para>
    283       <command>make -C firefox-build-dir install</command>: This runs
    284       <command>make install</command> in firefox-build-dir.
    285     </para>
    286 
    287     <para>
    288       <command>ln -sfv ... /usr/bin/firefox</command>: This puts a symbolic link
    289       to the <command>firefox</command> executable in your <envar>PATH</envar>
    290       variable.
    291     </para>
    292 
    293     <para>
    294       <command>mkdir -p /usr/lib/mozilla/plugins</command>: This checks
    295       that <filename class="directory">/usr/lib/mozilla/plugins</filename>
    296       exists.
    297     </para>
    298 
    299     <para>
    300       <command>ln -sv ... /usr/lib/firefox-&firefox-version;/browser</command>:
     279    <para>
     280      <command>ln -sfv ... /usr/lib/firefox-&firefox-version;/browser</command>:
    301281      This command creates a symbolic link to <filename
    302282      class="directory">/usr/lib/mozilla/plugins</filename>. It's not really
    … …  
    330310
    331311<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
    332 mkdir -pv /usr/share/pixmaps &amp;&amp;
    333312
    334313cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
    … …  
    347326EOF
    348327
    349 ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
    350         /usr/share/pixmaps/firefox.png</userinput></screen>
     328for s in 16 32 48
     329do
     330install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/chrome/icons/default/default${s}.png \
     331                  /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
     332done &amp;&amp;
     333install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
     334                  /usr/share/icons/hicolor/128x128/apps/firefox.png &amp;&amp;
     335gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
     336unset s</userinput></screen>
    351337
    352338  </sect2>
    … …  
    358344      <segtitle>Installed Programs</segtitle>
    359345      <segtitle>Installed Libraries</segtitle>
    360       <segtitle>Installed Directory</segtitle>
     346      <segtitle>Installed Directories</segtitle>
    361347
    362348      <seglistitem>
    … …  
    365351        </seg>
    366352        <seg>
    367           Numerous libraries, browser components, plugins, extensions, and
    368           helper modules installed in
    369           <filename class="directory">/usr/lib/firefox-&firefox-version;</filename>
     353          None
    370354        </seg>
    371355        <seg>
    372           /usr/lib/firefox-&firefox-version;
     356          /usr/lib/firefox-&firefox-version; and
     357          /usr/lib/mozilla/plugins
    373358        </seg>
    374359      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.