X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Ffirefox;h=1035f8275ec6e939b0e1d62e2951c78945b0e948;hb=4cb8a57fb3733338b89963330a28ac8a19775591;hp=0b799b2f84c0f258cb7e285f902fca462b8dca38;hpb=6531689d25d6ed05fcf872ae78d31643b00a00ff;p=hvlinux.git

diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox
index 0b799b2..1035f82 100644
--- a/stage5/pkg/firefox
+++ b/stage5/pkg/firefox
@@ -43,6 +43,7 @@ ac_add_options --with-system-png
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-lcms
 ac_add_options --enable-system-sqlite
+ac_add_options --with-system-libvpx
 ac_add_options --enable-startup-notification
 
 ac_add_options --enable-svg
@@ -57,26 +58,11 @@ ac_add_options --enable-svg
 
 ac_add_options --disable-gnomevfs
 
-# uncomment this if you did not build curl
 ac_add_options --disable-crashreporter
-
-# 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.
 ac_add_options --disable-installer
-
-# The updater is not useful if you build from source.
 ac_add_options --disable-updater
-
-# 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
-# built. These would only be required for debugging purposes.
 ac_add_options --disable-tests
-
-# The mochitest is a separate test feature and has caused problems
-# in the past.
 ac_add_options --disable-mochitest
 
 # use the anti-phishing blacklist
@@ -92,7 +78,7 @@ 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=/usr/lib/xulrunner-devel-${XULRUNNER_VER}" >> .mozconfig
+        echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-${FIREFOX_VERSION}" >> .mozconfig
 
         # This option causes the installed binaries to have the official
         # Firefox name embedded in them.
@@ -109,15 +95,21 @@ EOF
 
     if [ "x${HVLABEL}" = "x${FIREFOX}-xulrunner" ]; then
         install -v -m755 -d /usr/lib/mozilla
+
         # Remove old links (if applicable) and create new ones
         rm -f /usr/lib/mozilla/plugins
-        ln -sv /usr/lib/xulrunner-${XULRUNNER_VER}/plugins /usr/lib/mozilla
+        ln -sv /usr/lib/xulrunner-${FIREFOX_VERSION}/plugins /usr/lib/mozilla
         chown -Rv root:root /usr/lib/xulrunner-* \
             /usr/share/idl/xulrunner-* \
             /usr/include/xulrunner-*
+
+        # Fixes the error "run-mozilla.sh: no such file or directory"
+        ln -s /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/sdk/bin/run-mozilla.sh /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/bin
+        ln -s /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/sdk/bin/xpcshell       /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/bin
     else
-        chown -R -v root:root /usr/share/idl/${FIREFOX_PKG_VERSION} \
-            /usr/include/${FIREFOX_PKG_VERSION}   \
-            /usr/lib/firefox-devel-${FIREFOX_VERSION}/sdk/lib
+        rm /usr/bin/firefox
+        echo "#!/bin/bash" > /usr/bin/firefox
+        echo "/usr/lib/xulrunner-${FIREFOX_VERSION}/xulrunner /usr/lib/firefox-${FIREFOX_VERSION}/application.ini \"\${@}\"" >> /usr/bin/firefox
+        chmod 755 /usr/bin/firefox
     fi
 }