From 2082307db589e41aa3de0b0d0d08ce7fac378893 Mon Sep 17 00:00:00 2001 From: DJ Lucas Date: Sun, 6 Sep 2009 06:18:18 +0000 Subject: [PATCH] Updated to Xulrunner-1.9.1.2 and Firefox-3.5.2. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8008 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 6 +- introduction/welcome/changelog.xml | 9 ++ x/lib/xulrunner.xml | 161 +++++++++++---------- xsoft/graphweb/firefox.xml | 223 +++++++++++++++-------------- 4 files changed, 216 insertions(+), 183 deletions(-) diff --git a/general.ent b/general.ent index 6272903b10..a0d2438979 100644 --- a/general.ent +++ b/general.ent @@ -3,7 +3,7 @@ $LastChangedBy$ $Date$ --> - + @@ -482,7 +482,7 @@ $Date$ - + @@ -642,7 +642,7 @@ $Date$ - + + + September 6th, 2009 + + + [dj] - Updated to Xulrunner-1.9.1.2 and Firefox-3.5.2. + + + + September 5th, 2009 diff --git a/x/lib/xulrunner.xml b/x/lib/xulrunner.xml index 2f6f5c6d8d..ea59a162cc 100644 --- a/x/lib/xulrunner.xml +++ b/x/lib/xulrunner.xml @@ -7,10 +7,10 @@ - - - - + + + + ]> @@ -36,15 +36,6 @@ files so that applications such as Epiphany and Yelp can use it. - - If you later build a newer version of xulrunner - to pick up the latest security fixes, you must update the - symlinks (including for nss, nspr if you are using the versions in - xulrunner) and rebuild every application which uses - gecko, including upgrading firefox if you have installed - that. - - Package Information @@ -56,7 +47,7 @@ released, sometimes a corresponding new version of xulrunner appears at the same time. At other times it appears several days later or not at all. So far in the - firefox-3.0 series, every new release has + firefox-3.x series, every new release has created xulrunner libraries with a corresponding new version. Whenever a separate xulrunner tarball has been released, it has been bitwise identical to the corresponding firefox tarball. So, we will use the @@ -70,19 +61,32 @@ Download size: &xulrunner-size; - Estimated disk space required: &xulrunner-buildsize; + Estimated disk space required: &xulrunner-buildsize; (using + recommended dependencies) - Estimated build time: &xulrunner-time; + Estimated build time: &xulrunner-time; (using recommended + dependencies) + + + + Additional Downloads + + + Optional patch: + (Required if using the included NSPR and NSS libs as system versions for + other packages) Xulrunner Dependencies Required - , - - + + , + , + , , and @@ -92,6 +96,10 @@ you should remove the option from the .mozconfig file created below. + Recommended + (internal sqlite is + incompatable with existing or future installations) + Optional , , @@ -100,7 +108,10 @@ (for gnome integration), , (patched for apng support), - , + (recommended if you build any other Mozilla.org + packages), + (recommended if you build any other Mozilla.org + packages), . , Valgrind (only for testing the @@ -115,26 +126,16 @@ Installation of Xulrunner - The configuration of Xulrunner is accomplished by creating a .mozconfig file containing the desired configuration options. A default .mozconfig is created below. To see the entire list of available configuration options (and an abbreviated description of each one), issue - ./configure --help. If you are going to use - system-installed versions of the NSS and - NSPR libraries, ensure you uncomment the two - lines near the bottom of the file. - You should review the entire file and comment or uncomment options as - necessary. If you would prefer to download the file instead of creating - it by typing or cut-and-pasting, you can find it at + ./configure --help. You should review the entire file + and comment or uncomment options as necessary. If you would prefer to + download the file instead of creating it by typing or cut-and-pasting, you + can find it at + (the file must be installed in the root of the source tree mozilla directory, and named .mozconfig). @@ -168,57 +169,54 @@ ac_add_options --enable-optimize # These options are used so that the Xulrunner binaries are linked to # the system-installed copies of the specified libraries instead of -# the source tree code which may not be the most recent versions (or, -# for cairo, may contain additional patches) : with the exception of -# libsqlite3, the libraries are statically linked - using the shipped -# version of libsqlite3 has been reported to cause problems with other -# applications which were using sqlite3. +# the source tree code which may not be the most recent versions. +# With the exception of libsqlite3, the libraries are statically linked. -# (the --enable-system options) -# comment this if you want to use whatever patched version of cairo +# (Options to use system installed libraries) +# Using the shipped version of libsqlite3 has been reported to cause +# problems with other applications which were using sqlite3. +# Only comment this line if you know excatly what you are doing! +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. ac_add_options --enable-system-cairo -# comment this if you have not installed lcms +# Comment this if you have not installed lcms. ac_add_options --enable-system-lcms -# comment this if you have not installed sqlite -ac_add_options --enable-system-sqlite - -# (the --with-system options) -# comment this if you did not build libjpeg before gtk+-2 +# Comment this if you did not build libjpeg before GTK+-2. ac_add_options --with-system-jpeg # These two options enable support for building Xulrunner with # system-installed versions of the Network Security Services (NSS) -# and Netscape Portable Runtime (NSPR) libraries. Uncomment both -# lines to enable support for system-installed NSS/NSPR instead of -# building the versions shipped with xulrunner. -#ac_add_options --with-system-nspr -#ac_add_options --with-system-nss +# and Netscape Portable Runtime (NSPR) libraries. Comment them if +# you wish to use the included copies (not recommended). +ac_add_options --with-system-nspr +ac_add_options --with-system-nss -# comment this if you have not built png with the apng patch +# Comment this if you have not built png with the apng patch. ac_add_options --with-system-png # The pthreads option is only used when building nspr -# so you can comment this if you enable --with-system-nspr -ac_add_options --with-pthreads +# Uncomment this if you build the included nspr. +#ac_add_options --with-pthreads -# zlib is in LFS +# zlib is included in LFS. Do not comment this line. ac_add_options --with-system-zlib -# (options to disable parts of the package) +# (Options to disable parts of the package) # This option is used to disable the a11y support in the Xulrunner # binaries. Comment out this option if you require a11y support. ac_add_options --disable-accessibility -# uncomment this if you did not build curl -#ac_add_options --disable-crashreporter +# Uncomment this if you did not build curl. +ac_add_options --disable-crashreporter -# comment this if you have built dbus-glib -ac_add_options --disable-dbus +# 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 +# Comment this if you have gnome-vfs and libgnomeui, and wish to # integrate xulrunner into your gnome desktop ac_add_options --disable-gnomevfs @@ -248,13 +246,14 @@ ac_add_options --disable-updater # NOTE: You must uncomment this option if there is any chance of # compiling the OpenOffice package from source code using this copy # of Xulrunner for your Mozilla support. -# This has NOT been tested, current versions of OpenOffice are -# assumed not to compile against this version of xulrunner! +# +# This has NOT been tested, the current status of OpenOffice +# and xulrunner is unknown! (Remove this comment before release) # ################################################################### #ac_add_options --enable-ldap -# Use the anti-phishing measures (a blacklist of sites) +# 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 @@ -268,15 +267,19 @@ ac_add_options --enable-strip # display using the X-Window Xinerama libraries. #ac_add_options --enable-xinerama -# ('with' options) # This option identifies the default binary directory of the Xulrunner # installation and is used to locate Xulrunner's installed files. This -# option is not required for end-user browsing, and 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; EOF + If you did not install and + , then apply the patch with the following + command: + +patch -Np1 -i ../firefox-&firefox-version;-provide_system_nss_nspr-1.patch + Compile Xulrunner by issuing the following commands: @@ -289,14 +292,20 @@ make -f client.mk build install the package: make -f client.mk install && -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 && -ln -sv mozilla-nspr.pc /usr/lib/pkgconfig/nspr.pc && mkdir /usr/lib/mozilla && -ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins /usr/lib/mozilla/plugins +ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins \ + /usr/lib/mozilla/plugins + + If you've elected to use the included NSPR and NSS, while still the + root user, complete the + installation with the following commands: + +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 diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml index 3a733fdd53..b0d237f4ee 100644 --- a/xsoft/graphweb/firefox.xml +++ b/xsoft/graphweb/firefox.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -32,24 +32,27 @@ Firefox is a stand-alone browser based on the Mozilla codebase. - With the introduction of firefox-3, the pkgconfig - files for the Gecko engine (and for nss and - nspr) are not installed. This means that applications - such as Epiphany 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 first. + With the introduction of firefox-3.x, the + pkgconfig files for the Gecko engine (and for + nss and nspr) are not + installed. This means that applications such as + Epiphany 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 first. - Firefox is updated frequently as new vulnerabilities are found. Consult + Firefox is updated frequently as new vulnerabilities are found. + Consult mozilla security - 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.0), 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 xulrunner if you use that, then - update firefox (ensuring the libxul-sdk option points to the new version). + 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 + will have increased dependencies, or that something using the nss or gecko + libraries will break. If you update, begin by updating + xulrunner if you use that, then update firefox + (ensuring the libxul-sdk option points to the new version). Package Information @@ -74,15 +77,26 @@ + Additional Downloads + + + Optional patch: + (Required if using the included NSPR and NSS libs as system versions for + other packages) + + + Firefox Dependencies Recommended - which shares all these + which shares all these dependencies, or for a standalone firefox the following Required and Optional dependencies: Required - , + , + , , and @@ -102,8 +116,10 @@ (for gnome integration), , (patched for apng support), - , + , + , . + , , Valgrind (only for testing the jemalloc code), and @@ -122,16 +138,8 @@ the desired configuration options. A default .mozconfig is created below. To see the entire list of available configuration options (and an abbreviated description of each one), issue - ./configure --help. If you are going to use - system-installed versions of the NSS and - NSPR libraries, ensure you uncomment the two - lines near the bottom of the file. If you are going to build the - OpenOffice package and you want to use this - Firefox installation as the default - Mozilla source, ensure you uncomment the - option in the file created below. - If you are building against Xulrunner you - must uncomment the 'xulrunner' item. + ./configure --help. If you are not building against + Xulrunner you must comment the 'xulrunner' items. You may also wish to review the entire file and uncomment any other desired options. If you would prefer to download the file instead of creating it by typing or cut-and-pasting, you can find it at cat > .mozconfig << "EOF" -# This file contains the options used to build firefox on top -# of xulrunner. If you do not wish to build xulrunner, make the changes -# noted for a 'standalone browser'. You may need to specify additional -# options for your specific build needs (if you are building 'standalone') +# This file contains the options used in the Firefox build. You may +# need to specify additional options for your specific build needs. # Use the information provided by running './configure --help' to # help you determine if you need to add any additional options. # Some additional options can be added by uncommenting the examples # in this file or adding options by inserting a line containing -# 'ac_add_options --some-option-you-need'. +# 'ac_add_options --some-option-you-need'. Be aware that some accepted +# options, such as '--with-system-bz2', do not affect the build. -# build the browser +# specify that we want to build firefox ac_add_options --enable-application=browser # Use the default settings specified in the source tree @@ -164,102 +171,101 @@ ac_add_options --enable-application=browser # line below. mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../firefox-build -# Specify the installation prefix. If you would prefer Firefox +# Specify the installation prefix. If you would prefer Xulrunner # installed in a different prefix, modify the line below to fit -# your needs. You may also need to modify some of the instructions in -# the BLFS book to point to your desired prefix. +# your needs (the config will always be written to /etc/gre.d) ac_add_options --prefix=/usr -# Compile with a minimal level of optimization +# apply a minimal level of optimization (-O) ac_add_options --enable-optimize -# (the --enable-system options) -# comment this if you want to use whatever patched version of cairo -# is in the shipped mozilla tree, together with the system headers -ac_add_options --enable-system-cairo +# These options are used so that the Xulrunner binaries are linked to +# the system-installed copies of the specified libraries instead of +# the source tree code which may not be the most recent versions. +# With the exception of libsqlite3, the libraries are statically linked. -# comment this if you have not installed lcms - firefox will use -# its own copy -ac_add_options --enable-system-lcms - -# comment this if you have not installed sqlite, firefox will use -# its own old copy +# (Options to use system installed libraries) +# Using the shipped version of libsqlite3 has been reported to cause +# problems with other applications which were using sqlite3. +# Only comment this line if you know excatly what you are doing! ac_add_options --enable-system-sqlite -# (the --with-system options) -# comment this if you did not build libjpeg before gtk+-2 +# Comment this only if you want to use whatever patched version of cairo +# 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 -# These two options enable support for building Firefox with +# These two options enable support for building Xulrunner with # system-installed versions of the Network Security Services (NSS) -# and Netscape Portable Runtime (NSPR) libraries. We build these -# as part of xulrunner, so we can use them here. For a standalone -# firefox you might want to comment these. +# and Netscape Portable Runtime (NSPR) libraries. Comment them if +# you wish to use the included copies (not recommended). ac_add_options --with-system-nspr ac_add_options --with-system-nss -# comment this if you have not installed png with the apng patch +# Comment this if you have not built png with the apng patch. ac_add_options --with-system-png -# uncomment this if you are building nspr as part of firefox +# The pthreads option is only used when building nspr +# Uncomment this if you build the included nspr. #ac_add_options --with-pthreads -# zlib is in LFS +# zlib is included in LFS. Do not comment this line. ac_add_options --with-system-zlib -# (options to disable parts of the package) -# This option is used to disable the a11y support in the Firefox +# (Options to disable parts of the package) +# This option is used to disable the a11y support in the Xulrunner # binaries. Comment out this option if you require a11y support. ac_add_options --disable-accessibility -# uncomment this if you did not build curl -#ac_add_options --disable-crashreporter +# Uncomment this if you did not build curl. +ac_add_options --disable-crashreporter -# comment this if you have built dbus-glib -ac_add_options --disable-dbus +# 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 firefox 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 # 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 Firefox. +# installation of Xulrunner. ac_add_options --disable-installer -# The mochitest is a separate test feature and has caused problems -# in the past. +# If you enable javaxpcom, you must have a java compiler installed. +ac_add_options --disable-javaxpcom + +# mochitest often causes problems ac_add_options --disable-mochitest # 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 -# The updater is not useful if you build from source. +# 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) # This option is used to enable source tree included LDAP support in -# the Firefox binaries. +# the Xulrunner binaries. ################################################################### # # NOTE: You must uncomment this option if there is any chance of # compiling the OpenOffice package from source code using this copy -# of Firefox for your Mozilla support. -# This has NOT been tested, current versions of OpenOffice are -# assumed not to compile against this version of xulrunner! +# of Xulrunner for your Mozilla support. +# +# This has NOT been tested, the current status of OpenOffice +# and xulrunner is unknown! (Remove this comment before release) # ################################################################### #ac_add_options --enable-ldap -# This option causes the installed binaries to have the official -# Firefox name embedded in them. Due to license restrictions, you -# may not distribute binaries created using this option. It also -# means you get a popup EULA when you first run firefox. -# If you disable this, the browser will call itself Minefield. -ac_add_options --enable-official-branding - -# use the anti-phishing blacklist +# 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 @@ -270,21 +276,25 @@ ac_add_options --enable-safe-browsing ac_add_options --enable-strip # Uncomment this option if you desire support for dual-monitor -# display of Firefox using the X-Window Xinerama libraries. +# display using the X-Window Xinerama libraries. #ac_add_options --enable-xinerama -# ('with' options) -# This option identifies the default binary directory of the Firefox -# installation and is used to locate Firefox's installed files. This -# option is not required for end-user browsing, and is only used for -# development purposes. -#ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox-&firefox-version; - -# Point to the xulrunner libraries - comment this for a standalone browser -ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version; +# This option identifies the default binary directory of the Xulrunner +# installation and is used to locate Xulrunner's installed files. This +# option is is only used for development purposes. +#ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox-&firefox-version; +# Point to the xulrunner libraries - comment these for a standalone browser +ac_add_options --with-system-libxul +ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version; EOF + If you did not install or + and , then apply the patch + with the following command: + +patch -Np1 -i ../firefox-&firefox-version;-provide_system_nss_nspr-1.patch + Compile Firefox by issuing the following commands: @@ -302,7 +312,18 @@ EOF symbolic link: ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins \ - /usr/lib/firefox-&firefox-version;/plugins + /usr/lib/firefox-&firefox-version;/plugins + + If you've elected to use the included NSPR and NSS, while still the + root user, complete the + installation with the following commands: + +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 @@ -319,12 +340,6 @@ EOF configure script and compiles the package or installs the package. - - ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins /usr/lib/firefox-&firefox-version;/plugins: Firefox looks for plugins in its own directory, @@ -332,8 +347,8 @@ EOF installed by that package. - If you upgrade firefox, ensure that any additional plugins are moved to - the plugin directory of the new version. + If you upgrade firefox, ensure that any additional plugins are moved + to the plugin directory of the new version.