Changeset d7513fd


Ignore:
Timestamp:
07/14/2013 03:44:55 PM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
591858f
Parents:
71f73d39
Message:

Merge trunk and systemd branch, part 2.

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

Files:
16 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r71f73d39 rd7513fd  
    158158<!ENTITY nettle-version               "2.7">
    159159<!ENTITY nss-major-version            "15">
    160 <!ENTITY nss-minor-version            "">
     160<!ENTITY nss-minor-version            "1">
    161161<!-- <!ENTITY nss-version                  "3.&nss-major-version;.&nss-minor-version;"> -->
    162 <!ENTITY nss-version                  "3.&nss-major-version;">
     162<!ENTITY nss-version                  "3.&nss-major-version;.&nss-minor-version;">
    163163<!ENTITY openssh-version              "6.2p2">
    164164<!ENTITY openssl-version              "1.0.1e">
    … …  
    544544<!ENTITY xorg-server-version          "1.14.2">
    545545<!ENTITY twm-version                  "1.0.7">
    546 <!ENTITY xterm-version                "293">
     546<!ENTITY xterm-version                "295">
    547547<!ENTITY xclock-version               "1.0.6">
    548548<!ENTITY xinit-version                "1.3.2">
    … …  
    565565<!ENTITY goffice-version              "0.8.17">
    566566<!ENTITY goffice010-version           "0.10.2">
    567 <!ENTITY gtk2-version                 "2.24.19">
     567<!ENTITY gtk2-version                 "2.24.20">
    568568<!ENTITY gtk3-version                 "3.8.2">
    569569<!ENTITY gtk-engines-version          "2.20.2">
    … …  
    583583<!ENTITY webkitgtk-version            "1.10.2">   <!-- Even minors only -->
    584584<!ENTITY webkitgtk2-version           "2.0.3">    <!-- Even minors only -->
    585 <!ENTITY xulrunner-version            "21.0">
     585<!ENTITY xulrunner-version            "22.0">
    586586
    587587<!ENTITY gtk2-libdir                  "2.0/2.10.0">
    … …  
    813813<!ENTITY alsa-download-ftp            "ftp://ftp.alsa-project.org/pub">
    814814<!ENTITY alsa-version                 "1.0.27">
    815 <!ENTITY alsa-lib-version             "1.0.27">
     815<!ENTITY alsa-lib-version             "1.0.27.2">
    816816<!ENTITY alsa-plugins-version         "1.0.27">
    817 <!ENTITY alsa-utils-version           "1.0.27">
     817<!ENTITY alsa-utils-version           "1.0.27.1">
    818818<!ENTITY alsa-tools-version           "1.0.27">
    819819<!ENTITY alsa-firmware-version        "1.0.27">

  • general/genlib/libdrm.xml

    r71f73d39 rd7513fd  
    124124      This sed removes dependency on libpthread-stubs package
    125125      which is useless on Linux.
     126    </para>
     127
     128    <para>
     129      <option>--enable-udev</option>: This option enables support for using
     130      <application>Udev</application> instead of <command>mknod</command>.
    126131    </para>
    127132

  • general/genutils/hd2u.xml

    r71f73d39 rd7513fd  
    55  %general-entities;
    66
    7 <!ENTITY hd2u-download-http "http://www.megaloman.com/~hany/_data/hd2u/hd2u-&hd2u-version;.tgz">
     7<!ENTITY hd2u-download-http "http://hany.sk/~hany/_data/hd2u/hd2u-&hd2u-version;.tgz">
    88<!ENTITY hd2u-download-ftp  " ">
    99<!ENTITY hd2u-md5sum        "8f6668fafb279aa19f956ec0515717b6">

  • general/prog/librep.xml

    r71f73d39 rd7513fd  
    6161
    6262    <bridgehead renderas="sect4">Optional</bridgehead>
    63     <para role="optional">i
     63    <para role="optional">
    6464      <xref linkend="libffi"/>
    6565    </para>

  • introduction/welcome/changelog.xml

    r71f73d39 rd7513fd  
    4545-->
    4646    <listitem>
     47      <para>July 8th, 2013</para>
     48      <itemizedlist>
     49        <listitem>
     50          <para>[igor] - NSS-3.15.1.</para>
     51        </listitem>
     52        <listitem>
     53          <para>[igor] - GTK+-2.4.20.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[igor] - alsa-lib-1.0.27.2 and alsa-utils-1.0.27.1.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[igor] - xterm-295.</para>
     60        </listitem>
     61      </itemizedlist>
     62    </listitem>
     63
     64    <listitem>
     65      <para>July 7th, 2013</para>
     66      <itemizedlist>
     67        <listitem>
     68          <para>[igor] - libxcb: Automake fix and XKB extension.</para>
     69        </listitem>
     70        <listitem>
     71          <para>[ken] - fixes for firefox built on xulrunner.</para>
     72        </listitem>
     73      </itemizedlist>
     74    </listitem>
     75
     76    <listitem>
     77      <para>July 6th, 2013</para>
     78      <itemizedlist>
     79        <listitem>
     80          <para>[ken] - firefox- and xulrunner-22.0.</para>
     81        </listitem>
     82      </itemizedlist>
     83    </listitem>
     84
     85    <listitem>
    4786      <para>July 5th, 2013</para>
    4887      <itemizedlist>

  • multimedia/libdriv/alsa-lib.xml

    r71f73d39 rd7513fd  
    77  <!ENTITY alsa-lib-download-http "&alsa-download-http;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
    88  <!ENTITY alsa-lib-download-ftp  "&alsa-download-ftp;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
    9   <!ENTITY alsa-lib-md5sum        "f090c7dbd0fe57d786d82e411eac2d08">
    10   <!ENTITY alsa-lib-size          "880 KB">
    11   <!ENTITY alsa-lib-buildsize     "45 MB">
    12   <!ENTITY alsa-lib-time          "0.3 SBU">
     9  <!ENTITY alsa-lib-md5sum        "69129a7c37697f81ac092335e9fa452b">
     10  <!ENTITY alsa-lib-size          "886 KB">
     11  <!ENTITY alsa-lib-buildsize     "18 MB">
     12  <!ENTITY alsa-lib-time          "0.2 SBU">
    1313]>
    1414
    … …  
    6969        <para>
    7070          Estimated build time: &alsa-lib-time;
    71         </para>
    72       </listitem>
    73     </itemizedlist>
    74 
    75     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    76     <itemizedlist spacing="compact">
    77       <listitem>
    78         <para>
    79           Required patch:
    80           <ulink url="&patch-root;/alsa-lib-&alsa-lib-version;-upstream_fixes-1.patch"/>
    8171        </para>
    8272      </listitem>
    … …  
    122112    </para>
    123113
    124 <screen><userinput>patch -Np1 -i ../alsa-lib-&alsa-lib-version;-upstream_fixes-1.patch &amp;&amp;
    125 ./configure &amp;&amp;
     114<screen><userinput>./configure &amp;&amp;
    126115make</userinput></screen>
    127116
    128117    <para>
    129       This package does not come with a test suite.
     118      To test the results, issue: <command>make check</command>.
    130119    </para>
    131120

  • multimedia/libdriv/alsa-utils.xml

    r71f73d39 rd7513fd  
    77  <!ENTITY alsa-utils-download-http "&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
    88  <!ENTITY alsa-utils-download-ftp  "&alsa-download-ftp;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
    9   <!ENTITY alsa-utils-md5sum        "cbfb21a24f63fb052b3392195639ce48">
     9  <!ENTITY alsa-utils-md5sum        "3d81357b997744a139881ef72bc6921a">
    1010  <!ENTITY alsa-utils-size          "1.1 MB">
    11   <!ENTITY alsa-utils-buildsize     "13 MB">
     11  <!ENTITY alsa-utils-buildsize     "7 MB">
    1212  <!ENTITY alsa-utils-time          "0.2 SBU">
    13   <!ENTITY alsa-utils-patch         "alsa-utils-&alsa-utils-version;-no_xmlto-1.patch">
    1413]>
    1514
    … …  
    7372    </itemizedlist>
    7473
     74    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     75    <itemizedlist spacing='compact'>
     76      <listitem>
     77        <para>Required patch: <ulink
     78        url="&patch-root;/alsa-utils-&alsa-utils-version;-udev_rules-1.patch"/></para>
     79      </listitem>
     80    </itemizedlist>
     81
    7582    <bridgehead renderas="sect3">ALSA Utilities Dependencies</bridgehead>
    7683
    … …  
    8289    <bridgehead renderas="sect4">Optional</bridgehead>
    8390    <para role="optional">
     91      <xref linkend="libsamplerate"/>,
    8492      <ulink url="http://hightek.org/dialog/">Dialog</ulink> and
    8593      <xref linkend="xmlto"/>
    8694    </para>
    8795
    88     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    89     <itemizedlist spacing="compact">
    90       <listitem>
    91         <para>
    92           Optional patch:
    93           <ulink url="&patch-root;/&alsa-utils-patch;"/>
    94         </para>
    95       </listitem>
    96     </itemizedlist>
    97 
    9896    <para condition="html" role="usernotes">User Notes:
    9997      <ulink url="&blfs-wiki;/alsa-utils"/>
    … …  
    105103
    106104    <para>
    107       If you have not installed the optional dependency <xref linkend="xmlto"/>,
    108       apply the following patch:
    109     </para>
    110 
    111 <screen><userinput>patch -Np1 -i ../&alsa-utils-patch;</userinput></screen>
    112 
    113     <para>
    114105      Install <application>ALSA Utilities</application> by
    115106      running the following commands:
    116107    </para>
    117108
    118 <screen><userinput>./configure &amp;&amp;
    119 make</userinput></screen>
     109<screen><userinput>patch -Np1 -i ../alsa-utils-&alsa-utils-version;-udev_rules-1.patch &amp;&amp;
     110./configure --disable-alsaconf --disable-xmlto &amp;&amp;
     111make &amp;&amp;
     112pushd alsactl &amp;&amp;
     113make 90-alsa-restore.rules &amp;&amp;
     114popd</userinput></screen>
    120115
    121116    <para>
    … …  
    127122    </para>
    128123
    129 <screen role="root"><userinput>make install</userinput></screen>
     124<screen role="root"><userinput>make install &amp;&amp;
     125install -v -m644 alsactl/90-alsa-restore.rules /lib/udev/rules.d</userinput></screen>
     126
     127  </sect2>
     128
     129  <sect2 role="commands">
     130    <title>Command Explanations</title>
     131
     132    <para>
     133      <option>--disable-alsaconf</option>: This switch disables building the
     134      <command>alsaconf</command> configuration tool which is incompatible with
     135      <application>Udev</application>.
     136    </para>
     137
     138    <para>
     139      <option>--disable-xmlto</option>: Omit this switch if you have installed
     140      <xref linkend="xmlto"/> and don't wish to install pregenerated man pages.
     141    </para>
    130142
    131143  </sect2>
    … …  
    223235      <seglistitem>
    224236        <seg>
    225           aconnect, alsaconf, alsactl, alsaloop, alsamixer,
     237          aconnect, alsactl, alsaloop, alsamixer,
    226238          alsaucm, amidi, amixer, aplay, aplaymidi, arecord,
    227239          arecordmidi, aseqdump, aseqnet, iecset and
    … …  
    255267      </varlistentry>
    256268
    257       <varlistentry id="alsaconf">
    258         <term><command>alsaconf</command></term>
    259         <listitem>
    260           <para>
    261             is a configuration tool which tries to detect the sound cards
    262             on your system and write a suitable configuration file for ALSA.
    263             This program is incompatible with Udev.
    264           </para>
    265           <indexterm zone="alsa-utils alsaconf">
    266             <primary sortas="b-alsaconf">alsaconf</primary>
    267           </indexterm>
    268         </listitem>
    269       </varlistentry>
    270 
    271269      <varlistentry id="alsactl">
    272270        <term><command>alsactl</command></term>

  • multimedia/libdriv/libsamplerate.xml

    r71f73d39 rd7513fd  
    7676    following commands:</para>
    7777
    78 <screen><userinput>./configure --prefix=/usr &amp;&amp;
     78<screen><userinput>sed -i 's/libsamplerate0-dev/libsamplerate-&libsamplerate-version;/' configure &amp;&amp;
     79./configure --prefix=/usr --disable-static &amp;&amp;
    7980make</userinput></screen>
    8081
    … …  
    8586
    8687<screen role="root"><userinput>make install</userinput></screen>
     88  </sect2>
     89
     90  <sect2 role="commands">
     91    <title>Command Explanations</title>
     92
     93    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     94      href="../../xincludes/static-libraries.xml"/>
     95
    8796  </sect2>
    8897
    … …  
    98107        <seg>sndfile-resample</seg>
    99108        <seg>libsamplerate.so</seg>
    100         <seg>/usr/share/doc/libsamplerate0-dev</seg>
     109        <seg>/usr/share/doc/libsamplerate-&libsamplerate-version;</seg>
    101110      </seglistitem>
    102111    </segmentedlist>

  • networking/mailnews/procmail.xml

    r71f73d39 rd7513fd  
    77  <!-- <!ENTITY procmail-download-http "http://www.procmail.org/procmail-&procmail-version;.tar.gz"> -->
    88  <!ENTITY procmail-download-http "http://www.ring.gr.jp/archives/net/mail/procmail/procmail-&procmail-version;.tar.gz">
    9   <!ENTITY procmail-download-ftp  "ftp://ftp.psg.com/pub/unix/procmail/procmail-&procmail-version;.tar.gz">
     9  <!ENTITY procmail-download-ftp  "ftp://ftp.ucsb.edu/pub/mirrors/procmail/procmail-&procmail-version;.tar.gz">
    1010  <!ENTITY procmail-md5sum        "1678ea99b973eb77eda4ecf6acae53f1">
    1111  <!ENTITY procmail-size          "226 KB">

  • postlfs/security/nss.xml

    r71f73d39 rd7513fd  
    88
    99  <!ENTITY nss-download-http
    10            "http://&nss-url;/NSS_3_&nss-major-version;_RTM/src/nss-&nss-version;.tar.gz">
     10           "http://&nss-url;/NSS_3_&nss-major-version;_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
    1111  <!ENTITY nss-download-ftp
    12            "ftp://&nss-url;/NSS_3_&nss-major-version;_RTM/src/nss-&nss-version;.tar.gz">
    13   <!ENTITY nss-md5sum        "391fd6ef006f59ddc440054cad33d259">
     12           "ftp://&nss-url;/NSS_3_&nss-major-version;_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
     13  <!ENTITY nss-md5sum        "fb68f4d210ac9397dd0d3c39c4f938eb">
    1414  <!ENTITY nss-size          "6.0 MB">
    15   <!ENTITY nss-buildsize     "72 MB">
    16   <!ENTITY nss-time          "0.8 SBU">
     15  <!ENTITY nss-buildsize     "74 MB">
     16  <!ENTITY nss-time          "1.2 SBU">
    1717]>
    1818

  • postlfs/virtualization/qemu.xml

    r71f73d39 rd7513fd  
    252252        device, usually visible as tap0, to the host bridge.</para>
    253253
    254 <screen><userinput>cat &gt;&gt; /etc/qemu-ifup &lt;&lt; EOF
     254<screen><userinput>cat &gt; /etc/qemu-ifup &lt;&lt; EOF
    255255#!/bin/bash
    256256
    … …  
    272272chmod +x /etc/qemu-ifup</userinput></screen>
    273273
    274 <screen><userinput>cat &gt;&gt; /etc/qemu-ifdown &lt;&lt; EOF
     274<screen><userinput>cat &gt; /etc/qemu-ifdown &lt;&lt; EOF
    275275#!/bin/bash
    276276

  • x/installing/libxcb.xml

    r71f73d39 rd7513fd  
    5959    </itemizedlist>
    6060
     61    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     62    <itemizedlist spacing='compact'>
     63      <listitem>
     64        <para>Required patch: <ulink
     65        url="&patch-root;/libxcb-&libxcb-version;-automake_bug-1.patch"/></para>
     66      </listitem>
     67    </itemizedlist>
     68
    6169    <bridgehead renderas="sect3">libxcb Dependencies</bridgehead>
    6270
    … …  
    8694    commands:</para>
    8795
    88 <screen><userinput>sed -e "s/pthread-stubs//" -i configure.ac &amp;&amp;
     96<screen><userinput>patch -Np1 -i ../libxcb-&libxcb-version;-automake_bug-1.patch &amp;&amp;
     97sed -e "s/pthread-stubs//" -i configure.ac &amp;&amp;
    8998autoreconf -fi &amp;&amp;
    90 ./configure $XORG_CONFIG --enable-xinput --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
     99./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; \
     100            --enable-xinput --enable-xkb &amp;&amp;
    91101make</userinput></screen>
    92102
    … …  
    107117
    108118    <para><option>--enable-xinput</option>: This switch enables XCB Xinput
     119    extension.</para>
     120
     121    <para><option>--enable-xkb</option>: This switch enables XCB XKB
    109122    extension.</para>
    110123

  • x/installing/xterm.xml

    r71f73d39 rd7513fd  
    77  <!ENTITY xterm-download-http " ">
    88  <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
    9   <!ENTITY xterm-md5sum        "f9dc37486d5f1e550b6dc2e26a8a0439">
     9  <!ENTITY xterm-md5sum        "5a11e78d3504c859e8b16f7bbe03b0d1">
    1010  <!ENTITY xterm-size          "1.1 MB">
    1111  <!ENTITY xterm-buildsize     "13 MB">

  • x/lib/gtk+2.xml

    r71f73d39 rd7513fd  
    77  <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
    88  <!ENTITY gtk2-download-ftp  "&gnome-download-ftp;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
    9   <!ENTITY gtk2-md5sum        "490236abeb0d9351b2a34e9aca70e1de">
    10   <!ENTITY gtk2-size          "12.8 MB">
    11   <!ENTITY gtk2-buildsize     "381 MB">
    12   <!ENTITY gtk2-time          "3.0 SBU">
     9  <!ENTITY gtk2-md5sum        "9d7833331d7accd80668e29d7f567ce5">
     10  <!ENTITY gtk2-size          "13 MB">
     11  <!ENTITY gtk2-buildsize     "354 MB">
     12  <!ENTITY gtk2-time          "3.1 SBU">
    1313]>
    1414

  • x/lib/xulrunner.xml

    r71f73d39 rd7513fd  
    99  <!ENTITY xulrunner-download-ftp
    1010           "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
    11   <!ENTITY xulrunner-md5sum        "6e2510e9466b280c367de0e4c05a8840">
    12   <!ENTITY xulrunner-size          "101 MB">
    13   <!ENTITY xulrunner-buildsize     "4.1 GB (125 MB installed)">
    14   <!ENTITY xulrunner-time          "35 SBU">
     11  <!ENTITY xulrunner-md5sum        "4ffb6d1c1a04ca8e3dbca23df09626dd">
     12  <!ENTITY xulrunner-size          "107 MB">
     13  <!ENTITY xulrunner-buildsize     "4.4 GB (87 MB installed)">
     14  <!ENTITY xulrunner-time          "32 SBU">
    1515]>
    1616
    … …  
    139139
    140140<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
    141 # If you have a multicore machine you can speed up the build by running
    142 # several jobs at once by uncommenting the following line and setting the
    143 # value to number of CPU cores:
    144 #mk_add_options MOZ_MAKE_FLAGS="-j4"
     141# If you have a multicore machine, firefox will now use all the cores by
     142# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
     143# by uncommenting the next line and setting a valid number of CPU cores.
     144#mk_add_options MOZ_MAKE_FLAGS="-j1"
    145145
    146146# If you have installed DBus-Glib comment out this line:
    … …  
    218218ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
    219219
    220 chmod -v 755 /usr/lib/xulrunner-&xulrunner-version;/libxpcom.so \
    221              /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell &amp;&amp;
    222 
    223 for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so; do
     220chmod -v 755 /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell &amp;&amp;
     221
     222for library in libmozalloc.so libmozjs.so libxul.so; do
    224223    ln -sfv ../../../xulrunner-&xulrunner-version;/$library \
    225224            /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/$library
    … …  
    254253
    255254    <para>
    256       <command>for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so ...
     255      <command>for library in libmozalloc.so libmozjs.so libxul.so ...
    257256      </command>: The libraries shipped with this package are installed into
    258257      <filename class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>

  • xsoft/graphweb/firefox.xml

    r71f73d39 rd7513fd  
    99  <!ENTITY firefox-download-ftp
    1010           "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
    11   <!ENTITY firefox-md5sum        "6e2510e9466b280c367de0e4c05a8840">
    12   <!ENTITY firefox-size          "101 MB">
    13   <!ENTITY firefox-buildsize     "4.1 GB (45 MB installed) (or 730 MB and 4.0 MB if using Xulrunner)">
    14   <!ENTITY firefox-time          "35 SBU (0.4 SBU if using Xulrunner)">
     11  <!ENTITY firefox-md5sum        "4ffb6d1c1a04ca8e3dbca23df09626dd">
     12  <!ENTITY firefox-size          "107 MB">
     13  <!ENTITY firefox-buildsize     "4.4 GB (46 MB installed) (or 784 MB and 4.2 MB if using Xulrunner)">
     14  <!ENTITY firefox-time          "32 SBU (0.2 SBU if using Xulrunner)">
    1515]>
    1616
    … …  
    7070          Estimated build time: &firefox-time;
    7171        </para>
     72      </listitem>
     73    </itemizedlist>
     74
     75    <bridgehead renderas="sect3">Additional Download (if linking against xulrunner)</bridgehead>
     76    <itemizedlist spacing='compact'>
     77      <listitem>
     78        <para>Recommended Patch: <ulink
     79        url="&patch-root;/firefox-&firefox-version;-search_box_fix-1.patch"/></para>
    7280      </listitem>
    7381    </itemizedlist>
    … …  
    145153      abbreviated description of each one), issue <command>./configure
    146154      --help</command>. You may also wish to review the entire file and
    147       uncomment any other desired options. The commented line for
    148       <literal>--with-libxul-sdk</literal> has an escaped dollar sign - if you
    149       have chosed to paste the entries into a <filename>mozconfig</filename> file
    150       in your editor, you do not need the escape, it is only necessary when invoking
    151       a subshell in a HERE document. Create the file by issuing the following command:
     155      uncomment any other desired options.
     156      Create the file by issuing the following command:
    152157    </para>
    153158
    154159<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
    155 # If you have a multicore machine you can speed up the build by running
    156 # several jobs at once by uncommenting the following line and setting the
    157 # value to number of CPU cores:
    158 #mk_add_options MOZ_MAKE_FLAGS="-j4"
     160# If you have a multicore machine, firefox will now use all the cores by
     161# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
     162# by uncommenting the next line and setting a valid number of CPU cores.
     163#mk_add_options MOZ_MAKE_FLAGS="-j1"
    159164
    160165# If you have installed DBus-Glib comment out this line:
    … …  
    174179#ac_add_options --disable-webm
    175180
    176 # If you have installed xulrunner uncomment following two lines:
     181# If you have installed xulrunner uncomment the next two ac_add_options lines
     182# and check that the sdk will be set by running pkg-config in a subshell
     183# and has not become hardcoded or empty when you created this file
    177184#ac_add_options --with-system-libxul
    178 #ac_add_options --with-libxul-sdk=\$(pkg-config --variable=sdkdir libxul)
     185#ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
    179186
    180187# Comment out following options if you have not installed
    … …  
    219226
    220227    <para>
     228      If you are building against an already installed <application>xulrunner</application>
     229      apply the patch:
     230    </para>
     231
     232<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-search_box_fix-1.patch
     233</userinput></screen>
     234
     235    <para>
    221236      Compile <application>Firefox</application> by issuing the following
    222237      commands:
    … …  
    224239
    225240<screen><userinput>sed -i 's@ ""@@' browser/base/Makefile.in &amp;&amp;
    226 sed -i "/gre_path/s@DIST'\]@&amp; + '/bin'@" toolkit/mozapps/installer/packager.py &amp;&amp;
    227241make -f client.mk</userinput></screen>
    228242
    … …  
    252266    -C /usr/lib/firefox-&firefox-version; --strip-components=1 &amp;&amp;
    253267chown -R -v root:root /usr/lib/firefox-&firefox-version; &amp;&amp;
    254 chmod -v 755 /usr/lib/firefox-&firefox-version;/libxpcom.so &amp;&amp;
    255268
    256269ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;
    … …  
    302315
    303316    <para>
     317      <command>patch -Np1 -i ../firefox-&firefox-version;-search_box_fix-1.patch
     318      </command>: This command makes the search box work again. It is only
     319      needed if you are linking against an already installed
     320      <application>xulrunner</application>.
     321    </para>
     322
     323    <para>
    304324      <command>sed -i 's@ ""@@' browser/base/Makefile.in</command>: This sed
    305325      removes an unprintable control character from the title bar.
    306     </para>
    307 
    308     <para>
    309       <command>sed -i "/gre_path/s@DIST'\]@&amp; + '/bin'@" ...</command>: This
    310       sed fixes build with <application>Xulrunner</application>.
    311326    </para>
    312327
Note: See TracChangeset for help on using the changeset viewer.