firefox: removed 3.0.* versions

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

49 files changed, 0 insertions, 7899 deletions

diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig
deleted file mode 100644
index 094a0ff642..0000000000
--- a/recipes/mozilla/firefox-3.0.1+3.1b1/arm/mozconfig
+++ /dev/null
@@ -1,67 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-#ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap
-#ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-ac_add_options --disable-printing
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-gnomeui
-ac_add_options --enable-debugger-info-modules
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
-ac_add_options --enable-optimize=-O2
-ac_add_options --with-arm-kuser
-
-# Use cairo from system
-ac_add_options --enable-system-cairo
-
-# Disable jemalloc
-ac_add_options --disable-jemalloc
-
-# enable libxul
-ac_add_options --enable-libxul
diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch
deleted file mode 100644
index 39978cfd11..0000000000
--- a/recipes/mozilla/firefox-3.0.1+3.1b1/jsautocfg-dontoverwrite.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- mozilla/js/src/Makefile.in.orig	2006-12-12 11:46:02.000000000 +0000
-+++ mozilla/js/src/Makefile.in	2006-12-12 11:46:27.000000000 +0000
-@@ -319,20 +319,8 @@
- 
- jsopcode.h jsopcode.c: jsopcode.tbl
- 
--ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
- jsautocfg.h:
- 	touch $@
--else
--ifeq ($(OS_ARCH),WINCE)
--jsautocfg.h:
--	touch $@
--else
--jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
--	@rm -f $@ jsautocfg.tmp
--	./jscpucfg > jsautocfg.tmp
--	mv jsautocfg.tmp $@
--endif
--endif
- 
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b1/mozconfig
deleted file mode 100644
index f7ab5dd3a3..0000000000
--- a/recipes/mozilla/firefox-3.0.1+3.1b1/mozconfig
+++ /dev/null
@@ -1,66 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-#ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap
-#ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-ac_add_options --disable-printing
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-gnomeui
-ac_add_options --enable-debugger-info-modules
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource
-
-# build minimal set of image decoders
-#ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
-ac_add_options --enable-optimize=-O2
-
-# Use cairo from system
-ac_add_options --enable-system-cairo
-
-# Disable jemalloc
-ac_add_options --disable-jemalloc
-
-# enable libxul
-ac_add_options --enable-libxul
diff --git a/recipes/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff b/recipes/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff
deleted file mode 100644
index f969752381..0000000000
--- a/recipes/mozilla/firefox-3.0.1+3.1b1/random_to_urandom.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-# Component manager should not use /dev/random for generation ranodm numbers
-# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy
-# Bug somewhere exists but it is very old
-Index: nsprpub/pr/src/md/unix/uxrng.c
-===================================================================
---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig
-+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c
-@@ -144,17 +144,17 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
- static int      fdDevRandom;
- static PRCallOnceType coOpenDevRandom;
- 
- static PRStatus OpenDevRandom( void )
- {
--    fdDevRandom = open( "/dev/random", O_RDONLY );
-+    fdDevRandom = open( "/dev/urandom", O_RDONLY );
-     return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS );
- } /* end OpenDevRandom() */
- 
- static size_t GetDevRandom( void *buf, size_t size )
- {
-     int bytesIn;
-     int rc;
- 
diff --git a/recipes/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig
deleted file mode 100644
index 094a0ff642..0000000000
--- a/recipes/mozilla/firefox-3.0.1+3.1b2/arm/mozconfig
+++ /dev/null
@@ -1,67 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-#ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap
-#ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-ac_add_options --disable-printing
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-gnomeui
-ac_add_options --enable-debugger-info-modules
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
-ac_add_options --enable-optimize=-O2
-ac_add_options --with-arm-kuser
-
-# Use cairo from system
-ac_add_options --enable-system-cairo
-
-# Disable jemalloc
-ac_add_options --disable-jemalloc
-
-# enable libxul
-ac_add_options --enable-libxul
diff --git a/recipes/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch b/recipes/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch
deleted file mode 100644
index 39978cfd11..0000000000
--- a/recipes/mozilla/firefox-3.0.1+3.1b2/jsautocfg-dontoverwrite.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- mozilla/js/src/Makefile.in.orig	2006-12-12 11:46:02.000000000 +0000
-+++ mozilla/js/src/Makefile.in	2006-12-12 11:46:27.000000000 +0000
-@@ -319,20 +319,8 @@
- 
- jsopcode.h jsopcode.c: jsopcode.tbl
- 
--ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
- jsautocfg.h:
- 	touch $@
--else
--ifeq ($(OS_ARCH),WINCE)
--jsautocfg.h:
--	touch $@
--else
--jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
--	@rm -f $@ jsautocfg.tmp
--	./jscpucfg > jsautocfg.tmp
--	mv jsautocfg.tmp $@
--endif
--endif
- 
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
diff --git a/recipes/mozilla/firefox-3.0.1+3.1b2/mozconfig b/recipes/mozilla/firefox-3.0.1+3.1b2/mozconfig
deleted file mode 100644
index f7ab5dd3a3..0000000000
--- a/recipes/mozilla/firefox-3.0.1+3.1b2/mozconfig
+++ /dev/null
@@ -1,66 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-#ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap
-#ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-ac_add_options --disable-printing
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-gnomeui
-ac_add_options --enable-debugger-info-modules
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource
-
-# build minimal set of image decoders
-#ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
-ac_add_options --enable-optimize=-O2
-
-# Use cairo from system
-ac_add_options --enable-system-cairo
-
-# Disable jemalloc
-ac_add_options --disable-jemalloc
-
-# enable libxul
-ac_add_options --enable-libxul
diff --git a/recipes/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch
deleted file mode 100644
index 8fe1087b4d..0000000000
--- a/recipes/mozilla/firefox-3.0.1/0001-Remove-Werror-from-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001
-From: Eduardo Valentin <eduardo.valentin@openpossa.org>
-Date: Thu, 24 Jul 2008 16:05:09 -0400
-Subject: [PATCH 1/1] Remove -Werror from build
-
-Remove -Werror from build
-
-Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org>
----
- configure |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index a2d84ab..402e70a 100755
---- a/configure
-+++ b/configure
-@@ -5344,7 +5344,7 @@ if test "$GNU_CC"; then
-         # Don't allow undefined symbols in libraries
-         DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs"
-     fi
--    WARNINGS_AS_ERRORS='-Werror'
-+    WARNINGS_AS_ERRORS=''
-     DSO_CFLAGS=''
-     DSO_PIC_CFLAGS='-fPIC'
-     _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti
-@@ -6811,7 +6811,7 @@ EOF
-         IMPLIB='emximp -o'
-         FILTER='emxexp -o'
-         LDFLAGS='-Zmap'
--        WARNINGS_AS_ERRORS='-Werror'
-+        WARNINGS_AS_ERRORS=''
-         MOZ_DEBUG_FLAGS="-g -fno-inline"
-         MOZ_OPTIMIZE_FLAGS="-O2"
-         MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
-@@ -7048,7 +7048,7 @@ else
- fi
- rm -f conftest*
-        fi
--       WARNINGS_AS_ERRORS='-Werror'
-+       WARNINGS_AS_ERRORS=''
-        MOZ_OPTIMIZE_FLAGS="-xO4"
-        MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
-        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@'
---
-1.5.4.3
diff --git a/recipes/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch
deleted file mode 100644
index ce8d4d9948..0000000000
--- a/recipes/mozilla/firefox-3.0.1/0002-Fix-security-cross-compile-cpu-detection-error.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001
-From: Eduardo Valentin <eduardo.valentin@openpossa.org>
-Date: Fri, 25 Jul 2008 11:20:02 -0400
-Subject: [PATCH 1/1] Fix security cross compile cpu detection error
-
-Fix security cross compile cpu detection error.
-Reference to bug 376279.
-
-Signed-off-by: Eduardo Valentin <eduardo.valentin@openpossa.org>
----
- security/coreconf/arch.mk    |    2 ++
- security/manager/Makefile.in |    1 +
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk
-index fba38ff..28da32e 100644
---- a/security/coreconf/arch.mk
-+++ b/security/coreconf/arch.mk
-@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
- # Attempt to differentiate between sparc and x86 Solaris
- #
-
-+ifndef OE_TEST
- OS_TEST := $(shell uname -m)
-+endif
- ifeq ($(OS_TEST),i86pc)
-     OS_RELEASE := $(shell uname -r)_$(OS_TEST)
- else
-diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
-index 86119f7..86c09ca 100644
---- a/security/manager/Makefile.in
-+++ b/security/manager/Makefile.in
-@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \
-	RC="$(RC) $(RCFLAGS)" \
-	OS_ARCH="$(OS_ARCH)" \
-	CPU_ARCH="$(TARGET_CPU)" \
-+	OS_TEST="$(TARGET_CPU)" \
-	$(NULL)
- SKIP_CHK=1
- endif
---
-1.5.4.3
diff --git a/recipes/mozilla/firefox-3.0.1/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.0.1/010_FPU_IS_ARM_FPA_xslt.diff
deleted file mode 100644
index 854100c4c3..0000000000
--- a/recipes/mozilla/firefox-3.0.1/010_FPU_IS_ARM_FPA_xslt.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler
-#
---- mozilla/content/xslt/public/txDouble.h.orig	2006-07-13 17:21:52.000000000 +0300
-+++ mozilla/content/xslt/public/txDouble.h	2007-10-25 15:01:25.000000000 +0300
-@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask
- /**
-  * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
-  *  ARM is a little endian architecture but 64 bit double words are stored
-  * differently: the 32 bit words are in little endian byte order, the two words
-  * are stored in big endian`s way.
-  */
- 
- #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
--#define CPU_IS_ARM
-+#if !defined(__VFP_FP__)
-+#define FPU_IS_ARM_FPA
-+#endif
- #endif
- 
- #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
- /**
-  * This version of the macros is safe for the alias optimizations
-  * that gcc does, but uses gcc-specific extensions.
-  */
- 
- typedef union txdpun {
-     PRFloat64 d;
-     struct {
--#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
-+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
-         PRUint32 lo, hi;
- #else
-         PRUint32 hi, lo;
- #endif
-     } s;
- } txdpun;
- 
- #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
- #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
- 
- #else // __GNUC__
- 
- /* We don't know of any non-gcc compilers that perform alias optimization,
-  * so this code should work.
-  */
- 
--#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
-+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
- #define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[1])
- #define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[0])
- #else
- #define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[0])
- #define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[1])
- #endif
- 
- #endif // __GNUC__
diff --git a/recipes/mozilla/firefox-3.0.1/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.0.1/Bug339782.additional.fix.diff
deleted file mode 100644
index 0848e730d3..0000000000
--- a/recipes/mozilla/firefox-3.0.1/Bug339782.additional.fix.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-# XPTC_InvokeByIndex crashes
-# Bug 339782  [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery)
-Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
-===================================================================
---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
-@@ -51,22 +51,32 @@
- #ifdef __ARM_EABI__
- #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8))
- #define VAR_STACK_SIZE_64 3
- #else
- #define DOUBLEWORD_ALIGN(p) (p)
- #define VAR_STACK_SIZE_64 2
- #endif
- 
-+#ifdef __ARM_EABI__
-+#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8))
-+#else
-+#define DOUBLEWORD_ALIGN(p) (p)
-+#endif
-+
- // Remember that these 'words' are 32bit DWORDS
- 
- static PRUint32
- invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
- {
-     PRUint32 result = 0;
-+
-+    /* Note that we give a "worst case" estimate of how much stack _might_ be
-+     * needed, rather than the real count - this should be safe */
-+
-     for(PRUint32 i = 0; i < paramCount; i++, s++)
-     {
-         if(s->IsPtrData())
-         {
-             result++;
-             continue;
-         }
-         switch(s->type)
diff --git a/recipes/mozilla/firefox-3.0.1/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.0.1/Bug385583.nspr.jmp_buf.eabi.diff
deleted file mode 100644
index 486440c30e..0000000000
--- a/recipes/mozilla/firefox-3.0.1/Bug385583.nspr.jmp_buf.eabi.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h
---- mozilla/nsprpub/pr/include/md/_linux.h.orig	2007-11-28 14:16:03.000000000 -0500
-+++ mozilla/nsprpub/pr/include/md/_linux.h	2007-11-28 14:12:09.000000000 -0500
-@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void);
- #error "Linux/MIPS pre-glibc2 not supported yet"
- #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
- 
--#elif defined(__arm__)
--/* ARM/Linux */
-+#elif defined(__arm__) && !defined(__ARM_EABI__)
-+/* ARM/Linux (old-ABI) */
- #if defined(__GLIBC__) && __GLIBC__ >= 2
- #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
- #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val))
-@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void);
- #error "ARM/Linux pre-glibc2 not supported yet"
- #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
- 
-+#elif defined(__arm__) && defined(__ARM_EABI__)