linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 06:27:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update firefox (and xulrunner) to match the updated libpng. Tested on LFS-6.6 x86_64.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8454 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Ken Moffat 2010-08-03 19:39:53 +00:00
parent d0c5ea3d91
commit f40ee7929c
4 changed files with 54 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general.ent
View File

@ -520,7 +520,7 @@ $Date$
<!ENTITY goffice-version "0.6.1">
<!ENTITY mesalib-version "7.6">
<!-- The xulrunner version also appears in the firefox mozconfig as a literal -->
<!ENTITY xulrunner-version "1.9.2">
<!ENTITY xulrunner-version "1.9.2.8">
<!ENTITY webkitgtk-version "1.1.15.1">
<!ENTITY libsexy-version "0.1.11">
<!ENTITY libnotify-version "0.4.5">
@ -688,7 +688,7 @@ $Date$
<!-- Chapter 36 -->
<!ENTITY seamonkey-version "2.0">
<!ENTITY firefox-version "3.6">
<!ENTITY firefox-version "3.6.8">
<!ENTITY galeon-version "2.0.1">
<!-- Obsolete

4
introduction/welcome/changelog.xml
View File

@ -48,6 +48,10 @@
<para>[ken] - Updated to libpng-1.2.44. Fixes ticket
<ulink url="&blfs-ticket-root;3131">#3131</ulink>.</para>
</listitem>
<listitem>
<para>[ken] - Updated to firefox-3.6.8 / xulrunner-1.9.2.8. Fixes
ticket <ulink url="&blfs-ticket-root;3071">#3071</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>

56
x/lib/xulrunner.xml
View File

@ -7,9 +7,9 @@
<!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 buildize and time will differ -->
<!ENTITY xulrunner-md5sum "458051557ff49e6a352c1d56eee5782a">
<!ENTITY xulrunner-size "47 MB">
<!ENTITY xulrunner-buildsize "309 MB">
<!ENTITY xulrunner-md5sum "0ee5f14fd8be07513d16131027ebcb61">
<!ENTITY xulrunner-size "49 MB">
<!ENTITY xulrunner-buildsize "820 MB">
<!ENTITY xulrunner-time "12 SBU">
]>
@ -33,8 +33,9 @@
<para><application>Xulrunner</application> is a runtime environment for XUL
applications, and forms the major part of the <application>Mozilla</application>
codebase. In particular, it provides the gecko engine together with pkgconfig
files so that applications such as <application>Epiphany</application> and
<application>Yelp</application> can find and use it.</para>
files so that applications such as <application>Yelp</application> can find
and use it. However, be aware that Gnome applications are transitioning to
<application>Webkit</application> instead of gecko.</para>
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@ -106,7 +107,7 @@
<xref linkend="curl"/> (only for crash-reporter),
<xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/>
(for gnome integration),
<xref linkend="lcms"/>,
<xref linkend="libnotify"/>,
<xref linkend="libpng"/> (patched for apng support),
<!-- Redundant as NSS requires this
<xref linkend="nspr"/> (recommended if you build any other Mozilla.org
@ -152,11 +153,11 @@
# 'ac_add_options --some-option-you-need'. Be aware that some accepted
# options, such as '--with-system-bz2', do not affect the build.
# specify that Xulrunner should be built.
# specify that we want to build xulrunner
ac_add_options --enable-application=xulrunner
# Build the package in an object directory as recommended by the developers.
# If desired, modify the location of the object directory
# Create an object directory and specify to build the package in that
# directory. If desired, modify the location of the object directory
# to a directory inside the source tree by removing '../' from the
# line below.
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../xulrunner-build
@ -166,7 +167,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../xulrunner-build
# your needs (the config will always be written to /etc/gre.d)
ac_add_options --prefix=/usr
# apply the default optimizations recommended by the developers (-O)
# apply a minimal level of optimization (-O)
ac_add_options --enable-optimize
# These options are used so that the Xulrunner binaries are linked to
@ -181,12 +182,9 @@ ac_add_options --enable-optimize
ac_add_options --enable-system-sqlite
# Comment this only if you want to use whatever patched version of cairo
# is in the shipped Mozilla tree, together with the system headers.
# is in the shipped mozilla tree, together with the system headers.
ac_add_options --enable-system-cairo
# Comment this if you have not installed lcms.
ac_add_options --enable-system-lcms
# Comment this if you did not build libjpeg before GTK+-2.
ac_add_options --with-system-jpeg
@ -212,20 +210,23 @@ ac_add_options --with-system-zlib
# binaries. Comment out this option if you require a11y support.
ac_add_options --disable-accessibility
# Uncomment this if you did not build cURL.
# Uncomment this if you did not build curl.
#ac_add_options --disable-crashreporter
# Comment this if you have built D-Bus-GLib.
# Comment this if you have built dbus-glib.
ac_add_options --disable-dbus
# Comment this if you have Gnome-VFS and libgnomeui, and wish to
# integrate Xulrunner into your Gnome desktop.
# Comment this if you have gnome-vfs and libgnomeui, and wish to
# integrate xulrunner into your gnome desktop
ac_add_options --disable-gnomevfs
# Comment this if you have wireless-tools installed and wish to use the new
# Necko WiFi scanning.
ac_add_options --disable-necko-wifi
# Comment this if you have installed libnotify.
ac_add_options --disable-libnotify
# This option is added so that the Mozilla Installer program is not
# built or installed. The program is not required for a BLFS
# installation of Xulrunner.
@ -234,13 +235,17 @@ ac_add_options --disable-installer
# If you enable javaxpcom, you must have a java compiler installed.
ac_add_options --disable-javaxpcom
# This option is added so that test libraries and programs used for debugging
# are not built.
# This option is added so that test libraries and programs are not
# built. These would only be required for debugging purposes.
ac_add_options --disable-tests
# Disable the updater, which is not appropriate if you build from source
ac_add_options --disable-updater
# (options to add extra parts of the package)
# Use the anti-phishing measures (a blacklist of sites).
ac_add_options --enable-safe-browsing
# This option is used so that the debugging symbols are removed from
# the installed binaries during the installation process. Comment out
# this option if you may have a need to retain the debugging symbols
@ -248,19 +253,16 @@ ac_add_options --disable-updater
# bigger).
ac_add_options --enable-strip
# (Options to add extra parts of the package)
# Use the anti-phishing measures (a blacklist of sites).
ac_add_options --enable-safe-browsing
# Uncomment this option if you desire support for dual-monitor
# display using the X-Window Xinerama libraries.
#ac_add_options --enable-xinerama
# This option identifies the default binary directory of the Xulrunner
# installation and is used to locate Xulrunner's installed files. This
# option is only used for development purposes.
# option is is only used for development purposes.
#ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-&xulrunner-version;</literal>
EOF</userinput></screen>
<para>If you did not install <xref linkend="nspr"/> and
@ -282,7 +284,7 @@ make -f client.mk build</userinput></screen>
<para>Now, as the <systemitem class="username">root</systemitem> user:</para>
<screen role="root"><userinput>make -f client.mk install &amp;&amp;
install -v -m644 /usr/lib/mozilla &amp;&amp;
install -v -d-m644 /usr/lib/mozilla &amp;&amp;
ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins \
/usr/lib/mozilla &amp;&amp;
chown -Rv root:root /usr/lib/xulrunner-* \
@ -354,7 +356,7 @@ done</userinput></screen>
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>xulrunner</seg>
<seg>xulrunner, and optionally nspr-config</seg>
<seg>Numerous libraries, browser components, plugins, extensions, and
helper modules installed in <filename
class='directory'>/usr/lib/xulrunner-&xulrunner-version;</filename></seg>

53
xsoft/graphweb/firefox.xml
View File

@ -6,10 +6,10 @@
<!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 "458051557ff49e6a352c1d56eee5782a">
<!ENTITY firefox-size "47 MB">
<!ENTITY firefox-buildsize "321 MB (stand-alone) or 303 MB (on xulrunner)">
<!ENTITY firefox-time "12 SBU (stand-alone) or 0.1 SBU (on xulrunner)">
<!ENTITY firefox-md5sum "0ee5f14fd8be07513d16131027ebcb61">
<!ENTITY firefox-size "49 MB">
<!ENTITY firefox-buildsize "836 MB (stand-alone) or 425 MB (on xulrunner)">
<!ENTITY firefox-time "13 SBU (stand-alone) or 0.3 SBU (on xulrunner)">
]>
<sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
@ -35,12 +35,13 @@
<para>With the introduction of firefox-3.x, the
<application>pkgconfig</application> files for the Gecko engine (and for
<application>nss</application> and <application>nspr</application>) are not
installed. This means that applications such as
<application>Epiphany</application> can no longer be built against firefox,
and must instead be built against xulrunner (which is actually the same
code, but built in a different way). If you wish to build other packages
which use Gecko (for the moment, probably only gnome-2.24 or later versions
will recognize xulrunner), build <xref linkend="xulrunner"/> first.</para>
installed. This means that applications such as <application>Yelp
</application> can no longer be built against firefox, and must instead be
built against xulrunner (which is actually the same code, but built in a
different way). If you wish to build other packages which use Gecko (of the
applications in this book, probably only some sundry gnome-2.28 applications
will recognize this version of xulrunner, build <xref linkend="xulrunner"/>
first.</para>
<tip>
<para>Firefox is updated frequently as new vulnerabilities are found.
@ -48,7 +49,7 @@
<ulink url="http://www.mozilla.org/security/known-vulnerabilities/">mozilla security</ulink>
for details of what is fixed in newer releases. The editors cannot guess
what will differ in newer versions: it should be straightforward to upgrade
within the same series (3.5), but it is always possible that newer versions
within the same series (3.6), but it is always possible that newer versions
will have increased dependencies, or that something using the nss or gecko
libraries will break. If you update, begin by updating
<application>xulrunner</application> if you use that, then update firefox
@ -114,7 +115,7 @@
<xref linkend="curl"/> (only for crash-reporter),
<xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/>
(for gnome integration),
<xref linkend="lcms"/>,
<xref linkend="libnotify"/>,
<xref linkend="libpng"/> (patched for apng support),
<xref linkend="nspr"/>,
<xref linkend="nss"/>,
@ -282,13 +283,6 @@ ac_add_options --with-system-libxul
ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;</literal>
EOF</userinput></screen>
<para>If you did not install <xref linkend="xulrunner"/> or
<xref linkend="nspr"/> and <xref linkend="nss"/>, then fix a couple of build
errors with the following commands:</para>
<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-provide_system_nss_nspr-1.patch &amp;&amp;
sed 's@stable@unstable@' -i xulrunner/installer/mozilla-js.pc.in </userinput></screen>
<para>Compile <application>Firefox</application> by issuing the
following commands:</para>
@ -308,17 +302,6 @@ sed 's@stable@unstable@' -i xulrunner/installer/mozilla-js.pc.in </userinput></s
<screen role="root"><userinput>ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins \
/usr/lib/firefox-&firefox-version;/plugins</userinput></screen>
<para>If you've elected to use the included NSPR and NSS, while still the
<systemitem class="username">root</systemitem> user, complete the
installation with the following commands:</para>
<screen role="root"><userinput>for DL in \
libnss3.so libnssutil3.so libsmime3.so libssl3.so libsoftokn3.so \
libplds4.so libplc4.so libnspr4.so
do
ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib/$DL
done</userinput></screen>
</sect2>
<sect2 role="commands">
@ -338,7 +321,9 @@ done</userinput></screen>
/usr/lib/firefox-&firefox-version;/plugins</command>:
<application>Firefox</application> looks for plugins in its own directory,
but when building on <application>xulrunner</application> the plugins were
installed by that package.</para>
installed by that package. Note that any plugins in
<filename class="directory">/usr/lib/mozilla/plugins</filename> will also be
found.</para>
<tip>
<para>If you upgrade firefox, ensure that any additional plugins are moved
@ -393,9 +378,9 @@ done</userinput></screen>
url="http://preferential.mozdev.org/preferences.html"/>.</para>
</tip>
<para>Many applications look for <command>netscape</command> when they
need to open a browser. You may wish to make the following symlink for
convenience (as the <systemitem class="username">root</systemitem>
<para>Many old applications used to look for <command>netscape</command>
when they needed to open a browser. You may wish to make the following
symlink for convenience (as the <systemitem class="username">root</systemitem>
user).</para>
<screen role="root"><userinput>ln -v -sf firefox /usr/bin/netscape</userinput></screen>