diff options
author | ghen <ghen@pkgsrc.org> | 2006-02-05 14:49:05 +0000 |
---|---|---|
committer | ghen <ghen@pkgsrc.org> | 2006-02-05 14:49:05 +0000 |
commit | 778eb32adacf0988ff66638656f1a03bc7da1aa6 (patch) | |
tree | e3182383e0b1d341166a541e6c94f3fe68abf505 /mail/thunderbird/patches | |
parent | a704f855c6d2e7c888ae4c1a8a442e1cde22d861 (diff) | |
download | pkgsrc-778eb32adacf0988ff66638656f1a03bc7da1aa6.tar.gz |
Update to Thunderbird 1.5.
What's new:
* Automated update to streamline product upgrades. Notification of an
update is more prominent, and updates to Thunderbird may now be half a
megabyte or smaller. Updating extensions has also improved.
* Sort address autocomplete results by how often you send e-mail to each recipient.
* Spell check as you type.
* Saved Search Folders can now search across multiple accounts.
* Built in phishing detector to help protect users against email scams.
* Podcasting and other RSS Improvements.
* Deleting attachments from messages.
* Integration with server side spam filtering.
* Reply and forward actions for message filters.
* Kerberos Authentication.
* Auto save as draft for mail composition.
* Message aging.
* Filters for Global Inbox.
* Improvements to product usability including redesigned options interface,
and SMTP server management.
* Many security enhancements.
For a more detailed list of changes, see http://weblogs.mozillazine.org/rumblingedge/archives/2006/01/1-5.html
Ok with wiz.
Diffstat (limited to 'mail/thunderbird/patches')
24 files changed, 107 insertions, 299 deletions
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa index aeeecdaba77..8231ec23486 100644 --- a/mail/thunderbird/patches/patch-aa +++ b/mail/thunderbird/patches/patch-aa @@ -1,9 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2004/06/24 23:09:55 taya Exp $ +$NetBSD: patch-aa,v 1.4 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in ---- ../Orig/mozilla/config/autoconf.mk.in 2004-03-21 11:31:17.000000000 +0900 -+++ ./config/autoconf.mk.in 2004-06-15 23:55:36.000000000 +0900 -@@ -31,13 +31,13 @@ +--- config/autoconf.mk.in.orig 2006-02-02 13:20:06.000000000 +0100 ++++ config/autoconf.mk.in +@@ -54,13 +54,13 @@ MOZ_APP_VERSION = @MOZ_APP_VERSION@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab index 7ed0093aebe..b6acfd3e9d9 100644 --- a/mail/thunderbird/patches/patch-ab +++ b/mail/thunderbird/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2005/12/30 21:35:58 joerg Exp $ +$NetBSD: patch-ab,v 1.7 2006/02/05 14:49:05 ghen Exp $ ---- configure.in.orig 2004-10-31 07:17:58.000000000 +0000 +--- configure.in.orig 2006-02-02 13:20:06.000000000 +0100 +++ configure.in -@@ -1001,14 +1001,13 @@ case "$target" in +@@ -1346,7 +1346,6 @@ case "$target" in powerpc*) _PLATFORM_DEFAULT_TOOLKIT='mac' DSO_LDOPTS="$DSO_LDOPTS -arch ppc" @@ -10,15 +10,7 @@ $NetBSD: patch-ab,v 1.6 2005/12/30 21:35:58 joerg Exp $ # set MACOSX to generate lib/mac/MoreFiles/Makefile MACOSX=1 ;; - esac - ;; - --*-freebsd*) -+*-freebsd* | *-dragonfly*) - if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then - DLL_SUFFIX=".so.1.0" - DSO_LDOPTS="-shared" -@@ -1022,6 +1021,9 @@ case "$target" in +@@ -1374,6 +1373,9 @@ case "$target" in # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' # MKSHLIB_UNFORCE_ALL='' # fi @@ -28,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2005/12/30 21:35:58 joerg Exp $ ;; *-hpux*) -@@ -1316,6 +1318,13 @@ case "$target" in +@@ -1768,6 +1770,13 @@ case "$target" in if test "$LIBRUNPATH"; then DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" fi @@ -42,7 +34,7 @@ $NetBSD: patch-ab,v 1.6 2005/12/30 21:35:58 joerg Exp $ ;; *-nto*) -@@ -1539,7 +1548,7 @@ dnl the qsort routine under solaris is f +@@ -1993,7 +2002,7 @@ dnl the qsort routine under solaris is f MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@' MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' MKSHLIB_UNFORCE_ALL='' @@ -51,7 +43,7 @@ $NetBSD: patch-ab,v 1.6 2005/12/30 21:35:58 joerg Exp $ AR_LIST="$AR t" AR_EXTRACT="$AR x" AR_DELETE="$AR d" -@@ -2181,7 +2190,7 @@ then +@@ -2650,7 +2659,7 @@ then fi case "$target" in @@ -60,9 +52,9 @@ $NetBSD: patch-ab,v 1.6 2005/12/30 21:35:58 joerg Exp $ AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -4280,7 +4289,7 @@ dnl = Enable code optimization. OFF by d +@@ -5205,7 +5214,7 @@ dnl ==================================== + dnl = Enable code optimization. ON by default. dnl ======================================================== - MOZ_OPTIMIZE= if test -z "$MOZ_OPTIMIZE_FLAGS"; then - MOZ_OPTIMIZE_FLAGS="-O" + MOZ_OPTIMIZE_FLAGS="" diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac index a68573bf5d7..8d1ade7bfbc 100644 --- a/mail/thunderbird/patches/patch-ac +++ b/mail/thunderbird/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.5 2005/12/30 21:35:58 joerg Exp $ +$NetBSD: patch-ac,v 1.6 2006/02/05 14:49:05 ghen Exp $ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2005-04-28 16:01:33.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2006-02-02 13:20:12.000000000 +0100 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -45,10 +45,13 @@ include $(topsrcdir)/config/config.mk +@@ -61,10 +61,13 @@ include $(topsrcdir)/config/config.mk # # Lots of Unixish x86 flavors # @@ -17,7 +17,7 @@ $NetBSD: patch-ac,v 1.5 2005/12/30 21:35:58 joerg Exp $ endif # # New code for Linux, et. al., with gcc -@@ -140,7 +143,7 @@ endif +@@ -157,7 +160,7 @@ endif # NetBSD/ARM # ifeq ($(OS_ARCH),NetBSD) @@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.5 2005/12/30 21:35:58 joerg Exp $ CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp endif endif -@@ -174,7 +177,7 @@ endif +@@ -191,7 +194,7 @@ endif # NetBSD/m68k # ifeq ($(OS_ARCH),NetBSD) @@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.5 2005/12/30 21:35:58 joerg Exp $ CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp endif endif -@@ -257,6 +260,7 @@ endif +@@ -274,6 +277,7 @@ endif ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST))) CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s @@ -43,7 +43,7 @@ $NetBSD: patch-ac,v 1.5 2005/12/30 21:35:58 joerg Exp $ endif # -@@ -305,6 +309,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) +@@ -322,6 +326,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif diff --git a/mail/thunderbird/patches/patch-af b/mail/thunderbird/patches/patch-af index 6d915bfcc9b..0820c371e66 100644 --- a/mail/thunderbird/patches/patch-af +++ b/mail/thunderbird/patches/patch-af @@ -1,17 +1,16 @@ -$NetBSD: patch-af,v 1.3 2004/06/24 23:09:55 taya Exp $ +$NetBSD: patch-af,v 1.4 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/freebl/unix_rand.c ---- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c 2003-05-31 08:31:19.000000000 +0900 -+++ ./security/nss/lib/freebl/unix_rand.c 2004-06-15 23:55:49.000000000 +0900 -@@ -32,6 +32,7 @@ - */ +--- security/nss/lib/freebl/unix_rand.c.orig 2006-02-02 13:19:58.000000000 +0100 ++++ security/nss/lib/freebl/unix_rand.c +@@ -35,6 +35,7 @@ + * ***** END LICENSE BLOCK ***** */ #include <stdio.h> +#include <fcntl.h> #include <string.h> #include <signal.h> #include <unistd.h> -@@ -691,7 +692,11 @@ +@@ -694,7 +695,11 @@ safe_popen(char *cmd) /* dup write-side of pipe to stderr and stdout */ if (p[1] != 1) dup2(p[1], 1); if (p[1] != 2) dup2(p[1], 2); @@ -21,6 +20,6 @@ diff -ru ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/ + dup2(fd, 0); + close(fd); + } - for (fd = getdtablesize(); --fd > 2; close(fd)) - ; - + { + int ndesc = getdtablesize(); + for (fd = PR_MIN(65536, ndesc); --fd > 2; close(fd)); diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag index 8fb7cf810a7..7d5a80e5467 100644 --- a/mail/thunderbird/patches/patch-ag +++ b/mail/thunderbird/patches/patch-ag @@ -1,15 +1,14 @@ -$NetBSD: patch-ag,v 1.3 2004/06/24 23:09:55 taya Exp $ +$NetBSD: patch-ag,v 1.4 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h ---- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2003-01-17 21:39:36.000000000 +0900 -+++ ./extensions/transformiix/source/base/ErrorObserver.h 2004-06-15 23:55:51.000000000 +0900 -@@ -28,7 +28,8 @@ +--- extensions/transformiix/source/base/ErrorObserver.h.orig 2006-02-02 13:20:05.000000000 +0100 ++++ extensions/transformiix/source/base/ErrorObserver.h +@@ -41,7 +41,8 @@ - #include "baseutils.h" - #include "txError.h" + #include "txCore.h" + #ifdef TX_EXE -#include <iostream.h> +#include <iostream> +using namespace std; - class nsAString; + #endif /** diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai index 9cc925240ca..4046eba7627 100644 --- a/mail/thunderbird/patches/patch-ai +++ b/mail/thunderbird/patches/patch-ai @@ -1,9 +1,8 @@ -$NetBSD: patch-ai,v 1.2 2004/06/24 23:09:55 taya Exp $ +$NetBSD: patch-ai,v 1.3 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp ---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-02-05 10:57:05.000000000 +0900 -+++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-06-15 23:55:54.000000000 +0900 -@@ -1141,10 +1141,10 @@ +--- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-02-02 13:20:15.000000000 +0100 ++++ gfx/src/ps/nsFontMetricsPS.cpp +@@ -1859,10 +1859,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa mPixelSize = NSToIntRound(app2dev * mFont->size); @@ -18,7 +17,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetri nsresult rv; mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1190,7 +1190,7 @@ +@@ -1896,7 +1896,7 @@ nsFontPSFreeType::GetWidth(const PRUnich if (!face) return 0; @@ -27,7 +26,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetri nsresult rv = mFt2->GetImageCache(&iCache); if (NS_FAILED(rv)) { NS_ERROR("Failed to get Image Cache"); -@@ -1228,8 +1228,8 @@ +@@ -1934,8 +1934,8 @@ nsFontPSFreeType::getFTFace() FTC_Manager cManager; mFt2->GetFTCacheManager(&cManager); @@ -38,7 +37,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetri NS_ASSERTION(rv==0, "failed to get face/size"); if (rv) return nsnull; -@@ -1622,16 +1622,16 @@ +@@ -2379,16 +2379,16 @@ void nsFT2Type1Generator::GeneratePSFont mEntry->GetFamilyName(fontName); mEntry->GetStyleName(styleName); diff --git a/mail/thunderbird/patches/patch-aj b/mail/thunderbird/patches/patch-aj index 3b1546ccfb4..01d4b13b76b 100644 --- a/mail/thunderbird/patches/patch-aj +++ b/mail/thunderbird/patches/patch-aj @@ -1,9 +1,8 @@ -$NetBSD: patch-aj,v 1.2 2004/06/24 23:09:55 taya Exp $ +$NetBSD: patch-aj,v 1.3 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h ---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2004-04-17 06:31:42.000000000 +0900 -+++ ./gfx/src/freetype/nsFreeType.h 2004-06-15 23:55:59.000000000 +0900 -@@ -104,13 +104,13 @@ +--- gfx/src/freetype/nsFreeType.h.orig 2006-02-02 13:20:15.000000000 +0100 ++++ gfx/src/freetype/nsFreeType.h +@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); typedef FT_Error (*FTC_Image_Cache_Lookup_t) @@ -21,7 +20,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFree // #ifdef MOZ_SVG typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); typedef FT_Error (*FT_Get_Kerning_t) -@@ -165,7 +165,7 @@ +@@ -181,7 +181,7 @@ protected: FT_Outline_Decompose_t nsFT_Outline_Decompose; FT_Set_Charmap_t nsFT_Set_Charmap; FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; @@ -30,7 +29,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFree FTC_Manager_Done_t nsFTC_Manager_Done; FTC_Manager_New_t nsFTC_Manager_New; FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -213,7 +213,7 @@ +@@ -229,7 +229,7 @@ protected: PRLibrary *mSharedLib; FT_Library mFreeTypeLibrary; FTC_Manager mFTCacheManager; diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al index 941af0dcdbc..68d4529d6bb 100644 --- a/mail/thunderbird/patches/patch-al +++ b/mail/thunderbird/patches/patch-al @@ -1,23 +1,22 @@ -$NetBSD: patch-al,v 1.2 2004/06/24 23:09:55 taya Exp $ +$NetBSD: patch-al,v 1.3 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h ---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2003-04-23 01:25:09.000000000 +0900 -+++ ./gfx/src/ps/nsFontMetricsPS.h 2004-06-15 23:56:04.000000000 +0900 -@@ -320,7 +320,7 @@ +--- gfx/src/ps/nsFontMetricsPS.h.orig 2006-02-02 13:20:15.000000000 +0100 ++++ gfx/src/ps/nsFontMetricsPS.h +@@ -424,7 +424,7 @@ protected: nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; nsCOMPtr<nsIFreeType2> mFt2; PRUint16 mPixelSize; - FTC_Image_Desc mImageDesc; + FTC_ImageType mImageDesc; + nsCString mFontNameBase; // the base name of type 1 (sub) fonts + nscoord mHeight; - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -363,7 +363,7 @@ +@@ -493,7 +493,7 @@ public: protected: nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; nsCOMPtr<nsIFreeType2> mFt2; - FTC_Image_Desc mImageDesc; + FTC_ImageType mImageDesc; }; - #endif - + #endif // MOZ_ENABLE_FREETYPE2 + #endif // MOZ_ENABLE_XFT diff --git a/mail/thunderbird/patches/patch-ap b/mail/thunderbird/patches/patch-ap index d99ad3206f2..1754e0d6510 100644 --- a/mail/thunderbird/patches/patch-ap +++ b/mail/thunderbird/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.1 2005/07/25 15:46:02 adam Exp $ +$NetBSD: patch-ap,v 1.2 2006/02/05 14:49:05 ghen Exp $ ---- security/coreconf/command.mk.orig 2005-07-25 11:03:35.000000000 +0000 +--- security/coreconf/command.mk.orig 2006-02-02 13:19:58.000000000 +0100 +++ security/coreconf/command.mk -@@ -42,7 +42,7 @@ CCF = $(CC) $(CFLAGS) +@@ -46,7 +46,7 @@ CCF = $(CC) $(CFLAGS) LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) NFSPWD = $(NSINSTALL_DIR)/nfspwd diff --git a/mail/thunderbird/patches/patch-aq b/mail/thunderbird/patches/patch-aq index bd0b5160ccb..313277101f3 100644 --- a/mail/thunderbird/patches/patch-aq +++ b/mail/thunderbird/patches/patch-aq @@ -1,9 +1,8 @@ -$NetBSD: patch-aq,v 1.2 2005/12/30 21:35:58 joerg Exp $ +$NetBSD: patch-aq,v 1.3 2006/02/05 14:49:05 ghen Exp $ -diff -ruN ../Orig/mozilla/directory/c-sdk/configure.in ./directory/c-sdk/configure.in ---- ../Orig/mozilla/directory/c-sdk/configure.in 2005-06-15 06:27:33.000000000 +0900 -+++ ./directory/c-sdk/configure.in 2005-12-04 19:07:54.000000000 +0900 -@@ -54,7 +54,7 @@ +--- directory/c-sdk/configure.in.orig 2006-02-02 13:29:07.000000000 +0100 ++++ directory/c-sdk/configure.in +@@ -54,7 +54,7 @@ USE_64= USE_CPLUS= USE_IPV6= USE_MDUPDATE= @@ -12,7 +11,7 @@ diff -ruN ../Orig/mozilla/directory/c-sdk/configure.in ./directory/c-sdk/configu _DEBUG_FLAGS=-g MOZ_DEBUG=1 MOZ_OPTIMIZE= -@@ -907,7 +907,7 @@ +@@ -907,7 +907,7 @@ case "$target" in PR_MD_CSRCS=dgux.c ;; @@ -21,7 +20,7 @@ diff -ruN ../Orig/mozilla/directory/c-sdk/configure.in ./directory/c-sdk/configu if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi -@@ -2061,7 +2061,7 @@ +@@ -2061,7 +2061,7 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS= fi ;; @@ -30,7 +29,7 @@ diff -ruN ../Orig/mozilla/directory/c-sdk/configure.in ./directory/c-sdk/configu AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. if test "$ac_cv_have_dash_pthread" = "yes"; then -@@ -2114,7 +2114,7 @@ +@@ -2114,7 +2114,7 @@ case "$target" in AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw index 51f5e00f451..18c172c7eaa 100644 --- a/mail/thunderbird/patches/patch-aw +++ b/mail/thunderbird/patches/patch-aw @@ -1,12 +1,11 @@ -$NetBSD: patch-aw,v 1.3 2004/06/24 23:09:56 taya Exp $ +$NetBSD: patch-aw,v 1.4 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in ---- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2004-01-07 22:36:54.000000000 +0900 -+++ ./widget/src/gtksuperwin/Makefile.in 2004-06-15 23:56:15.000000000 +0900 -@@ -25,6 +25,7 @@ - MODULE = widget +--- widget/src/gtksuperwin/Makefile.in.orig 2006-02-02 13:31:00.000000000 +0100 ++++ widget/src/gtksuperwin/Makefile.in +@@ -46,6 +46,7 @@ MODULE = widget LIBRARY_NAME = gtksuperwin EXPORT_LIBRARY = 1 + LIBXUL_LIBRARY = 1 +MKSHLIB = $(MKCSHLIB) PACKAGE_FILE = gtksuperwin.pkg diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax index db3d95ca4fd..ca3cd394e13 100644 --- a/mail/thunderbird/patches/patch-ax +++ b/mail/thunderbird/patches/patch-ax @@ -1,9 +1,8 @@ -$NetBSD: patch-ax,v 1.2 2004/06/24 23:09:56 taya Exp $ +$NetBSD: patch-ax,v 1.3 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/security/coreconf/SunOS5.mk ./security/coreconf/SunOS5.mk ---- ../Orig/mozilla/security/coreconf/SunOS5.mk 2003-05-16 04:12:10.000000000 +0900 -+++ ./security/coreconf/SunOS5.mk 2004-06-15 23:56:19.000000000 +0900 -@@ -165,6 +165,10 @@ +--- security/coreconf/SunOS5.mk.orig 2006-02-02 13:19:58.000000000 +0100 ++++ security/coreconf/SunOS5.mk +@@ -182,6 +182,10 @@ endif DSO_LDOPTS += -G -h $(notdir $@) endif diff --git a/mail/thunderbird/patches/patch-bb b/mail/thunderbird/patches/patch-bb index e021723a657..901616b49ee 100644 --- a/mail/thunderbird/patches/patch-bb +++ b/mail/thunderbird/patches/patch-bb @@ -1,9 +1,8 @@ -$NetBSD: patch-bb,v 1.3 2004/06/24 23:09:56 taya Exp $ +$NetBSD: patch-bb,v 1.4 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h ---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h 2003-09-12 02:24:53.000000000 +0900 -+++ ./nsprpub/pr/include/md/_netbsd.h 2004-06-15 23:56:27.000000000 +0900 -@@ -44,16 +44,26 @@ +--- nsprpub/pr/include/md/_netbsd.h.orig 2006-02-02 13:52:50.000000000 +0100 ++++ nsprpub/pr/include/md/_netbsd.h +@@ -44,6 +44,8 @@ #define _PR_SI_ARCHITECTURE "x86" #elif defined(__alpha__) #define _PR_SI_ARCHITECTURE "alpha" @@ -12,26 +11,8 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md #elif defined(__m68k__) #define _PR_SI_ARCHITECTURE "m68k" #elif defined(__powerpc__) - #define _PR_SI_ARCHITECTURE "powerpc" -+#elif defined(__sparc_v9__) -+#define _PR_SI_ARCHITECTURE "sparc64" - #elif defined(__sparc__) - #define _PR_SI_ARCHITECTURE "sparc" - #elif defined(__mips__) - #define _PR_SI_ARCHITECTURE "mips" - #elif defined(__arm32__) - #define _PR_SI_ARCHITECTURE "arm32" -+#elif defined(__ARMEL__) -+#define _PR_SI_ARCHITECTURE "armel" -+#elif defined(__ARMEL__) -+#define _PR_SI_ARCHITECTURE "armeb" -+#elif defined(__arm__) -+#define _PR_SI_ARCHITECTURE "arm" - #endif - - #if defined(__ELF__) -@@ -86,6 +96,12 @@ - #define _PR_INET6_PROBE +@@ -95,6 +97,12 @@ + #define _PR_HAVE_GETPROTO_R_INT #endif +#if __NetBSD_Version__ >= 106370000 @@ -43,31 +24,3 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md #define USE_SETJMP #ifndef _PR_PTHREADS -@@ -108,7 +124,17 @@ - } - #define _MD_GET_SP(_thread) CONTEXT(_thread)[2] - #endif --#ifdef __sparc__ -+#ifdef __sparc_v9__ -+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ -+{ \ -+ sigsetjmp(CONTEXT(_thread), 1); \ -+ CONTEXT(_thread)[1] = (unsigned char*) ((_sp) - 176 - 0x7ff); \ -+ CONTEXT(_thread)[2] = (long) _main; \ -+ CONTEXT(_thread)[3] = (long) _main + 4; \ -+ *status = PR_TRUE; \ -+} -+#define _MD_GET_SP(_thread) (CONTEXT(_thread)[2]+0x7ff) -+#elif defined(__sparc__) - #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ - { \ - sigsetjmp(CONTEXT(_thread), 1); \ -@@ -150,7 +176,7 @@ - } - #define _MD_GET_SP(_thread) CONTEXT(_thread)[32] - #endif --#ifdef __arm32__ -+#ifdef __arm__ - #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ - { \ - sigsetjmp(CONTEXT(_thread), 1); \ diff --git a/mail/thunderbird/patches/patch-bo b/mail/thunderbird/patches/patch-bo index 031978f2ab2..5cd7aa5f4c2 100644 --- a/mail/thunderbird/patches/patch-bo +++ b/mail/thunderbird/patches/patch-bo @@ -1,9 +1,8 @@ -$NetBSD: patch-bo,v 1.5 2005/12/30 21:35:58 joerg Exp $ +$NetBSD: patch-bo,v 1.6 2006/02/05 14:49:05 ghen Exp $ -diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in ---- ../Orig/mozilla/nsprpub/configure.in 2005-09-16 07:37:52.000000000 +0900 -+++ ./nsprpub/configure.in 2005-12-04 19:17:56.000000000 +0900 -@@ -1045,6 +1045,34 @@ +--- nsprpub/configure.in.orig 2006-02-02 13:38:48.000000000 +0100 ++++ nsprpub/configure.in +@@ -1045,6 +1045,34 @@ case "$target" in DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c @@ -38,7 +37,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in ;; *-hpux*) -@@ -1544,6 +1572,7 @@ +@@ -1544,6 +1572,7 @@ mips-nec-sysv*) AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -46,7 +45,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in USE_NSPR_THREADS=1 MDCPUCFG_H=_netbsd.cfg PR_MD_CSRCS=netbsd.c -@@ -2307,7 +2336,7 @@ +@@ -2307,7 +2336,7 @@ if test -n "$USE_PTHREADS"; then if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then ac_cv_have_dash_pthread=yes case "$target_os" in @@ -55,7 +54,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in # Freebsd doesn't use -pthread for compiles, it uses them for linking ;; *) -@@ -2345,7 +2374,7 @@ +@@ -2345,7 +2374,7 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS= fi ;; @@ -64,7 +63,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -2426,7 +2455,7 @@ +@@ -2426,7 +2455,7 @@ case "$target" in AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; diff --git a/mail/thunderbird/patches/patch-bq b/mail/thunderbird/patches/patch-bq index 9466fdeabea..1a855738d18 100644 --- a/mail/thunderbird/patches/patch-bq +++ b/mail/thunderbird/patches/patch-bq @@ -1,9 +1,8 @@ -$NetBSD: patch-bq,v 1.4 2004/06/24 23:09:56 taya Exp $ +$NetBSD: patch-bq,v 1.5 2006/02/05 14:49:05 ghen Exp $ -diff -ru ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h ---- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h 2004-01-15 15:14:13.000000000 +0900 -+++ ./xpcom/io/nsLocalFileUnix.h 2004-06-15 23:56:45.000000000 +0900 -@@ -57,7 +57,7 @@ +--- xpcom/io/nsLocalFileUnix.h.orig 2006-02-02 13:20:12.000000000 +0100 ++++ xpcom/io/nsLocalFileUnix.h +@@ -73,7 +73,7 @@ #endif // so we can statfs on freebsd diff --git a/mail/thunderbird/patches/patch-br b/mail/thunderbird/patches/patch-br index 56b38070227..b06423f12a3 100644 --- a/mail/thunderbird/patches/patch-br +++ b/mail/thunderbird/patches/patch-br @@ -1,8 +1,8 @@ -$NetBSD: patch-br,v 1.5 2005/09/08 22:03:45 abs Exp $ +$NetBSD: patch-br,v 1.6 2006/02/05 14:49:05 ghen Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig 2004-04-28 22:00:17.000000000 +1000 +--- nsprpub/pr/src/misc/prnetdb.c.orig 2006-02-02 13:19:56.000000000 +0100 +++ nsprpub/pr/src/misc/prnetdb.c -@@ -2097,7 +2097,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +@@ -2110,7 +2110,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf */ hints.ai_socktype = SOCK_STREAM; diff --git a/mail/thunderbird/patches/patch-bt b/mail/thunderbird/patches/patch-bt deleted file mode 100644 index 9549c8d59ca..00000000000 --- a/mail/thunderbird/patches/patch-bt +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bt,v 1.2 2004/11/04 20:06:34 kristerw Exp $ - -diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c ---- ../Orig/mozilla/nsprpub/pr/src/io/prprf.c 2004-03-09 12:18:19.000000000 +0900 -+++ ./nsprpub/pr/src/io/prprf.c 2004-06-15 23:56:50.000000000 +0900 -@@ -53,6 +53,11 @@ - */ - #if (defined(LINUX) && defined(__x86_64__)) - #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) -+#elif (defined (__NetBSD__) && \ -+ (defined(__amd64__) || \ -+ (defined(__powerpc__) && __NetBSD_Version__ >= 105000000))) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) - #elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ - (defined(LINUX) && defined(__s390x__)) || \ diff --git a/mail/thunderbird/patches/patch-bw b/mail/thunderbird/patches/patch-bw deleted file mode 100644 index db0e0ce57fb..00000000000 --- a/mail/thunderbird/patches/patch-bw +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-bw,v 1.1 2004/06/24 23:09:56 taya Exp $ - -diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2001-09-29 05:12:52.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2004-05-11 16:29:31.000000000 +0900 -@@ -188,6 +188,50 @@ - * nsresult nsXPTCStubBase::Stub##n() - * Sets register $1 to "methodIndex" and jumps to SharedStub. - */ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+"#### Stub"#n" ####\n" \ -+".text\n" \ -+" .align 5\n" \ -+" .if "#n" < 10 \n" \ -+" .globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+" .ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n" \ -+" .frame $30,0,$26,0\n" \ -+" ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n" \ -+" .prologue 1\n" \ -+" lda $1,"#n"\n" \ -+" br $31,$SharedStub..ng\n" \ -+" .end _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+" .elseif "#n" < 100 \n" \ -+" .globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+" .ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n" \ -+" .frame $30,0,$26,0\n" \ -+" ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n" \ -+" .prologue 1\n" \ -+" lda $1,"#n"\n" \ -+" br $31,$SharedStub..ng\n" \ -+" .end _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+" .elseif "#n" < 1000 \n" \ -+" .globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+" .ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n" \ -+" .frame $30,0,$26,0\n" \ -+" ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n" \ -+" .prologue 1\n" \ -+" lda $1,"#n"\n" \ -+" br $31,$SharedStub..ng\n" \ -+" .end _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+" .else\n" \ -+" .err \"stub number "#n"> 1000 not yet supported\"\n" \ -+" .endif\n" \ -+ ); -+#else /* G++2.95 ABI */ - #define STUB_ENTRY(n) \ - __asm__( \ - "#### Stub"#n" ####\n" \ -@@ -204,6 +248,7 @@ - "br $31,$SharedStub..ng\n\t" \ - ".end Stub"#n"__14nsXPTCStubBase" \ - ); -+#endif - - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ diff --git a/mail/thunderbird/patches/patch-cc b/mail/thunderbird/patches/patch-cc deleted file mode 100644 index c0d4b1cfc7e..00000000000 --- a/mail/thunderbird/patches/patch-cc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2004/12/04 02:16:03 taya Exp $ - ---- /mnt/local/src/mozilla-1.7rc3/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2004-08-13 01:24:00.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2004-08-13 01:23:35.000000000 +0900 -@@ -163,7 +163,11 @@ - "bis $16,$16,$1\n\t" /* load "this" */ - "ldq $2,16($15)\n\t" /* load "methodIndex" */ - "ldq $1,0($1)\n\t" /* load vtable */ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ "s8addq $2,0,$2\n\t" /* vtable index = "methodIndex" * 8 */ -+#else /* G++2.95 ABI */ - "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#endif - "addq $1,$2,$1\n\t" - "ldq $27,0($1)\n\t" /* load address of function */ - "jsr $26,($27),0\n\t" /* call virtual function */ diff --git a/mail/thunderbird/patches/patch-ce b/mail/thunderbird/patches/patch-ce deleted file mode 100644 index 3df0df2c8e5..00000000000 --- a/mail/thunderbird/patches/patch-ce +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2005/03/08 08:53:08 grant Exp $ - ---- toolkit/mozapps/installer/unix/wizard/Makefile.in.orig 2004-08-27 05:57:00.000000000 +1000 -+++ toolkit/mozapps/installer/unix/wizard/Makefile.in -@@ -60,6 +60,10 @@ LIBS = \ - -lpthread \ - $(NULL) - -+ifeq ($(OS_ARCH),SunOS) -+LIBS += -lnsl -+endif -+ - EXTRA_DEPS = \ - $(DIST)/lib/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \ diff --git a/mail/thunderbird/patches/patch-cf b/mail/thunderbird/patches/patch-cf deleted file mode 100644 index 2eab41d777f..00000000000 --- a/mail/thunderbird/patches/patch-cf +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2005/03/08 08:53:08 grant Exp $ - ---- mail/config/mozconfig.orig 2004-10-31 16:00:51.000000000 +1100 -+++ mail/config/mozconfig -@@ -3,7 +3,8 @@ - # . $topsrcdir/mail/config/mozconfig - # to the top of your mozconfig file. - --export MOZ_THUNDERBIRD=1 -+MOZ_THUNDERBIRD=1 -+export MOZ_THUNDERBIRD - mk_add_options MOZ_THUNDERBIRD=1 - - ac_add_options --enable-crypto diff --git a/mail/thunderbird/patches/patch-db b/mail/thunderbird/patches/patch-db index c99cc8a84e6..83147bdd954 100644 --- a/mail/thunderbird/patches/patch-db +++ b/mail/thunderbird/patches/patch-db @@ -1,8 +1,8 @@ -$NetBSD: patch-db,v 1.1 2005/12/30 21:35:58 joerg Exp $ +$NetBSD: patch-db,v 1.2 2006/02/05 14:49:05 ghen Exp $ ---- js/src/Makefile.in.orig 2005-12-29 17:04:08.000000000 +0000 +--- js/src/Makefile.in.orig 2006-02-02 13:20:09.000000000 +0100 +++ js/src/Makefile.in -@@ -250,6 +250,9 @@ endif # WINNT +@@ -256,6 +256,9 @@ endif # WINNT ifeq ($(OS_ARCH),FreeBSD) LDFLAGS += -pthread endif diff --git a/mail/thunderbird/patches/patch-de b/mail/thunderbird/patches/patch-de index f92b8ec5f48..eea2a7cb226 100644 --- a/mail/thunderbird/patches/patch-de +++ b/mail/thunderbird/patches/patch-de @@ -1,8 +1,8 @@ -$NetBSD: patch-de,v 1.1 2005/12/30 21:35:58 joerg Exp $ +$NetBSD: patch-de,v 1.2 2006/02/05 14:49:05 ghen Exp $ ---- config/rules.mk.orig 2005-12-29 17:05:40.000000000 +0000 +--- config/rules.mk.orig 2006-02-02 13:20:06.000000000 +0100 +++ config/rules.mk -@@ -444,6 +444,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +@@ -447,6 +447,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic endif endif diff --git a/mail/thunderbird/patches/patch-df b/mail/thunderbird/patches/patch-df index 9fe33931a5e..02deebbd9d6 100644 --- a/mail/thunderbird/patches/patch-df +++ b/mail/thunderbird/patches/patch-df @@ -1,8 +1,8 @@ -$NetBSD: patch-df,v 1.1 2005/12/30 21:35:58 joerg Exp $ +$NetBSD: patch-df,v 1.2 2006/02/05 14:49:05 ghen Exp $ ---- config/config.mk.orig 2005-12-29 17:06:04.000000000 +0000 +--- config/config.mk.orig 2006-02-02 13:20:06.000000000 +0100 +++ config/config.mk -@@ -146,7 +146,7 @@ endif +@@ -121,7 +121,7 @@ endif # but save the version to allow multiple versions of the same base # platform to be built in the same tree. # |