Author: krejzi Date: Sun Jul 14 08:44:55 2013 New Revision: 11406 Log: Merge trunk and systemd branch, part 2.
Modified: branches/systemd/general.ent branches/systemd/general/genlib/libdrm.xml branches/systemd/general/genutils/hd2u.xml branches/systemd/general/prog/librep.xml branches/systemd/introduction/welcome/changelog.xml branches/systemd/multimedia/libdriv/alsa-lib.xml branches/systemd/multimedia/libdriv/alsa-utils.xml branches/systemd/multimedia/libdriv/libsamplerate.xml branches/systemd/networking/mailnews/procmail.xml branches/systemd/postlfs/security/nss.xml branches/systemd/postlfs/virtualization/qemu.xml branches/systemd/x/installing/libxcb.xml branches/systemd/x/installing/xterm.xml branches/systemd/x/lib/gtk+2.xml branches/systemd/x/lib/xulrunner.xml branches/systemd/xsoft/graphweb/firefox.xml Modified: branches/systemd/general.ent ============================================================================== --- branches/systemd/general.ent Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/general.ent Sun Jul 14 08:44:55 2013 (r11406) @@ -157,9 +157,9 @@ <!ENTITY mitkrb-version "1.11.2"> <!ENTITY nettle-version "2.7"> <!ENTITY nss-major-version "15"> -<!ENTITY nss-minor-version ""> +<!ENTITY nss-minor-version "1"> <!-- <!ENTITY nss-version "3.&nss-major-version;.&nss-minor-version;"> --> -<!ENTITY nss-version "3.&nss-major-version;"> +<!ENTITY nss-version "3.&nss-major-version;.&nss-minor-version;"> <!ENTITY openssh-version "6.2p2"> <!ENTITY openssl-version "1.0.1e"> <!ENTITY p11-kit-version "0.18.2"> <!-- Even minors only --> @@ -543,7 +543,7 @@ <!ENTITY libXp-version "1.0.2"> <!ENTITY xorg-server-version "1.14.2"> <!ENTITY twm-version "1.0.7"> -<!ENTITY xterm-version "293"> +<!ENTITY xterm-version "295"> <!ENTITY xclock-version "1.0.6"> <!ENTITY xinit-version "1.3.2"> @@ -564,7 +564,7 @@ <!ENTITY gdk-pixbuf-version "2.28.2"> <!ENTITY goffice-version "0.8.17"> <!ENTITY goffice010-version "0.10.2"> -<!ENTITY gtk2-version "2.24.19"> +<!ENTITY gtk2-version "2.24.20"> <!ENTITY gtk3-version "3.8.2"> <!ENTITY gtk-engines-version "2.20.2"> <!ENTITY gtkmm2-version "2.24.4"> @@ -582,7 +582,7 @@ <!ENTITY startup-notification-version "0.12"> <!ENTITY webkitgtk-version "1.10.2"> <!-- Even minors only --> <!ENTITY webkitgtk2-version "2.0.3"> <!-- Even minors only --> -<!ENTITY xulrunner-version "21.0"> +<!ENTITY xulrunner-version "22.0"> <!ENTITY gtk2-libdir "2.0/2.10.0"> <!ENTITY qt4-dir "$QTDIR"> @@ -812,9 +812,9 @@ <!ENTITY alsa-download-http "http://alsa.cybermirror.org";> <!ENTITY alsa-download-ftp "ftp://ftp.alsa-project.org/pub";> <!ENTITY alsa-version "1.0.27"> -<!ENTITY alsa-lib-version "1.0.27"> +<!ENTITY alsa-lib-version "1.0.27.2"> <!ENTITY alsa-plugins-version "1.0.27"> -<!ENTITY alsa-utils-version "1.0.27"> +<!ENTITY alsa-utils-version "1.0.27.1"> <!ENTITY alsa-tools-version "1.0.27"> <!ENTITY alsa-firmware-version "1.0.27"> <!ENTITY alsa-oss-version "1.0.25"> Modified: branches/systemd/general/genlib/libdrm.xml ============================================================================== --- branches/systemd/general/genlib/libdrm.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/general/genlib/libdrm.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -125,6 +125,11 @@ which is useless on Linux. </para> + <para> + <option>--enable-udev</option>: This option enables support for using + <application>Udev</application> instead of <command>mknod</command>. + </para> + </sect2> <sect2 role="content"> Modified: branches/systemd/general/genutils/hd2u.xml ============================================================================== --- branches/systemd/general/genutils/hd2u.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/general/genutils/hd2u.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -4,7 +4,7 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; -<!ENTITY hd2u-download-http "http://www.megaloman.com/~hany/_data/hd2u/hd2u-&hd2u-version;.tgz";> +<!ENTITY hd2u-download-http "http://hany.sk/~hany/_data/hd2u/hd2u-&hd2u-version;.tgz";> <!ENTITY hd2u-download-ftp " "> <!ENTITY hd2u-md5sum "8f6668fafb279aa19f956ec0515717b6"> <!ENTITY hd2u-size "64 KB"> Modified: branches/systemd/general/prog/librep.xml ============================================================================== --- branches/systemd/general/prog/librep.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/general/prog/librep.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -60,7 +60,7 @@ <bridgehead renderas="sect3">Librep Dependencies</bridgehead> <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional">i + <para role="optional"> <xref linkend="libffi"/> </para> Modified: branches/systemd/introduction/welcome/changelog.xml ============================================================================== --- branches/systemd/introduction/welcome/changelog.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/introduction/welcome/changelog.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -44,6 +44,45 @@ --> <listitem> + <para>July 8th, 2013</para> + <itemizedlist> + <listitem> + <para>[igor] - NSS-3.15.1.</para> + </listitem> + <listitem> + <para>[igor] - GTK+-2.4.20.</para> + </listitem> + <listitem> + <para>[igor] - alsa-lib-1.0.27.2 and alsa-utils-1.0.27.1.</para> + </listitem> + <listitem> + <para>[igor] - xterm-295.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>July 7th, 2013</para> + <itemizedlist> + <listitem> + <para>[igor] - libxcb: Automake fix and XKB extension.</para> + </listitem> + <listitem> + <para>[ken] - fixes for firefox built on xulrunner.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para>July 6th, 2013</para> + <itemizedlist> + <listitem> + <para>[ken] - firefox- and xulrunner-22.0.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>July 5th, 2013</para> <itemizedlist> <listitem> Modified: branches/systemd/multimedia/libdriv/alsa-lib.xml ============================================================================== --- branches/systemd/multimedia/libdriv/alsa-lib.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/multimedia/libdriv/alsa-lib.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -6,10 +6,10 @@ <!ENTITY alsa-lib-download-http "&alsa-download-http;/lib/alsa-lib-&alsa-lib-version;.tar.bz2"> <!ENTITY alsa-lib-download-ftp "&alsa-download-ftp;/lib/alsa-lib-&alsa-lib-version;.tar.bz2"> - <!ENTITY alsa-lib-md5sum "f090c7dbd0fe57d786d82e411eac2d08"> - <!ENTITY alsa-lib-size "880 KB"> - <!ENTITY alsa-lib-buildsize "45 MB"> - <!ENTITY alsa-lib-time "0.3 SBU"> + <!ENTITY alsa-lib-md5sum "69129a7c37697f81ac092335e9fa452b"> + <!ENTITY alsa-lib-size "886 KB"> + <!ENTITY alsa-lib-buildsize "18 MB"> + <!ENTITY alsa-lib-time "0.2 SBU"> ]> <sect1 id="alsa-lib" xreflabel="alsa-lib-&alsa-lib-version;"> @@ -72,16 +72,6 @@ </listitem> </itemizedlist> - <bridgehead renderas="sect3">Additional Downloads</bridgehead> - <itemizedlist spacing="compact"> - <listitem> - <para> - Required patch: - <ulink url="&patch-root;/alsa-lib-&alsa-lib-version;-upstream_fixes-1.patch"/> - </para> - </listitem> - </itemizedlist> - <bridgehead renderas="sect3">ALSA Library Dependencies</bridgehead> <bridgehead renderas="sect4">Optional</bridgehead> @@ -121,12 +111,11 @@ running the following commands: </para> -<screen><userinput>patch -Np1 -i ../alsa-lib-&alsa-lib-version;-upstream_fixes-1.patch && -./configure && +<screen><userinput>./configure && make</userinput></screen> <para> - This package does not come with a test suite. + To test the results, issue: <command>make check</command>. </para> <para> Modified: branches/systemd/multimedia/libdriv/alsa-utils.xml ============================================================================== --- branches/systemd/multimedia/libdriv/alsa-utils.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/multimedia/libdriv/alsa-utils.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -6,11 +6,10 @@ <!ENTITY alsa-utils-download-http "&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2"> <!ENTITY alsa-utils-download-ftp "&alsa-download-ftp;/utils/alsa-utils-&alsa-utils-version;.tar.bz2"> - <!ENTITY alsa-utils-md5sum "cbfb21a24f63fb052b3392195639ce48"> + <!ENTITY alsa-utils-md5sum "3d81357b997744a139881ef72bc6921a"> <!ENTITY alsa-utils-size "1.1 MB"> - <!ENTITY alsa-utils-buildsize "13 MB"> + <!ENTITY alsa-utils-buildsize "7 MB"> <!ENTITY alsa-utils-time "0.2 SBU"> - <!ENTITY alsa-utils-patch "alsa-utils-&alsa-utils-version;-no_xmlto-1.patch"> ]> <sect1 id="alsa-utils" xreflabel="alsa-utils-&alsa-utils-version;"> @@ -72,6 +71,14 @@ </listitem> </itemizedlist> + <bridgehead renderas="sect3">Additional Downloads</bridgehead> + <itemizedlist spacing='compact'> + <listitem> + <para>Required patch: <ulink + url="&patch-root;/alsa-utils-&alsa-utils-version;-udev_rules-1.patch"/></para> + </listitem> + </itemizedlist> + <bridgehead renderas="sect3">ALSA Utilities Dependencies</bridgehead> <bridgehead renderas="sect4">Required</bridgehead> @@ -81,20 +88,11 @@ <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"> + <xref linkend="libsamplerate"/>, <ulink url="http://hightek.org/dialog/";>Dialog</ulink> and <xref linkend="xmlto"/> </para> - <bridgehead renderas="sect3">Additional Downloads</bridgehead> - <itemizedlist spacing="compact"> - <listitem> - <para> - Optional patch: - <ulink url="&patch-root;/&alsa-utils-patch;"/> - </para> - </listitem> - </itemizedlist> - <para condition="html" role="usernotes">User Notes: <ulink url="&blfs-wiki;/alsa-utils"/> </para> @@ -104,19 +102,16 @@ <title>Installation of ALSA Utilities</title> <para> - If you have not installed the optional dependency <xref linkend="xmlto"/>, - apply the following patch: - </para> - -<screen><userinput>patch -Np1 -i ../&alsa-utils-patch;</userinput></screen> - - <para> Install <application>ALSA Utilities</application> by running the following commands: </para> -<screen><userinput>./configure && -make</userinput></screen> +<screen><userinput>patch -Np1 -i ../alsa-utils-&alsa-utils-version;-udev_rules-1.patch && +./configure --disable-alsaconf --disable-xmlto && +make && +pushd alsactl && +make 90-alsa-restore.rules && +popd</userinput></screen> <para> This package does not come with a test suite. @@ -126,7 +121,24 @@ Now, as the <systemitem class="username">root</systemitem> user: </para> -<screen role="root"><userinput>make install</userinput></screen> +<screen role="root"><userinput>make install && +install -v -m644 alsactl/90-alsa-restore.rules /lib/udev/rules.d</userinput></screen> + + </sect2> + + <sect2 role="commands"> + <title>Command Explanations</title> + + <para> + <option>--disable-alsaconf</option>: This switch disables building the + <command>alsaconf</command> configuration tool which is incompatible with + <application>Udev</application>. + </para> + + <para> + <option>--disable-xmlto</option>: Omit this switch if you have installed + <xref linkend="xmlto"/> and don't wish to install pregenerated man pages. + </para> </sect2> @@ -222,7 +234,7 @@ <seglistitem> <seg> - aconnect, alsaconf, alsactl, alsaloop, alsamixer, + aconnect, alsactl, alsaloop, alsamixer, alsaucm, amidi, amixer, aplay, aplaymidi, arecord, arecordmidi, aseqdump, aseqnet, iecset and speaker-test @@ -253,20 +265,6 @@ </indexterm> </listitem> </varlistentry> - - <varlistentry id="alsaconf"> - <term><command>alsaconf</command></term> - <listitem> - <para> - is a configuration tool which tries to detect the sound cards - on your system and write a suitable configuration file for ALSA. - This program is incompatible with Udev. - </para> - <indexterm zone="alsa-utils alsaconf"> - <primary sortas="b-alsaconf">alsaconf</primary> - </indexterm> - </listitem> - </varlistentry> <varlistentry id="alsactl"> <term><command>alsactl</command></term> Modified: branches/systemd/multimedia/libdriv/libsamplerate.xml ============================================================================== --- branches/systemd/multimedia/libdriv/libsamplerate.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/multimedia/libdriv/libsamplerate.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -75,7 +75,8 @@ <para>Install <application>libsamplerate</application> by running the following commands:</para> -<screen><userinput>./configure --prefix=/usr && +<screen><userinput>sed -i 's/libsamplerate0-dev/libsamplerate-&libsamplerate-version;/' configure && +./configure --prefix=/usr --disable-static && make</userinput></screen> <para>To test the results, issue: <command>make check</command>.</para> @@ -86,6 +87,14 @@ <screen role="root"><userinput>make install</userinput></screen> </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; + href="../../xincludes/static-libraries.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> @@ -97,7 +106,7 @@ <seglistitem> <seg>sndfile-resample</seg> <seg>libsamplerate.so</seg> - <seg>/usr/share/doc/libsamplerate0-dev</seg> + <seg>/usr/share/doc/libsamplerate-&libsamplerate-version;</seg> </seglistitem> </segmentedlist> Modified: branches/systemd/networking/mailnews/procmail.xml ============================================================================== --- branches/systemd/networking/mailnews/procmail.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/networking/mailnews/procmail.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -6,7 +6,7 @@ <!-- <!ENTITY procmail-download-http "http://www.procmail.org/procmail-&procmail-version;.tar.gz";> --> <!ENTITY procmail-download-http "http://www.ring.gr.jp/archives/net/mail/procmail/procmail-&procmail-version;.tar.gz";> - <!ENTITY procmail-download-ftp "ftp://ftp.psg.com/pub/unix/procmail/procmail-&procmail-version;.tar.gz";> + <!ENTITY procmail-download-ftp "ftp://ftp.ucsb.edu/pub/mirrors/procmail/procmail-&procmail-version;.tar.gz";> <!ENTITY procmail-md5sum "1678ea99b973eb77eda4ecf6acae53f1"> <!ENTITY procmail-size "226 KB"> <!ENTITY procmail-buildsize "1.7 MB"> Modified: branches/systemd/postlfs/security/nss.xml ============================================================================== --- branches/systemd/postlfs/security/nss.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/postlfs/security/nss.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -7,13 +7,13 @@ <!ENTITY nss-url "ftp.mozilla.org/pub/mozilla.org/security/nss/releases"> <!ENTITY nss-download-http - "http://&nss-url;/NSS_3_&nss-major-version;_RTM/src/nss-&nss-version;.tar.gz";> + "http://&nss-url;/NSS_3_&nss-major-version;_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz";> <!ENTITY nss-download-ftp - "ftp://&nss-url;/NSS_3_&nss-major-version;_RTM/src/nss-&nss-version;.tar.gz";> - <!ENTITY nss-md5sum "391fd6ef006f59ddc440054cad33d259"> + "ftp://&nss-url;/NSS_3_&nss-major-version;_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz";> + <!ENTITY nss-md5sum "fb68f4d210ac9397dd0d3c39c4f938eb"> <!ENTITY nss-size "6.0 MB"> - <!ENTITY nss-buildsize "72 MB"> - <!ENTITY nss-time "0.8 SBU"> + <!ENTITY nss-buildsize "74 MB"> + <!ENTITY nss-time "1.2 SBU"> ]> <sect1 id="nss" xreflabel="NSS-&nss-version;"> Modified: branches/systemd/postlfs/virtualization/qemu.xml ============================================================================== --- branches/systemd/postlfs/virtualization/qemu.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/postlfs/virtualization/qemu.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -251,7 +251,7 @@ <para>Create scripts for qemu to attach the client network device, usually visible as tap0, to the host bridge.</para> -<screen><userinput>cat >> /etc/qemu-ifup << EOF +<screen><userinput>cat > /etc/qemu-ifup << EOF #!/bin/bash switch=br0 @@ -271,7 +271,7 @@ chmod +x /etc/qemu-ifup</userinput></screen> -<screen><userinput>cat >> /etc/qemu-ifdown << EOF +<screen><userinput>cat > /etc/qemu-ifdown << EOF #!/bin/bash switch=br0 Modified: branches/systemd/x/installing/libxcb.xml ============================================================================== --- branches/systemd/x/installing/libxcb.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/x/installing/libxcb.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -58,6 +58,14 @@ </listitem> </itemizedlist> + <bridgehead renderas="sect3">Additional Downloads</bridgehead> + <itemizedlist spacing='compact'> + <listitem> + <para>Required patch: <ulink + url="&patch-root;/libxcb-&libxcb-version;-automake_bug-1.patch"/></para> + </listitem> + </itemizedlist> + <bridgehead renderas="sect3">libxcb Dependencies</bridgehead> <bridgehead renderas="sect4">Required</bridgehead> @@ -85,9 +93,11 @@ <para>Install <application>libxcb</application> by running the following commands:</para> -<screen><userinput>sed -e "s/pthread-stubs//" -i configure.ac && +<screen><userinput>patch -Np1 -i ../libxcb-&libxcb-version;-automake_bug-1.patch && +sed -e "s/pthread-stubs//" -i configure.ac && autoreconf -fi && -./configure $XORG_CONFIG --enable-xinput --docdir='${datadir}'/doc/libxcb-&libxcb-version; && +./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; \ + --enable-xinput --enable-xkb && make</userinput></screen> <para>To test the results, issue: <command>make check</command>.</para> @@ -108,6 +118,9 @@ <para><option>--enable-xinput</option>: This switch enables XCB Xinput extension.</para> + <para><option>--enable-xkb</option>: This switch enables XCB XKB + extension.</para> + <para><parameter>--without-doxygen</parameter>: This switch can be used to disable the API documentation if <xref linkend="doxygen"/> is installed.</para> Modified: branches/systemd/x/installing/xterm.xml ============================================================================== --- branches/systemd/x/installing/xterm.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/x/installing/xterm.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -6,7 +6,7 @@ <!ENTITY xterm-download-http " "> <!ENTITY xterm-download-ftp "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz";> - <!ENTITY xterm-md5sum "f9dc37486d5f1e550b6dc2e26a8a0439"> + <!ENTITY xterm-md5sum "5a11e78d3504c859e8b16f7bbe03b0d1"> <!ENTITY xterm-size "1.1 MB"> <!ENTITY xterm-buildsize "13 MB"> <!ENTITY xterm-time "0.2 SBU"> Modified: branches/systemd/x/lib/gtk+2.xml ============================================================================== --- branches/systemd/x/lib/gtk+2.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/x/lib/gtk+2.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -6,10 +6,10 @@ <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.24/gtk+->k2-version;.tar.xz"> <!ENTITY gtk2-download-ftp "&gnome-download-ftp;/gtk+/2.24/gtk+->k2-version;.tar.xz"> - <!ENTITY gtk2-md5sum "490236abeb0d9351b2a34e9aca70e1de"> - <!ENTITY gtk2-size "12.8 MB"> - <!ENTITY gtk2-buildsize "381 MB"> - <!ENTITY gtk2-time "3.0 SBU"> + <!ENTITY gtk2-md5sum "9d7833331d7accd80668e29d7f567ce5"> + <!ENTITY gtk2-size "13 MB"> + <!ENTITY gtk2-buildsize "354 MB"> + <!ENTITY gtk2-time "3.1 SBU"> ]> <sect1 id="gtk2" xreflabel="GTK+->k2-version;"> Modified: branches/systemd/x/lib/xulrunner.xml ============================================================================== --- branches/systemd/x/lib/xulrunner.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/x/lib/xulrunner.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -8,10 +8,10 @@ "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";> <!ENTITY xulrunner-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";> - <!ENTITY xulrunner-md5sum "6e2510e9466b280c367de0e4c05a8840"> - <!ENTITY xulrunner-size "101 MB"> - <!ENTITY xulrunner-buildsize "4.1 GB (125 MB installed)"> - <!ENTITY xulrunner-time "35 SBU"> + <!ENTITY xulrunner-md5sum "4ffb6d1c1a04ca8e3dbca23df09626dd"> + <!ENTITY xulrunner-size "107 MB"> + <!ENTITY xulrunner-buildsize "4.4 GB (87 MB installed)"> + <!ENTITY xulrunner-time "32 SBU"> ]> <sect1 id="xulrunner" xreflabel="Xulrunner-&xulrunner-version;"> @@ -138,10 +138,10 @@ </para> <screen><userinput>cat > mozconfig << "EOF" -# If you have a multicore machine you can speed up the build by running -# several jobs at once by uncommenting the following line and setting the -# value to number of CPU cores: -#mk_add_options MOZ_MAKE_FLAGS="-j4" +# If you have a multicore machine, firefox will now use all the cores by +# default. Exceptionally, you can reduce the number of cores, e.g. to 1, +# by uncommenting the next line and setting a valid number of CPU cores. +#mk_add_options MOZ_MAKE_FLAGS="-j1" # If you have installed DBus-Glib comment out this line: ac_add_options --disable-dbus @@ -217,10 +217,9 @@ rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins && ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; && -chmod -v 755 /usr/lib/xulrunner-&xulrunner-version;/libxpcom.so \ - /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell && +chmod -v 755 /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell && -for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so; do +for library in libmozalloc.so libmozjs.so libxul.so; do ln -sfv ../../../xulrunner-&xulrunner-version;/$library \ /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/$library ln -sfv xulrunner-&xulrunner-version;/$library /usr/lib/$library @@ -253,7 +252,7 @@ </para> <para> - <command>for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so ... + <command>for library in libmozalloc.so libmozjs.so libxul.so ... </command>: The libraries shipped with this package are installed into <filename class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename> which means they will not be found at runtime. These commands make Modified: branches/systemd/xsoft/graphweb/firefox.xml ============================================================================== --- branches/systemd/xsoft/graphweb/firefox.xml Sun Jul 14 08:40:03 2013 (r11405) +++ branches/systemd/xsoft/graphweb/firefox.xml Sun Jul 14 08:44:55 2013 (r11406) @@ -8,10 +8,10 @@ "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";> <!ENTITY firefox-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";> - <!ENTITY firefox-md5sum "6e2510e9466b280c367de0e4c05a8840"> - <!ENTITY firefox-size "101 MB"> - <!ENTITY firefox-buildsize "4.1 GB (45 MB installed) (or 730 MB and 4.0 MB if using Xulrunner)"> - <!ENTITY firefox-time "35 SBU (0.4 SBU if using Xulrunner)"> + <!ENTITY firefox-md5sum "4ffb6d1c1a04ca8e3dbca23df09626dd"> + <!ENTITY firefox-size "107 MB"> + <!ENTITY firefox-buildsize "4.4 GB (46 MB installed) (or 784 MB and 4.2 MB if using Xulrunner)"> + <!ENTITY firefox-time "32 SBU (0.2 SBU if using Xulrunner)"> ]> <sect1 id="firefox" xreflabel="Firefox-&firefox-version;"> @@ -72,6 +72,14 @@ </listitem> </itemizedlist> + <bridgehead renderas="sect3">Additional Download (if linking against xulrunner)</bridgehead> + <itemizedlist spacing='compact'> + <listitem> + <para>Recommended Patch: <ulink + url="&patch-root;/firefox-&firefox-version;-search_box_fix-1.patch"/></para> + </listitem> + </itemizedlist> + <bridgehead renderas="sect3">Firefox Dependencies</bridgehead> <bridgehead renderas="sect4">Required</bridgehead> @@ -144,18 +152,15 @@ below. To see the entire list of available configuration options (and an abbreviated description of each one), issue <command>./configure --help</command>. You may also wish to review the entire file and - uncomment any other desired options. The commented line for - <literal>--with-libxul-sdk</literal> has an escaped dollar sign - if you - have chosed to paste the entries into a <filename>mozconfig</filename> file - in your editor, you do not need the escape, it is only necessary when invoking - a subshell in a HERE document. Create the file by issuing the following command: + uncomment any other desired options. + Create the file by issuing the following command: </para> <screen><userinput>cat > mozconfig << "EOF" -# If you have a multicore machine you can speed up the build by running -# several jobs at once by uncommenting the following line and setting the -# value to number of CPU cores: -#mk_add_options MOZ_MAKE_FLAGS="-j4" +# If you have a multicore machine, firefox will now use all the cores by +# default. Exceptionally, you can reduce the number of cores, e.g. to 1, +# by uncommenting the next line and setting a valid number of CPU cores. +#mk_add_options MOZ_MAKE_FLAGS="-j1" # If you have installed DBus-Glib comment out this line: ac_add_options --disable-dbus @@ -173,9 +178,11 @@ # If you have not installed Yasm then uncomment this line: #ac_add_options --disable-webm -# If you have installed xulrunner uncomment following two lines: +# If you have installed xulrunner uncomment the next two ac_add_options lines +# and check that the sdk will be set by running pkg-config in a subshell +# and has not become hardcoded or empty when you created this file #ac_add_options --with-system-libxul -#ac_add_options --with-libxul-sdk=\$(pkg-config --variable=sdkdir libxul) +#ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul) # Comment out following options if you have not installed # recommended dependencies: @@ -218,12 +225,19 @@ EOF</userinput></screen> <para> + If you are building against an already installed <application>xulrunner</application> + apply the patch: + </para> + +<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-search_box_fix-1.patch +</userinput></screen> + + <para> Compile <application>Firefox</application> by issuing the following commands: </para> <screen><userinput>sed -i 's@ ""@@' browser/base/Makefile.in && -sed -i "/gre_path/s@DIST'\]@& + '/bin'@" toolkit/mozapps/installer/packager.py && make -f client.mk</userinput></screen> <para> @@ -251,7 +265,6 @@ 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 && chown -R -v root:root /usr/lib/firefox-&firefox-version; && -chmod -v 755 /usr/lib/firefox-&firefox-version;/libxpcom.so && ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin && @@ -301,13 +314,15 @@ <title>Command Explanations</title> <para> - <command>sed -i 's@ ""@@' browser/base/Makefile.in</command>: This sed - removes an unprintable control character from the title bar. + <command>patch -Np1 -i ../firefox-&firefox-version;-search_box_fix-1.patch + </command>: This command makes the search box work again. It is only + needed if you are linking against an already installed + <application>xulrunner</application>. </para> <para> - <command>sed -i "/gre_path/s@DIST'\]@& + '/bin'@" ...</command>: This - sed fixes build with <application>Xulrunner</application>. + <command>sed -i 's@ ""@@' browser/base/Makefile.in</command>: This sed + removes an unprintable control character from the title bar. </para> <para> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
