firefox: Major spell update to get 5.0.1 to build. Works for me. :)

11 files changed, 135 insertions, 94 deletions

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 498a968fcc..e7cd074fef 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -4,13 +4,6 @@ FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&
 export  MOZ_PHOENIX=1 &&
 
 #
-# Only strip if the user wants us to
-#
-if  echo  $LDFLAGS  |  grep  -q  --  '-s';  then
-  OPTS="$OPTS  --enable-strip"
-fi  &&
-
-#
 # No fast optimization for Mozilla, bit us so many times...
 #
 CFLAGS="${CFLAGS//-Os/-O2}"      &&
@@ -23,19 +16,7 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}"  &&
 #
 CFLAGS="${CFLAGS//-ffast-math/}"      &&
 CXXFLAGS="${CXXFLAGS//-ffast-math/}"  &&
-
-if [[ "$FIREFOX_CVS" == "y" ]]; then
-  autoconf-2.13 &&
  
-# workaround for configure not handling --disable-webm correctly
-  if [[ $OPTS =~ --disable-webm ]]; then
-   echo ac_add_options --disable-webm >> .mozconfig
-  fi
-fi &&
-
-# necko-wifi is part of xulrunner if enabled, but firefox
-# compile fails without wireless_tools without this option
-echo ac_add_options --disable-necko-wifi >> .mozconfig  &&
 echo ac_add_options --enable-optimize=-O2 >> .mozconfig  &&
 
 make_single  &&
diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index b3dce72f05..331cb81e9a 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -2,3 +2,7 @@ config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n
 
 config_query FIREFOX_OFFICIAL "Enable official branding? If enabled, you may \
 be restricted in distributing these binaries IAW mozilla policies" n
+
+config_query  FIREFOX_STRIP                              \
+                     'Remove debugging symbols?' \
+                     n
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index b38a77f11c..5b3ff13908 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,6 +1,6 @@
 depends  atk                               &&
 depends  curl                              &&
-depends -sub CXX gcc                               &&
+depends -sub CXX gcc                       &&
 depends  glib2                             &&
 depends  JPEG                              &&
 depends  pango                             &&
@@ -10,22 +10,16 @@ depends  zlib                              &&
 depends  cairo                             &&
 depends  python                            &&
 depends  libnotify                         &&
-if [[ "$FIREFOX_CVS" = "n" ]]; then 
 depends  nspr                              &&
 depends  -sub "3.12.x" nss                 &&
-depends -sub APNG libpng                   &&
-depends  xulrunner
-else
 depends autoconf-2.13                      &&
-depends libnotify                          &&
-optional_depends yasm \
-                 "--enable-webm" \
-                 "--disable-webm" \
-                 "enables the WebM video format"
-fi                                         &&
-
 depends  gtk+2                             &&
 depends  libidl                            &&
+depends  yasm                              &&
+
+optional_depends wireless_tools "" "" "for geolocation via WiFi access points" &&
+optional_depends alsa-lib "" "" "for audio support" &&
+
 
 suggest_depends_2 firefox-smglwiki '' '' \
   'to enable searching the SMGL Wiki from the Search Bar'
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index bfb88a3d95..c933eea794 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,14 +1,13 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=4.0.1
+         VERSION=5.0.1
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
-#     SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
   SOURCE2_URL[0]=$SOURCE_URL.asc
 else
-         VERSION=3.6.15
+         VERSION=5.0.1
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 861acfc970..df2e447b99 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,18 @@
+2011-08-05 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated devel and stable to version 5.0.1
+	* CONFIGURE: Added option to strip debugging symbols
+	* DEPENDS: Added depends yasm for web video
+	  Removed depends libpng, needs newer version
+	  Removed depends xulrunner, won't build against
+	  Added optional for wireless tools and alsa-lib
+	* INSTALL: Removed ln -s for xulrunnerplugins
+	* PRE_BUILD: Added curl patch and options to setup .mozconfig file
+	* curl.patch: Added patch for curl-7.21.7
+	* mozconfig3: Removed old file
+	* mozconfig4: Removed old file
+	* mozconfig5: Updated and added new .mozconfig file
+	* firefox-xulrunner.patch: Removed un-needed patch
+
 2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 5364ea78aa..17466d9652 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -42,10 +42,4 @@ if  test  -f   $INSTALL_ROOT/usr/lib/libnssckbi.so;  then
          test  -h   $FIREFOX_HOME/libnssckbi.so; then
     ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so  $FIREFOX_HOME/libnssckbi.so
   fi
-fi  &&
-
-
-ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
-       "$INSTALL_ROOT/usr/lib/$SPELL-$VERSION/plugins"
-
-
+fi
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index f2f9e2b25a..9a5a1af6c1 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,15 +3,28 @@ cd  $SOURCE_DIRECTORY             &&
 unpack_file  ''                   &&
 cd  mozilla*                       &&
 
-patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch &&
+#Fix compilation with curl-7.21.7
+# https://bug673072.bugzilla.mozilla.org/attachment.cgi?id=547353
+patch -p0 < $SPELL_DIRECTORY/curl.patch &&
 
-if [[ "$FIREFOX_CVS" == "n" ]]; then
-    cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig
+cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&
+
+if is_depends_enabled $SPELL wireless_tools; then
+   sed -i '27iac_add_options --enable-necko-wifi' .mozconfig
 else
-    cp -v $SPELL_DIRECTORY/mozconfig4 .mozconfig
-fi
+   sed -i '27iac_add_options --disable-necko-wifi' .mozconfig
+fi &&
+
+if ! is_depends_enabled $SPELL alsa-lib; then
+   sed -i '27iac_add_options --disable-ogg' .mozconfig &&
+   sed -i '27iac_add_options --disable-wave' .mozconfig
+fi &&
+
+if [[ "$FIREFOX_STRIP" == "y" ]]; then
+   sed -i '27iac_add_options --enable-strip' .mozconfig
+fi &&
 
 
 if [[ $FIREFOX_OFFICIAL == y ]]; then
-  sed -i '24iac_add_options --enable-official-branding' .mozconfig || return 1
+  sed -i '27iac_add_options --enable-official-branding' .mozconfig || return 1
 fi
diff --git a/http/firefox/curl.patch b/http/firefox/curl.patch
new file mode 100644
index 0000000000..66b90cc4ca
--- /dev/null
+++ b/http/firefox/curl.patch
@@ -0,0 +1,84 @@
+diff -r 15b32ce27a28 config/system-headers
+--- config/system-headers	Thu Jul 21 20:50:16 2011 +1200
++++ config/system-headers	Thu Jul 21 21:28:49 2011 +1200
+@@ -199,17 +199,16 @@ crypt.h
+ cstddef
+ cstdio
+ cstdlib
+ cstring
+ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+ dbus/dbus.h
+ dbus/dbus-glib.h
+ dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+diff -r 15b32ce27a28 js/src/config/system-headers
+--- js/src/config/system-headers	Thu Jul 21 20:50:16 2011 +1200
++++ js/src/config/system-headers	Thu Jul 21 21:28:49 2011 +1200
+@@ -199,17 +199,16 @@ crypt.h
+ cstddef
+ cstdio
+ cstdlib
+ cstring
+ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+ dbus/dbus.h
+ dbus/dbus-glib.h
+ dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+diff -r 15b32ce27a28 toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+--- toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc	Thu Jul 21 20:50:16 2011 +1200
++++ toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc	Thu Jul 21 21:28:49 2011 +1200
+@@ -28,17 +28,16 @@
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ #include "common/linux/http_upload.h"
+ 
+ #include <assert.h>
+ #include <dlfcn.h>
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ 
+ namespace {
+ 
+ // Callback to get the response data from server.
+ static size_t WriteCallback(void *ptr, size_t size,
+                             size_t nmemb, void *userp) {
+   if (!userp)
+     return 0;
+diff -r 15b32ce27a28 toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+--- toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc	Thu Jul 21 20:50:16 2011 +1200
++++ toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc	Thu Jul 21 21:28:49 2011 +1200
+@@ -24,17 +24,16 @@
+ // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ #include <dlfcn.h>
+ 
+ #include <iostream>
+ #include <string>
+ 
+ #include "common/linux/libcurl_wrapper.h"
+ 
+ using std::string;
diff --git a/http/firefox/firefox-xulrunner.patch b/http/firefox/firefox-xulrunner.patch
deleted file mode 100644
index e9cabf993e..0000000000
--- a/http/firefox/firefox-xulrunner.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- config/rules.mk.orig	2009-06-30 09:00:33.000000000 -0500
-+++ config/rules.mk	2009-06-30 09:00:57.000000000 -0500
-@@ -67,6 +67,11 @@
-   SKIP_COPY_XULRUNNER=1
- endif
- 
-+# Don't copy xulrunner files at install time, when using system xulrunner
-+ifdef LIBXUL_SDK
-+  SKIP_COPY_XULRUNNER=1
-+endif
-+
- # ELOG prints out failed command when building silently (gmake -s).
- ifneq (,$(findstring -s,$(MAKEFLAGS)))
-   ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
diff --git a/http/firefox/mozconfig4 b/http/firefox/mozconfig4
deleted file mode 100644
index 5fd53fb4c5..0000000000
--- a/http/firefox/mozconfig4
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# See http://www.mozilla.org/build/ for build instructions.
-#
-
-# Options for client.mk.
-mk_add_options MOZ_CO_PROJECT=browser
-
-# Options for 'configure' (same as command-line options).
-ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-#ac_add_options --with-system-png=/usr/lib
-#ac_add_options --with-system-nspr
-#ac_add_options --with-system-nss
-ac_add_options --enable-application=browser
-ac_add_options --disable-system-cairo
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-freetype2
-ac_add_options --enable-pango
-ac_add_options --disable-dbus
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-#ac_add_options --with-system-libxul
-#ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CFLAGS"
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig5
index fa47e6eece..4aa3f097a6 100644
--- a/http/firefox/mozconfig3
+++ b/http/firefox/mozconfig5
@@ -4,25 +4,24 @@
 
 # Options for client.mk.
 mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
+mk_add_options AUTOCONF=autoconf2.13
 
 # Options for 'configure' (same as command-line options).
 ac_add_options --with-pthreads
 ac_add_options --with-system-jpeg=/usr/lib
 ac_add_options --with-system-zlib=/usr/lib
-ac_add_options --with-system-png=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
 ac_add_options --enable-application=browser
 ac_add_options --disable-system-cairo
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-freetype2
 ac_add_options --enable-pango
+ac_add_opitons --envable-svg
 ac_add_options --disable-dbus
 ac_add_options --disable-installer
 ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --with-system-libxul
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
 ac_add_options --prefix=$INSTALL_ROOT/usr
 ac_add_options --mandir=$INSTALL_ROOT/usr
 ac_add_options --enable-optimize="$CFLAGS"
+ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox