Author: krejzi
Date: 2013-01-20 10:26:45 -0700 (Sun, 20 Jan 2013)
New Revision: 10955
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/xulrunner.xml
trunk/BOOK/xsoft/graphweb/firefox.xml
trunk/BOOK/xsoft/other/thunderbird.xml
Log:
Firefox, Xulrunner and Thunderbird updates.
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2013-01-20 16:51:05 UTC (rev 10954)
+++ trunk/BOOK/general.ent 2013-01-20 17:26:45 UTC (rev 10955)
@@ -592,7 +592,7 @@
<!ENTITY shared-mime-info-version "1.0">
<!ENTITY startup-notification-version "0.12">
<!ENTITY webkitgtk-version "1.10.2">
-<!ENTITY xulrunner-version "16.0.1">
+<!ENTITY xulrunner-version "18.0.1">
<!ENTITY gtk2-libdir "2.0/2.10.0">
<!ENTITY qt-dir "$QTDIR">
@@ -806,7 +806,7 @@
<!ENTITY pan-version "0.133">
<!ENTITY pidgin-version "2.10.6">
<!ENTITY rox-filer-version "2.11">
-<!ENTITY thunderbird-version "16.0.1">
+<!ENTITY thunderbird-version "17.0.2">
<!ENTITY transmission-version "2.75">
<!ENTITY xchat-version "2.8.8">
<!ENTITY xdg-utils-version "1.1.0-rc1">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2013-01-20 16:51:05 UTC
(rev 10954)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2013-01-20 17:26:45 UTC
(rev 10955)
@@ -51,6 +51,12 @@
<para>[randy] - Added a patch to the GeoClue instructions so it will
build against GPSD.</para>
</listitem>
+ <listitem>
+ <para>[krejzi] - Firefox/Xulrunner 18.0.1.</para>
+ </listitem>
+ <listitem>
+ <para>[krejzi] - Thunderbird 17.0.2.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/x/lib/xulrunner.xml
===================================================================
--- trunk/BOOK/x/lib/xulrunner.xml 2013-01-20 16:51:05 UTC (rev 10954)
+++ trunk/BOOK/x/lib/xulrunner.xml 2013-01-20 17:26:45 UTC (rev 10955)
@@ -4,14 +4,14 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY xulrunner-download-http " ">
+ <!ENTITY xulrunner-download-http
+
"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";>
- <!-- md5sum and size should match firefox, but the buildsize and time will
differ -->
- <!ENTITY xulrunner-md5sum "78e641c67dc4a40cb3f48fce3e782d41">
- <!ENTITY xulrunner-size "85 MB">
- <!ENTITY xulrunner-buildsize "961 MB (59 MB installed)">
- <!ENTITY xulrunner-time "27 SBU">
+
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";>
+ <!ENTITY xulrunner-md5sum "8b400555fc7063163e3b99472d0c92a1">
+ <!ENTITY xulrunner-size "93 MB">
+ <!ENTITY xulrunner-buildsize "3.5 GB (110 MB installed)">
+ <!ENTITY xulrunner-time "29 SBU">
]>
<sect1 id="xulrunner" xreflabel="Xulrunner-&xulrunner-version;">
@@ -82,32 +82,40 @@
<xref linkend="alsa-lib"/>,
<xref linkend="gtk2"/>,
<xref linkend="zip"/> and
- <xref linkend="unzip"/>.
+ <xref linkend="unzip"/>
</para>
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="yasm"/> or <xref linkend="libvpx"/>
- (to allow <application>Xulrunner</application> to play webm videos).
+ <xref linkend="libevent"/>,
+ <xref linkend="libvpx"/>,
+ <xref linkend="nspr"/>,
+ <xref linkend="nss"/>,
+ <xref linkend="sqlite"/> and
+ <xref linkend="yasm"/>
</para>
+ <note>
+ <para>
+ If you don't install recommended dependencies,
+ then internal copies of those packages will
+ be used. They might be tested to work, but
+ they can be out of date or contain security
+ holes.
+ </para>
+ </note>
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="dbus-glib"/>,
- <xref linkend="startup-notification"/>,
- <xref linkend="sqlite"/>,
- <ulink url="http://sourceforge.net/projects/hunspell/";>Hunspell</ulink>,
- <xref linkend="libevent"/>,
<xref linkend="doxygen"/>,
- <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/> (for
- integration with the old version of <application>Gnome</application>),
+ <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/>
+ (for integration with the old version of
<application>GNOME</application>),
+ <ulink url="http://hunspell.sourceforge.net/";>Hunspell</ulink>,
<xref linkend="libnotify"/>,
- <xref linkend="nspr"/>,
- <xref linkend="nss"/>,
- <xref linkend="wireless_tools"/>,
- <ulink url="http://www.valgrind.org/";>Valgrind</ulink> (only for testing
- the jemalloc code) and
- <xref linkend="wget"/>
+ <xref linkend="startup-notification"/>,
+ <xref linkend="wget"/> and
+ <xref linkend="wireless_tools"/>
</para>
<para condition="html" role="usernotes">
@@ -130,46 +138,61 @@
<screen><userinput>cat > mozconfig << "EOF"
# If you have a multicore machine you can speed up the build by running
-# several jobs at once, but if you have a single core, delete this line:
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+# 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 not installed Yasm, uncomment this option:
-# ac_add_options --disable-webm
-
-# If you have installed DBus-Glib delete this option:
+# If you have installed DBus-Glib comment out this line:
ac_add_options --disable-dbus
-# If you have installed wireless-tools delete this option:
+# If you have installed wireless-tools comment out this line:
ac_add_options --disable-necko-wifi
-# If you have installed libnotify delete this option:
+# If you have installed libnotify comment out this line:
ac_add_options --disable-libnotify
-# Uncomment these if you have installed them:
-# ac_add_options --enable-startup-notification
-# ac_add_options --enable-system-hunspell
-# ac_add_options --enable-system-sqlite
-# ac_add_options --with-system-libevent
-# ac_add_options --with-system-libvpx
-# ac_add_options --with-system-nspr
-# ac_add_options --with-system-nss
+# Uncomment these lines if you have installed optional dependencies:
+#ac_add_options --enable-system-hunspell
+#ac_add_options --enable-startup-notification
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/xulrunner-build-dir
+# If you have not installed Yasm then uncomment this line:
+#ac_add_options --disable-webm
+
+# Comment out following options if you have not installed
+# recommended dependencies:
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+
+# It is recommended not to touch anything below this line
+ac_add_options --prefix=/usr
+ac_add_options --enable-application=xulrunner
+
ac_add_options --disable-crashreporter
+ac_add_options --disable-installer
+ac_add_options --disable-updater
ac_add_options --disable-debug
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-installer
-ac_add_options --disable-static
ac_add_options --disable-tests
-ac_add_options --disable-updater
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-shared
+ac_add_options --disable-mochitest
+
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+
ac_add_options --enable-system-ffi
-ac_add_options --prefix=/usr
+ac_add_options --enable-system-pixman
+
+ac_add_options --enable-shared-js
ac_add_options --with-pthreads
+
+ac_add_options --with-system-bz2
ac_add_options --with-system-jpeg
ac_add_options --with-system-png
ac_add_options --with-system-zlib
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/xulrunner-build-dir
EOF</userinput></screen>
<para>
@@ -187,21 +210,26 @@
Now, as the <systemitem class="username">root</systemitem> user:
</para>
-<!-- the end two symlinks for run-mozilla.sh and xpcshell might not be needed
- in xulrunner-15 -->
-<screen role="root"><userinput>make -C xulrunner-build-dir install
&&
-mkdir -p /usr/lib/mozilla/plugins &&
-rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &&
-ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &&
+<screen role="root"><userinput>make -C xulrunner-build-dir install &&
-for library in /usr/lib/xulrunner-&xulrunner-version;/*.so; do
- ln -sfv $library /usr/lib
+mkdir -pv /usr/lib/mozilla/plugins &&
+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
&&
+
+for library in libmozalloc.so libmozjs.so libxpcom.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
done
-ln -sv -f ../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh \
- /usr/lib/xulrunner-&xulrunner-version;
-ln -sv -f ../xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell \
- /usr/lib/xulrunner-&xulrunner-version;</userinput></screen>
+ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh \
+ /usr/lib/xulrunner-&xulrunner-version;
+ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell \
+ /usr/lib/xulrunner-&xulrunner-version;</userinput></screen>
+
</sect2>
<sect2 role="commands">
@@ -216,7 +244,7 @@
</para>
<para>
- <command>ln -sv ../mozilla/plugins ...</command>: Some packages will
+ <command>ln -sfv ../mozilla/plugins ...</command>: Some packages will
install browser plugins into
<filename class="directory">/usr/lib/mozilla/plugins</filename>.
Creating this symlink <application>Xulrunner</application> keeps
@@ -224,22 +252,24 @@
</para>
<para>
- <command>for library in
- /usr/lib/xulrunner-&xulrunner-version;/*.so; do ln -sfv $library
/usr/lib;
- done</command>: The libraries shipped with this package are installed
into
+ <command>for library in libmozalloc.so libmozjs.so libxpcom.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
relative symbolic links to the shared libraries from
- <filename class="directory">/usr/lib</filename>. Debug versions of some,
- but not all, of these libraries can also be found in
- <filename
class="directory">/usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib</filename>.
+ <filename class="directory">/usr/lib</filename>. They will also replace
duplicate
+ libraries that are installed in
+ <filename
class="directory">/usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib</filename>
+ with symlinks in order to save some space.
</para>
<para>
- <command>ln -sv -f
../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh</command>
- The <filename>run-mozilla.sh</filename> and <filename>xpcshell</filename>
files
- have been moved in this version, but the code which installs
<command>firefox</command>
- (when linked to xulrunner) was not updated. These symlinks allow firefox
to install.
+ <command>ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/
...</command>
+ The <filename>run-mozilla.sh</filename> and
<filename>xpcshell</filename> files
+ have been moved in this version, but the code which installs
+ <application>Firefox</application> (when linked to xulrunner) was not
updated.
+ These symlinks allow<application>Firefox</application> to install when
built against
+ <application>Xulrunner</application>.
</para>
</sect2>
@@ -253,14 +283,20 @@
<segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>xulrunner</seg>
- <seg>Numerous libraries, browser components, plugins, extensions, and
- helper modules installed in <filename
-
class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename></seg>
- <seg>/etc/gre.d, /usr/include/xulrunner-&xulrunner-version;,
- /usr/lib/xulrunner-&xulrunner-version;,
- /usr/lib/xulrunner-devel-&xulrunner-version;, and
- /usr/share/idl/xulrunner-&xulrunner-version;</seg>
+ <seg>
+ xulrunner
+ </seg>
+ <seg>
+ Numerous libraries, browser components, plugins, extensions, and
+ helper modules installed in <filename
+ class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>
+ </seg>
+ <seg>
+ /usr/include/xulrunner-&xulrunner-version;,
+ /usr/lib/xulrunner-&xulrunner-version;,
+ /usr/lib/xulrunner-devel-&xulrunner-version; and
+ /usr/share/idl/xulrunner-&xulrunner-version;
+ </seg>
</seglistitem>
</segmentedlist>
@@ -273,13 +309,17 @@
<term><command>xulrunner</command></term>
<listitem>
<para>
- is a shell script, useful for identifying the version installed.
+ is a shell script used for identifying the installed version
+ and running <application>Xulrunner</application> applications.
</para>
<indexterm zone="xulrunner xulrunner-prog">
<primary sortas="b-xulrunner">xulrunner</primary>
</indexterm>
</listitem>
</varlistentry>
+
</variablelist>
+
</sect2>
+
</sect1>
Modified: trunk/BOOK/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/BOOK/xsoft/graphweb/firefox.xml 2013-01-20 16:51:05 UTC (rev
10954)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml 2013-01-20 17:26:45 UTC (rev
10955)
@@ -4,13 +4,14 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY firefox-download-http " ">
+ <!ENTITY firefox-download-http
+
"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 "78e641c67dc4a40cb3f48fce3e782d41">
- <!ENTITY firefox-size "85 MB">
- <!ENTITY firefox-buildsize "994 MB (34 MB installed) (or 647 MB and 4.1
MB if using xulrunner)">
- <!ENTITY firefox-time "27 SBU (0.4 SBU if using xulrunner)">
+
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";>
+ <!ENTITY firefox-md5sum "8b400555fc7063163e3b99472d0c92a1">
+ <!ENTITY firefox-size "93 MB">
+ <!ENTITY firefox-buildsize "3.5 GB (41 MB installed) (or 695 MB and 4.2
MB if using Xulrunner)">
+ <!ENTITY firefox-time "29 SBU (0.4 SBU if using Xulrunner)">
]>
<sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
@@ -78,32 +79,40 @@
<xref linkend="alsa-lib"/>,
<xref linkend="gtk2"/>,
<xref linkend="zip"/>, and
- <xref linkend="unzip"/>.
+ <xref linkend="unzip"/>
</para>
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="yasm"/> or <xref linkend="libvpx"/>
- (to allow <application>Firefox</application> to play webm videos).
+ <xref linkend="libevent"/>,
+ <xref linkend="libvpx"/>,
+ <xref linkend="nspr"/>,
+ <xref linkend="nss"/>,
+ <xref linkend="sqlite"/> and
+ <xref linkend="yasm"/>
</para>
+ <note>
+ <para>
+ If you don't install recommended dependencies,
+ then internal copies of those packages will
+ be used. They might be tested to work, but
+ they can be out of date or contain security
+ holes.
+ </para>
+ </note>
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="dbus-glib"/>,
- <xref linkend="startup-notification"/>,
- <xref linkend="sqlite"/>,
+ <xref linkend="doxygen"/>,
+ <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/>
+ (for integration with the old version of
<application>GNOME</application>),
<ulink url="http://hunspell.sourceforge.net/";>Hunspell</ulink>,
- <xref linkend="libevent"/>,
- <xref linkend="doxygen"/>,
- <xref linkend="gnome-vfs"/> and
- <xref linkend="libgnomeui"/> (for integration with the old version of
- <application>Gnome</application>),
<xref linkend="libnotify"/>,
- <xref linkend="nspr"/>, <xref linkend="nss"/>,
- <xref linkend="wireless_tools"/>,
- <ulink url="http://www.valgrind.org/";>Valgrind</ulink> (only for testing
- the jemalloc code),
- <xref linkend="wget"/>, and
+ <xref linkend="startup-notification"/>,
+ <xref linkend="wget"/>,
+ <xref linkend="wireless_tools"/> and
<xref linkend="xulrunner"/>
</para>
@@ -141,70 +150,73 @@
a subshell in a HERE document. Create the file by issuing the following
command:
</para>
-<screen><userinput>cat > mozconfig << EOF
+<screen><userinput>cat > mozconfig << "EOF"
# If you have a multicore machine you can speed up the build by running
-# several jobs at once, but if you have a single core, delete this line:
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+# 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 not installed Yasm, uncomment this option:
-# ac_add_options --disable-webm
-
-# If you have installed DBus-Glib delete this option:
+# If you have installed DBus-Glib comment out this line:
ac_add_options --disable-dbus
-# If you have installed wireless-tools delete this option:
+# If you have installed wireless-tools comment out this line:
ac_add_options --disable-necko-wifi
-# If you have installed libnotify delete this option:
+# If you have installed libnotify comment out this line:
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=\$(pkg-config --variable=sdkdir libxul)
+# Uncomment these lines if you have installed optional dependencies:
+#ac_add_options --enable-system-hunspell
+#ac_add_options --enable-startup-notification
-# Note: The backslash above is to facilitate a paste operation. It
-# should not appear in the mozconfig file.
+# If you have not installed Yasm then uncomment this line:
+#ac_add_options --disable-webm
-# Uncomment these if you have installed them:
-# ac_add_options --enable-startup-notification
-# ac_add_options --enable-system-hunspell
-# ac_add_options --enable-system-sqlite
-# ac_add_options --with-system-libevent
-# ac_add_options --with-system-libvpx
-# ac_add_options --with-system-nspr
-# ac_add_options --with-system-nss
+# If you have installed xulrunner uncomment following two lines:
+#ac_add_options --with-system-libxul
+#ac_add_options --with-libxul-sdk=\$(pkg-config --variable=sdkdir libxul)
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
-ac_add_options --enable-official-branding
+# Comment out following options if you have not installed
+# recommended dependencies:
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+
+# It is recommended not to touch anything below this line
ac_add_options --prefix=/usr
+ac_add_options --enable-application=browser
-# 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-installer
+ac_add_options --disable-updater
ac_add_options --disable-debug
-ac_add_options --disable-installer
-ac_add_options --disable-static
ac_add_options --disable-tests
-ac_add_options --disable-updater
-ac_add_options --enable-shared
+
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+
+ac_add_options --enable-gio
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-url-classifier
+
ac_add_options --enable-system-ffi
+ac_add_options --enable-system-pixman
+
ac_add_options --with-pthreads
+
+ac_add_options --with-system-bz2
ac_add_options --with-system-jpeg
ac_add_options --with-system-png
ac_add_options --with-system-zlib
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
EOF</userinput></screen>
<para>
- If you are building a stand-alone <application>firefox</application> with
- system versions of <application>nspr</application>,
- <application>nss</application>, or <application>sqlite</application>
- issue the following command:
- </para>
-
-<screen><userinput>sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
- browser/installer/Makefile.in &&</userinput></screen>
-
- <para>
Compile <application>Firefox</application> by issuing the following
commands:
</para>
@@ -212,7 +224,9 @@
<screen><userinput>sed -i 's# ""##' browser/base/Makefile.in &&
make -f client.mk</userinput></screen>
- <para>This package does not come with a test suite.</para>
+ <para>
+ This package does not come with a test suite.
+ </para>
<para>
If you have <emphasis>not</emphasis> linked
@@ -233,13 +247,15 @@
mkdir /usr/lib/firefox-&firefox-version; &&
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 &&
+ -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 &&
-mkdir -pv /usr/lib/mozilla/plugins &&
-ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &&
-chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
+ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &&
+mkdir -pv /usr/lib/mozilla/plugins &&
+ln -sfv ../mozilla/plugins
/usr/lib/firefox-&firefox-version;</userinput></screen>
+
<para>
If you <emphasis>have</emphasis> linked against an already installed
<application>Xulrunner</application>, as the
@@ -247,20 +263,21 @@
</para>
<screen role="root"><userinput>make -C firefox-build-dir install &&
-rm /usr/bin/firefox &&
+rm -v /usr/bin/firefox &&
-cat > /usr/bin/firefox << "HERE_DOC" &&
+cat > /usr/bin/firefox << "EOF" &&
#!/bin/bash
/usr/lib/xulrunner-&xulrunner-version;/xulrunner
/usr/lib/firefox-&firefox-version;/application.ini "${@}"
-HERE_DOC
+EOF
-chmod 755 /usr/bin/firefox &&
+chmod -v 755 /usr/bin/firefox &&
mkdir -pv /usr/lib/mozilla/plugins &&
-ln -sfv ../mozilla/plugins
/usr/lib/firefox-&firefox-version;</userinput></screen>
+ln -sfv ../mozilla/plugins
/usr/lib/firefox-&firefox-version;</userinput></screen>
<bridgehead renderas="sect3" id="npapi-firefox" xreflabel="Firefox">
NPAPI Headers
</bridgehead>
+
<para>
The above instructions just install the parts you need to run
<application>Firefox</application>. If you want to compile
@@ -269,9 +286,18 @@
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>rm -rf /usr/include/npapi &&
+<screen role="root"><userinput>rm -rf /usr/include/npapi &&
mkdir -v /usr/include/npapi &&
cp -v dom/plugins/base/*.h /usr/include/npapi</userinput></screen>
+
+ <note>
+ <para>
+ You don't need to install the headers if you have built
+ <application>Firefox</application> against
+ <application>Xulrunner</application>.
+ </para>
+ </note>
+
</sect2>
<sect2 role="commands">
@@ -328,7 +354,7 @@
<para>
<command>ln -sv ... /usr/lib/firefox-&firefox-version;</command>: This
- makes a symbolic link to
+ command creates a symbolic link to
<filename class="directory">/usr/lib/mozilla/plugins</filename>. It's not
really needed, as <application>Firefox</application> checks
<filename class="directory">/usr/lib/mozilla/plugins</filename> by
@@ -359,21 +385,26 @@
</para>
<screen role="root"><userinput>mkdir -pv /usr/share/applications &&
+mkdir -pv /usr/share/pixmaps &&
cat > /usr/share/applications/firefox.desktop << "EOF" &&
[Desktop Entry]
Encoding=UTF-8
+Name=Firefox Web Browser
+Comment=Browse the World Wide Web
+GenericName=Web Browser
+Exec=firefox %u
+Terminal=false
Type=Application
-Name=Firefox
-Comment=Browse The Web
Icon=firefox
-Exec=firefox
-Categories=Network;GTK;Application;Browser;WebBrowser;
+Categories=GNOME;GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
StartupNotify=true
-Terminal=false
EOF
-ln -sfv /usr/lib/firefox-&firefox-version;/icons/mozicon128.png
/usr/share/pixmaps/firefox.png</userinput></screen>
+ln -sfv /usr/lib/firefox-&firefox-version;/icons/mozicon128.png \
+ /usr/share/pixmaps/firefox.png</userinput></screen>
+
</sect2>
<sect2 role="content">
@@ -385,15 +416,17 @@
<segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>firefox</seg>
<seg>
+ firefox
+ </seg>
+ <seg>
Numerous libraries, browser components, plugins, extensions, and
helper modules installed in
- <filename
class="directory">/usr/lib/firefox-&firefox-version;</filename>.
+ <filename
class="directory">/usr/lib/firefox-&firefox-version;</filename>
</seg>
<seg>
/usr/include/npapi and
- /usr/lib/firefox-&firefox-version;.
+ /usr/lib/firefox-&firefox-version;
</seg>
</seglistitem>
</segmentedlist>
@@ -407,7 +440,7 @@
<term><command>firefox</command></term>
<listitem>
<para>
- is a <application>Gtk 2</application> internet browser that uses
the
+ is a <application>GTK+ 2</application> internet browser that uses
the
Mozilla Gecko rendering engine.
</para>
<indexterm zone="firefox firefox-prog">
@@ -415,6 +448,9 @@
</indexterm>
</listitem>
</varlistentry>
+
</variablelist>
+
</sect2>
+
</sect1>
Modified: trunk/BOOK/xsoft/other/thunderbird.xml
===================================================================
--- trunk/BOOK/xsoft/other/thunderbird.xml 2013-01-20 16:51:05 UTC (rev
10954)
+++ trunk/BOOK/xsoft/other/thunderbird.xml 2013-01-20 17:26:45 UTC (rev
10955)
@@ -8,9 +8,9 @@
"&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
<!ENTITY thunderbird-download-ftp
"&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
- <!ENTITY thunderbird-md5sum "5b0ceb8d403b607fc0330e276b2e7c65">
- <!ENTITY thunderbird-size "107 MB">
- <!ENTITY thunderbird-buildsize "2.4 GB (40 MB installed)">
+ <!ENTITY thunderbird-md5sum "9b7f15fbc672745571d47a3c0e227ca1">
+ <!ENTITY thunderbird-size "109 MB">
+ <!ENTITY thunderbird-buildsize "3,1 GB (47 MB installed)">
<!ENTITY thunderbird-time "30 SBU">
]>
@@ -216,7 +216,7 @@
</para>
<screen role="root"><userinput>mkdir -pv
/usr/lib/thunderbird-&thunderbird-version; &&
-tar -xf
thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname
-m).tar.bz2 \
+tar -xfv
thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname
-m).tar.bz2 \
-C /usr/lib/thunderbird-&thunderbird-version; --strip-components=1
&&
ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird
/usr/bin</userinput></screen>
@@ -319,6 +319,8 @@
</para>
<screen role="root"><userinput>mkdir -pv /usr/share/applications &&
+mkdir -pv /usr/share/pixmaps &&
+
cat > /usr/share/applications/thunderbird.desktop << "EOF" &&
[Desktop Entry]
Encoding=UTF-8
@@ -333,6 +335,7 @@
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto;
StartupNotify=true
EOF
+
ln -sfv
/usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
/usr/share/pixmaps/thunderbird.png</userinput></screen>
</sect3>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
