From 14de4227c1fdaca40e7ed1bcf6bdbf27bcb324c5 Mon Sep 17 00:00:00 2001 From: Ken Moffat Date: Wed, 15 Jun 2016 02:49:32 +0000 Subject: [PATCH] firefox-47.0 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17495 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/graphlib/graphite2.xml | 9 ++-- introduction/welcome/changelog.xml | 4 ++ packages.ent | 2 +- xsoft/graphweb/firefox.xml | 85 ++++++++++++++++++++++++------ 4 files changed, 78 insertions(+), 22 deletions(-) diff --git a/general/graphlib/graphite2.xml b/general/graphlib/graphite2.xml index d87bda6bb6..ec60ca2a83 100644 --- a/general/graphlib/graphite2.xml +++ b/general/graphlib/graphite2.xml @@ -37,12 +37,13 @@ non-Roman writing systems. They may contain rules for e.g. ligatures, glyph substitution, kerning, justification - this can make them useful even on text written in Roman writing systems such as English. Note that - firefox provides an internal copy of the - graphite engine and cannot use a system version, but it too should benefit - from the availability of graphite fonts. + firefox by default provides an internal copy of + the graphite engine and cannot use a system version (although it can now + be patched to use it), but it too should benefit from the availability of + graphite fonts. - &lfs79_checked; + &lfs79_checked;&gcc6_checked; Package Information diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 2e29640886..3d24187941 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -46,6 +46,10 @@ June 14th, 2016 + + [ken] - Updated to firefox-47.0. Fixes + #7876. + [ken] - Add autoconf-2.13, now required by firefox-47. This is partially based on Tushar's hint "Installing multiple autotool diff --git a/packages.ent b/packages.ent index f5faf8cbb2..a0011e03b9 100644 --- a/packages.ent +++ b/packages.ent @@ -674,7 +674,7 @@ - + diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml index 7df4124634..d4a405a1c7 100644 --- a/xsoft/graphweb/firefox.xml +++ b/xsoft/graphweb/firefox.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -34,8 +34,7 @@ Mozilla codebase. - &lfs79_checked; - &gcc6_checked; + &lfs79_checked;&gcc6_checked; Package Information @@ -71,6 +70,23 @@ + Additional Downloads + + + + Required patch if using gtk+-3.20 or later (do not use with earlier versions) + + + + + + Optional patch to allow system versions of + and - this should be regarded as experimental + + + + + The tarball firefox-&firefox-version;.source.tar.xz @@ -83,8 +99,9 @@ Required , - - (or if you change the mozconfig where indicated), + , + + (or if you change the mozconfig where indicated), , , , and @@ -142,8 +159,11 @@ , Hunspell, liboauth, and - libproxy, and - Rust + libproxy, + Rust, + and (with the patch) + and + @@ -187,8 +207,8 @@ ac_add_options --disable-necko-wifi ac_add_options --disable-gstreamer #ac_add_options --enable-gstreamer=1.0 -# Comment out this option if you wish to build with gtk+-3 -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Uncomment this option if you wish to build with gtk+-2 +#ac_add_options --enable-default-toolkit=cairo-gtk2 # Uncomment these lines if you have installed optional dependencies: #ac_add_options --enable-system-hunspell @@ -209,6 +229,16 @@ ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-icu +# If you are going to apply the patch for system graphite +# and system harfbuzz, uncomment these lines: +#ac_add_options --with-system-graphite2 +#ac_add_options --with-system-harfbuzz + +# Stripping is now enabled by default. +# Uncomment these lines if you need to run a debugger: +#ac_add_options --disable-strip +#ac_add_options --disable-install-strip + # The BLFS editors recommend not changing anything below this line: ac_add_options --prefix=/usr ac_add_options --enable-application=browser @@ -218,8 +248,6 @@ ac_add_options --disable-updater ac_add_options --disable-tests 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 @@ -247,6 +275,22 @@ EOF commands: + + If you are using gtk+-3.20 or later, apply a patch to restore the + slider on scrollbars: + + +patch -Np1 -i ../firefox-&firefox-version;-gtk320-1.patch + + + If you have installed system versions of graphite2 and harfbuzz and wish + firefox to use those instead of its shipped versions, apply the patch and + uncomment the appropriate entries in the mozconfig + file: + + +patch -Np1 -i ../firefox-&firefox-version;-system_graphite2_harfbuzz-1.patch + If you are compiling Firefox in chroot, make sure you have $SHELL environment variable set or prepend @@ -261,7 +305,8 @@ sed -e '/#include/a\ print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \ -i nsprpub/config/make-system-wrappers.pl -CXX='g++ -std=c++11' make -f client.mk +CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" +CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" This package does not come with a test suite. @@ -283,8 +328,14 @@ ln -sfv ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browserCommand Explanations - sed ...: These commads correct the source to be - compatible with gcc6. + sed ...: These commands correct the source to be + compatible with gcc6 by preventing c++ scope errors. + + + + CFLAGS= ... CXXFLAGS= ...: These settings work around + code which gcc6 would otherwise regard as out-of-specification and allow + it to produce a working program.