packages/files/mozilla : cleaned out old versions and add a new version

I had left sitting on my HD locally by accident.
firefox_1.0.7.bb : add gcc4 patch
thunderbird_1.0.7.bb : add gcc4 patch

20 files changed, 122 insertions, 389 deletions

diff --git a/packages/mozilla/files/firefox-1.0-gcc4-compile.patch b/packages/mozilla/files/firefox-1.0-gcc4-compile.patch
new file mode 100644
index 0000000000..5179a3195c
--- /dev/null
+++ b/packages/mozilla/files/firefox-1.0-gcc4-compile.patch
@@ -0,0 +1,119 @@
+Index: gfx/src/freetype/nsFreeType.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
+retrieving revision 1.24
+diff -u -r1.24 nsFreeType.cpp
+--- gfx/src/freetype/nsFreeType.cpp	7 Feb 2004 15:22:30 -0000	1.24
++++ gfx/src/freetype/nsFreeType.cpp	4 Mar 2005 19:59:53 -0000
+@@ -96,7 +96,7 @@
+ // Define the FreeType2 functions we resolve at run time.
+ // see the comment near nsFreeType2::DoneFace() for more info
+ //
+-#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
++#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
+ FtFuncList nsFreeType2::FtFuncs [] = {
+   {"FT_Done_Face",            NS_FT2_OFFSET(nsFT_Done_Face),            PR_TRUE},
+   {"FT_Done_FreeType",        NS_FT2_OFFSET(nsFT_Done_FreeType),        PR_TRUE},
+Index: netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,v
+retrieving revision 1.7.20.1
+diff -u -r1.7.20.1 nsHttpConnectionMgr.cpp
+--- netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	1 Sep 2004 23:31:03 -0000	1.7.20.1
++++ netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	4 Mar 2005 19:59:57 -0000
+@@ -834,8 +834,8 @@
+ void
+ nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
+ {
+-    PRUint16 name  = (PRUint32(param) & 0xFFFF0000) >> 16;
+-    PRUint16 value =  PRUint32(param) & 0x0000FFFF;
++    PRUint16 name  = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16;
++    PRUint16 value =  NS_PTR_TO_INT32(param) & 0x0000FFFF;
+ 
+     switch (name) {
+     case MAX_CONNECTIONS:
+Index: security/nss/lib/pki1/oiddata.h
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/pki1/oiddata.h,v
+retrieving revision 1.1
+diff -u -r1.1 oiddata.h
+--- security/nss/lib/pki1/oiddata.h	4 Jan 2002 05:22:07 -0000	1.1
++++ security/nss/lib/pki1/oiddata.h	4 Mar 2005 19:59:58 -0000
+@@ -43,9 +43,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+ /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+ /*extern const PRUint32 nss_attribute_type_alias_count;*/
+ 
+Index: security/nss/lib/pki1/pki1.h
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/pki1/pki1.h,v
+retrieving revision 1.2
+diff -u -r1.2 pki1.h
+--- security/nss/lib/pki1/pki1.h	19 Jul 2001 20:40:42 -0000	1.2
++++ security/nss/lib/pki1/pki1.h	4 Mar 2005 19:59:59 -0000
+@@ -58,6 +58,8 @@
+ /* fgmr 19990505 moved these here from oiddata.h */
+ extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
+ extern const PRUint32 nss_attribute_type_alias_count;
++extern const NSSOID nss_builtin_oids[];
++extern const PRUint32 nss_builtin_oid_count;
+ 
+ /*
+  * NSSOID
+Index: widget/src/gtk2/nsDragService.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v
+retrieving revision 1.5
+diff -u -r1.5 nsDragService.cpp
+--- widget/src/gtk2/nsDragService.cpp	30 Oct 2003 01:48:41 -0000	1.5
++++ widget/src/gtk2/nsDragService.cpp	4 Mar 2005 20:00:01 -0000
+@@ -838,7 +838,7 @@
+             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+         listTarget->target = g_strdup(gMimeListType);
+         listTarget->flags = 0;
+-        listTarget->info = (guint)listAtom;
++        listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
+         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                ("automatically adding target %s with id %ld\n",
+                listTarget->target, listAtom));
+@@ -877,7 +877,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             listTarget->target = g_strdup(gTextUriListType);
+                             listTarget->flags = 0;
+-                            listTarget->info = (guint)listAtom;
++                            listTarget->info = (guint)NS_PTR_TO_INT32(listAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", listTarget->target, listAtom));
+@@ -914,7 +914,7 @@
+                           (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                         target->target = g_strdup(flavorStr);
+                         target->flags = 0;
+-                        target->info = (guint)atom;
++                        target->info = (guint)NS_PTR_TO_INT32(atom);
+                         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                ("adding target %s with id %ld\n",
+                                target->target, atom));
+@@ -931,7 +931,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             plainTarget->target = g_strdup(kTextMime);
+                             plainTarget->flags = 0;
+-                            plainTarget->info = (guint)plainAtom;
++                            plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", plainTarget->target, plainAtom));
+@@ -948,7 +948,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             urlTarget->target = g_strdup(gMozUrlType);
+                             urlTarget->flags = 0;
+-                            urlTarget->info = (guint)urlAtom;
++                            urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", urlTarget->target, urlAtom));
diff --git a/packages/mozilla/firefox-1.0.6/firefox-cc-fix.patch b/packages/mozilla/firefox-1.0.6/firefox-cc-fix.patch
deleted file mode 100644
index e2df2a390c..0000000000
--- a/packages/mozilla/firefox-1.0.6/firefox-cc-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla/js/src/Makefile.in	2004-03-31 09:38:54.000000000 -0700
-+++ mozilla.new/js/src/Makefile.in	2004-11-12 16:29:32.856436952 -0700
-@@ -342,16 +342,10 @@
- 
- jsopcode.h jsopcode.c: jsopcode.tbl
- 
--ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
-+# OE hack - we copy this in 
- jsautocfg.h:
- 	touch $@
--else
--jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
--	@rm -f $@ jsautocfg.tmp
--	./jscpucfg > jsautocfg.tmp
--	mv jsautocfg.tmp $@
--endif
--
-+	
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
- # the mdcpucfg for the target so it needs the appropriate target defines
diff --git a/packages/mozilla/firefox-1.0.6/.mtn2git_empty b/packages/mozilla/firefox-1.5.0.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mozilla/firefox-1.0.6/.mtn2git_empty
+++ b/packages/mozilla/firefox-1.5.0.1/.mtn2git_empty
diff --git a/packages/mozilla/firefox-1.0.6/jsautocfg.h b/packages/mozilla/firefox-1.5.0.1/jsautocfg.h
index 05f3dad50a..05f3dad50a 100644
--- a/packages/mozilla/firefox-1.0.6/jsautocfg.h
+++ b/packages/mozilla/firefox-1.5.0.1/jsautocfg.h
diff --git a/packages/mozilla/firefox-1.0.6/mozconfig b/packages/mozilla/firefox-1.5.0.1/mozconfig
index 025b396ac7..025b396ac7 100644
--- a/packages/mozilla/firefox-1.0.6/mozconfig
+++ b/packages/mozilla/firefox-1.5.0.1/mozconfig
diff --git a/packages/mozilla/firefox-1.5/.mtn2git_empty b/packages/mozilla/firefox-1.5/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/firefox-1.5/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/firefox-1.5/jsautocfg.h b/packages/mozilla/firefox-1.5/jsautocfg.h
deleted file mode 100644
index 05f3dad50a..0000000000
--- a/packages/mozilla/firefox-1.5/jsautocfg.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* Lovingly crafted by hand avoiding Mozilla stupidity */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   4L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define JS_WORDS_PER_DWORD_LOG2  2L
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#endif /* js_cpucfg___ */
diff --git a/packages/mozilla/firefox-1.5/mozconfig b/packages/mozilla/firefox-1.5/mozconfig
deleted file mode 100644
index 025b396ac7..0000000000
--- a/packages/mozilla/firefox-1.5/mozconfig
+++ /dev/null
@@ -1,53 +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-debug
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-
-# 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,jar,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
diff --git a/packages/mozilla/firefox_1.0.6.bb b/packages/mozilla/firefox_1.0.6.bb
deleted file mode 100644
index b3eeedcf64..0000000000
--- a/packages/mozilla/firefox_1.0.6.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PR = "r0"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://firefox-cc-fix.patch;patch=1 \
-	file://jsautocfg.h \
-	file://extensions-hack.patch;patch=1"
-
-S = "${WORKDIR}/mozilla"
-
-inherit mozilla
-
-include firefox.inc
-
-do_compile_prepend() {
-	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
-}
-
diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb
index b3eeedcf64..668c9a6aeb 100644
--- a/packages/mozilla/firefox_1.0.7.bb
+++ b/packages/mozilla/firefox_1.0.7.bb
@@ -4,7 +4,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/
 	file://no-xmb.patch;patch=1 \
 	file://firefox-cc-fix.patch;patch=1 \
 	file://jsautocfg.h \
-	file://extensions-hack.patch;patch=1"
+	file://extensions-hack.patch;patch=1 \
+	file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0"
 
 S = "${WORKDIR}/mozilla"
 
diff --git a/packages/mozilla/firefox_1.5.bb b/packages/mozilla/firefox_1.5.0.1.bb
index 95c9509b69..95c9509b69 100644
--- a/packages/mozilla/firefox_1.5.bb
+++ b/packages/mozilla/firefox_1.5.0.1.bb
diff --git a/packages/mozilla/thunderbird-0.7.3/.mtn2git_empty b/packages/mozilla/thunderbird-0.7.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/thunderbird-0.7.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/thunderbird-0.7.3/extensions-hack.patch b/packages/mozilla/thunderbird-0.7.3/extensions-hack.patch
deleted file mode 100644
index b3906b2be6..0000000000
--- a/packages/mozilla/thunderbird-0.7.3/extensions-hack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in.old	2004-08-03 11:45:51.000000000 +0100
-+++ mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in	2004-08-03 11:46:04.000000000 +0100
-@@ -1429,6 +1429,7 @@
-       win.close();
-       
-     }
-+    needsRestart = false;
-     return needsRestart;
-   },
- 
diff --git a/packages/mozilla/thunderbird-0.7.3/mozconfig b/packages/mozilla/thunderbird-0.7.3/mozconfig
deleted file mode 100644
index b48cb7398d..0000000000
--- a/packages/mozilla/thunderbird-0.7.3/mozconfig
+++ /dev/null
@@ -1,49 +0,0 @@
-ac_add_options --with-pthreads
-ac_add_options --disable-freetype2
-ac_add_options --disable-xprint
-ac_add_options --enable-crypto
-ac_add_options --disable-jsd
-ac_add_options --disable-oji
-ac_add_options --disable-accessibility
-ac_add_options --enable-single-profile
-ac_add_options --disable-composer
-ac_add_options --enable-extensions=pref,spellcheck,universalchardet,wallet
-ac_add_options --disable-ldap
-ac_add_options --disable-mathml
-ac_add_options --disable-installer
-ac_add_options --disable-activex
-ac_add_options --disable-activex-scripting
-ac_add_options --disable-tests
-ac_add_options --disable-logging
-ac_add_options --enable-reorder
-ac_add_options --enable-strip
-ac_add_options --enable-elf-dynstr-gc
-ac_add_options --enable-xterm-updates
-ac_add_options --with-default-mozilla-five-home=/usr/lib/thunderbird-0.7.3
-ac_add_options --disable-pedantic
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --disable-necko-disk-cache
-ac_add_options --enable-necko-small-buffers
-
-# 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
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar,viewsource
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-export MOZ_THUNDERBIRD=1
-mk_add_options MOZ_THUNDERBIRD=1
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1 
diff --git a/packages/mozilla/thunderbird-1.0.6/.mtn2git_empty b/packages/mozilla/thunderbird-1.0.6/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/thunderbird-1.0.6/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/thunderbird-1.0.6/extensions-hack.patch b/packages/mozilla/thunderbird-1.0.6/extensions-hack.patch
deleted file mode 100644
index b3906b2be6..0000000000
--- a/packages/mozilla/thunderbird-1.0.6/extensions-hack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in.old	2004-08-03 11:45:51.000000000 +0100
-+++ mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in	2004-08-03 11:46:04.000000000 +0100
-@@ -1429,6 +1429,7 @@
-       win.close();
-       
-     }
-+    needsRestart = false;
-     return needsRestart;
-   },
- 
diff --git a/packages/mozilla/thunderbird-1.0.6/mozconfig b/packages/mozilla/thunderbird-1.0.6/mozconfig
deleted file mode 100644
index b48cb7398d..0000000000
--- a/packages/mozilla/thunderbird-1.0.6/mozconfig
+++ /dev/null
@@ -1,49 +0,0 @@
-ac_add_options --with-pthreads
-ac_add_options --disable-freetype2
-ac_add_options --disable-xprint
-ac_add_options --enable-crypto
-ac_add_options --disable-jsd
-ac_add_options --disable-oji
-ac_add_options --disable-accessibility
-ac_add_options --enable-single-profile
-ac_add_options --disable-composer
-ac_add_options --enable-extensions=pref,spellcheck,universalchardet,wallet
-ac_add_options --disable-ldap
-ac_add_options --disable-mathml
-ac_add_options --disable-installer
-ac_add_options --disable-activex
-ac_add_options --disable-activex-scripting
-ac_add_options --disable-tests
-ac_add_options --disable-logging
-ac_add_options --enable-reorder
-ac_add_options --enable-strip
-ac_add_options --enable-elf-dynstr-gc
-ac_add_options --enable-xterm-updates
-ac_add_options --with-default-mozilla-five-home=/usr/lib/thunderbird-0.7.3
-ac_add_options --disable-pedantic
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --disable-necko-disk-cache
-ac_add_options --enable-necko-small-buffers
-
-# 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
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar,viewsource
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-export MOZ_THUNDERBIRD=1
-mk_add_options MOZ_THUNDERBIRD=1
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1 
diff --git a/packages/mozilla/thunderbird_0.7.3.bb b/packages/mozilla/thunderbird_0.7.3.bb
deleted file mode 100644
index 8b83da248f..0000000000
--- a/packages/mozilla/thunderbird_0.7.3.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-SECTION = "x11/utils"
-DEPENDS += "gnupg"
-RRECOMMENDS += "gnupg"
-PR = "r1"
-
-EMVER="0.85.0"
-IPCVER="1.0.7"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/thunderbird-${PV}-source.tar.bz2 \
-	http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz \
-http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://extensions-hack.patch;patch=1 \
-	file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop"
-S = "${WORKDIR}/mozilla"
-
-FILES_${PN} += "${libdir}/thunderbird-${PV} ${datadir}/idl"
-
-inherit mozilla
-
-export MOZ_THUNDERBIRD=1
-
-do_configure() {
-	for x in ipc enigmail; do
-		if [ ! -e ${WORKDIR}/mozilla/extensions/$x ]; then
-			mv ${WORKDIR}/$x ${WORKDIR}/mozilla/extensions/
-			cd ${WORKDIR}/mozilla/extensions/$x
-			makemake
-		fi
-	done
-	cd ${S}
-	mozilla_do_configure
-}
-
-do_compile() {
-	mozilla_do_compile
-	oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc
-	oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail
-}
-
-do_install() {
-	mozilla_do_install
-	oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc DESTDIR="${D}" install
-	oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail DESTDIR="${D}" install
-	install -d ${D}${datadir}/applications
-	install -d ${D}${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/mozilla-thunderbird.desktop ${D}${datadir}/applications/
-	install -m 0644 ${WORKDIR}/mozilla-thunderbird.png ${D}${datadir}/pixmaps/
-}
-
-pkg_postinst_thunderbird() {
-	chmod -R a+w ${libdir}/thunderbird*
-}
-
-# Simulate the silly csh makemake script
-makemake() {
-    typeset m topdir
-    for m in $(find . -name Makefile.in); do
-        topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
-        sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
-            < ${m} > ${m%.in} || die "sed ${m} failed"
-    done
-}
diff --git a/packages/mozilla/thunderbird_1.0.6.bb b/packages/mozilla/thunderbird_1.0.6.bb
deleted file mode 100644
index 52d68ef481..0000000000
--- a/packages/mozilla/thunderbird_1.0.6.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-SECTION = "x11/utils"
-DEPENDS += "gnupg"
-RRECOMMENDS += "gnupg"
-PR = "r0"
-
-EMVER="0.92.0"
-IPCVER="1.1.3"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2 \
-	http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz \
-http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://extensions-hack.patch;patch=1 \
-	file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop"
-S = "${WORKDIR}/mozilla"
-
-FILES_${PN} += "${libdir}/thunderbird-${PV} ${datadir}/idl"
-
-inherit mozilla
-
-export MOZ_THUNDERBIRD=1
-
-do_configure() {
-	for x in ipc enigmail; do
-		if [ ! -e ${WORKDIR}/mozilla/extensions/$x ]; then
-			mv ${WORKDIR}/$x ${WORKDIR}/mozilla/extensions/
-			cd ${WORKDIR}/mozilla/extensions/$x
-			makemake
-		fi
-	done
-	cd ${S}
-	mozilla_do_configure
-}
-
-do_compile() {
-	mozilla_do_compile
-	oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc
-	oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail
-}
-
-do_install() {
-	mozilla_do_install
-	oe_runmake -C ${WORKDIR}/mozilla/extensions/ipc DESTDIR="${D}" install
-	oe_runmake -C ${WORKDIR}/mozilla/extensions/enigmail DESTDIR="${D}" install
-	install -d ${D}${datadir}/applications
-	install -d ${D}${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/mozilla-thunderbird.desktop ${D}${datadir}/applications/
-	install -m 0644 ${WORKDIR}/mozilla-thunderbird.png ${D}${datadir}/pixmaps/
-}
-
-pkg_postinst_thunderbird() {
-	chmod -R a+w ${libdir}/thunderbird*
-}
-
-# Simulate the silly csh makemake script
-makemake() {
-    typeset m topdir
-    for m in $(find . -name Makefile.in); do
-        topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
-        sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
-            < ${m} > ${m%.in} || die "sed ${m} failed"
-    done
-}
diff --git a/packages/mozilla/thunderbird_1.0.7.bb b/packages/mozilla/thunderbird_1.0.7.bb
index 52d68ef481..c3370c6f28 100644
--- a/packages/mozilla/thunderbird_1.0.7.bb
+++ b/packages/mozilla/thunderbird_1.0.7.bb
@@ -11,6 +11,7 @@ http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
 	file://extensions-hack.patch;patch=1 \
+	file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \
 	file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop"
 S = "${WORKDIR}/mozilla"