From 7e74a993776a9ff8f748f603436ffee231bf5c81 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sun, 14 Dec 2014 23:50:47 -0500 Subject: [PATCH] Upgrade to firefox-34.0.5 --- config/packages-list | 2 +- stage5/hv-install-1 | 3 +- stage5/pkg/firefox | 77 ++++++++++---------------------------------- 3 files changed, 19 insertions(+), 63 deletions(-) diff --git a/config/packages-list b/config/packages-list index 464b994..ded1924 100644 --- a/config/packages-list +++ b/config/packages-list @@ -91,7 +91,7 @@ FCRON="fcron-3.0.6" FETCHMAIL="fetchmail-6.3.21" FFMPEG="ffmpeg-2.5" FFTW="fftw-3.3.2" -FIREFOX="firefox-22.0" +FIREFOX="firefox-34.0.5" FILE_PKG="file-5.18" FINDUTILS="findutils-4.4.2" FIRMWARE_B43_LPPHY="broadcom-wl-5.100.138" diff --git a/stage5/hv-install-1 b/stage5/hv-install-1 index 29e2f3d..d18b863 100755 --- a/stage5/hv-install-1 +++ b/stage5/hv-install-1 @@ -200,8 +200,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg -m noac ${NSPR} "--with-mozilla --with-pthreads \ $([ $(uname -m) = x86_64 ] && echo --enable-64bit)" ipkg -m noac ${NSS} - ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX} - ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX} + ipkg -m noac ${FIREFOX} ipkg -m noac ${KEYUTILS} ipkg -s ecryptfs-utils ${ECRYPTFS_UTILS} diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox index 89352ed..ba7940f 100644 --- a/stage5/pkg/firefox +++ b/stage5/pkg/firefox @@ -8,14 +8,8 @@ hvbuild() cd ${LFS_TMP}/${PACKAGE} - echo "# This file contains the options used in the Firefox or Xulrunner build." > .mozconfig - # Use the default settings specified in the source tree. - if [ "x${HVLABEL}" = "x${FIREFOX}-xulrunner" ]; then - echo '. $topsrcdir/xulrunner/config/mozconfig' >> .mozconfig - else - echo '. $topsrcdir/browser/config/mozconfig' >> .mozconfig - fi + echo '. $topsrcdir/browser/config/mozconfig' > .mozconfig cat >> .mozconfig << "EOF" # Create an object directory and specify to build the package in that @@ -34,12 +28,11 @@ ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --with-system-zlib ac_add_options --with-system-bz2 -# Temporary: system-jpeg uses turbo-jpeg, but there is a bug -# as jpeg images are blank, so use internal jpeg lib. -# ac_add_options --with-system-jpeg +ac_add_options --with-system-jpeg ac_add_options --with-system-png ac_add_options --enable-system-ffi ac_add_options --enable-system-pixman +###ac_add_options --enable-gstreamer=1.0 ac_add_options --enable-shared-js ac_add_options --enable-startup-notification @@ -55,6 +48,7 @@ ac_add_options --enable-install-strip ac_add_options --with-system-nspr ac_add_options --with-system-nss +ac_add_options --with-system-icu ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter @@ -63,68 +57,31 @@ ac_add_options --disable-updater ac_add_options --disable-accessibility ac_add_options --disable-tests ac_add_options --disable-mochitest +ac_add_options --disable-pulseaudio # use the anti-phishing blacklist ac_add_options --enable-safe-browsing +# This option causes the installed binaries to have the official +# Firefox name embedded in them. +ac_add_options --enable-official-branding +ac_add_options --enable-url-classifier + +ac_add_options --enable-gio + # If you enable javaxpcom, you must have a java compiler installed. ac_add_options --disable-javaxpcom EOF - if [ "x${HVLABEL}" = "x${FIREFOX}-browser" ]; then - # Point to the xulrunner libraries. - echo "ac_add_options --with-system-libxul" >> .mozconfig - echo "ac_add_options --with-libxul-sdk=\$(pkg-config --variable=sdkdir libxul)" >> \ - .mozconfig - - # This option causes the installed binaries to have the official - # Firefox name embedded in them. - echo "ac_add_options --enable-official-branding" >> .mozconfig - echo "ac_add_options --enable-url-classifier" >> .mozconfig - - # Remove an unprintable control character from the title bar - sed -i 's@ ""@@' browser/base/Makefile.in - fi - sed -i -e "s!_FIREFOX_BUILD_DIR_!${FIREFOX_BUILD_DIR}!g" .mozconfig if [ -z "${WIFI_SUPPORT}" ]; then echo "ac_add_options --disable-necko-wifi" >> .mozconfig fi + MOZ_MAKE_FLAGS="-j${MAKEJOBS}" make -f client.mk - make -C ${LFS_TMP}/${PACKAGE}-build install - - if [ "x${HVLABEL}" = "x${FIREFOX}-xulrunner" ]; then - install -v -m755 -d /usr/lib/mozilla - - mkdir -pv /usr/lib/xulrunner-${FIREFOX_VERSION}/plugins - - # Remove old links (if applicable) and create new ones - rm -f /usr/lib/mozilla/plugins - ln -sv /usr/lib/xulrunner-${FIREFOX_VERSION}/plugins /usr/lib/mozilla - - chmod -v 755 /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/sdk/bin/xpcshell - - # The libraries shipped with this package are installed into - # /usr/lib/xulrunner-xxx, which means they will not be found at runtime. - # These commands make relative symbolic links to the shared libraries - # from /usr/lib. They will also replace duplicate libraries that are - # installed in /usr/lib/xulrunner-devel-xxx/sdk/lib with symlinks in - # order to save some space. - for library in libmozalloc.so libmozjs.so libxul.so; do - ln -sfv ../../../xulrunner-22.0/$library \ - /usr/lib/xulrunner-devel-22.0/sdk/lib/$library - ln -sfv xulrunner-22.0/$library /usr/lib/$library - done - - # Fixes the error "run-mozilla.sh: no such file or directory" - rm -f /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/bin/{run-mozilla.sh,xpcshell} - ln -sv /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/sdk/bin/run-mozilla.sh \ - /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/bin - ln -sv /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/sdk/bin/xpcshell \ - /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/bin - else - ln -sfv ../lib/firefox-${FIREFOX_VERSION}/firefox /usr/bin - ln -sfv ../xulrunner-${FIREFOX_VERSION} /usr/lib/firefox-${FIREFOX_VERSION}/xulrunner - fi + make -C ${LFS_TMP}/${PACKAGE}-build install INSTALL_SDK= + + install -v -m755 -d /usr/lib/mozilla/plugins + ln -sfv ../../mozilla/plugins /usr/lib/firefox-${FIREFOX_VERSION}/browser } -- 2.20.1