X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Ffirefox;h=180865c9f4a11d4ee8492bbe2864392fec348907;hb=80ded7d3025385c80af4e034a79cf23f5be04267;hp=abd04a35462de81c6a4d62cf3530730533dbb826;hpb=76d0fb8907b4f4d497ff9f6d20293907ff2a5589;p=hvlinux.git

diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox
index abd04a3..180865c 100644
--- a/stage5/pkg/firefox
+++ b/stage5/pkg/firefox
@@ -5,16 +5,13 @@ hvbuild()
     FIREFOX_BUILD_DIR="${PACKAGE}-build"
     FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})"
 
+    # This file contains the options used in the Firefox build.
     cd ${LFS_TMP}/${PACKAGE}
     cat > .mozconfig << "EOF"
-# This file contains the options used in the Firefox build.
-
-# Use the default settings specified in the source tree
+# Use the default settings specified in the source tree.
+# This includes the option --enable-application=browser
 . $topsrcdir/browser/config/mozconfig
 
-# build the browser
-ac_add_options --enable-application=browser
-
 # 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
@@ -35,14 +32,13 @@ ac_add_options --enable-optimize
 # the source tree code which may not be the most recent versions.
 ac_add_options --with-system-zlib
 ac_add_options --with-system-jpeg
+ac_add_options --with-system-png
+
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-lcms
 ac_add_options --enable-system-sqlite
-# comment this if you have not installed png with the apng patch
-ac_add_options --with-system-png
+ac_add_options --enable-startup-notification
 
-# This option is used to enable support for rendering SVG files in the
-# Firefox browser. Comment out the line to disable the option.
 ac_add_options --enable-svg
 
 # These two options enable support for building Firefox with
@@ -53,6 +49,8 @@ ac_add_options --enable-svg
 #ac_add_options --with-system-nspr
 #ac_add_options --with-system-nss
 
+ac_add_options --disable-gnomevfs
+
 # uncomment this if you did not build curl
 ac_add_options --disable-crashreporter
 
@@ -64,8 +62,7 @@ ac_add_options --disable-installer
 # The updater is not useful if you build from source.
 ac_add_options --disable-updater
 
-# This option is used to disable the a11y support in the Firefox
-# binaries. Comment out this option if you require a11y support.
+# Disable the a11y support in the Firefox binaries.
 ac_add_options --disable-accessibility
 
 # This option is added so that test libraries and programs are not
@@ -107,22 +104,20 @@ ac_add_options --enable-strip
 
 # Point to the xulrunner libraries - comment this for a standalone browser
 #ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.0.7
-
 EOF
 
     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
 
     make -f client.mk build
     make -f client.mk install
 
-    # Many applications look for netscape when they need to open a browser...
-    ln -v -sf firefox /usr/bin/netscape
-
-    # Remove old links
+    # Remove old links and create new ones
     rm -f /usr/lib/mozilla
-    rm -f /usr/lib/firefox
-
     ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/mozilla
+    rm -f /usr/lib/firefox
     ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/firefox
 
     # Addition to /etc/ld.so.conf