summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authortaya <taya@pkgsrc.org>2004-06-24 23:09:55 +0000
committertaya <taya@pkgsrc.org>2004-06-24 23:09:55 +0000
commitf01bf78aca7f40eea9954913516eec4e5d882647 (patch)
tree26b1bc03b6dde0870fccaca952e3aefece4274c3 /mail
parent8dad1a2f3f710ac93e6aa4d0d2c55826c0aae64f (diff)
downloadpkgsrc-f01bf78aca7f40eea9954913516eec4e5d882647.tar.gz
Update thunderbird to 0.7
Here are the highlights for this release of Thunderbird: * Smaller and Faster The Windows Installer is now only a 5.9MB download. Significant performance improvements on Windows, Linux and Mac OS X! * New Themes and Extension Manager Provides a convenient and secure way to manage and update the many add-ons that set Thunderbird apart from other e-mail clients. * Crash Analysis Tools (Talkback) Help us help you! Integration with Mozilla Talkback allows users to submit crash reports which makes it easier for us to find Thunderbird top crashes. * Other New Features... New user interface for viewing vCards. New Profile Manager which also supports running from a USB device. Color quoting for quoted message parts. Thunderbird now supports a user interface for creating multiple identities per e-mail account. This makes it easy to have several e-mail addresses which end up going into the same account. * Recently Fixed Bugs Fix for an occassional hang when reading IMAP mail over SSL. Our LDAP support works against older version 2 LDAP servers again in addition to version 3. Thunderbird can handle mailto urls that contain raw spaces in the subject. Other bug fixes too numerous to mention!
Diffstat (limited to 'mail')
-rw-r--r--mail/thunderbird/Makefile12
-rw-r--r--mail/thunderbird/PLIST94
-rw-r--r--mail/thunderbird/distinfo59
-rw-r--r--mail/thunderbird/patches/patch-aa4
-rw-r--r--mail/thunderbird/patches/patch-ab6
-rw-r--r--mail/thunderbird/patches/patch-ac20
-rw-r--r--mail/thunderbird/patches/patch-ad4
-rw-r--r--mail/thunderbird/patches/patch-ae4
-rw-r--r--mail/thunderbird/patches/patch-af4
-rw-r--r--mail/thunderbird/patches/patch-ag4
-rw-r--r--mail/thunderbird/patches/patch-ah4
-rw-r--r--mail/thunderbird/patches/patch-ai4
-rw-r--r--mail/thunderbird/patches/patch-aj4
-rw-r--r--mail/thunderbird/patches/patch-ak10
-rw-r--r--mail/thunderbird/patches/patch-al4
-rw-r--r--mail/thunderbird/patches/patch-an4
-rw-r--r--mail/thunderbird/patches/patch-ao4
-rw-r--r--mail/thunderbird/patches/patch-aw4
-rw-r--r--mail/thunderbird/patches/patch-ax4
-rw-r--r--mail/thunderbird/patches/patch-ba66
-rw-r--r--mail/thunderbird/patches/patch-bb28
-rw-r--r--mail/thunderbird/patches/patch-bm4
-rw-r--r--mail/thunderbird/patches/patch-bn6
-rw-r--r--mail/thunderbird/patches/patch-bo6
-rw-r--r--mail/thunderbird/patches/patch-bq4
-rw-r--r--mail/thunderbird/patches/patch-br4
-rw-r--r--mail/thunderbird/patches/patch-bs15
-rw-r--r--mail/thunderbird/patches/patch-bt17
-rw-r--r--mail/thunderbird/patches/patch-bu179
-rw-r--r--mail/thunderbird/patches/patch-bv211
-rw-r--r--mail/thunderbird/patches/patch-bw64
-rw-r--r--mail/thunderbird/patches/patch-bx61
-rw-r--r--mail/thunderbird/patches/patch-by31
33 files changed, 851 insertions, 98 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 901f13b2f90..8b58ebfb8bf 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/05/08 04:35:37 taya Exp $
+# $NetBSD: Makefile,v 1.4 2004/06/24 23:09:55 taya Exp $
MOZILLA= thunderbird
MOZILLA_BIN= thunderbird-bin
-MOZ_VER= 0.6
+MOZ_VER= 0.7
EXTRACT_SUFX= .tar.bz2
-DISTNAME= thunderbird-source-${MOZ_VER}
+DISTNAME= thunderbird-${MOZ_VER}-source
MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/ \
ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/
@@ -16,4 +16,10 @@ MAKE_ENV+= MOZ_THUNDERBIRD=1
CONFIGURE_ARGS+= --enable-extensions=wallet,spellcheck,xmlextras
+pre-install:
+ ${CP} -r ${WRKSRC}/dist/bin/defaults/profile/extensions \
+ ${WRKSRC}/dist/bin
+ ${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
+ ${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
+
.include "../../www/mozilla/Makefile.common"
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 857dcd1de5b..feeb4e038f2 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/08 04:35:37 taya Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/06/24 23:09:55 taya Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
lib/${MOZILLA}/dirver
lib/${MOZILLA}/mangle
+lib/${MOZILLA}/mozilla-ipcd
lib/${MOZILLA}/mozilla-xremote-client
lib/${MOZILLA}/nsinstall
lib/${MOZILLA}/regchrome
@@ -37,6 +38,7 @@ lib/${MOZILLA}/components/libhtmlpars.${SO_SUFFIX}
lib/${MOZILLA}/components/libi18n.${SO_SUFFIX}
lib/${MOZILLA}/components/libimglib2.${SO_SUFFIX}
lib/${MOZILLA}/components/libimport.${SO_SUFFIX}
+lib/${MOZILLA}/components/libipcdc.${SO_SUFFIX}
lib/${MOZILLA}/components/libjar50.${SO_SUFFIX}
lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
lib/${MOZILLA}/components/libmail.${SO_SUFFIX}
@@ -49,15 +51,18 @@ lib/${MOZILLA}/components/libnecko.${SO_SUFFIX}
lib/${MOZILLA}/components/libnecko2.${SO_SUFFIX}
lib/${MOZILLA}/components/libnsappshell.${SO_SUFFIX}
lib/${MOZILLA}/components/libnsprefm.${SO_SUFFIX}
+lib/${MOZILLA}/components/liboji.${SO_SUFFIX}
lib/${MOZILLA}/components/libpipboot.${SO_SUFFIX}
lib/${MOZILLA}/components/libpipnss.${SO_SUFFIX}
lib/${MOZILLA}/components/libpippki.${SO_SUFFIX}
lib/${MOZILLA}/components/libpref.${SO_SUFFIX}
lib/${MOZILLA}/components/libprofile.${SO_SUFFIX}
+lib/${MOZILLA}/components/libprofilemigration.${SO_SUFFIX}
lib/${MOZILLA}/components/librdf.${SO_SUFFIX}
lib/${MOZILLA}/components/libspellchecker.${SO_SUFFIX}
lib/${MOZILLA}/components/libtxmgr.${SO_SUFFIX}
lib/${MOZILLA}/components/libuconv.${SO_SUFFIX}
+lib/${MOZILLA}/components/libucvmath.${SO_SUFFIX}
lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
@@ -68,10 +73,13 @@ lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
lib/${MOZILLA}/components/libxremote_client.${SO_SUFFIX}
lib/${MOZILLA}/components/libxremoteservice.${SO_SUFFIX}
+lib/${MOZILLA}/ipc/modules/liblockmodule.${SO_SUFFIX}
+lib/${MOZILLA}/ipc/modules/libtransmgr.${SO_SUFFIX}
lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
lib/${MOZILLA}/libgtksuperwin.${SO_SUFFIX}
lib/${MOZILLA}/libgtkxtbin.${SO_SUFFIX}
+lib/${MOZILLA}/libjsj.${SO_SUFFIX}
lib/${MOZILLA}/libldap50.${SO_SUFFIX}
lib/${MOZILLA}/libmozjs.${SO_SUFFIX}
lib/${MOZILLA}/libmozz.${SO_SUFFIX}
@@ -159,6 +167,7 @@ lib/${MOZILLA}/components/imglib2.xpt
lib/${MOZILLA}/components/impComm4xMail.xpt
lib/${MOZILLA}/components/import.xpt
lib/${MOZILLA}/components/intl.xpt
+lib/${MOZILLA}/components/ipcd.xpt
lib/${MOZILLA}/components/jar.xpt
lib/${MOZILLA}/components/jsconsole-clhandler.js
lib/${MOZILLA}/components/jsconsole.xpt
@@ -201,6 +210,7 @@ lib/${MOZILLA}/components/necko_res.xpt
lib/${MOZILLA}/components/necko_socket.xpt
lib/${MOZILLA}/components/necko_strconv.xpt
lib/${MOZILLA}/components/necko_viewsource.xpt
+lib/${MOZILLA}/components/nsBackgroundUpdateService.js
lib/${MOZILLA}/components/nsCloseAllWindows.js
lib/${MOZILLA}/components/nsDownloadProgressListener.js
lib/${MOZILLA}/components/nsExtensionManager.js
@@ -210,6 +220,7 @@ lib/${MOZILLA}/components/nsLDAPPrefsService.js
lib/${MOZILLA}/components/nsProgressDialog.js
lib/${MOZILLA}/components/nsProxyAutoConfig.js
lib/${MOZILLA}/components/offlineStartup.js
+lib/${MOZILLA}/components/oji.xpt
lib/${MOZILLA}/components/pipboot.xpt
lib/${MOZILLA}/components/pipnss.xpt
lib/${MOZILLA}/components/pippki.xpt
@@ -218,6 +229,7 @@ lib/${MOZILLA}/components/pref.xpt
lib/${MOZILLA}/components/prefetch.xpt
lib/${MOZILLA}/components/prefmigr.xpt
lib/${MOZILLA}/components/profile.xpt
+lib/${MOZILLA}/components/profilesharingsetup.xpt
lib/${MOZILLA}/components/progressDlg.xpt
lib/${MOZILLA}/components/proxyObjInst.xpt
lib/${MOZILLA}/components/rdf.xpt
@@ -226,10 +238,12 @@ lib/${MOZILLA}/components/sidebar.xpt
lib/${MOZILLA}/components/signonviewer.xpt
lib/${MOZILLA}/components/smime-service.js
lib/${MOZILLA}/components/spellchecker.xpt
+lib/${MOZILLA}/components/toolkitprofile.xpt
lib/${MOZILLA}/components/txmgr.xpt
lib/${MOZILLA}/components/txtsvc.xpt
lib/${MOZILLA}/components/uconv.xpt
lib/${MOZILLA}/components/unicharutil.xpt
+lib/${MOZILLA}/components/update.xpt
lib/${MOZILLA}/components/uriloader.xpt
lib/${MOZILLA}/components/wallet.xpt
lib/${MOZILLA}/components/walleteditor.xpt
@@ -272,6 +286,9 @@ lib/${MOZILLA}/defaults/profile/US/search.rdf
lib/${MOZILLA}/defaults/profile/bookmarks.html
lib/${MOZILLA}/defaults/profile/chrome/userChrome-example.css
lib/${MOZILLA}/defaults/profile/chrome/userContent-example.css
+lib/${MOZILLA}/defaults/profile/extensions/Extensions.rdf
+lib/${MOZILLA}/defaults/profile/extensions/installed-extensions.txt
+lib/${MOZILLA}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/${MOZILLA}/defaults/profile/localstore.rdf
lib/${MOZILLA}/defaults/profile/mimeTypes.rdf
lib/${MOZILLA}/defaults/profile/panels.rdf
@@ -283,7 +300,11 @@ lib/${MOZILLA}/defaults/wallet/SchemaConcat.tbl
lib/${MOZILLA}/defaults/wallet/SchemaStrings.tbl
lib/${MOZILLA}/defaults/wallet/StateSchema.tbl
lib/${MOZILLA}/defaults/wallet/VcardSchema.tbl
+lib/${MOZILLA}/extensions/Extensions.rdf
+lib/${MOZILLA}/extensions/installed-extensions-processed.txt
+lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/${MOZILLA}/greprefs/all.js
+lib/${MOZILLA}/greprefs/non-shared.txt
lib/${MOZILLA}/greprefs/security-prefs.js
lib/${MOZILLA}/greprefs/xpinstall.js
lib/${MOZILLA}/icons/mozicon16.xpm
@@ -300,12 +321,23 @@ lib/${MOZILLA}/res/builtin/platformHTMLBindings.xml
lib/${MOZILLA}/res/charsetData.properties
lib/${MOZILLA}/res/charsetalias.properties
lib/${MOZILLA}/res/cmessage.txt
+lib/${MOZILLA}/res/dtd/mathml.dtd
lib/${MOZILLA}/res/dtd/xhtml11.dtd
lib/${MOZILLA}/res/entityTables/html40Latin1.properties
lib/${MOZILLA}/res/entityTables/html40Special.properties
lib/${MOZILLA}/res/entityTables/html40Symbols.properties
lib/${MOZILLA}/res/entityTables/htmlEntityVersions.properties
+lib/${MOZILLA}/res/entityTables/mathml20.properties
lib/${MOZILLA}/res/entityTables/transliterate.properties
+lib/${MOZILLA}/res/fonts/mathfont.properties
+lib/${MOZILLA}/res/fonts/mathfontCMEX10.properties
+lib/${MOZILLA}/res/fonts/mathfontCMSY10.properties
+lib/${MOZILLA}/res/fonts/mathfontMTExtra.properties
+lib/${MOZILLA}/res/fonts/mathfontMath1.properties
+lib/${MOZILLA}/res/fonts/mathfontMath2.properties
+lib/${MOZILLA}/res/fonts/mathfontMath4.properties
+lib/${MOZILLA}/res/fonts/mathfontPUA.properties
+lib/${MOZILLA}/res/fonts/mathfontSymbol.properties
lib/${MOZILLA}/res/forms.css
lib/${MOZILLA}/res/grabber.gif
lib/${MOZILLA}/res/html.css
@@ -322,6 +354,7 @@ lib/${MOZILLA}/res/html/gopher-unknown.gif
lib/${MOZILLA}/res/langGroups.properties
lib/${MOZILLA}/res/language.properties
lib/${MOZILLA}/res/loading-image.gif
+lib/${MOZILLA}/res/mathml.css
lib/${MOZILLA}/res/platform-forms.css
lib/${MOZILLA}/res/quirk.css
lib/${MOZILLA}/res/rdf/dom-test-4.css
@@ -706,7 +739,6 @@ include/${MOZILLA}/content/nsIStyleSheet.h
include/${MOZILLA}/content/nsIStyleSheetLinkingElement.h
include/${MOZILLA}/content/nsIStyledContent.h
include/${MOZILLA}/content/nsISyncLoadDOMService.h
-include/${MOZILLA}/content/nsITextAreaElement.h
include/${MOZILLA}/content/nsITextContent.h
include/${MOZILLA}/content/nsITextControlElement.h
include/${MOZILLA}/content/nsIWyciwygChannel.h
@@ -1136,6 +1168,18 @@ include/${MOZILLA}/import/nsImportStringBundle.h
include/${MOZILLA}/import/nsImportTranslator.h
include/${MOZILLA}/intl/nsIStringBundle.h
include/${MOZILLA}/intl/nsIStringBundleOverride.h
+include/${MOZILLA}/ipcd/ipcIClientObserver.h
+include/${MOZILLA}/ipcd/ipcIClientQueryHandler.h
+include/${MOZILLA}/ipcd/ipcILockNotify.h
+include/${MOZILLA}/ipcd/ipcILockService.h
+include/${MOZILLA}/ipcd/ipcIMessageObserver.h
+include/${MOZILLA}/ipcd/ipcIService.h
+include/${MOZILLA}/ipcd/ipcITransactionObserver.h
+include/${MOZILLA}/ipcd/ipcITransactionService.h
+include/${MOZILLA}/ipcd/ipcMessageReader.h
+include/${MOZILLA}/ipcd/ipcMessageWriter.h
+include/${MOZILLA}/ipcd/ipcModule.h
+include/${MOZILLA}/ipcd/ipcModuleUtil.h
include/${MOZILLA}/jar/nsIJAR.h
include/${MOZILLA}/jar/nsIZipReader.h
include/${MOZILLA}/jar/zipfile.h
@@ -1304,6 +1348,12 @@ include/${MOZILLA}/layout/nsTreeSelection.h
include/${MOZILLA}/layout/nsTreeUtils.h
include/${MOZILLA}/libreg/NSReg.h
include/${MOZILLA}/libreg/VerReg.h
+include/${MOZILLA}/liveconnect/jsjava.h
+include/${MOZILLA}/liveconnect/netscape_javascript_JSException.h
+include/${MOZILLA}/liveconnect/netscape_javascript_JSObject.h
+include/${MOZILLA}/liveconnect/nsILiveconnect.h
+include/${MOZILLA}/liveconnect/nsISecureLiveconnect.h
+include/${MOZILLA}/liveconnect/nsISecurityContext.h
include/${MOZILLA}/locale/nsCollation.h
include/${MOZILLA}/locale/nsCollationCID.h
include/${MOZILLA}/locale/nsDateTimeFormatCID.h
@@ -1913,6 +1963,26 @@ include/${MOZILLA}/nspr/prtrace.h
include/${MOZILLA}/nspr/prtypes.h
include/${MOZILLA}/nspr/prvrsion.h
include/${MOZILLA}/nspr/prwin16.h
+include/${MOZILLA}/oji/ProxyJNI.h
+include/${MOZILLA}/oji/jvmmgr.h
+include/${MOZILLA}/oji/nsIJRIPlugin.h
+include/${MOZILLA}/oji/nsIJVMAuthTools.h
+include/${MOZILLA}/oji/nsIJVMConfigManager.h
+include/${MOZILLA}/oji/nsIJVMConsole.h
+include/${MOZILLA}/oji/nsIJVMManager.h
+include/${MOZILLA}/oji/nsIJVMPlugin.h
+include/${MOZILLA}/oji/nsIJVMPluginInstance.h
+include/${MOZILLA}/oji/nsIJVMPluginTagInfo.h
+include/${MOZILLA}/oji/nsIJVMPrefsWindow.h
+include/${MOZILLA}/oji/nsIJVMWindow.h
+include/${MOZILLA}/oji/nsILiveConnectManager.h
+include/${MOZILLA}/oji/nsISecureEnv.h
+include/${MOZILLA}/oji/nsISymantecDebugManager.h
+include/${MOZILLA}/oji/nsISymantecDebugger.h
+include/${MOZILLA}/oji/nsIThreadManager.h
+include/${MOZILLA}/oji/nsJVMManager.h
+include/${MOZILLA}/oji/nsJVMPluginTagInfo.h
+include/${MOZILLA}/oji/nsjvm.h
include/${MOZILLA}/pipboot/nsIBufEntropyCollector.h
include/${MOZILLA}/pipboot/nsISSLStatusProvider.h
include/${MOZILLA}/pipboot/nsISecurityWarningDialogs.h
@@ -2011,6 +2081,7 @@ include/${MOZILLA}/profile/nsIProfileChangeStatus.h
include/${MOZILLA}/profile/nsIProfileInternal.h
include/${MOZILLA}/profile/nsIProfileStartupListener.h
include/${MOZILLA}/profile/nsISessionRoaming.h
+include/${MOZILLA}/profilesharingsetup/nsIProfileSharingSetup.h
include/${MOZILLA}/progressDlg/nsIProgressDialog.h
include/${MOZILLA}/rdf/nsILocalStore.h
include/${MOZILLA}/rdf/nsIRDFCompositeDataSource.h
@@ -2111,6 +2182,7 @@ include/${MOZILLA}/ucvja/nsUCVJA2CID.h
include/${MOZILLA}/ucvja/nsUCVJACID.h
include/${MOZILLA}/ucvko/nsUCvKOCID.h
include/${MOZILLA}/ucvlatin/nsUCvLatinCID.h
+include/${MOZILLA}/ucvmath/nsUCvMathCID.h
include/${MOZILLA}/ucvtw/nsUCvTWCID.h
include/${MOZILLA}/ucvtw2/nsUCvTW2CID.h
include/${MOZILLA}/unicharutil/nsCompressedCharMap.h
@@ -2125,6 +2197,7 @@ include/${MOZILLA}/unicharutil/nsIUGenDetailCategory.h
include/${MOZILLA}/unicharutil/nsIUnicodeNormalizer.h
include/${MOZILLA}/unicharutil/nsUnicharUtilCIID.h
include/${MOZILLA}/unicharutil/nsUnicharUtils.h
+include/${MOZILLA}/update/nsIUpdateService.h
include/${MOZILLA}/uriloader/nsCURILoader.h
include/${MOZILLA}/uriloader/nsDocLoader.h
include/${MOZILLA}/uriloader/nsIContentHandler.h
@@ -2455,6 +2528,7 @@ include/${MOZILLA}/xpinstall/nsISoftwareUpdate.h
include/${MOZILLA}/xpinstall/nsIXPIDialogService.h
include/${MOZILLA}/xpinstall/nsIXPINotifier.h
include/${MOZILLA}/xpinstall/nsIXPIProgressDialog.h
+include/${MOZILLA}/xpinstall/nsIXPInstallManager.h
include/${MOZILLA}/xpinstall/nsPICertNotification.h
include/${MOZILLA}/xpinstall/nsPIXPIProxy.h
include/${MOZILLA}/xpinstall/nsPIXPIStubHook.h
@@ -2464,6 +2538,9 @@ include/${MOZILLA}/xprintutil/xprintutil.h
include/${MOZILLA}/xremoteservice/nsIXRemoteService.h
include/${MOZILLA}/xul/nsIXULContent.h
include/${MOZILLA}/xul/nsIXULPopupListener.h
+include/${MOZILLA}/xulapp/nsIProfileMigrator.h
+include/${MOZILLA}/xulapp/nsIToolkitProfile.h
+include/${MOZILLA}/xulapp/nsIToolkitProfileService.h
include/${MOZILLA}/xulapp/nsXULAppAPI.h
include/${MOZILLA}/xuldoc/nsIController.h
include/${MOZILLA}/xuldoc/nsIControllers.h
@@ -2502,15 +2579,22 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm lib/${MOZILLA}/res/samples
@dirrm lib/${MOZILLA}/res/rdf
@dirrm lib/${MOZILLA}/res/html
+@dirrm lib/${MOZILLA}/res/fonts
@dirrm lib/${MOZILLA}/res/entityTables
@dirrm lib/${MOZILLA}/res/dtd
@dirrm lib/${MOZILLA}/res/builtin
@dirrm lib/${MOZILLA}/res
@dirrm lib/${MOZILLA}/plugins
+@dirrm lib/${MOZILLA}/ipc/modules
+@dirrm lib/${MOZILLA}/ipc
@dirrm lib/${MOZILLA}/init.d
@dirrm lib/${MOZILLA}/icons
@dirrm lib/${MOZILLA}/greprefs
+@dirrm lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/${MOZILLA}/extensions
@dirrm lib/${MOZILLA}/defaults/wallet
+@dirrm lib/${MOZILLA}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/${MOZILLA}/defaults/profile/extensions
@dirrm lib/${MOZILLA}/defaults/profile/chrome
@dirrm lib/${MOZILLA}/defaults/profile/US/chrome
@dirrm lib/${MOZILLA}/defaults/profile/US
@@ -2550,9 +2634,11 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/view
@dirrm include/${MOZILLA}/util
@dirrm include/${MOZILLA}/uriloader
+@dirrm include/${MOZILLA}/update
@dirrm include/${MOZILLA}/unicharutil
@dirrm include/${MOZILLA}/ucvtw2
@dirrm include/${MOZILLA}/ucvtw
+@dirrm include/${MOZILLA}/ucvmath
@dirrm include/${MOZILLA}/ucvlatin
@dirrm include/${MOZILLA}/ucvko
@dirrm include/${MOZILLA}/ucvja
@@ -2568,6 +2654,7 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/rdfutil
@dirrm include/${MOZILLA}/rdf
@dirrm include/${MOZILLA}/progressDlg
+@dirrm include/${MOZILLA}/profilesharingsetup
@dirrm include/${MOZILLA}/profile
@dirrm include/${MOZILLA}/profdirserviceprovider
@dirrm include/${MOZILLA}/prefmigr
@@ -2577,6 +2664,7 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/pippki
@dirrm include/${MOZILLA}/pipnss
@dirrm include/${MOZILLA}/pipboot
+@dirrm include/${MOZILLA}/oji
@dirrm include/${MOZILLA}/nspr/private
@dirrm include/${MOZILLA}/nspr/obsolete
@dirrm include/${MOZILLA}/nspr/md
@@ -2602,6 +2690,7 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/mailnews
@dirrm include/${MOZILLA}/lwbrk
@dirrm include/${MOZILLA}/locale
+@dirrm include/${MOZILLA}/liveconnect
@dirrm include/${MOZILLA}/libreg
@dirrm include/${MOZILLA}/layout
@dirrm include/${MOZILLA}/jsurl
@@ -2610,6 +2699,7 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/js
@dirrm include/${MOZILLA}/java
@dirrm include/${MOZILLA}/jar
+@dirrm include/${MOZILLA}/ipcd
@dirrm include/${MOZILLA}/intl
@dirrm include/${MOZILLA}/import
@dirrm include/${MOZILLA}/impText
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 46f22e61a70..e67dcfa6274 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,27 +1,34 @@
-$NetBSD: distinfo,v 1.3 2004/05/08 04:35:37 taya Exp $
+$NetBSD: distinfo,v 1.4 2004/06/24 23:09:55 taya Exp $
-SHA1 (thunderbird-source-0.6.tar.bz2) = 480d11b4f058139837e9d8b961c0099a779c3ebd
-Size (thunderbird-source-0.6.tar.bz2) = 32442259 bytes
-SHA1 (patch-aa) = 688706f89820d7d0ee044e9fb475458d923a85a9
-SHA1 (patch-ab) = e1674b4585cd219da0d92979f6051150f8e5fc4e
-SHA1 (patch-ac) = 2ad5ebefc6bdf27f05a9dcd09cd702ad1a778ce8
-SHA1 (patch-ad) = 844e4335ae5d1b43501b11c6cb1cc503346cd738
-SHA1 (patch-ae) = 1232c91dc65ac5065fbafb21e290d8601c4af339
-SHA1 (patch-af) = c5388568bf1f050a09ecde1f8ae986eab2436850
-SHA1 (patch-ag) = 2073ca1245b4b4c4940361c6d88642320db43d88
-SHA1 (patch-ah) = 416c173d70866cab1312f4e9a33f0d82f90d83f3
-SHA1 (patch-ai) = a1eb47484d12b163d0c5cfc47108d9937abcda91
-SHA1 (patch-aj) = 340fd6df5dee0385aed87204eb6129cc634712f9
-SHA1 (patch-ak) = 18b01acd17899fe36f0a55addf33abe36a320819
-SHA1 (patch-al) = af9d1da6ecdfc6372412f460795aa81f36d1b552
-SHA1 (patch-an) = 69a87262438467349324494e6e1ae6d8af0adeb4
-SHA1 (patch-ao) = be7967c69315ee096d55c464f8d7b3a86f20ad1f
-SHA1 (patch-aw) = 25b351796022b1c47f7f07d88d7f3aa3828e9493
-SHA1 (patch-ax) = af25ec155ffbd6ad288f11393172dd37bdbf82e9
-SHA1 (patch-ba) = 6fa8b415333452e965e0fbc7e5ee199fb8aeff15
-SHA1 (patch-bb) = b92de91377bf3cb9ffc780799343ec6bbafb1f5d
-SHA1 (patch-bm) = b119519d880f071ae193caa4cc3d379f417a63b3
-SHA1 (patch-bn) = d8d721dca97c239996271aaecdf0f367a752d20b
-SHA1 (patch-bo) = 2a8019ae8604d56b4c3c53da30190824a9c41ec1
-SHA1 (patch-bq) = a9fd9ac386eca49aec1daaef8f2612a345eaf963
-SHA1 (patch-br) = d7abd08157585a0ce1fbe159526f3360cc45878d
+SHA1 (thunderbird-0.7-source.tar.bz2) = 945c77869fa066e2b9ae3d923c1b22f728bddbe7
+Size (thunderbird-0.7-source.tar.bz2) = 32523616 bytes
+SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
+SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
+SHA1 (patch-ac) = e9bc27529cf595ab6f120d9021dd7d6c49112084
+SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
+SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
+SHA1 (patch-af) = 6addfc2bd0b3e3aaefff6cce6836384ca44baf30
+SHA1 (patch-ag) = 40bf4f3eb3b44d3a0d7c26cf955cf47fd6d22893
+SHA1 (patch-ah) = 4cd8e37475af19bcfe4530f910990f86c89ed916
+SHA1 (patch-ai) = 607e2f599ab74d7549930183f160ee9daab523e5
+SHA1 (patch-aj) = 4e7424b078afc0f4dfcf51a3857aba5a66c7c31c
+SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a
+SHA1 (patch-al) = ece2c5591e3a86f80ce8257b87a802aa2fda6494
+SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641
+SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d
+SHA1 (patch-aw) = e2968bcf9e1175a660dcc715d68b33cdc221ef81
+SHA1 (patch-ax) = 2421096cf84bd174cfe576db855cca2338615495
+SHA1 (patch-ba) = a0d70d713d2d4746d9128724c382b019f353f5af
+SHA1 (patch-bb) = 9ba4bcd86e581496bbc6b40b3a3f062dfd5e416f
+SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
+SHA1 (patch-bn) = d31d2b2c3712abdd766e9fa0cee147d7c8936cd4
+SHA1 (patch-bo) = 357c4cacdc179191d6fe263b4eb62cc56b7ec25f
+SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae
+SHA1 (patch-br) = aa48e974306fdbfc1e71b5fd9c1f5d18771143f5
+SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb
+SHA1 (patch-bt) = 8ee09dd2acbbc0c002283b15eafbafb4f324948a
+SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
+SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
+SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8
+SHA1 (patch-bx) = 721c58f89c829ec3dfd72a311d49c211833b107c
+SHA1 (patch-by) = 5c226fb01508decdf13c0db505066623d7636a0f
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index ad733d97994..aeeecdaba77 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/05/08 04:35:37 taya Exp $
+$NetBSD: patch-aa,v 1.3 2004/06/24 23:09:55 taya 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-05-05 23:08:22.000000000 +0900
++++ ./config/autoconf.mk.in 2004-06-15 23:55:36.000000000 +0900
@@ -31,13 +31,13 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
index 33fdcea6a21..0116bc12431 100644
--- a/mail/thunderbird/patches/patch-ab
+++ b/mail/thunderbird/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ab,v 1.3 2004/06/24 23:09:55 taya Exp $
diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in 2004-04-21 10:39:17.000000000 +0900
-+++ ./configure.in 2004-05-05 23:08:54.000000000 +0900
+--- ../Orig/mozilla/configure.in 2004-05-14 06:57:46.000000000 +0900
++++ ./configure.in 2004-06-15 23:55:39.000000000 +0900
@@ -1017,6 +1017,9 @@
# MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
# MKSHLIB_UNFORCE_ALL=''
diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
index 365a28a2e53..28a1d297626 100644
--- a/mail/thunderbird/patches/patch-ac
+++ b/mail/thunderbird/patches/patch-ac
@@ -1,9 +1,19 @@
-$NetBSD: patch-ac,v 1.2 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ac,v 1.3 2004/06/24 23:09:55 taya Exp $
diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-04-23 05:50:05.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-05-05 23:09:39.000000000 +0900
-@@ -140,7 +140,7 @@
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-06-15 23:55:43.000000000 +0900
+@@ -49,6 +49,9 @@
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+ endif
++ifeq (amd64,$(OS_TEST))
++CPPSRCS := xptcinvoke_unixish_amd64.cpp xptcstubs_unixish_amd64.cpp
++endif
+ endif
+ #
+ # New code for Linux, et. al., with gcc
+@@ -140,7 +143,7 @@
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -12,7 +22,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -174,7 +174,7 @@
+@@ -174,7 +177,7 @@
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -21,7 +31,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -305,6 +305,13 @@
+@@ -305,6 +308,13 @@
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-ad b/mail/thunderbird/patches/patch-ad
index a279449fb7d..93be816469f 100644
--- a/mail/thunderbird/patches/patch-ad
+++ b/mail/thunderbird/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ad,v 1.3 2004/06/24 23:09:55 taya Exp $
diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2001-09-29 05:12:51.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2004-05-05 23:09:42.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2004-06-15 23:55:46.000000000 +0900
@@ -132,6 +132,15 @@
}
}
diff --git a/mail/thunderbird/patches/patch-ae b/mail/thunderbird/patches/patch-ae
index 3e81b3efc2d..8757c8a1100 100644
--- a/mail/thunderbird/patches/patch-ae
+++ b/mail/thunderbird/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ae,v 1.3 2004/06/24 23:09:55 taya Exp $
diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2004-05-05 23:09:44.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2004-06-15 23:55:47.000000000 +0900
@@ -123,17 +123,27 @@
}
}
diff --git a/mail/thunderbird/patches/patch-af b/mail/thunderbird/patches/patch-af
index 2dc92c9d667..6d915bfcc9b 100644
--- a/mail/thunderbird/patches/patch-af
+++ b/mail/thunderbird/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-af,v 1.3 2004/06/24 23:09:55 taya 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-05-05 23:09:46.000000000 +0900
++++ ./security/nss/lib/freebl/unix_rand.c 2004-06-15 23:55:49.000000000 +0900
@@ -32,6 +32,7 @@
*/
diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag
index 9450af5478f..8fb7cf810a7 100644
--- a/mail/thunderbird/patches/patch-ag
+++ b/mail/thunderbird/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ag,v 1.3 2004/06/24 23:09:55 taya 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-05-05 23:09:56.000000000 +0900
++++ ./extensions/transformiix/source/base/ErrorObserver.h 2004-06-15 23:55:51.000000000 +0900
@@ -28,7 +28,8 @@
#include "baseutils.h"
diff --git a/mail/thunderbird/patches/patch-ah b/mail/thunderbird/patches/patch-ah
index 94be2602af7..5f63d954921 100644
--- a/mail/thunderbird/patches/patch-ah
+++ b/mail/thunderbird/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ah,v 1.2 2004/06/24 23:09:55 taya Exp $
diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 10:09:33.000000000 +0900
-+++ ./gfx/idl/nsIFreeType2.idl 2004-05-05 23:15:51.000000000 +0900
++++ ./gfx/idl/nsIFreeType2.idl 2004-06-15 23:55:52.000000000 +0900
@@ -76,10 +76,11 @@
native FT_Sfnt_Tag(FT_Sfnt_Tag);
native FT_Size(FT_Size);
diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai
index b99c77433e9..9cc925240ca 100644
--- a/mail/thunderbird/patches/patch-ai
+++ b/mail/thunderbird/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ai,v 1.2 2004/06/24 23:09:55 taya 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-05-05 23:17:00.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-06-15 23:55:54.000000000 +0900
@@ -1141,10 +1141,10 @@
mPixelSize = NSToIntRound(app2dev * mFont->size);
diff --git a/mail/thunderbird/patches/patch-aj b/mail/thunderbird/patches/patch-aj
index e334b6c261a..3b1546ccfb4 100644
--- a/mail/thunderbird/patches/patch-aj
+++ b/mail/thunderbird/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-aj,v 1.2 2004/06/24 23:09:55 taya 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-05-05 23:20:07.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.h 2004-06-15 23:55:59.000000000 +0900
@@ -104,13 +104,13 @@
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);
diff --git a/mail/thunderbird/patches/patch-ak b/mail/thunderbird/patches/patch-ak
index 259fac5cfc9..31deac54564 100644
--- a/mail/thunderbird/patches/patch-ak
+++ b/mail/thunderbird/patches/patch-ak
@@ -1,20 +1,20 @@
-$NetBSD: patch-ak,v 1.1 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ak,v 1.2 2004/06/24 23:09:55 taya Exp $
diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
-+++ ./gfx/src/freetype/nsFreeType.cpp 2004-05-06 08:26:21.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.cpp 2004-06-15 23:56:01.000000000 +0900
@@ -110,11 +110,11 @@
{"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
{"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
{"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
-+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
++ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
++ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
{"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
{"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
-+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
++ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
// #ifdef MOZ_SVG
{"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
{"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al
index fd9de33f0c1..941af0dcdbc 100644
--- a/mail/thunderbird/patches/patch-al
+++ b/mail/thunderbird/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-al,v 1.2 2004/06/24 23:09:55 taya 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-05-05 23:22:27.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.h 2004-06-15 23:56:04.000000000 +0900
@@ -320,7 +320,7 @@
nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
nsCOMPtr<nsIFreeType2> mFt2;
diff --git a/mail/thunderbird/patches/patch-an b/mail/thunderbird/patches/patch-an
index ea0c00585e0..bc60ea7d557 100644
--- a/mail/thunderbird/patches/patch-an
+++ b/mail/thunderbird/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-an,v 1.2 2004/06/24 23:09:55 taya Exp $
diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2003-04-23 01:25:13.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.h 2004-05-05 23:22:39.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.h 2004-06-15 23:56:10.000000000 +0900
@@ -110,7 +110,7 @@
XImage *GetXImage(PRUint32 width, PRUint32 height);
nsITrueTypeFontCatalogEntry *mFaceID;
diff --git a/mail/thunderbird/patches/patch-ao b/mail/thunderbird/patches/patch-ao
index bcc7eea153a..6506fa3d1e1 100644
--- a/mail/thunderbird/patches/patch-ao
+++ b/mail/thunderbird/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ao,v 1.2 2004/06/24 23:09:56 taya Exp $
diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2003-12-25 17:24:52.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-05-05 23:22:43.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-06-15 23:56:14.000000000 +0900
@@ -177,7 +177,7 @@
FTC_Manager mgr;
nsresult rv;
diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw
index 74b1d67db9d..51f5e00f451 100644
--- a/mail/thunderbird/patches/patch-aw
+++ b/mail/thunderbird/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.2 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-aw,v 1.3 2004/06/24 23:09:56 taya 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-05-05 23:22:48.000000000 +0900
++++ ./widget/src/gtksuperwin/Makefile.in 2004-06-15 23:56:15.000000000 +0900
@@ -25,6 +25,7 @@
MODULE = widget
LIBRARY_NAME = gtksuperwin
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax
index c4e442c253d..db3d95ca4fd 100644
--- a/mail/thunderbird/patches/patch-ax
+++ b/mail/thunderbird/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.1 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ax,v 1.2 2004/06/24 23:09:56 taya 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-05-05 23:22:51.000000000 +0900
++++ ./security/coreconf/SunOS5.mk 2004-06-15 23:56:19.000000000 +0900
@@ -165,6 +165,10 @@
DSO_LDOPTS += -G -h $(notdir $@)
endif
diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
index daea145d6f2..51d25757ea7 100644
--- a/mail/thunderbird/patches/patch-ba
+++ b/mail/thunderbird/patches/patch-ba
@@ -1,15 +1,15 @@
-$NetBSD: patch-ba,v 1.2 2004/05/08 04:35:38 taya Exp $
+$NetBSD: patch-ba,v 1.3 2004/06/24 23:09:56 taya Exp $
diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2000-12-02 06:29:17.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.cfg 2004-05-05 23:23:03.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.cfg 2004-06-15 23:56:25.000000000 +0900
@@ -45,7 +45,8 @@
#define PR_AF_INET6 24 /* same as AF_INET6 */
-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__arm__) || \
-+ defined(__armel__) || defined(__MIPSEL__)
++#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
++ defined(__MIPSEL__)
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
@@ -64,7 +64,63 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/
+#define PR_ALIGN_OF_DOUBLE 8
+#define PR_ALIGN_OF_POINTER 8
+
-+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__armeb__)
++#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__)
#undef IS_LITTLE_ENDIAN
#define IS_BIG_ENDIAN 1
+@@ -184,6 +231,55 @@
+ #define PR_BYTES_PER_WORD_LOG2 3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
++#elif defined(__amd64__)
++#define IS_LITTLE_ENDIAN 1
++#undef IS_BIG_ENDIAN
++#define IS_64
++
++#define PR_BYTES_PER_BYTE 1
++#define PR_BYTES_PER_SHORT 2
++#define PR_BYTES_PER_INT 4
++#define PR_BYTES_PER_INT64 8
++#define PR_BYTES_PER_LONG 8
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 8
++#define PR_BYTES_PER_DWORD 8
++
++#define PR_BITS_PER_BYTE 8
++#define PR_BITS_PER_SHORT 16
++#define PR_BITS_PER_INT 32
++#define PR_BITS_PER_INT64 64
++#define PR_BITS_PER_LONG 64
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 64
++
++#define PR_BITS_PER_BYTE_LOG2 3
++#define PR_BITS_PER_SHORT_LOG2 4
++#define PR_BITS_PER_INT_LOG2 5
++#define PR_BITS_PER_INT64_LOG2 6
++#define PR_BITS_PER_LONG_LOG2 6
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 6
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 8
++#define PR_ALIGN_OF_INT64 8
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD 8
++
++#define PR_BYTES_PER_WORD_LOG2 3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#define HAVE_LONG_LONG
++#define HAVE_ALIGNED_DOUBLES
++#define HAVE_ALIGNED_LONGLONGS
++
+ #elif defined(__powerpc__) || defined(__m68k__)
+
+ #undef IS_LITTLE_ENDIAN
diff --git a/mail/thunderbird/patches/patch-bb b/mail/thunderbird/patches/patch-bb
index e5c8128c2a3..e021723a657 100644
--- a/mail/thunderbird/patches/patch-bb
+++ b/mail/thunderbird/patches/patch-bb
@@ -1,9 +1,15 @@
-$NetBSD: patch-bb,v 1.2 2004/05/08 04:35:39 taya Exp $
+$NetBSD: patch-bb,v 1.3 2004/06/24 23:09:56 taya 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-05-05 23:23:04.000000000 +0900
-@@ -48,12 +48,20 @@
++++ ./nsprpub/pr/include/md/_netbsd.h 2004-06-15 23:56:27.000000000 +0900
+@@ -44,16 +44,26 @@
+ #define _PR_SI_ARCHITECTURE "x86"
+ #elif defined(__alpha__)
+ #define _PR_SI_ARCHITECTURE "alpha"
++#elif defined(__amd64__)
++#define _PR_SI_ARCHITECTURE "amd64"
+ #elif defined(__m68k__)
#define _PR_SI_ARCHITECTURE "m68k"
#elif defined(__powerpc__)
#define _PR_SI_ARCHITECTURE "powerpc"
@@ -15,16 +21,16 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
#define _PR_SI_ARCHITECTURE "mips"
#elif defined(__arm32__)
#define _PR_SI_ARCHITECTURE "arm32"
-+#elif defined(__arm__)
-+#define _PR_SI_ARCHITECTURE "arm"
-+#elif defined(__armel__)
++#elif defined(__ARMEL__)
+#define _PR_SI_ARCHITECTURE "armel"
-+#elif defined(__armeb__)
++#elif defined(__ARMEL__)
+#define _PR_SI_ARCHITECTURE "armeb"
++#elif defined(__arm__)
++#define _PR_SI_ARCHITECTURE "arm"
#endif
#if defined(__ELF__)
-@@ -86,6 +94,12 @@
+@@ -86,6 +96,12 @@
#define _PR_INET6_PROBE
#endif
@@ -37,7 +43,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
#define USE_SETJMP
#ifndef _PR_PTHREADS
-@@ -108,7 +122,17 @@
+@@ -108,7 +124,17 @@
}
#define _MD_GET_SP(_thread) CONTEXT(_thread)[2]
#endif
@@ -56,12 +62,12 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
{ \
sigsetjmp(CONTEXT(_thread), 1); \
-@@ -150,7 +174,7 @@
+@@ -150,7 +176,7 @@
}
#define _MD_GET_SP(_thread) CONTEXT(_thread)[32]
#endif
-#ifdef __arm32__
-+#if defined(__arm32__) || defined(__arm__) || defined(__armel__) || defined(__armeb__)
++#ifdef __arm__
#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \
{ \
sigsetjmp(CONTEXT(_thread), 1); \
diff --git a/mail/thunderbird/patches/patch-bm b/mail/thunderbird/patches/patch-bm
index 11ba7ca1760..a83c43f5b9b 100644
--- a/mail/thunderbird/patches/patch-bm
+++ b/mail/thunderbird/patches/patch-bm
@@ -1,8 +1,8 @@
-$NetBSD: patch-bm,v 1.2 2004/05/08 04:35:39 taya Exp $
+$NetBSD: patch-bm,v 1.3 2004/06/24 23:09:56 taya Exp $
diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2004-05-05 23:23:13.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2004-06-15 23:56:36.000000000 +0900
@@ -118,18 +118,23 @@
* so they are contiguous with values passed on the stack, and then calls
* PrepareAndDispatch() to do the dirty work.
diff --git a/mail/thunderbird/patches/patch-bn b/mail/thunderbird/patches/patch-bn
index fd17b9e3b3c..03df32a4669 100644
--- a/mail/thunderbird/patches/patch-bn
+++ b/mail/thunderbird/patches/patch-bn
@@ -1,8 +1,8 @@
-$NetBSD: patch-bn,v 1.2 2004/05/08 04:35:39 taya Exp $
+$NetBSD: patch-bn,v 1.3 2004/06/24 23:09:56 taya Exp $
diff -ru ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp ./xpcom/io/nsNativeCharsetUtils.cpp
---- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2004-03-26 14:29:18.000000000 +0900
-+++ ./xpcom/io/nsNativeCharsetUtils.cpp 2004-05-05 23:23:15.000000000 +0900
+--- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2004-05-28 03:55:10.000000000 +0900
++++ ./xpcom/io/nsNativeCharsetUtils.cpp 2004-06-15 23:56:38.000000000 +0900
@@ -295,7 +295,12 @@
{
const char *blank_list[] = { "", NULL };
diff --git a/mail/thunderbird/patches/patch-bo b/mail/thunderbird/patches/patch-bo
index e6621de427b..114b75c3fd7 100644
--- a/mail/thunderbird/patches/patch-bo
+++ b/mail/thunderbird/patches/patch-bo
@@ -1,8 +1,8 @@
-$NetBSD: patch-bo,v 1.2 2004/05/08 04:35:39 taya Exp $
+$NetBSD: patch-bo,v 1.3 2004/06/24 23:09:56 taya Exp $
diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
---- ../Orig/mozilla/nsprpub/configure.in 2004-04-17 07:28:02.000000000 +0900
-+++ ./nsprpub/configure.in 2004-05-05 23:23:18.000000000 +0900
+--- ../Orig/mozilla/nsprpub/configure.in 2004-06-05 14:46:38.000000000 +0900
++++ ./nsprpub/configure.in 2004-06-15 23:56:41.000000000 +0900
@@ -933,6 +933,9 @@
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
MDCPUCFG_H=_freebsd.cfg
diff --git a/mail/thunderbird/patches/patch-bq b/mail/thunderbird/patches/patch-bq
index 6f8f4d85455..9466fdeabea 100644
--- a/mail/thunderbird/patches/patch-bq
+++ b/mail/thunderbird/patches/patch-bq
@@ -1,8 +1,8 @@
-$NetBSD: patch-bq,v 1.3 2004/05/08 04:35:39 taya Exp $
+$NetBSD: patch-bq,v 1.4 2004/06/24 23:09:56 taya 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-05-05 23:24:31.000000000 +0900
++++ ./xpcom/io/nsLocalFileUnix.h 2004-06-15 23:56:45.000000000 +0900
@@ -57,7 +57,7 @@
#endif
diff --git a/mail/thunderbird/patches/patch-br b/mail/thunderbird/patches/patch-br
index 7ddd32c3a74..5ab290769df 100644
--- a/mail/thunderbird/patches/patch-br
+++ b/mail/thunderbird/patches/patch-br
@@ -1,8 +1,8 @@
-$NetBSD: patch-br,v 1.2 2004/05/08 04:35:39 taya Exp $
+$NetBSD: patch-br,v 1.3 2004/06/24 23:09:56 taya Exp $
diff -ru ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
--- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2004-01-23 07:22:37.000000000 +0900
-+++ ./nsprpub/pr/src/misc/prnetdb.c 2004-05-05 23:24:35.000000000 +0900
++++ ./nsprpub/pr/src/misc/prnetdb.c 2004-06-15 23:56:46.000000000 +0900
@@ -2094,7 +2094,12 @@
*/
hints.ai_socktype = SOCK_STREAM;
diff --git a/mail/thunderbird/patches/patch-bs b/mail/thunderbird/patches/patch-bs
new file mode 100644
index 00000000000..c350bebaa05
--- /dev/null
+++ b/mail/thunderbird/patches/patch-bs
@@ -0,0 +1,15 @@
+$NetBSD: patch-bs,v 1.3 2004/06/24 23:09:56 taya Exp $
+
+diff -ru ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h
+--- ../Orig/mozilla/config/mkdepend/imakemdep.h 1998-09-05 13:22:25.000000000 +0900
++++ ./config/mkdepend/imakemdep.h 2004-06-15 23:56:48.000000000 +0900
+@@ -277,6 +277,9 @@
+ # ifdef __i386__
+ "-D__i386__",
+ # endif
++#if defined(__amd64__) || defined(__x86_64__)
++ "-D__amd64__ -D__x86_64__",
++# endif
+ # ifdef __GNUC__
+ "-traditional",
+ # endif
diff --git a/mail/thunderbird/patches/patch-bt b/mail/thunderbird/patches/patch-bt
new file mode 100644
index 00000000000..8f9f3342b5f
--- /dev/null
+++ b/mail/thunderbird/patches/patch-bt
@@ -0,0 +1,17 @@
+$NetBSD: patch-bt,v 1.1 2004/06/24 23:09:56 taya 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-bu b/mail/thunderbird/patches/patch-bu
new file mode 100644
index 00000000000..af417dfe118
--- /dev/null
+++ b/mail/thunderbird/patches/patch-bu
@@ -0,0 +1,179 @@
+$NetBSD: patch-bu,v 1.1 2004/06/24 23:09:56 taya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig 2004-05-30 21:38:13.000000000 +0900
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 2004-05-30 21:37:22.000000000 +0900
+@@ -0,0 +1,174 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++// Platform specific code to invoke XPCOM methods on native objects
++
++#include "xptcprivate.h"
++
++// 6 integral parameters are passed in registers
++const PRUint32 GPR_COUNT = 6;
++
++// 8 floating point parameters are passed in SSE registers
++const PRUint32 FPR_COUNT = 8;
++
++// Remember that these 'words' are 64-bit long
++static inline void
++invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
++ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
++{
++ nr_gpr = 1; // skip one GP register for 'that'
++ nr_fpr = 0;
++ nr_stack = 0;
++
++ /* Compute number of eightbytes of class MEMORY. */
++ for (uint32 i = 0; i < paramCount; i++, s++) {
++ if (!s->IsPtrData()
++ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
++ if (nr_fpr < FPR_COUNT)
++ nr_fpr++;
++ else
++ nr_stack++;
++ }
++ else {
++ if (nr_gpr < GPR_COUNT)
++ nr_gpr++;
++ else
++ nr_stack++;
++ }
++ }
++}
++
++static void
++invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
++ PRUint64 * gpregs, double * fpregs)
++{
++ PRUint32 nr_gpr = 1; // skip one GP register for 'that'
++ PRUint32 nr_fpr = 0;
++ PRUint64 value;
++
++ for (uint32 i = 0; i < paramCount; i++, s++) {
++ if (s->IsPtrData())
++ value = (PRUint64) s->ptr;
++ else {
++ switch (s->type) {
++ case nsXPTType::T_FLOAT: break;
++ case nsXPTType::T_DOUBLE: break;
++ case nsXPTType::T_I8: value = s->val.i8; break;
++ case nsXPTType::T_I16: value = s->val.i16; break;
++ case nsXPTType::T_I32: value = s->val.i32; break;
++ case nsXPTType::T_I64: value = s->val.i64; break;
++ case nsXPTType::T_U8: value = s->val.u8; break;
++ case nsXPTType::T_U16: value = s->val.u16; break;
++ case nsXPTType::T_U32: value = s->val.u32; break;
++ case nsXPTType::T_U64: value = s->val.u64; break;
++ case nsXPTType::T_BOOL: value = s->val.b; break;
++ case nsXPTType::T_CHAR: value = s->val.c; break;
++ case nsXPTType::T_WCHAR: value = s->val.wc; break;
++ default: value = (PRUint64) s->val.p; break;
++ }
++ }
++
++ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
++ if (nr_fpr < FPR_COUNT)
++ fpregs[nr_fpr++] = s->val.d;
++ else {
++ *((double *)d) = s->val.d;
++ d++;
++ }
++ }
++ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
++ if (nr_fpr < FPR_COUNT)
++ // The value in %xmm register is already prepared to
++ // be retrieved as a float. Therefore, we pass the
++ // value verbatim, as a double without conversion.
++ fpregs[nr_fpr++] = s->val.d;
++ else {
++ *((float *)d) = s->val.f;
++ d++;
++ }
++ }
++ else {
++ if (nr_gpr < GPR_COUNT)
++ gpregs[nr_gpr++] = value;
++ else
++ *d++ = value;
++ }
++ }
++}
++
++extern "C"
++XPTC_PUBLIC_API(nsresult)
++XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
++ PRUint32 paramCount, nsXPTCVariant * params)
++{
++ PRUint32 nr_gpr, nr_fpr, nr_stack;
++ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
++
++ // Stack, if used, must be 16-bytes aligned
++ if (nr_stack)
++ nr_stack = (nr_stack + 1) & ~1;
++
++ // Load parameters to stack, if necessary
++ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
++ PRUint64 gpregs[GPR_COUNT];
++ double fpregs[FPR_COUNT];
++ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
++
++ // Load FPR registers from fpregs[]
++ register double d0 asm("xmm0");
++ register double d1 asm("xmm1");
++ register double d2 asm("xmm2");
++ register double d3 asm("xmm3");
++ register double d4 asm("xmm4");
++ register double d5 asm("xmm5");
++ register double d6 asm("xmm6");
++ register double d7 asm("xmm7");
++
++ switch (nr_fpr) {
++#define ARG_FPR(N) \
++ case N+1: d##N = fpregs[N];
++ ARG_FPR(7);
++ ARG_FPR(6);
++ ARG_FPR(5);
++ ARG_FPR(4);
++ ARG_FPR(3);
++ ARG_FPR(2);
++ ARG_FPR(1);
++ ARG_FPR(0);
++ case 0:;
++#undef ARG_FPR
++ }
++
++ // Load GPR registers from gpregs[]
++ register PRUint64 a0 asm("rdi");
++ register PRUint64 a1 asm("rsi");
++ register PRUint64 a2 asm("rdx");
++ register PRUint64 a3 asm("rcx");
++ register PRUint64 a4 asm("r8");
++ register PRUint64 a5 asm("r9");
++
++ switch (nr_gpr) {
++#define ARG_GPR(N) \
++ case N+1: a##N = gpregs[N];
++ ARG_GPR(5);
++ ARG_GPR(4);
++ ARG_GPR(3);
++ ARG_GPR(2);
++ ARG_GPR(1);
++ case 1: a0 = (PRUint64) that;
++ case 0:;
++#undef ARG_GPR
++ }
++
++ // Ensure that assignments to SSE registers won't be optimized away
++ asm("" ::
++ "x" (d0), "x" (d1), "x" (d2), "x" (d3),
++ "x" (d4), "x" (d5), "x" (d6), "x" (d7));
++
++ // Get pointer to method
++ PRUint64 methodAddress = *((PRUint64 *)that);
++ methodAddress += 8 * methodIndex;
++ methodAddress = *((PRUint64 *)methodAddress);
++
++ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
++ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
++ return result;
++}
diff --git a/mail/thunderbird/patches/patch-bv b/mail/thunderbird/patches/patch-bv
new file mode 100644
index 00000000000..de1dd0dcf20
--- /dev/null
+++ b/mail/thunderbird/patches/patch-bv
@@ -0,0 +1,211 @@
+$NetBSD: patch-bv,v 1.1 2004/06/24 23:09:56 taya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig 2004-05-30 21:38:22.000000000 +0900
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 2004-05-30 21:37:22.000000000 +0900
+@@ -0,0 +1,206 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++
++// Implement shared vtbl methods.
++
++#include "xptcprivate.h"
++
++// The Linux/x86-64 ABI passes the first 6 integral parameters and the
++// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
++// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
++// caller. The rest of the parameters are passed in the callers stack
++// area.
++
++const PRUint32 PARAM_BUFFER_COUNT = 16;
++const PRUint32 GPR_COUNT = 6;
++const PRUint32 FPR_COUNT = 8;
++
++// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
++//
++// - 'args[]' contains the arguments passed on stack
++// - 'gpregs[]' contains the arguments passed in integer registers
++// - 'fpregs[]' contains the arguments passed in floating point registers
++//
++// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
++// and then the method gets called.
++
++extern "C" nsresult
++PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
++ PRUint64 * args, PRUint64 * gpregs, double *fpregs)
++{
++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
++ nsXPTCMiniVariant* dispatchParams = NULL;
++ nsIInterfaceInfo* iface_info = NULL;
++ const nsXPTMethodInfo* info;
++ PRUint32 paramCount;
++ PRUint32 i;
++ nsresult result = NS_ERROR_FAILURE;
++
++ NS_ASSERTION(self,"no self");
++
++ self->GetInterfaceInfo(&iface_info);
++ NS_ASSERTION(iface_info,"no interface info");
++ if (! iface_info)
++ return NS_ERROR_UNEXPECTED;
++
++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
++ NS_ASSERTION(info,"no method info");
++ if (! info)
++ return NS_ERROR_UNEXPECTED;
++
++ paramCount = info->GetParamCount();
++
++ // setup variant array pointer
++ if(paramCount > PARAM_BUFFER_COUNT)
++ dispatchParams = new nsXPTCMiniVariant[paramCount];
++ else
++ dispatchParams = paramBuffer;
++
++ NS_ASSERTION(dispatchParams,"no place for params");
++ if (! dispatchParams)
++ return NS_ERROR_OUT_OF_MEMORY;
++
++ PRUint64* ap = args;
++ PRUint32 nr_gpr = 1; // skip one GPR register for 'that'
++ PRUint32 nr_fpr = 0;
++ PRUint64 value;
++
++ for(i = 0; i < paramCount; i++) {
++ const nsXPTParamInfo& param = info->GetParam(i);
++ const nsXPTType& type = param.GetType();
++ nsXPTCMiniVariant* dp = &dispatchParams[i];
++
++ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
++ if (nr_fpr < FPR_COUNT)
++ dp->val.d = fpregs[nr_fpr++];
++ else
++ dp->val.d = *(double*) ap++;
++ continue;
++ }
++ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
++ if (nr_fpr < FPR_COUNT)
++ // The value in %xmm register is already prepared to
++ // be retrieved as a float. Therefore, we pass the
++ // value verbatim, as a double without conversion.
++ dp->val.d = *(double*) ap++;
++ else
++ dp->val.f = *(float*) ap++;
++ continue;
++ }
++ else {
++ if (nr_gpr < GPR_COUNT)
++ value = gpregs[nr_gpr++];
++ else
++ value = *ap++;
++ }
++
++ if (param.IsOut() || !type.IsArithmetic()) {
++ dp->val.p = (void*) value;
++ continue;
++ }
++
++ switch (type) {
++ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break;
++ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break;
++ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break;
++ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break;
++ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break;
++ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break;
++ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break;
++ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break;
++ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break;
++ case nsXPTType::T_CHAR: dp->val.c = (char) value; break;
++ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break;
++
++ default:
++ NS_ASSERTION(0, "bad type");
++ break;
++ }
++ }
++
++ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
++
++ NS_RELEASE(iface_info);
++
++ if (dispatchParams != paramBuffer)
++ delete [] dispatchParams;
++
++ return result;
++}
++
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++// Linux/x86-64 uses gcc >= 3.1
++#define STUB_ENTRY(n) \
++asm(".section \".text\"\n\t" \
++ ".align 2\n\t" \
++ ".if " #n " < 10\n\t" \
++ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
++ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
++ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
++ ".elseif " #n " < 100\n\t" \
++ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
++ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
++ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
++ ".elseif " #n " < 1000\n\t" \
++ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
++ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
++ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
++ ".else\n\t" \
++ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \
++ ".endif\n\t" \
++ "movl $" #n ", %eax\n\t" \
++ "jmp SharedStub\n\t" \
++ ".if " #n " < 10\n\t" \
++ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
++ ".elseif " #n " < 100\n\t" \
++ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
++ ".else\n\t" \
++ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
++ ".endif");
++
++// static nsresult SharedStub(PRUint32 methodIndex)
++asm(".section \".text\"\n\t"
++ ".align 2\n\t"
++ ".type SharedStub,@function\n\t"
++ "SharedStub:\n\t"
++ // make room for gpregs (48), fpregs (64)
++ "pushq %rbp\n\t"
++ "movq %rsp,%rbp\n\t"
++ "subq $112,%rsp\n\t"
++ // save GP registers
++ "movq %rdi,-112(%rbp)\n\t"
++ "movq %rsi,-104(%rbp)\n\t"
++ "movq %rdx, -96(%rbp)\n\t"
++ "movq %rcx, -88(%rbp)\n\t"
++ "movq %r8 , -80(%rbp)\n\t"
++ "movq %r9 , -72(%rbp)\n\t"
++ "leaq -112(%rbp),%rcx\n\t"
++ // save FP registers
++ "movsd %xmm0,-64(%rbp)\n\t"
++ "movsd %xmm1,-56(%rbp)\n\t"
++ "movsd %xmm2,-48(%rbp)\n\t"
++ "movsd %xmm3,-40(%rbp)\n\t"
++ "movsd %xmm4,-32(%rbp)\n\t"
++ "movsd %xmm5,-24(%rbp)\n\t"
++ "movsd %xmm6,-16(%rbp)\n\t"
++ "movsd %xmm7, -8(%rbp)\n\t"
++ "leaq -64(%rbp),%r8\n\t"
++ // rdi has the 'self' pointer already
++ "movl %eax,%esi\n\t"
++ "leaq 16(%rbp),%rdx\n\t"
++ "call PrepareAndDispatch\n\t"
++ "leave\n\t"
++ "ret\n\t"
++ ".size SharedStub,.-SharedStub");
++
++#define SENTINEL_ENTRY(n) \
++nsresult nsXPTCStubBase::Sentinel##n() \
++{ \
++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
++ return NS_ERROR_NOT_IMPLEMENTED; \
++}
++
++#include "xptcstubsdef.inc"
++
++#else
++#error "can't find a compiler to use"
++#endif /* __GNUC__ */
diff --git a/mail/thunderbird/patches/patch-bw b/mail/thunderbird/patches/patch-bw
new file mode 100644
index 00000000000..db0e0ce57fb
--- /dev/null
+++ b/mail/thunderbird/patches/patch-bw
@@ -0,0 +1,64 @@
+$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-bx b/mail/thunderbird/patches/patch-bx
new file mode 100644
index 00000000000..78b813996bc
--- /dev/null
+++ b/mail/thunderbird/patches/patch-bx
@@ -0,0 +1,61 @@
+$NetBSD: patch-bx,v 1.1 2004/06/24 23:09:56 taya Exp $
+
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2001-09-29 05:12:53.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2004-06-15 23:56:59.000000000 +0900
+@@ -195,6 +195,47 @@
+ // however, it's quick, dirty, and'll break when the ABI changes on
+ // us, which is what we want ;-).
+
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++// gcc-3 version
++//
++// As G++3 ABI contains the length of the functionname in the mangled
++// name, it is difficult to get a generic assembler mechanism like
++// in the G++ 2.95 case.
++// Create names would be like:
++// _ZN14nsXPTCStubBase5Stub1Ev
++// _ZN14nsXPTCStubBase6Stub12Ev
++// _ZN14nsXPTCStubBase7Stub123Ev
++// _ZN14nsXPTCStubBase8Stub1234Ev
++// etc.
++// Use assembler directives to get the names right...
++
++# define STUB_ENTRY(n) \
++__asm__ ( \
++ ".section \".text\" \n\t" \
++ ".align 2 \n\t" \
++ ".if "#n" < 10 \n\t" \
++ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
++ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \
++"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \
++ \
++ ".elseif "#n" < 100 \n\t" \
++ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
++ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \
++"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \
++ \
++ ".elseif "#n" < 1000 \n\t" \
++ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
++ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \
++"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \
++ \
++ ".else \n\t" \
++ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \
++ ".endif \n\t" \
++ \
++ "li 11,"#n" \n\t" \
++ "b SharedStub@local \n" \
++);
++#else
+ #define STUB_ENTRY(n) \
+ __asm__ ( \
+ ".section \".text\" \n\t" \
+@@ -206,6 +247,7 @@
+ "li 11,"#n" \n\t" \
+ "b SharedStub@local \n" \
+ );
++#endif
+
+ #define SENTINEL_ENTRY(n) \
+ nsresult nsXPTCStubBase::Sentinel##n() \
diff --git a/mail/thunderbird/patches/patch-by b/mail/thunderbird/patches/patch-by
new file mode 100644
index 00000000000..7e2e8fd3954
--- /dev/null
+++ b/mail/thunderbird/patches/patch-by
@@ -0,0 +1,31 @@
+$NetBSD: patch-by,v 1.1 2004/06/24 23:09:56 taya Exp $
+
+diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
+--- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-03-19 10:36:16.000000000 +0900
++++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-06-15 23:57:02.000000000 +0900
+@@ -440,19 +440,19 @@
+ return;
+ }
+
+- FTC_Image_Desc imageDesc;
+- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
++ FTC_ImageType imageDesc;
++ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
+ float twipstopixel = GetTwipsToPixels();
+ float scale = GetPixelScale();
+- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
+- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
+- imageDesc.image_type |= ftc_image_grays;
++ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
++ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
++ imageDesc->flags = 0;
+
+ // get the face
+ nsresult rv;
+ FTC_Manager mgr;
+ nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
+- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
++ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
+ NS_ASSERTION(mFace, "failed to get face/size");
+ }
+