Update to thunderbird-8.0 and enigmail-1.3.3.

8.0 changes: Thunderbird is based on the new Mozilla Gecko 8 engine Add-ons installed by third party programs are now disabled by default New Search and Find Shortcuts Improved accessibility of the attachment list Folder switching pane widget has been removed, can be added back with the Folder Pane View Switcher Add-on Numerous platform fixes to stability Fixed several security issues 7.0 changes: Thunderbird is based on the new Mozilla Gecko 7 engine Several user interface fixes and improvements Several fixes to attachment handling Ability to print a summary of selected email messages Platform improvements to Address Book Fixed several security issues Numerous platform fixes that improve speed, performance and stability
author: tnn <tnn@pkgsrc.org> 2011-11-13 16:59:58 +0000
committer: tnn <tnn@pkgsrc.org> 2011-11-13 16:59:58 +0000
commit: c8594d1c1224512e83c9f95ffef80d9409be9e92 (patch)
tree: da72e66c1b33d456f41dbe559ee56266b63ef69d /mail/thunderbird
parent: 1cd5099c292a1e2ffe581b671f79ac9708d82f97 (diff)
download: pkgsrc-c8594d1c1224512e83c9f95ffef80d9409be9e92.tar.gz
14 files changed, 251 insertions, 238 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index f594b05bb42..b2bf266557f 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.75 2011/11/01 06:11:55 sbd Exp $
+# $NetBSD: Makefile,v 1.76 2011/11/13 16:59:58 tnn Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-PKGREVISION=	2
-TB_VER=		6.0.1
+TB_VER=		8.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
@@ -25,14 +24,13 @@ CONFIGURE_ARGS+=	--enable-application=mail
 
 ALL_ENV+=		MOZILLA_PKG_NAME=thunderbird
 
-# Looks like mozilla forgot to bump allowed versions to 6.0
-SUBST_CLASSES+=			ext-compat
-SUBST_STAGE.ext-compat=		pre-configure
-SUBST_MESSAGE.ext-compat=	Fixing extension compatibility
-SUBST_FILES.ext-compat=		mailnews/extensions/enigmail/package/install.rdf
-SUBST_FILES.ext-compat+=	calendar/*/install.rdf
-SUBST_FILES.ext-compat+=	calendar/*/*/install.rdf
-SUBST_SED.ext-compat=		-e 's,\(<em:maxVersion>\)5.*<,\19.0<,g'
+#SUBST_CLASSES+=			ext-compat
+#SUBST_STAGE.ext-compat=		pre-configure
+#SUBST_MESSAGE.ext-compat=	Fixing extension compatibility
+#SUBST_FILES.ext-compat=		mailnews/extensions/enigmail/package/install.rdf
+#SUBST_FILES.ext-compat+=	calendar/*/install.rdf
+#SUBST_FILES.ext-compat+=	calendar/*/*/install.rdf
+#SUBST_SED.ext-compat=		-e 's,\(<em:maxVersion>\).*<,\19.0<,g'
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index b76f082a668..9f9335dd6e8 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2011/08/23 18:04:17 tnn Exp $
+@comment $NetBSD: PLIST,v 1.35 2011/11/13 16:59:58 tnn Exp $
 bin/thunderbird
 ${PLIST.jit}include/thunderbird/Allocator.h
 ${PLIST.jit}include/thunderbird/Assembler.h
@@ -46,7 +46,6 @@ ${PLIST.jit}include/thunderbird/VMPI.h
 include/thunderbird/VerReg.h
 include/thunderbird/VideoUtils.h
 ${PLIST.jit}include/thunderbird/Writer.h
-include/thunderbird/XPCIDispatch.h
 include/thunderbird/a11yGeneric.h
 include/thunderbird/amIInstallTrigger.h
 include/thunderbird/amIWebInstallListener.h
@@ -63,6 +62,7 @@ include/thunderbird/cairo/cairo-pdf.h
 include/thunderbird/cairo/cairo-platform.h
 include/thunderbird/cairo/cairo-ps.h
 include/thunderbird/cairo/cairo-rename.h
+include/thunderbird/cairo/cairo-tee.h
 include/thunderbird/cairo/cairo-version.h
 include/thunderbird/cairo/cairo-xlib-xrender.h
 include/thunderbird/cairo/cairo-xlib.h
@@ -89,6 +89,7 @@ include/thunderbird/expat_config.h
 include/thunderbird/expat_external.h
 include/thunderbird/extIApplication.h
 include/thunderbird/ftpCore.h
+include/thunderbird/gfx2DGlue.h
 include/thunderbird/gfx3DMatrix.h
 include/thunderbird/gfxASurface.h
 include/thunderbird/gfxAlphaRecovery.h
@@ -117,6 +118,7 @@ include/thunderbird/gfxPattern.h
 include/thunderbird/gfxPlatform.h
 include/thunderbird/gfxPlatformGtk.h
 include/thunderbird/gfxPoint.h
+include/thunderbird/gfxPoint3D.h
 include/thunderbird/gfxRect.h
 include/thunderbird/gfxSharedImageSurface.h
 include/thunderbird/gfxSkipChars.h
@@ -160,21 +162,19 @@ include/thunderbird/inIDeepTreeWalker.h
 include/thunderbird/inIFlasher.h
 include/thunderbird/inISearchObserver.h
 include/thunderbird/inISearchProcess.h
+include/thunderbird/jArray.h
 include/thunderbird/jar-ds.h
 include/thunderbird/jar.h
 include/thunderbird/jarfile.h
 include/thunderbird/js-config.h
 include/thunderbird/js.msg
 include/thunderbird/jsalloc.h
-include/thunderbird/jsanalyze.h
 include/thunderbird/jsapi.h
 include/thunderbird/jsarena.h
-include/thunderbird/jsarray.h
 include/thunderbird/jsatom.h
 include/thunderbird/jsautocfg.h
 include/thunderbird/jsautokw.h
 include/thunderbird/jsbit.h
-include/thunderbird/jsbool.h
 ${PLIST.jit}include/thunderbird/jsbuiltins.h
 include/thunderbird/jscell.h
 include/thunderbird/jsclist.h
@@ -182,54 +182,43 @@ include/thunderbird/jsclone.h
 include/thunderbird/jscntxt.h
 include/thunderbird/jscompartment.h
 include/thunderbird/jscompat.h
+include/thunderbird/jscrashreport.h
 include/thunderbird/jsdIDebuggerService.h
 include/thunderbird/jsdate.h
 include/thunderbird/jsdbgapi.h
 include/thunderbird/jsdebug.h
 include/thunderbird/jsdhash.h
-include/thunderbird/jsdtoa.h
 include/thunderbird/jsemit.h
 include/thunderbird/jsfriendapi.h
 include/thunderbird/jsfun.h
 include/thunderbird/jsgc.h
 include/thunderbird/jsgcchunk.h
-include/thunderbird/jsgcmark.h
 include/thunderbird/jsgcstats.h
 include/thunderbird/jshash.h
 include/thunderbird/jshashtable.h
-include/thunderbird/jshotloop.h
 include/thunderbird/jsinterp.h
 include/thunderbird/jsinttypes.h
 include/thunderbird/jsiter.h
 include/thunderbird/jslock.h
-include/thunderbird/jslong.h
-include/thunderbird/jsmath.h
-include/thunderbird/jsnum.h
 include/thunderbird/jsobj.h
-include/thunderbird/jsobjinlines.h
 include/thunderbird/json.h
-include/thunderbird/jsonparser.h
 include/thunderbird/jsopcode.h
 include/thunderbird/jsopcode.tbl
-include/thunderbird/jsopcodeinlines.h
 include/thunderbird/jsotypes.h
 include/thunderbird/jsparse.h
 include/thunderbird/jsperf.h
 include/thunderbird/jsprf.h
 include/thunderbird/jsprobes.h
 include/thunderbird/jspropertycache.h
-include/thunderbird/jspropertycacheinlines.h
 include/thunderbird/jspropertytree.h
 include/thunderbird/jsproto.tbl
 include/thunderbird/jsproxy.h
 include/thunderbird/jsprvtd.h
 include/thunderbird/jspubtd.h
 include/thunderbird/jsreflect.h
-include/thunderbird/jsregexp.h
 include/thunderbird/jsscan.h
 include/thunderbird/jsscope.h
 include/thunderbird/jsscript.h
-include/thunderbird/jsscriptinlines.h
 include/thunderbird/jsstaticcheck.h
 include/thunderbird/jsstdint.h
 include/thunderbird/jsstr.h
@@ -242,10 +231,8 @@ include/thunderbird/jsval.h
 include/thunderbird/jsvalue.h
 include/thunderbird/jsvector.h
 include/thunderbird/jsversion.h
-include/thunderbird/jsweakmap.h
 include/thunderbird/jswrapper.h
 include/thunderbird/jsxdrapi.h
-include/thunderbird/jsxml.h
 include/thunderbird/key.h
 include/thunderbird/keyhi.h
 include/thunderbird/keyt.h
@@ -337,10 +324,7 @@ include/thunderbird/mozStorageHelper.h
 include/thunderbird/mozcontainer.h
 include/thunderbird/mozilla-config.h
 include/thunderbird/mozilla/AutoRestore.h
-include/thunderbird/mozilla/BaseMargin.h
-include/thunderbird/mozilla/BasePoint.h
-include/thunderbird/mozilla/BaseRect.h
-include/thunderbird/mozilla/BaseSize.h
+include/thunderbird/mozilla/Base64.h
 include/thunderbird/mozilla/BlockingResourceBase.h
 include/thunderbird/mozilla/CondVar.h
 include/thunderbird/mozilla/DeadlockDetector.h
@@ -359,16 +343,21 @@ include/thunderbird/mozilla/PaintTracker.h
 include/thunderbird/mozilla/PluginLibrary.h
 include/thunderbird/mozilla/PluginPRLibrary.h
 include/thunderbird/mozilla/Preferences.h
+include/thunderbird/mozilla/RangedPtr.h
 include/thunderbird/mozilla/ReentrantMonitor.h
+include/thunderbird/mozilla/RefPtr.h
 include/thunderbird/mozilla/SSE.h
 include/thunderbird/mozilla/ServiceList.h
 include/thunderbird/mozilla/Services.h
+include/thunderbird/mozilla/Telemetry.h
+include/thunderbird/mozilla/TelemetryHistograms.h
 include/thunderbird/mozilla/TimeStamp.h
 include/thunderbird/mozilla/Types.h
 include/thunderbird/mozilla/Util.h
 include/thunderbird/mozilla/WidgetTraceEvent.h
 include/thunderbird/mozilla/X11Util.h
 include/thunderbird/mozilla/XPCOM.h
+include/thunderbird/mozilla/a11y/States.h
 include/thunderbird/mozilla/arm.h
 include/thunderbird/mozilla/chrome/RegistryMessageUtils.h
 include/thunderbird/mozilla/css/Declaration.h
@@ -394,6 +383,7 @@ include/thunderbird/mozilla/dom/FromParser.h
 include/thunderbird/mozilla/dom/Link.h
 include/thunderbird/mozilla/dom/StorageChild.h
 include/thunderbird/mozilla/dom/StorageParent.h
+include/thunderbird/mozilla/dom/StructuredCloneTags.h
 include/thunderbird/mozilla/dom/TabChild.h
 include/thunderbird/mozilla/dom/TabParent.h
 include/thunderbird/mozilla/dom/indexedDB/IDBCursor.h
@@ -409,7 +399,18 @@ include/thunderbird/mozilla/dom/indexedDB/IndexedDatabase.h
 include/thunderbird/mozilla/dom/indexedDB/IndexedDatabaseManager.h
 include/thunderbird/mozilla/dom/indexedDB/Key.h
 include/thunderbird/mozilla/dom/indexedDB/LazyIdleThread.h
+include/thunderbird/mozilla/dom/workers/Workers.h
+include/thunderbird/mozilla/gfx/2D.h
+include/thunderbird/mozilla/gfx/BaseMargin.h
+include/thunderbird/mozilla/gfx/BasePoint.h
+include/thunderbird/mozilla/gfx/BasePoint3D.h
+include/thunderbird/mozilla/gfx/BaseRect.h
+include/thunderbird/mozilla/gfx/BaseSize.h
+include/thunderbird/mozilla/gfx/Matrix.h
+include/thunderbird/mozilla/gfx/Point.h
+include/thunderbird/mozilla/gfx/Rect.h
 include/thunderbird/mozilla/gfx/SharedDIB.h
+include/thunderbird/mozilla/gfx/Types.h
 include/thunderbird/mozilla/ipc/AsyncChannel.h
 include/thunderbird/mozilla/ipc/BrowserProcessSubThread.h
 include/thunderbird/mozilla/ipc/DocumentRendererChild.h
@@ -432,6 +433,8 @@ include/thunderbird/mozilla/ipc/Shmem.h
 include/thunderbird/mozilla/ipc/SyncChannel.h
 include/thunderbird/mozilla/ipc/TestShellChild.h
 include/thunderbird/mozilla/ipc/TestShellParent.h
+include/thunderbird/mozilla/ipc/Transport.h
+include/thunderbird/mozilla/ipc/Transport_posix.h
 include/thunderbird/mozilla/ipc/XPCShellEnvironment.h
 include/thunderbird/mozilla/jetpack/Handle.h
 include/thunderbird/mozilla/jetpack/JetpackActorCommon.h
@@ -456,6 +459,7 @@ include/thunderbird/mozilla/mozalloc_abort.h
 include/thunderbird/mozilla/mozalloc_macro_wrappers.h
 include/thunderbird/mozilla/mozalloc_oom.h
 include/thunderbird/mozilla/mozalloc_undef_macro_wrappers.h
+include/thunderbird/mozilla/net/BaseWebSocketChannel.h
 include/thunderbird/mozilla/net/ChannelEventQueue.h
 include/thunderbird/mozilla/net/CookieServiceChild.h
 include/thunderbird/mozilla/net/CookieServiceParent.h
@@ -469,6 +473,9 @@ include/thunderbird/mozilla/net/NeckoCommon.h
 include/thunderbird/mozilla/net/NeckoMessageUtils.h
 include/thunderbird/mozilla/net/NeckoParent.h
 include/thunderbird/mozilla/net/PHttpChannelParams.h
+include/thunderbird/mozilla/net/WebSocketChannel.h
+include/thunderbird/mozilla/net/WebSocketChannelChild.h
+include/thunderbird/mozilla/net/WebSocketChannelParent.h
 include/thunderbird/mozilla/net/WyciwygChannelChild.h
 include/thunderbird/mozilla/net/WyciwygChannelParent.h
 include/thunderbird/mozilla/places/History.h
@@ -496,6 +503,7 @@ include/thunderbird/mozilla/plugins/PluginScriptableObjectUtils-inl.h
 include/thunderbird/mozilla/plugins/PluginScriptableObjectUtils.h
 include/thunderbird/mozilla/plugins/PluginStreamChild.h
 include/thunderbird/mozilla/plugins/PluginStreamParent.h
+include/thunderbird/mozilla/plugins/PluginUtilsOSX.h
 include/thunderbird/mozilla/plugins/StreamNotifyChild.h
 include/thunderbird/mozilla/plugins/StreamNotifyParent.h
 include/thunderbird/mozilla/scache/StartupCache.h
@@ -520,7 +528,8 @@ include/thunderbird/npapi.h
 include/thunderbird/npfunctions.h
 include/thunderbird/npruntime.h
 include/thunderbird/nptypes.h
-include/thunderbird/nsAHtml5FragmentParser.h
+include/thunderbird/nsAHtml5TreeBuilderState.h
+include/thunderbird/nsAHtml5TreeOpSink.h
 include/thunderbird/nsARIAGridAccessibleWrap.h
 include/thunderbird/nsARIAMap.h
 include/thunderbird/nsASocketHandler.h
@@ -533,7 +542,6 @@ include/thunderbird/nsAccessNode.h
 include/thunderbird/nsAccessNodeWrap.h
 include/thunderbird/nsAccessibilityService.h
 include/thunderbird/nsAccessible.h
-include/thunderbird/nsAccessibleRelationWrap.h
 include/thunderbird/nsAccessibleWrap.h
 include/thunderbird/nsAgg.h
 include/thunderbird/nsAlgorithm.h
@@ -553,7 +561,6 @@ include/thunderbird/nsAutoPtr.h
 include/thunderbird/nsAutoRef.h
 include/thunderbird/nsBaseHashtable.h
 include/thunderbird/nsBidi.h
-include/thunderbird/nsBidiFrames.h
 include/thunderbird/nsBidiPresUtils.h
 include/thunderbird/nsBidiUtils.h
 include/thunderbird/nsBindingManager.h
@@ -619,6 +626,7 @@ include/thunderbird/nsContentErrors.h
 include/thunderbird/nsContentList.h
 include/thunderbird/nsContentPermissionHelper.h
 include/thunderbird/nsContentPolicyUtils.h
+include/thunderbird/nsContentSink.h
 include/thunderbird/nsContentUtils.h
 include/thunderbird/nsCoord.h
 include/thunderbird/nsCopySupport.h
@@ -638,6 +646,7 @@ include/thunderbird/nsDOMEventTargetWrapperCache.h
 include/thunderbird/nsDOMFile.h
 include/thunderbird/nsDOMJSUtils.h
 include/thunderbird/nsDOMMediaQueryList.h
+include/thunderbird/nsDOMMemoryReporter.h
 include/thunderbird/nsDOMScriptObjectHolder.h
 include/thunderbird/nsDOMString.h
 include/thunderbird/nsDataHashtable.h
@@ -646,6 +655,7 @@ include/thunderbird/nsDebug.h
 include/thunderbird/nsDebugImpl.h
 include/thunderbird/nsDependentString.h
 include/thunderbird/nsDependentSubstring.h
+include/thunderbird/nsDeprecatedOperationList.h
 include/thunderbird/nsDeque.h
 include/thunderbird/nsDetectionConfident.h
 include/thunderbird/nsDeviceContext.h
@@ -671,15 +681,18 @@ include/thunderbird/nsError.h
 include/thunderbird/nsEscape.h
 include/thunderbird/nsEvent.h
 include/thunderbird/nsEventDispatcher.h
+include/thunderbird/nsEventListenerManager.h
+include/thunderbird/nsEventNameList.h
 include/thunderbird/nsEventQueue.h
 include/thunderbird/nsEventStateManager.h
 include/thunderbird/nsEventStates.h
 include/thunderbird/nsExpirationTracker.h
 include/thunderbird/nsExternalHelperAppService.h
-include/thunderbird/nsFastLoadService.h
 include/thunderbird/nsFixedSizeAllocator.h
 include/thunderbird/nsFocusManager.h
 include/thunderbird/nsFont.h
+include/thunderbird/nsFontFace.h
+include/thunderbird/nsFontFaceList.h
 include/thunderbird/nsFontMetrics.h
 include/thunderbird/nsFormSubmission.h
 include/thunderbird/nsFrameList.h
@@ -720,8 +733,30 @@ include/thunderbird/nsHashKeys.h
 include/thunderbird/nsHashPropertyBag.h
 include/thunderbird/nsHashSets.h
 include/thunderbird/nsHashtable.h
+include/thunderbird/nsHtml5ArrayCopy.h
+include/thunderbird/nsHtml5AtomList.h
+include/thunderbird/nsHtml5AtomTable.h
+include/thunderbird/nsHtml5Atoms.h
+include/thunderbird/nsHtml5ByteReadable.h
+include/thunderbird/nsHtml5DocumentMode.h
+include/thunderbird/nsHtml5HtmlAttributes.h
+include/thunderbird/nsHtml5Macros.h
+include/thunderbird/nsHtml5MetaScanner.h
+include/thunderbird/nsHtml5MetaScannerHSupplement.h
 include/thunderbird/nsHtml5Module.h
+include/thunderbird/nsHtml5NamedCharacters.h
+include/thunderbird/nsHtml5NamedCharactersAccel.h
+include/thunderbird/nsHtml5Parser.h
+include/thunderbird/nsHtml5PendingNotification.h
 include/thunderbird/nsHtml5SVGLoadDispatcher.h
+include/thunderbird/nsHtml5Speculation.h
+include/thunderbird/nsHtml5SpeculativeLoad.h
+include/thunderbird/nsHtml5StreamParser.h
+include/thunderbird/nsHtml5TreeOpExecutor.h
+include/thunderbird/nsHtml5TreeOpStage.h
+include/thunderbird/nsHtml5TreeOperation.h
+include/thunderbird/nsHtml5UTF16Buffer.h
+include/thunderbird/nsHtml5UTF16BufferHSupplement.h
 include/thunderbird/nsHttp.h
 include/thunderbird/nsHttpAtomList.h
 include/thunderbird/nsHttpHeaderArray.h
@@ -830,6 +865,7 @@ include/thunderbird/nsIAutoSyncFolderStrategy.h
 include/thunderbird/nsIAutoSyncManager.h
 include/thunderbird/nsIAutoSyncMsgStrategy.h
 include/thunderbird/nsIAutoSyncState.h
+include/thunderbird/nsIBFCacheEntry.h
 include/thunderbird/nsIBadCertListener2.h
 include/thunderbird/nsIBaseDOMException.h
 include/thunderbird/nsIBaseWindow.h
@@ -965,11 +1001,6 @@ include/thunderbird/nsIDBFolderInfo.h
 include/thunderbird/nsIDNSListener.h
 include/thunderbird/nsIDNSRecord.h
 include/thunderbird/nsIDNSService.h
-include/thunderbird/nsIDOM3Attr.h
-include/thunderbird/nsIDOM3EventTarget.h
-include/thunderbird/nsIDOM3Node.h
-include/thunderbird/nsIDOM3Text.h
-include/thunderbird/nsIDOM3TypeInfo.h
 include/thunderbird/nsIDOMAnimationEvent.h
 include/thunderbird/nsIDOMAttr.h
 include/thunderbird/nsIDOMBarProp.h
@@ -1002,9 +1033,7 @@ include/thunderbird/nsIDOMClientRectList.h
 include/thunderbird/nsIDOMCloseEvent.h
 include/thunderbird/nsIDOMCommandEvent.h
 include/thunderbird/nsIDOMComment.h
-include/thunderbird/nsIDOMCompositionListener.h
 include/thunderbird/nsIDOMConstructor.h
-include/thunderbird/nsIDOMContextMenuListener.h
 include/thunderbird/nsIDOMCounter.h
 include/thunderbird/nsIDOMCrypto.h
 include/thunderbird/nsIDOMCryptoDialogs.h
@@ -1021,20 +1050,15 @@ include/thunderbird/nsIDOMDesktopNotification.h
 include/thunderbird/nsIDOMDeviceMotionEvent.h
 include/thunderbird/nsIDOMDeviceOrientationEvent.h
 include/thunderbird/nsIDOMDocument.h
-include/thunderbird/nsIDOMDocumentCSS.h
 include/thunderbird/nsIDOMDocumentFragment.h
-include/thunderbird/nsIDOMDocumentStyle.h
 include/thunderbird/nsIDOMDocumentType.h
 include/thunderbird/nsIDOMDocumentXBL.h
 include/thunderbird/nsIDOMDragEvent.h
 include/thunderbird/nsIDOMElement.h
 include/thunderbird/nsIDOMElementCSSInlineStyle.h
 include/thunderbird/nsIDOMElementTimeControl.h
-include/thunderbird/nsIDOMEntity.h
-include/thunderbird/nsIDOMEntityReference.h
 include/thunderbird/nsIDOMEvent.h
 include/thunderbird/nsIDOMEventException.h
-include/thunderbird/nsIDOMEventGroup.h
 include/thunderbird/nsIDOMEventListener.h
 include/thunderbird/nsIDOMEventTarget.h
 include/thunderbird/nsIDOMFile.h
@@ -1042,9 +1066,9 @@ include/thunderbird/nsIDOMFileError.h
 include/thunderbird/nsIDOMFileException.h
 include/thunderbird/nsIDOMFileList.h
 include/thunderbird/nsIDOMFileReader.h
-include/thunderbird/nsIDOMFocusListener.h
+include/thunderbird/nsIDOMFontFace.h
+include/thunderbird/nsIDOMFontFaceList.h
 include/thunderbird/nsIDOMFormData.h
-include/thunderbird/nsIDOMFormListener.h
 include/thunderbird/nsIDOMGeoGeolocation.h
 include/thunderbird/nsIDOMGeoPosition.h
 include/thunderbird/nsIDOMGeoPositionAddress.h
@@ -1066,6 +1090,7 @@ include/thunderbird/nsIDOMHTMLButtonElement.h
 include/thunderbird/nsIDOMHTMLByteRanges.h
 include/thunderbird/nsIDOMHTMLCanvasElement.h
 include/thunderbird/nsIDOMHTMLCollection.h
+include/thunderbird/nsIDOMHTMLCommandElement.h
 include/thunderbird/nsIDOMHTMLDListElement.h
 include/thunderbird/nsIDOMHTMLDataListElement.h
 include/thunderbird/nsIDOMHTMLDirectoryElement.h
@@ -1085,7 +1110,6 @@ include/thunderbird/nsIDOMHTMLHtmlElement.h
 include/thunderbird/nsIDOMHTMLIFrameElement.h
 include/thunderbird/nsIDOMHTMLImageElement.h
 include/thunderbird/nsIDOMHTMLInputElement.h
-include/thunderbird/nsIDOMHTMLIsIndexElement.h
 include/thunderbird/nsIDOMHTMLLIElement.h
 include/thunderbird/nsIDOMHTMLLabelElement.h
 include/thunderbird/nsIDOMHTMLLegendElement.h
@@ -1093,6 +1117,7 @@ include/thunderbird/nsIDOMHTMLLinkElement.h
 include/thunderbird/nsIDOMHTMLMapElement.h
 include/thunderbird/nsIDOMHTMLMediaElement.h
 include/thunderbird/nsIDOMHTMLMenuElement.h
+include/thunderbird/nsIDOMHTMLMenuItemElement.h
 include/thunderbird/nsIDOMHTMLMetaElement.h
 include/thunderbird/nsIDOMHTMLModElement.h
 include/thunderbird/nsIDOMHTMLOListElement.h
@@ -1125,10 +1150,8 @@ include/thunderbird/nsIDOMHashChangeEvent.h
 include/thunderbird/nsIDOMHistory.h
 include/thunderbird/nsIDOMJSWindow.h
 include/thunderbird/nsIDOMKeyEvent.h
-include/thunderbird/nsIDOMKeyListener.h
 include/thunderbird/nsIDOMLSProgressEvent.h
 include/thunderbird/nsIDOMLinkStyle.h
-include/thunderbird/nsIDOMLoadListener.h
 include/thunderbird/nsIDOMLoadStatus.h
 include/thunderbird/nsIDOMLocation.h
 include/thunderbird/nsIDOMMediaError.h
@@ -1139,27 +1162,17 @@ include/thunderbird/nsIDOMMimeType.h
 include/thunderbird/nsIDOMMimeTypeArray.h
 include/thunderbird/nsIDOMModalContentWindow.h
 include/thunderbird/nsIDOMMouseEvent.h
-include/thunderbird/nsIDOMMouseListener.h
-include/thunderbird/nsIDOMMouseMotionListener.h
 include/thunderbird/nsIDOMMouseScrollEvent.h
 include/thunderbird/nsIDOMMozCSSKeyframeRule.h
 include/thunderbird/nsIDOMMozCSSKeyframesRule.h
 include/thunderbird/nsIDOMMozTouchEvent.h
 include/thunderbird/nsIDOMMutationEvent.h
-include/thunderbird/nsIDOMNSDocument.h
-include/thunderbird/nsIDOMNSDocumentStyle.h
 include/thunderbird/nsIDOMNSEditableElement.h
 include/thunderbird/nsIDOMNSElement.h
 include/thunderbird/nsIDOMNSEvent.h
-include/thunderbird/nsIDOMNSEventTarget.h
-include/thunderbird/nsIDOMNSFeatureFactory.h
-include/thunderbird/nsIDOMNSHTMLDocument.h
 include/thunderbird/nsIDOMNSHTMLElement.h
-include/thunderbird/nsIDOMNSHTMLFormElement.h
 include/thunderbird/nsIDOMNSHTMLFrameElement.h
-include/thunderbird/nsIDOMNSHTMLHRElement.h
 include/thunderbird/nsIDOMNSHTMLOptionCollectn.h
-include/thunderbird/nsIDOMNSHTMLTextAreaElement.h
 include/thunderbird/nsIDOMNSMouseEvent.h
 include/thunderbird/nsIDOMNSRGBAColor.h
 include/thunderbird/nsIDOMNSRange.h
@@ -1175,7 +1188,6 @@ include/thunderbird/nsIDOMNodeFilter.h
 include/thunderbird/nsIDOMNodeIterator.h
 include/thunderbird/nsIDOMNodeList.h
 include/thunderbird/nsIDOMNodeSelector.h
-include/thunderbird/nsIDOMNotation.h
 include/thunderbird/nsIDOMNotifyAudioAvailableEvent.h
 include/thunderbird/nsIDOMNotifyPaintEvent.h
 include/thunderbird/nsIDOMOfflineResourceList.h
@@ -1183,6 +1195,9 @@ include/thunderbird/nsIDOMPageTransitionEvent.h
 include/thunderbird/nsIDOMPaintRequest.h
 include/thunderbird/nsIDOMPaintRequestList.h
 include/thunderbird/nsIDOMParser.h
+include/thunderbird/nsIDOMPerformance.h
+include/thunderbird/nsIDOMPerformanceNavigation.h
+include/thunderbird/nsIDOMPerformanceTiming.h
 include/thunderbird/nsIDOMPkcs11.h
 include/thunderbird/nsIDOMPlugin.h
 include/thunderbird/nsIDOMPluginArray.h
@@ -1290,11 +1305,9 @@ include/thunderbird/nsIDOMStorageItem.h
 include/thunderbird/nsIDOMStorageList.h
 include/thunderbird/nsIDOMStorageManager.h
 include/thunderbird/nsIDOMStorageObsolete.h
-include/thunderbird/nsIDOMStorageWindow.h
 include/thunderbird/nsIDOMStyleSheet.h
 include/thunderbird/nsIDOMStyleSheetList.h
 include/thunderbird/nsIDOMText.h
-include/thunderbird/nsIDOMTextListener.h
 include/thunderbird/nsIDOMTimeEvent.h
 include/thunderbird/nsIDOMTimeRanges.h
 include/thunderbird/nsIDOMToString.h
@@ -1302,16 +1315,12 @@ include/thunderbird/nsIDOMTouchEvent.h
 include/thunderbird/nsIDOMTransitionEvent.h
 include/thunderbird/nsIDOMTreeWalker.h
 include/thunderbird/nsIDOMUIEvent.h
-include/thunderbird/nsIDOMUIListener.h
 include/thunderbird/nsIDOMUserDataHandler.h
 include/thunderbird/nsIDOMValidityState.h
 include/thunderbird/nsIDOMWebGLRenderingContext.h
 include/thunderbird/nsIDOMWindow.h
-include/thunderbird/nsIDOMWindow2.h
 include/thunderbird/nsIDOMWindowCollection.h
-include/thunderbird/nsIDOMWindowInternal.h
 include/thunderbird/nsIDOMWindowUtils.h
-include/thunderbird/nsIDOMWorkers.h
 include/thunderbird/nsIDOMXMLDocument.h
 include/thunderbird/nsIDOMXPathEvaluator.h
 include/thunderbird/nsIDOMXPathException.h
@@ -1402,7 +1411,6 @@ include/thunderbird/nsIEntropyCollector.h
 include/thunderbird/nsIEnumerator.h
 include/thunderbird/nsIEnvironment.h
 include/thunderbird/nsIErrorService.h
-include/thunderbird/nsIEventListenerManager.h
 include/thunderbird/nsIEventListenerService.h
 include/thunderbird/nsIEventSource.h
 include/thunderbird/nsIEventTarget.h
@@ -1417,8 +1425,6 @@ include/thunderbird/nsIExternalSharingAppService.h
 include/thunderbird/nsIExternalURLHandlerService.h
 include/thunderbird/nsIFTPChannel.h
 include/thunderbird/nsIFactory.h
-include/thunderbird/nsIFastLoadFileControl.h
-include/thunderbird/nsIFastLoadService.h
 include/thunderbird/nsIFaviconService.h
 include/thunderbird/nsIFeed.h
 include/thunderbird/nsIFeedContainer.h
@@ -1457,7 +1463,6 @@ include/thunderbird/nsIFragmentContentSink.h
 include/thunderbird/nsIFrame.h
 include/thunderbird/nsIFrameLoader.h
 include/thunderbird/nsIFrameMessageManager.h
-include/thunderbird/nsIFrameSetElement.h
 include/thunderbird/nsIFrameTraversal.h
 include/thunderbird/nsIFrameUtil.h
 include/thunderbird/nsIFts3Tokenizer.h
@@ -1479,6 +1484,7 @@ include/thunderbird/nsIHTMLContentSink.h
 include/thunderbird/nsIHTMLDocument.h
 include/thunderbird/nsIHTMLEditor.h
 include/thunderbird/nsIHTMLInlineTableEditor.h
+include/thunderbird/nsIHTMLMenu.h
 include/thunderbird/nsIHTMLObjectResizeListener.h
 include/thunderbird/nsIHTMLObjectResizer.h
 include/thunderbird/nsIHTMLToTextSink.h
@@ -1567,6 +1573,7 @@ include/thunderbird/nsIJARChannel.h
 include/thunderbird/nsIJARProtocolHandler.h
 include/thunderbird/nsIJARURI.h
 include/thunderbird/nsIJSContextStack.h
+include/thunderbird/nsIJSEngineTelemetryStats.h
 include/thunderbird/nsIJSEventListener.h
 include/thunderbird/nsIJSNativeInitializer.h
 include/thunderbird/nsIJSON.h
@@ -1631,7 +1638,7 @@ include/thunderbird/nsIMdbFactoryFactory.h
 include/thunderbird/nsIMemory.h
 include/thunderbird/nsIMemoryReporter.h
 include/thunderbird/nsIMenuBoxObject.h
-include/thunderbird/nsIMenuFrame.h
+include/thunderbird/nsIMenuBuilder.h
 include/thunderbird/nsIMenuRollup.h
 include/thunderbird/nsIMessenger.h
 include/thunderbird/nsIMessengerMigrator.h
@@ -1682,6 +1689,7 @@ include/thunderbird/nsIMsgHeaderParser.h
 include/thunderbird/nsIMsgIdentity.h
 include/thunderbird/nsIMsgImapMailFolder.h
 include/thunderbird/nsIMsgIncomingServer.h
+include/thunderbird/nsIMsgKeyArray.h
 include/thunderbird/nsIMsgLocalMailFolder.h
 include/thunderbird/nsIMsgMailNewsUrl.h
 include/thunderbird/nsIMsgMailSession.h
@@ -1807,7 +1815,6 @@ include/thunderbird/nsIPop3Sink.h
 include/thunderbird/nsIPop3URL.h
 include/thunderbird/nsIPopupBoxObject.h
 include/thunderbird/nsIPopupWindowManager.h
-include/thunderbird/nsIPosixLocale.h
 include/thunderbird/nsIPrefBranch.h
 include/thunderbird/nsIPrefBranch2.h
 include/thunderbird/nsIPrefBranchInternal.h
@@ -1889,7 +1896,6 @@ include/thunderbird/nsIRedirectChannelRegistrar.h
 include/thunderbird/nsIRedirectResultListener.h
 include/thunderbird/nsIReflowCallback.h
 include/thunderbird/nsIRefreshURI.h
-include/thunderbird/nsIRegion.h
 include/thunderbird/nsIRelativeFilePref.h
 include/thunderbird/nsIRemoteService.h
 include/thunderbird/nsIRequest.h
@@ -1938,8 +1944,6 @@ include/thunderbird/nsIScriptChannel.h
 include/thunderbird/nsIScriptContext.h
 include/thunderbird/nsIScriptElement.h
 include/thunderbird/nsIScriptError.h
-include/thunderbird/nsIScriptEventHandler.h
-include/thunderbird/nsIScriptEventManager.h
 include/thunderbird/nsIScriptExternalNameSet.h
 include/thunderbird/nsIScriptGlobalObject.h
 include/thunderbird/nsIScriptGlobalObjectOwner.h
@@ -1950,6 +1954,7 @@ include/thunderbird/nsIScriptObjectPrincipal.h
 include/thunderbird/nsIScriptRuntime.h
 include/thunderbird/nsIScriptSecurityManager.h
 include/thunderbird/nsIScriptTimeoutHandler.h
+include/thunderbird/nsIScriptableBase64Encoder.h
 include/thunderbird/nsIScriptableDateFormat.h
 include/thunderbird/nsIScriptableInputStream.h
 include/thunderbird/nsIScriptableInterfaces.h
@@ -1970,8 +1975,6 @@ include/thunderbird/nsISecurityWarningDialogs.h
 include/thunderbird/nsISeekableStream.h
 include/thunderbird/nsISelectControlFrame.h
 include/thunderbird/nsISelection.h
-include/thunderbird/nsISelection2.h
-include/thunderbird/nsISelection3.h
 include/thunderbird/nsISelectionController.h
 include/thunderbird/nsISelectionDisplay.h
 include/thunderbird/nsISelectionListener.h
@@ -2036,7 +2039,6 @@ include/thunderbird/nsISupportsPrimitives.h
 include/thunderbird/nsISupportsPriority.h
 include/thunderbird/nsISupportsUtils.h
 include/thunderbird/nsISyncJPAKE.h
-include/thunderbird/nsISyncLoadDOMService.h
 include/thunderbird/nsISyncStreamListener.h
 include/thunderbird/nsISystemProxySettings.h
 include/thunderbird/nsITXTToHTMLConv.h
@@ -2060,7 +2062,6 @@ include/thunderbird/nsIThreadInternal.h
 include/thunderbird/nsIThreadManager.h
 include/thunderbird/nsIThreadPool.h
 include/thunderbird/nsITimedChannel.h
-include/thunderbird/nsITimelineService.h
 include/thunderbird/nsITimer.h
 include/thunderbird/nsITokenDialogs.h
 include/thunderbird/nsITokenPasswordDialogs.h
@@ -2149,8 +2150,8 @@ include/thunderbird/nsIWebProgress.h
 include/thunderbird/nsIWebProgressListener.h
 include/thunderbird/nsIWebProgressListener2.h
 include/thunderbird/nsIWebShellServices.h
-include/thunderbird/nsIWebSocketProtocol.h
-include/thunderbird/nsIWebappsSupport.h
+include/thunderbird/nsIWebSocketChannel.h
+include/thunderbird/nsIWebSocketListener.h
 include/thunderbird/nsIWidget.h
 include/thunderbird/nsIWindowCreator.h
 include/thunderbird/nsIWindowCreator2.h
@@ -2194,6 +2195,7 @@ include/thunderbird/nsIXTFService.h
 include/thunderbird/nsIXULAppInfo.h
 include/thunderbird/nsIXULBrowserWindow.h
 include/thunderbird/nsIXULBuilderListener.h
+include/thunderbird/nsIXULContextMenuBuilder.h
 include/thunderbird/nsIXULDocument.h
 include/thunderbird/nsIXULOverlayProvider.h
 include/thunderbird/nsIXULPrototypeCache.h
@@ -2206,7 +2208,6 @@ include/thunderbird/nsIXULTemplateRuleFilter.h
 include/thunderbird/nsIXULWindow.h
 include/thunderbird/nsIZipReader.h
 include/thunderbird/nsIZipWriter.h
-include/thunderbird/nsImageMapUtils.h
 include/thunderbird/nsImapCore.h
 include/thunderbird/nsImapMailDatabase.h
 include/thunderbird/nsImapMoveCoalescer.h
@@ -2242,7 +2243,6 @@ include/thunderbird/nsMimeEmitterCID.h
 include/thunderbird/nsMimeStringResources.h
 include/thunderbird/nsMimeTypes.h
 include/thunderbird/nsMorkCID.h
-include/thunderbird/nsMorkReader.h
 include/thunderbird/nsMsgBaseCID.h
 include/thunderbird/nsMsgBodyHandler.h
 include/thunderbird/nsMsgCompCID.h
@@ -2260,6 +2260,7 @@ include/thunderbird/nsMsgI18N.h
 include/thunderbird/nsMsgIdentity.h
 include/thunderbird/nsMsgImapCID.h
 include/thunderbird/nsMsgIncomingServer.h
+include/thunderbird/nsMsgKeyArray.h
 include/thunderbird/nsMsgKeySet.h
 include/thunderbird/nsMsgLineBuffer.h
 include/thunderbird/nsMsgLocalCID.h
@@ -2292,8 +2293,10 @@ include/thunderbird/nsNetStrings.h
 include/thunderbird/nsNetUtil.h
 include/thunderbird/nsNewsDatabase.h
 include/thunderbird/nsNodeInfoManager.h
+include/thunderbird/nsNodeUtils.h
 include/thunderbird/nsOSHelperAppService.h
 include/thunderbird/nsObjCExceptions.h
+include/thunderbird/nsObjectFrame.h
 include/thunderbird/nsObserverService.h
 include/thunderbird/nsOggCodecState.h
 include/thunderbird/nsOggDecoder.h
@@ -2301,7 +2304,6 @@ include/thunderbird/nsOggDecoderStateMachine.h
 include/thunderbird/nsPIBoxObject.h
 include/thunderbird/nsPICommandUpdater.h
 include/thunderbird/nsPIDNSService.h
-include/thunderbird/nsPIDOMEventTarget.h
 include/thunderbird/nsPIDOMStorage.h
 include/thunderbird/nsPIDOMWindow.h
 include/thunderbird/nsPIEditorTransaction.h
@@ -2313,15 +2315,18 @@ include/thunderbird/nsPIWindowRoot.h
 include/thunderbird/nsPIWindowWatcher.h
 include/thunderbird/nsPLDOMEvent.h
 include/thunderbird/nsParserCIID.h
+include/thunderbird/nsParserConstants.h
 include/thunderbird/nsPluginDirServiceProvider.h
 include/thunderbird/nsPluginError.h
 include/thunderbird/nsPluginHost.h
+include/thunderbird/nsPluginInstanceOwner.h
 include/thunderbird/nsPluginLogging.h
 include/thunderbird/nsPluginNativeWindow.h
 include/thunderbird/nsPluginTags.h
 include/thunderbird/nsPluginsCID.h
 include/thunderbird/nsPluginsDir.h
 include/thunderbird/nsPoint.h
+include/thunderbird/nsPosixLocale.h
 include/thunderbird/nsPresContext.h
 include/thunderbird/nsPresState.h
 include/thunderbird/nsPrintfCString.h
@@ -2353,6 +2358,7 @@ include/thunderbird/nsRuleWalker.h
 include/thunderbird/nsSAXAttributes.h
 include/thunderbird/nsSAXLocator.h
 include/thunderbird/nsSAXXMLReader.h
+include/thunderbird/nsSHEntryShared.h
 include/thunderbird/nsSMILAnimationController.h
 include/thunderbird/nsSMILCSSProperty.h
 include/thunderbird/nsSMILCompositorTable.h
@@ -2419,7 +2425,6 @@ include/thunderbird/nsTHashtable.h
 include/thunderbird/nsTObserverArray.h
 include/thunderbird/nsTPriorityQueue.h
 include/thunderbird/nsTPromiseFlatString.h
-include/thunderbird/nsTPtrArray.h
 include/thunderbird/nsTString.h
 include/thunderbird/nsTSubstring.h
 include/thunderbird/nsTSubstringTuple.h
@@ -2431,7 +2436,6 @@ include/thunderbird/nsTextServicesCID.h
 include/thunderbird/nsThemeConstants.h
 include/thunderbird/nsThreadUtils.h
 include/thunderbird/nsThreadUtilsInternal.h
-include/thunderbird/nsTime.h
 include/thunderbird/nsToken.h
 include/thunderbird/nsToolkitCompsCID.h
 include/thunderbird/nsTraceRefcnt.h
@@ -2439,6 +2443,7 @@ include/thunderbird/nsTraceRefcntImpl.h
 include/thunderbird/nsTransactionManagerCID.h
 include/thunderbird/nsTransform2D.h
 include/thunderbird/nsTreeColFrame.h
+include/thunderbird/nsTreeSanitizer.h
 include/thunderbird/nsTreeUtils.h
 include/thunderbird/nsUCVJA2CID.h
 include/thunderbird/nsUCVJACID.h
@@ -2723,7 +2728,6 @@ include/thunderbird/theora/codec.h
 include/thunderbird/theora/theora.h
 include/thunderbird/theora/theoradec.h
 include/thunderbird/theora/theoraenc.h
-include/thunderbird/txDouble.h
 include/thunderbird/txIEXSLTRegExFunctions.h
 include/thunderbird/txIFunctionEvaluationContext.h
 include/thunderbird/txINodeSet.h
@@ -2733,7 +2737,9 @@ include/thunderbird/utilrename.h
 include/thunderbird/vm/ArgumentsObject.h
 include/thunderbird/vm/GlobalObject.h
 include/thunderbird/vm/Stack.h
+include/thunderbird/vm/String.h
 include/thunderbird/vm/StringObject.h
+include/thunderbird/vm/Unicode.h
 include/thunderbird/vorbis/codec.h
 include/thunderbird/vpx/arm.h
 include/thunderbird/vpx/config.h
@@ -2783,6 +2789,9 @@ lib/thunderbird-sdk/bin
 lib/thunderbird-sdk/idl
 lib/thunderbird-sdk/include
 lib/thunderbird-sdk/lib
+lib/thunderbird-sdk/sdk/bin/nspr-config
+lib/thunderbird-sdk/sdk/bin/xpidl
+lib/thunderbird-sdk/sdk/bin/xpt.py
 lib/thunderbird-sdk/sdk/lib/libcrmf.a
 lib/thunderbird-sdk/sdk/lib/libmozalloc.so
 lib/thunderbird-sdk/sdk/lib/libmozreg_s.a
@@ -2802,7 +2811,6 @@ lib/thunderbird-sdk/sdk/lib/libxpcomglue_s.a
 lib/thunderbird-sdk/sdk/lib/libxpcomglue_s_nomozalloc.a
 lib/thunderbird-sdk/sdk/lib/libxul.so
 lib/thunderbird-sdk/xpcom-config.h
-lib/thunderbird/README.txt
 lib/thunderbird/application.ini
 lib/thunderbird/blocklist.xml
 lib/thunderbird/chrome.manifest
@@ -2879,6 +2887,7 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/addressbook/icons/contact-
 lib/thunderbird/chrome/classic/skin/classic/messenger/addressbook/icons/remote-addrbook-error.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/addressbook/icons/remote-addrbook.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png
+lib/thunderbird/chrome/classic/skin/classic/messenger/attachmentList.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/contactStarred.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/dialogs.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/editContactOverlay.css
@@ -2911,11 +2920,14 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/icons/black_pin.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/cancel.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/check.gif
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/close-button.png
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/dropmarker-hover.svg
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/dropmarker.svg
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/empty-search-results.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/error.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/exclude-selected.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/exclude.png
-lib/thunderbird/chrome/classic/skin/classic/messenger/icons/filter.png
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/filter-hover.svg
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/filter.svg
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/filterbar.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/flag-col.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/folder-blank.png
@@ -2954,6 +2966,7 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/icons/timeline.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/update.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/zoomout-hover.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/zoomout.png
+lib/thunderbird/chrome/classic/skin/classic/messenger/imageFilters.svg
 lib/thunderbird/chrome/classic/skin/classic/messenger/junkMail.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/mailWindow1.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/messageBody.css
@@ -3201,7 +3214,6 @@ lib/thunderbird/chrome/en-US/locale/en-US/global/printjoboptions.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/global/regionNames.properties
 lib/thunderbird/chrome/en-US/locale/en-US/global/search/search.properties
 lib/thunderbird/chrome/en-US/locale/en-US/global/security/caps.properties
-lib/thunderbird/chrome/en-US/locale/en-US/global/storage.properties
 lib/thunderbird/chrome/en-US/locale/en-US/global/svg/svg.properties
 lib/thunderbird/chrome/en-US/locale/en-US/global/textcontext.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/global/tree.dtd
@@ -3396,6 +3408,10 @@ lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/about.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/blocklist.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/extensions.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/extensions.properties
+lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/newaddon.dtd
+lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/newaddon.properties
+lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/selectAddons.dtd
+lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/selectAddons.properties
 lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/update.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/mozapps/extensions/update.properties
 lib/thunderbird/chrome/en-US/locale/en-US/mozapps/handling/handling.dtd
@@ -3654,8 +3670,7 @@ lib/thunderbird/chrome/messenger/content/messenger/messageWindow.js
 lib/thunderbird/chrome/messenger/content/messenger/messageWindow.xul
 lib/thunderbird/chrome/messenger/content/messenger/messenger.css
 lib/thunderbird/chrome/messenger/content/messenger/messenger.xul
-lib/thunderbird/chrome/messenger/content/messenger/messengercompose/MsgAttachPage.js
-lib/thunderbird/chrome/messenger/content/messenger/messengercompose/MsgAttachPage.xul
+lib/thunderbird/chrome/messenger/content/messenger/messengercompose/EdImageOverlayOverlay.xul
 lib/thunderbird/chrome/messenger/content/messenger/messengercompose/MsgComposeCommands.js
 lib/thunderbird/chrome/messenger/content/messenger/messengercompose/addressingWidgetOverlay.js
 lib/thunderbird/chrome/messenger/content/messenger/messengercompose/askSendFormat.js
@@ -4000,6 +4015,13 @@ lib/thunderbird/chrome/toolkit/content/mozapps/extensions/extensions.xml
 lib/thunderbird/chrome/toolkit/content/mozapps/extensions/extensions.xul
 lib/thunderbird/chrome/toolkit/content/mozapps/extensions/list.js
 lib/thunderbird/chrome/toolkit/content/mozapps/extensions/list.xul
+lib/thunderbird/chrome/toolkit/content/mozapps/extensions/newaddon.js
+lib/thunderbird/chrome/toolkit/content/mozapps/extensions/newaddon.xul
+lib/thunderbird/chrome/toolkit/content/mozapps/extensions/selectAddons.css
+lib/thunderbird/chrome/toolkit/content/mozapps/extensions/selectAddons.js
+lib/thunderbird/chrome/toolkit/content/mozapps/extensions/selectAddons.xml
+lib/thunderbird/chrome/toolkit/content/mozapps/extensions/selectAddons.xul
+lib/thunderbird/chrome/toolkit/content/mozapps/extensions/setting.xml
 lib/thunderbird/chrome/toolkit/content/mozapps/extensions/update.js
 lib/thunderbird/chrome/toolkit/content/mozapps/extensions/update.xul
 lib/thunderbird/chrome/toolkit/content/mozapps/extensions/updateinfo.xsl
@@ -4173,6 +4195,8 @@ lib/thunderbird/chrome/toolkit/skin/classic/global/icons/warning-large.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/icons/webconsole.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/icons/windowControls.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/icons/wrap.png
+lib/thunderbird/chrome/toolkit/skin/classic/global/inContentUI.css
+lib/thunderbird/chrome/toolkit/skin/classic/global/inContentUI/background-texture.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/linkTree.css
 lib/thunderbird/chrome/toolkit/skin/classic/global/listbox.css
 lib/thunderbird/chrome/toolkit/skin/classic/global/media/error.png
@@ -4181,6 +4205,7 @@ lib/thunderbird/chrome/toolkit/skin/classic/global/media/pauseButton.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/media/playButton.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/media/scrubberThumb.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/media/scrubberThumbWide.png
+lib/thunderbird/chrome/toolkit/skin/classic/global/media/stalled.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/media/throbber.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/media/unmuteButton.png
 lib/thunderbird/chrome/toolkit/skin/classic/global/media/videocontrols.css
@@ -4243,7 +4268,6 @@ lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-error.p
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-info-negative.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-info-positive.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-warning.png
-lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/background-texture.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/blocklist.css
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/cancel.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/category-available.png
@@ -4264,8 +4288,10 @@ lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/extensions.svg
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/heart.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/navigation.png
+lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/newaddon.css
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/rating-not-won.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/rating-won.png
+lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/selectAddons.css
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/stripes-error.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-negative.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-positive.png
@@ -4401,6 +4427,38 @@ lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 lib/thunderbird/greprefs.js
+lib/thunderbird/hyphenation/hyph_af.dic
+lib/thunderbird/hyphenation/hyph_bg.dic
+lib/thunderbird/hyphenation/hyph_ca.dic
+lib/thunderbird/hyphenation/hyph_cy.dic
+lib/thunderbird/hyphenation/hyph_da.dic
+lib/thunderbird/hyphenation/hyph_de-1901.dic
+lib/thunderbird/hyphenation/hyph_de-1996.dic
+lib/thunderbird/hyphenation/hyph_de-CH.dic
+lib/thunderbird/hyphenation/hyph_en_US.dic
+lib/thunderbird/hyphenation/hyph_eo.dic
+lib/thunderbird/hyphenation/hyph_es.dic
+lib/thunderbird/hyphenation/hyph_et.dic
+lib/thunderbird/hyphenation/hyph_fi.dic
+lib/thunderbird/hyphenation/hyph_fr.dic
+lib/thunderbird/hyphenation/hyph_gl.dic
+lib/thunderbird/hyphenation/hyph_hr.dic
+lib/thunderbird/hyphenation/hyph_hsb.dic
+lib/thunderbird/hyphenation/hyph_ia.dic
+lib/thunderbird/hyphenation/hyph_is.dic
+lib/thunderbird/hyphenation/hyph_kmr.dic
+lib/thunderbird/hyphenation/hyph_la.dic
+lib/thunderbird/hyphenation/hyph_lt.dic
+lib/thunderbird/hyphenation/hyph_mn.dic
+lib/thunderbird/hyphenation/hyph_nb.dic
+lib/thunderbird/hyphenation/hyph_nl.dic
+lib/thunderbird/hyphenation/hyph_nn.dic
+lib/thunderbird/hyphenation/hyph_pt.dic
+lib/thunderbird/hyphenation/hyph_ru.dic
+lib/thunderbird/hyphenation/hyph_sh.dic
+lib/thunderbird/hyphenation/hyph_sl.dic
+lib/thunderbird/hyphenation/hyph_sv.dic
+lib/thunderbird/hyphenation/hyph_uk.dic
 lib/thunderbird/icons/updater.png
 lib/thunderbird/isp/SpamAssassin.sfd
 lib/thunderbird/isp/SpamPal.sfd
@@ -4449,6 +4507,7 @@ lib/thunderbird/modules/MailUtils.js
 lib/thunderbird/modules/Microformats.js
 lib/thunderbird/modules/MsgHdrSyntheticView.js
 lib/thunderbird/modules/NetUtil.jsm
+lib/thunderbird/modules/PageMenu.jsm
 lib/thunderbird/modules/PerfMeasurement.jsm
 lib/thunderbird/modules/PlacesDBUtils.jsm
 lib/thunderbird/modules/PlacesUtils.jsm
@@ -4457,7 +4516,6 @@ lib/thunderbird/modules/PluralForm.jsm
 lib/thunderbird/modules/PopupNotifications.jsm
 lib/thunderbird/modules/SearchIntegration.js
 lib/thunderbird/modules/Services.jsm
-lib/thunderbird/modules/SpatialNavigation.js
 lib/thunderbird/modules/StringBundle.js
 lib/thunderbird/modules/WindowDraggingUtils.jsm
 lib/thunderbird/modules/XPCOMUtils.jsm
@@ -4476,7 +4534,6 @@ lib/thunderbird/modules/attachmentChecker.js
 lib/thunderbird/modules/ctypes.jsm
 lib/thunderbird/modules/dbViewWrapper.js
 lib/thunderbird/modules/debug.js
-lib/thunderbird/modules/dictUtils.js
 lib/thunderbird/modules/errUtils.js
 lib/thunderbird/modules/folderUtils.jsm
 lib/thunderbird/modules/gloda/collection.js
@@ -4513,6 +4570,7 @@ lib/thunderbird/modules/mailViewManager.js
 lib/thunderbird/modules/mailnewsMigrator.js
 lib/thunderbird/modules/nsFormAutoCompleteResult.jsm
 lib/thunderbird/modules/quickFilterManager.js
+lib/thunderbird/modules/reflect.jsm
 lib/thunderbird/modules/searchSpec.js
 lib/thunderbird/modules/sessionStoreManager.js
 lib/thunderbird/modules/templateUtils.js
@@ -4535,6 +4593,7 @@ lib/thunderbird/res/entityTables/htmlEntityVersions.properties
 lib/thunderbird/res/entityTables/mathml20.properties
 lib/thunderbird/res/entityTables/transliterate.properties
 lib/thunderbird/res/fonts/mathfont.properties
+lib/thunderbird/res/fonts/mathfontAsanaMath.properties
 lib/thunderbird/res/fonts/mathfontSTIXNonUnicode.properties
 lib/thunderbird/res/fonts/mathfontSTIXSize1.properties
 lib/thunderbird/res/fonts/mathfontSTIXSizeOneSym.properties
@@ -4571,7 +4630,6 @@ lib/thunderbird/updater
 lib/thunderbird/updater.ini
 share/applications/thunderbird.desktop
 share/idl/thunderbird/MailNewsTypes2.idl
-share/idl/thunderbird/XPCIDispatch.idl
 share/idl/thunderbird/amIInstallTrigger.idl
 share/idl/thunderbird/amIWebInstallListener.idl
 share/idl/thunderbird/amIWebInstaller.idl
@@ -4726,6 +4784,7 @@ share/idl/thunderbird/nsIAutoSyncFolderStrategy.idl
 share/idl/thunderbird/nsIAutoSyncManager.idl
 share/idl/thunderbird/nsIAutoSyncMsgStrategy.idl
 share/idl/thunderbird/nsIAutoSyncState.idl
+share/idl/thunderbird/nsIBFCacheEntry.idl
 share/idl/thunderbird/nsIBadCertListener2.idl
 share/idl/thunderbird/nsIBaseWindow.idl
 share/idl/thunderbird/nsIBidiKeyboard.idl
@@ -4839,11 +4898,6 @@ share/idl/thunderbird/nsIDBFolderInfo.idl
 share/idl/thunderbird/nsIDNSListener.idl
 share/idl/thunderbird/nsIDNSRecord.idl
 share/idl/thunderbird/nsIDNSService.idl
-share/idl/thunderbird/nsIDOM3Attr.idl
-share/idl/thunderbird/nsIDOM3EventTarget.idl
-share/idl/thunderbird/nsIDOM3Node.idl
-share/idl/thunderbird/nsIDOM3Text.idl
-share/idl/thunderbird/nsIDOM3TypeInfo.idl
 share/idl/thunderbird/nsIDOMAnimationEvent.idl
 share/idl/thunderbird/nsIDOMAttr.idl
 share/idl/thunderbird/nsIDOMBarProp.idl
@@ -4892,20 +4946,15 @@ share/idl/thunderbird/nsIDOMDesktopNotification.idl
 share/idl/thunderbird/nsIDOMDeviceMotionEvent.idl
 share/idl/thunderbird/nsIDOMDeviceOrientationEvent.idl
 share/idl/thunderbird/nsIDOMDocument.idl
-share/idl/thunderbird/nsIDOMDocumentCSS.idl
 share/idl/thunderbird/nsIDOMDocumentFragment.idl
-share/idl/thunderbird/nsIDOMDocumentStyle.idl
 share/idl/thunderbird/nsIDOMDocumentType.idl
 share/idl/thunderbird/nsIDOMDocumentXBL.idl
 share/idl/thunderbird/nsIDOMDragEvent.idl
 share/idl/thunderbird/nsIDOMElement.idl
 share/idl/thunderbird/nsIDOMElementCSSInlineStyle.idl
 share/idl/thunderbird/nsIDOMElementTimeControl.idl
-share/idl/thunderbird/nsIDOMEntity.idl
-share/idl/thunderbird/nsIDOMEntityReference.idl
 share/idl/thunderbird/nsIDOMEvent.idl
 share/idl/thunderbird/nsIDOMEventException.idl
-share/idl/thunderbird/nsIDOMEventGroup.idl
 share/idl/thunderbird/nsIDOMEventListener.idl
 share/idl/thunderbird/nsIDOMEventTarget.idl
 share/idl/thunderbird/nsIDOMFile.idl
@@ -4913,6 +4962,8 @@ share/idl/thunderbird/nsIDOMFileError.idl
 share/idl/thunderbird/nsIDOMFileException.idl
 share/idl/thunderbird/nsIDOMFileList.idl
 share/idl/thunderbird/nsIDOMFileReader.idl
+share/idl/thunderbird/nsIDOMFontFace.idl
+share/idl/thunderbird/nsIDOMFontFaceList.idl
 share/idl/thunderbird/nsIDOMFormData.idl
 share/idl/thunderbird/nsIDOMGeoGeolocation.idl
 share/idl/thunderbird/nsIDOMGeoPosition.idl
@@ -4935,6 +4986,7 @@ share/idl/thunderbird/nsIDOMHTMLButtonElement.idl
 share/idl/thunderbird/nsIDOMHTMLByteRanges.idl
 share/idl/thunderbird/nsIDOMHTMLCanvasElement.idl
 share/idl/thunderbird/nsIDOMHTMLCollection.idl
+share/idl/thunderbird/nsIDOMHTMLCommandElement.idl
 share/idl/thunderbird/nsIDOMHTMLDListElement.idl
 share/idl/thunderbird/nsIDOMHTMLDataListElement.idl
 share/idl/thunderbird/nsIDOMHTMLDirectoryElement.idl
@@ -4954,7 +5006,6 @@ share/idl/thunderbird/nsIDOMHTMLHtmlElement.idl
 share/idl/thunderbird/nsIDOMHTMLIFrameElement.idl
 share/idl/thunderbird/nsIDOMHTMLImageElement.idl
 share/idl/thunderbird/nsIDOMHTMLInputElement.idl
-share/idl/thunderbird/nsIDOMHTMLIsIndexElement.idl
 share/idl/thunderbird/nsIDOMHTMLLIElement.idl
 share/idl/thunderbird/nsIDOMHTMLLabelElement.idl
 share/idl/thunderbird/nsIDOMHTMLLegendElement.idl
@@ -4962,6 +5013,7 @@ share/idl/thunderbird/nsIDOMHTMLLinkElement.idl
 share/idl/thunderbird/nsIDOMHTMLMapElement.idl
 share/idl/thunderbird/nsIDOMHTMLMediaElement.idl
 share/idl/thunderbird/nsIDOMHTMLMenuElement.idl
+share/idl/thunderbird/nsIDOMHTMLMenuItemElement.idl
 share/idl/thunderbird/nsIDOMHTMLMetaElement.idl
 share/idl/thunderbird/nsIDOMHTMLModElement.idl
 share/idl/thunderbird/nsIDOMHTMLOListElement.idl
@@ -5011,20 +5063,12 @@ share/idl/thunderbird/nsIDOMMozCSSKeyframeRule.idl
 share/idl/thunderbird/nsIDOMMozCSSKeyframesRule.idl
 share/idl/thunderbird/nsIDOMMozTouchEvent.idl
 share/idl/thunderbird/nsIDOMMutationEvent.idl
-share/idl/thunderbird/nsIDOMNSDocument.idl
-share/idl/thunderbird/nsIDOMNSDocumentStyle.idl
 share/idl/thunderbird/nsIDOMNSEditableElement.idl
 share/idl/thunderbird/nsIDOMNSElement.idl
 share/idl/thunderbird/nsIDOMNSEvent.idl
-share/idl/thunderbird/nsIDOMNSEventTarget.idl
-share/idl/thunderbird/nsIDOMNSFeatureFactory.idl
-share/idl/thunderbird/nsIDOMNSHTMLDocument.idl
 share/idl/thunderbird/nsIDOMNSHTMLElement.idl
-share/idl/thunderbird/nsIDOMNSHTMLFormElement.idl
 share/idl/thunderbird/nsIDOMNSHTMLFrameElement.idl
-share/idl/thunderbird/nsIDOMNSHTMLHRElement.idl
 share/idl/thunderbird/nsIDOMNSHTMLOptionCollectn.idl
-share/idl/thunderbird/nsIDOMNSHTMLTextAreaElement.idl
 share/idl/thunderbird/nsIDOMNSMouseEvent.idl
 share/idl/thunderbird/nsIDOMNSRGBAColor.idl
 share/idl/thunderbird/nsIDOMNSRange.idl
@@ -5040,7 +5084,6 @@ share/idl/thunderbird/nsIDOMNodeFilter.idl
 share/idl/thunderbird/nsIDOMNodeIterator.idl
 share/idl/thunderbird/nsIDOMNodeList.idl
 share/idl/thunderbird/nsIDOMNodeSelector.idl
-share/idl/thunderbird/nsIDOMNotation.idl
 share/idl/thunderbird/nsIDOMNotifyAudioAvailableEvent.idl
 share/idl/thunderbird/nsIDOMNotifyPaintEvent.idl
 share/idl/thunderbird/nsIDOMOfflineResourceList.idl
@@ -5048,6 +5091,9 @@ share/idl/thunderbird/nsIDOMPageTransitionEvent.idl
 share/idl/thunderbird/nsIDOMPaintRequest.idl
 share/idl/thunderbird/nsIDOMPaintRequestList.idl
 share/idl/thunderbird/nsIDOMParser.idl
+share/idl/thunderbird/nsIDOMPerformance.idl
+share/idl/thunderbird/nsIDOMPerformanceNavigation.idl
+share/idl/thunderbird/nsIDOMPerformanceTiming.idl
 share/idl/thunderbird/nsIDOMPkcs11.idl
 share/idl/thunderbird/nsIDOMPlugin.idl
 share/idl/thunderbird/nsIDOMPluginArray.idl
@@ -5154,7 +5200,6 @@ share/idl/thunderbird/nsIDOMStorageItem.idl
 share/idl/thunderbird/nsIDOMStorageList.idl
 share/idl/thunderbird/nsIDOMStorageManager.idl
 share/idl/thunderbird/nsIDOMStorageObsolete.idl
-share/idl/thunderbird/nsIDOMStorageWindow.idl
 share/idl/thunderbird/nsIDOMStyleSheet.idl
 share/idl/thunderbird/nsIDOMStyleSheetList.idl
 share/idl/thunderbird/nsIDOMText.idl
@@ -5169,11 +5214,8 @@ share/idl/thunderbird/nsIDOMUserDataHandler.idl
 share/idl/thunderbird/nsIDOMValidityState.idl
 share/idl/thunderbird/nsIDOMWebGLRenderingContext.idl
 share/idl/thunderbird/nsIDOMWindow.idl
-share/idl/thunderbird/nsIDOMWindow2.idl
 share/idl/thunderbird/nsIDOMWindowCollection.idl
-share/idl/thunderbird/nsIDOMWindowInternal.idl
 share/idl/thunderbird/nsIDOMWindowUtils.idl
-share/idl/thunderbird/nsIDOMWorkers.idl
 share/idl/thunderbird/nsIDOMXMLDocument.idl
 share/idl/thunderbird/nsIDOMXPathEvaluator.idl
 share/idl/thunderbird/nsIDOMXPathException.idl
@@ -5269,8 +5311,6 @@ share/idl/thunderbird/nsIExternalSharingAppService.idl
 share/idl/thunderbird/nsIExternalURLHandlerService.idl
 share/idl/thunderbird/nsIFTPChannel.idl
 share/idl/thunderbird/nsIFactory.idl
-share/idl/thunderbird/nsIFastLoadFileControl.idl
-share/idl/thunderbird/nsIFastLoadService.idl
 share/idl/thunderbird/nsIFaviconService.idl
 share/idl/thunderbird/nsIFeed.idl
 share/idl/thunderbird/nsIFeedContainer.idl
@@ -5318,6 +5358,7 @@ share/idl/thunderbird/nsIGnomeVFSService.idl
 share/idl/thunderbird/nsIHTMLAbsPosEditor.idl
 share/idl/thunderbird/nsIHTMLEditor.idl
 share/idl/thunderbird/nsIHTMLInlineTableEditor.idl
+share/idl/thunderbird/nsIHTMLMenu.idl
 share/idl/thunderbird/nsIHTMLObjectResizeListener.idl
 share/idl/thunderbird/nsIHTMLObjectResizer.idl
 share/idl/thunderbird/nsIHTTPHeaderListener.idl
@@ -5401,6 +5442,7 @@ share/idl/thunderbird/nsIJARChannel.idl
 share/idl/thunderbird/nsIJARProtocolHandler.idl
 share/idl/thunderbird/nsIJARURI.idl
 share/idl/thunderbird/nsIJSContextStack.idl
+share/idl/thunderbird/nsIJSEngineTelemetryStats.idl
 share/idl/thunderbird/nsIJSON.idl
 share/idl/thunderbird/nsIJSRuntimeService.idl
 share/idl/thunderbird/nsIJetpack.idl
@@ -5452,6 +5494,7 @@ share/idl/thunderbird/nsIMarkupDocumentViewer.idl
 share/idl/thunderbird/nsIMemory.idl
 share/idl/thunderbird/nsIMemoryReporter.idl
 share/idl/thunderbird/nsIMenuBoxObject.idl
+share/idl/thunderbird/nsIMenuBuilder.idl
 share/idl/thunderbird/nsIMessenger.idl
 share/idl/thunderbird/nsIMessengerMigrator.idl
 share/idl/thunderbird/nsIMessengerOSIntegration.idl
@@ -5499,6 +5542,7 @@ share/idl/thunderbird/nsIMsgHeaderParser.idl
 share/idl/thunderbird/nsIMsgIdentity.idl
 share/idl/thunderbird/nsIMsgImapMailFolder.idl
 share/idl/thunderbird/nsIMsgIncomingServer.idl
+share/idl/thunderbird/nsIMsgKeyArray.idl
 share/idl/thunderbird/nsIMsgLocalMailFolder.idl
 share/idl/thunderbird/nsIMsgMailNewsUrl.idl
 share/idl/thunderbird/nsIMsgMailSession.idl
@@ -5715,10 +5759,9 @@ share/idl/thunderbird/nsIScreen.idl
 share/idl/thunderbird/nsIScreenManager.idl
 share/idl/thunderbird/nsIScriptChannel.idl
 share/idl/thunderbird/nsIScriptError.idl
-share/idl/thunderbird/nsIScriptEventHandler.idl
-share/idl/thunderbird/nsIScriptEventManager.idl
 share/idl/thunderbird/nsIScriptLoaderObserver.idl
 share/idl/thunderbird/nsIScriptSecurityManager.idl
+share/idl/thunderbird/nsIScriptableBase64Encoder.idl
 share/idl/thunderbird/nsIScriptableDateFormat.idl
 share/idl/thunderbird/nsIScriptableInputStream.idl
 share/idl/thunderbird/nsIScriptableInterfaces.idl
@@ -5735,8 +5778,6 @@ share/idl/thunderbird/nsISecurityInfoProvider.idl
 share/idl/thunderbird/nsISecurityWarningDialogs.idl
 share/idl/thunderbird/nsISeekableStream.idl
 share/idl/thunderbird/nsISelection.idl
-share/idl/thunderbird/nsISelection2.idl
-share/idl/thunderbird/nsISelection3.idl
 share/idl/thunderbird/nsISelectionController.idl
 share/idl/thunderbird/nsISelectionDisplay.idl
 share/idl/thunderbird/nsISelectionListener.idl
@@ -5790,7 +5831,6 @@ share/idl/thunderbird/nsISupportsIterators.idl
 share/idl/thunderbird/nsISupportsPrimitives.idl
 share/idl/thunderbird/nsISupportsPriority.idl
 share/idl/thunderbird/nsISyncJPAKE.idl
-share/idl/thunderbird/nsISyncLoadDOMService.idl
 share/idl/thunderbird/nsISyncStreamListener.idl
 share/idl/thunderbird/nsISystemProxySettings.idl
 share/idl/thunderbird/nsITXTToHTMLConv.idl
@@ -5807,7 +5847,6 @@ share/idl/thunderbird/nsIThreadInternal.idl
 share/idl/thunderbird/nsIThreadManager.idl
 share/idl/thunderbird/nsIThreadPool.idl
 share/idl/thunderbird/nsITimedChannel.idl
-share/idl/thunderbird/nsITimelineService.idl
 share/idl/thunderbird/nsITimer.idl
 share/idl/thunderbird/nsITokenDialogs.idl
 share/idl/thunderbird/nsITokenPasswordDialogs.idl
@@ -5886,8 +5925,8 @@ share/idl/thunderbird/nsIWebPageDescriptor.idl
 share/idl/thunderbird/nsIWebProgress.idl
 share/idl/thunderbird/nsIWebProgressListener.idl
 share/idl/thunderbird/nsIWebProgressListener2.idl
-share/idl/thunderbird/nsIWebSocketProtocol.idl
-share/idl/thunderbird/nsIWebappsSupport.idl
+share/idl/thunderbird/nsIWebSocketChannel.idl
+share/idl/thunderbird/nsIWebSocketListener.idl
 share/idl/thunderbird/nsIWindowCreator.idl
 share/idl/thunderbird/nsIWindowCreator2.idl
 share/idl/thunderbird/nsIWindowDataSource.idl
@@ -5924,6 +5963,7 @@ share/idl/thunderbird/nsIXTFPrivate.idl
 share/idl/thunderbird/nsIXULAppInfo.idl
 share/idl/thunderbird/nsIXULBrowserWindow.idl
 share/idl/thunderbird/nsIXULBuilderListener.idl
+share/idl/thunderbird/nsIXULContextMenuBuilder.idl
 share/idl/thunderbird/nsIXULOverlayProvider.idl
 share/idl/thunderbird/nsIXULRuntime.idl
 share/idl/thunderbird/nsIXULSortService.idl
diff --git a/mail/thunderbird/PLIST.lightning b/mail/thunderbird/PLIST.lightning
index 23730917edd..61860bc06c7 100644
--- a/mail/thunderbird/PLIST.lightning
+++ b/mail/thunderbird/PLIST.lightning
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST.lightning,v 1.5 2011/08/19 14:39:09 tnn Exp $
-include/thunderbird/calBaseCID.h
+@comment $NetBSD: PLIST.lightning,v 1.6 2011/11/13 16:59:58 tnn Exp $
 include/thunderbird/calIAlarm.h
 include/thunderbird/calIAlarmService.h
 include/thunderbird/calIAttachment.h
 include/thunderbird/calIAttendee.h
+include/thunderbird/calBaseCID.h
 include/thunderbird/calICalDavCalendar.h
 include/thunderbird/calICalendar.h
 include/thunderbird/calICalendarManager.h
@@ -94,7 +94,6 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/ca
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFreeBusyService.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calHtmlExport.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsImportExport.js
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsParser-worker.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsParser.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsSerializer.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calItemBase.js
@@ -106,7 +105,6 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/ca
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceInfo.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRelation.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calStartupService.js
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTimezoneService.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTodo.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTransactionManager.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calUtils.js
@@ -136,6 +134,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-clipboard.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-common-sets.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-common-sets.xul
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-conflicts-dialog.xul
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-creation.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-daypicker.xml
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calendar-dialog-utils.js
@@ -233,7 +232,6 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-alarm-dialog.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-alarms.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-creation-wizard.css
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-day-label-back.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-daypicker.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-event-dialog-attendees.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-event-dialog-toolbar-small.png
@@ -257,7 +255,6 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-timezone-highlighter.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-unifinder.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-views.css
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/category-overlay.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/checkbox-images.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-task-tree.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/datetimepickers/datetimepickers.css
@@ -268,8 +265,6 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grippy-left.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grippy-right.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grippy-top.png
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/gradient-overlay.png
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/mini-day-background.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/ok-cancel.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/task-images.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/tasks-actions.png
@@ -280,7 +275,9 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/toolbar-small.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/calendar-widgets.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/minimonth.css
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/nav-buttons.png
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/nav-arrow.svg
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/nav-today-hov.svg
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/nav-today.svg
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/widgets/view-navigation.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-alarm-dialog.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-dialog.png
@@ -333,6 +330,8 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/cal
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calMemoryCalendar.manifest
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calStorageCalendar.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calStorageCalendar.manifest
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calTimezoneService.js
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calTimezoneService.manifest
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calWcapCalendarModule.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calWcapCalendarModule.manifest
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calbase.xpt
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 27d7c55484c..e0e92f6877e 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,34 +1,34 @@
-$NetBSD: distinfo,v 1.84 2011/09/04 21:28:35 tnn Exp $
+$NetBSD: distinfo,v 1.85 2011/11/13 16:59:58 tnn Exp $
 
-SHA1 (enigmail-1.2.1.tar.gz) = 44ea48d881a936dd72d1f974b56f31632c5ed91a
-RMD160 (enigmail-1.2.1.tar.gz) = b712e964e71c3b4dd14018b33ee1d985ba4fef8b
-Size (enigmail-1.2.1.tar.gz) = 1463012 bytes
-SHA1 (thunderbird-6.0.1.source.tar.bz2) = b32775400b6605ce0bfa5facaa6deebc53aa9950
-RMD160 (thunderbird-6.0.1.source.tar.bz2) = 6f018abf1bd3daed62f87cde6c93fc2d2268ca3a
-Size (thunderbird-6.0.1.source.tar.bz2) = 85820670 bytes
-SHA1 (patch-aa) = 3ba0d3d84d88131c6d79718b6fa88639e6e43b49
-SHA1 (patch-aa-toplevel) = 098a2bc08351230e178091a96d863bd5661ce4b8
+SHA1 (enigmail-1.3.3.tar.gz) = a6d61b6dbdcfdb0dc4eaa8aac1b6277fed65c8c5
+RMD160 (enigmail-1.3.3.tar.gz) = 4c7ab726052b566f913612cfbdd767714486bf9c
+Size (enigmail-1.3.3.tar.gz) = 1367995 bytes
+SHA1 (thunderbird-8.0.source.tar.bz2) = 18b77e44f1653eb3d59056870f535e3c373d99fd
+RMD160 (thunderbird-8.0.source.tar.bz2) = 373420ec009a7f28f12a64a0d55e9d959573974e
+Size (thunderbird-8.0.source.tar.bz2) = 89435206 bytes
+SHA1 (patch-aa) = 19166ee99b804e5b05d6936a2a09315eb29f9ca2
+SHA1 (patch-aa-toplevel) = b5278820a02405f03e328ba4dd217ef16ae52bcb
 SHA1 (patch-ab) = c2bffac6626ce22d15855a80d84ffac6cbd52fe2
 SHA1 (patch-ac) = cbbc17c71dd96969079fc7268b15f822a29d01aa
 SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105
-SHA1 (patch-ae) = 12003b21c7ab1d7f0587cba3c93d8eca85f23383
+SHA1 (patch-ae) = 7cb8cbf920fe5fae7bfe7ace98e93fcf2c506789
 SHA1 (patch-af) = 16cae98e043dedeb6331212fd15ce914196fe8c7
 SHA1 (patch-ag) = 22cca24b67c85fbf9bafb35441dfcb460ecde6bf
 SHA1 (patch-ah) = 10c80ec60801295b037b4a45fbad8937922da235
 SHA1 (patch-ai) = 4d701ece9a2aaa0b640c189745fa7e731617fb7c
 SHA1 (patch-aj) = c6d14934700c2f9fc12c00474ef321f8265f4527
-SHA1 (patch-ak) = 0f379cc1e9d972dbb3e18a04605e4c19b3dc54ee
+SHA1 (patch-ak) = bf763083d8a2986d82e8613c40ed7c99722c82c4
 SHA1 (patch-al) = 616f500ba2af8f522454858ed0d845a127f41a96
 SHA1 (patch-am) = 81bcda476a7b54050ed1ae87bd47cf9de8f19919
 SHA1 (patch-an) = e30362e1a07c6c8e96dc81d134517685c3f19ca9
 SHA1 (patch-ao) = 42c268711a8bb24c3bde3c5bf74bb5a9f73ff21a
-SHA1 (patch-as) = 183d36e92ea6fd3142344b057a7335044ef5c1c3
+SHA1 (patch-as) = 0724caef986c0288b24bedb7b3acd384536d376f
 SHA1 (patch-at) = 32fcebfa1f3778a1fa1e020002060db433e8491b
 SHA1 (patch-au) = 1bf6913c702c7d586d73603597efae0e39f2b49f
 SHA1 (patch-av) = 2cb2e3d5b94f7b83117eb752d4410638daa6ae73
 SHA1 (patch-aw) = 55d2769dfb6d0c65bd2072c1a7c82cfef0fd5404
 SHA1 (patch-ax) = 4d0b83ab7592ee8c674a176e64dbc3ddb5b9d3b5
-SHA1 (patch-ay) = 5aaeb992cab024fb2b6035ddee239a8534b23aee
+SHA1 (patch-ay) = 83d023cd43beb08b17f1161fe025959ca441e1ce
 SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600
 SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987
 SHA1 (patch-bd) = c2296fe47f6f9e38d424ef27ca367a257188e2d1
@@ -36,7 +36,6 @@ SHA1 (patch-be) = 8783683729e40b5deec2e33fbc50e63e1357aea3
 SHA1 (patch-bf) = b95177e3a5db42bf4edf59eaae5232910c802d69
 SHA1 (patch-bg) = b30ecac3ee44d749a3eb125bbcd5e24e31b23243
 SHA1 (patch-bi) = c47064c71c6fc960a1a9afb735f249f3f7d0d09d
-SHA1 (patch-calendar_base_src_caldateTime.cpp) = 90ad68ba9a37863f340566a4e9567c5e19e663be
 SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 5f9f69ac57da0c830f2fa33e82057a1eb5907249
 SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = bc98be56df67b1a3c2b1174613f0d6c3134a2c8e
 SHA1 (patch-ipc_chromium_src_base_file__util.h) = 51dc4a5a32da8e7d7eb3c026e3ebaae7858564cf
@@ -52,7 +51,7 @@ SHA1 (patch-ma-toplevel) = 67ea79e29f6e9737ce76b8541ab8b3860eb02561
 SHA1 (patch-mb) = 8481afe61902cb16dfe35a5ee015cb4d43a54236
 SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e
 SHA1 (patch-me) = 66c15af6d7b07a4fec7ecd06cb9c9278b35a123e
-SHA1 (patch-mf) = 93a578c9592bcb17661c3884d28af29be62a8135
+SHA1 (patch-mf) = 14674ed31c912ef647a913cb93762dc963b96177
 SHA1 (patch-mg) = f33a92539ebe171b7bbbd83a54ad9ac2fdca249a
 SHA1 (patch-mh) = 9f1b447ef0236ac10b88c8d6f6d62cde4acb4331
 SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a
@@ -83,5 +82,5 @@ SHA1 (patch-xl) = 1425f9e5fd0dc49f3204730d1d88b9600d6475e4
 SHA1 (patch-xm) = 270e762936fe686cc55b820d52e15421b27c7c2c
 SHA1 (patch-xn) = edd741e4e71ecb44fc58750727aac473ff2e628e
 SHA1 (patch-xo) = 02c913b01bba8afd70ea28c0dd752ebf4b696e0c
-SHA1 (patch-zb) = c8df6271f75ea051042b57f21b1336f3348db6bc
+SHA1 (patch-zb) = ab62310f88491255a959824f327829bfab3e2991
 SHA1 (patch-zc) = 0b06b5c77ea4eb4a6b845eaeb4ec82a96d5cc4c3
diff --git a/mail/thunderbird/enigmail.mk b/mail/thunderbird/enigmail.mk
index 07b17739f02..272609186ad 100644
--- a/mail/thunderbird/enigmail.mk
+++ b/mail/thunderbird/enigmail.mk
@@ -1,9 +1,9 @@
-# $NetBSD: enigmail.mk,v 1.3 2011/08/19 14:39:09 tnn Exp $
+# $NetBSD: enigmail.mk,v 1.4 2011/11/13 16:59:58 tnn Exp $
 #
 # This Makefile fragment hooks the Enigmail OpenPGP extension
 # (see http://www.mozilla-enigmail.org/ ) into the build.
 
-ENIGMAIL_DIST=		enigmail-1.2.1.tar.gz
+ENIGMAIL_DIST=		enigmail-1.3.3.tar.gz
 XPI_FILES+=		${WRKDIR}/enigmail.xpi
 .if !defined(DISTFILES)
 DISTFILES=		${DEFAULT_DISTFILES}
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index db23c16500a..b075cd5696a 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2011/08/19 14:39:09 tnn Exp $
+$NetBSD: patch-aa,v 1.9 2011/11/13 16:59:58 tnn Exp $
 
---- mozilla/configure.in.orig	2011-08-11 21:40:51.000000000 +0000
+--- mozilla/configure.in.orig	2011-11-07 21:07:43.000000000 +0000
 +++ mozilla/configure.in
-@@ -2063,7 +2063,7 @@ case "$target" in
+@@ -2137,7 +2137,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2011/08/19 14:39:09 tnn Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2071,6 +2071,9 @@ case "$target" in
+@@ -2145,6 +2145,9 @@ case "$target" in
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.8 2011/08/19 14:39:09 tnn Exp $
      ;; 
  
  ia64*-hpux*)
-@@ -3277,6 +3280,9 @@ dnl ====================================
+@@ -3312,6 +3315,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.8 2011/08/19 14:39:09 tnn Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4593,6 +4599,14 @@ if test -n "$YASM"; then
+@@ -4520,6 +4526,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -46,17 +46,16 @@ $NetBSD: patch-aa,v 1.8 2011/08/19 14:39:09 tnn Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -9200,7 +9214,8 @@ rm -f confdefs.h.save
- mv confdefs.h confdefs.h.save
- egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
- AC_OUTPUT_MAKE_DEFS()
--MOZ_DEFINES=$DEFS
-+# nbsed broken. PR bin/42261
-+MOZ_DEFINES="$DEFS`awk 'BEGIN {while(x<1000){printf " ";x++}}'`"
- AC_SUBST(MOZ_DEFINES)
- rm -f confdefs.h
- mv confdefs.h.save confdefs.h
-@@ -9307,6 +9322,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -7439,7 +7453,7 @@ else
+   *-mingw*)
+     AC_DEFINE(MOZ_MEMORY_WINDOWS)
+     AC_MSG_CHECKING([for VC2005/2008++ CRT source])
+-    if test "$CC_VERSION" == "14.00.50727.762" -o "$CC_VERSION" == "15.00.30729.01"; then
++    if test "$CC_VERSION" = "14.00.50727.762" -o "$CC_VERSION" = "15.00.30729.01"; then
+       if test -z "$WIN32_CRT_SRC_DIR" -a -n "$VCINSTALLDIR"; then
+         WIN32_CRT_SRC_DIR="$VCINSTALLDIR\crt\src"
+       fi
+@@ -9516,6 +9530,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
      AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
      if test "$OS_ARCH" != "WINNT"; then
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
diff --git a/mail/thunderbird/patches/patch-aa-toplevel b/mail/thunderbird/patches/patch-aa-toplevel
index 435c386bfa6..fa0bd251388 100644
--- a/mail/thunderbird/patches/patch-aa-toplevel
+++ b/mail/thunderbird/patches/patch-aa-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa-toplevel,v 1.3 2011/08/19 14:39:09 tnn Exp $
+$NetBSD: patch-aa-toplevel,v 1.4 2011/11/13 16:59:58 tnn Exp $
 
---- configure.in.orig	2011-08-14 01:09:28.000000000 +0000
+--- configure.in.orig	2011-11-07 20:53:31.000000000 +0000
 +++ configure.in
-@@ -1974,7 +1974,7 @@ ld.])
+@@ -1950,7 +1950,7 @@ ld.])
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa-toplevel,v 1.3 2011/08/19 14:39:09 tnn Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1982,6 +1982,9 @@ ld.])
+@@ -1958,6 +1958,9 @@ ld.])
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa-toplevel,v 1.3 2011/08/19 14:39:09 tnn Exp $
      ;; 
  
  ia64*-hpux*)
-@@ -3222,6 +3225,9 @@ dnl ====================================
+@@ -3198,6 +3201,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,13 +31,3 @@ $NetBSD: patch-aa-toplevel,v 1.3 2011/08/19 14:39:09 tnn Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -7304,7 +7310,8 @@ rm -f confdefs.h.save
- mv confdefs.h confdefs.h.save
- egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
- AC_OUTPUT_MAKE_DEFS()
--MOZ_DEFINES=$DEFS
-+# nbsed broken. PR bin/42261
-+MOZ_DEFINES="$DEFS`awk 'BEGIN {while(x<1000){printf " ";x++}}'`"
- AC_SUBST(MOZ_DEFINES)
- rm -f confdefs.h
- mv confdefs.h.save confdefs.h
diff --git a/mail/thunderbird/patches/patch-ae b/mail/thunderbird/patches/patch-ae
index aca9493ca1e..2af2b6427a9 100644
--- a/mail/thunderbird/patches/patch-ae
+++ b/mail/thunderbird/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.7 2011/08/19 14:39:09 tnn Exp $
+$NetBSD: patch-ae,v 1.8 2011/11/13 16:59:58 tnn Exp $
 
---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2011-08-11 21:41:20.000000000 +0000
+--- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2011-09-22 20:20:37.000000000 +0000
 +++ mozilla/nsprpub/pr/src/misc/prnetdb.c
 @@ -105,7 +105,7 @@ PRLock *_pr_dnsLock = NULL;
          || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
@@ -43,7 +43,7 @@ $NetBSD: patch-ae,v 1.7 2011/08/19 14:39:09 tnn Exp $
 +
          rv = GETADDRINFO(hostname, NULL, &hints, &res);
  #ifdef AI_ADDRCONFIG
-         if (rv == EAI_BADFLAGS) {
+         if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) {
 @@ -2083,6 +2093,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
              rv = GETADDRINFO(hostname, NULL, &hints, &res);
          }
diff --git a/mail/thunderbird/patches/patch-ak b/mail/thunderbird/patches/patch-ak
index a9c4eac1cc1..be662a418a7 100644
--- a/mail/thunderbird/patches/patch-ak
+++ b/mail/thunderbird/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.6 2011/08/19 14:39:09 tnn Exp $
+$NetBSD: patch-ak,v 1.7 2011/11/13 16:59:58 tnn Exp $
 
---- mozilla/js/src/ctypes/libffi/configure.orig	2010-03-16 01:02:50.000000000 +0000
+--- mozilla/js/src/ctypes/libffi/configure.orig	2011-11-04 21:34:01.000000000 +0000
 +++ mozilla/js/src/ctypes/libffi/configure
-@@ -12232,7 +12232,7 @@ case "$host" in
+@@ -11277,7 +11277,7 @@ case "$host" in
    powerpc-*-aix* | rs6000-*-aix*)
  	TARGET=POWERPC_AIX; TARGETDIR=powerpc
  	;;
--  powerpc-*-freebsd*)
-+  powerpc-*-freebsd* | powerpc-*-netbsd*)
+-  powerpc-*-freebsd* | powerpc-*-openbsd*)
++  powerpc-*-freebsd* | powerpc-*-openbsd* | powerpc-*-netbsd*)
  	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
  	;;
    powerpc*-*-rtems*)
diff --git a/mail/thunderbird/patches/patch-as b/mail/thunderbird/patches/patch-as
index 87f985a83b5..d1e631ecf76 100644
--- a/mail/thunderbird/patches/patch-as
+++ b/mail/thunderbird/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.7 2011/08/19 14:39:09 tnn Exp $
+$NetBSD: patch-as,v 1.8 2011/11/13 16:59:58 tnn Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/js/src/configure.in.orig	2011-08-11 21:41:02.000000000 +0000
+--- mozilla/js/src/configure.in.orig	2011-09-22 20:20:26.000000000 +0000
 +++ mozilla/js/src/configure.in
-@@ -748,7 +748,7 @@ EOF
+@@ -784,7 +784,7 @@ EOF
                  AC_LANG_RESTORE
              ])
  
@@ -13,7 +13,7 @@ Treat DragonFly like FreeBSD.
              AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug,
                             ac_cv_have_dllimport_exception_bug,
                  [
-@@ -1977,7 +1977,7 @@ case "$target" in
+@@ -1999,7 +1999,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -22,7 +22,7 @@ Treat DragonFly like FreeBSD.
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2821,7 +2821,7 @@ case "$target" in
+@@ -2846,7 +2846,7 @@ case "$target" in
  *-solaris*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
@@ -31,7 +31,7 @@ Treat DragonFly like FreeBSD.
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
  *-openbsd*)
-@@ -4730,7 +4730,7 @@ if test "$MOZ_MEMORY"; then
+@@ -4846,7 +4846,7 @@ if test "$MOZ_MEMORY"; then
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
@@ -39,4 +39,4 @@ Treat DragonFly like FreeBSD.
 +  *-*freebsd*|*-*dragonfly*)
      AC_DEFINE(MOZ_MEMORY_BSD)
      ;;
-   *-*linux*)
+   *-android*|*-linuxandroid*)
diff --git a/mail/thunderbird/patches/patch-ay b/mail/thunderbird/patches/patch-ay
index cb583aa8f5d..c05c4a7f6b4 100644
--- a/mail/thunderbird/patches/patch-ay
+++ b/mail/thunderbird/patches/patch-ay
@@ -1,11 +1,11 @@
-$NetBSD: patch-ay,v 1.2 2010/07/12 16:49:22 tnn Exp $
+$NetBSD: patch-ay,v 1.3 2011/11/13 16:59:58 tnn Exp $
 
---- mozilla/browser/app/nsBrowserApp.cpp.orig	2009-06-29 18:14:40.000000000 +0200
+--- mozilla/browser/app/nsBrowserApp.cpp.orig	2011-09-22 20:20:17.000000000 +0000
 +++ mozilla/browser/app/nsBrowserApp.cpp
-@@ -44,6 +44,27 @@
- 
+@@ -49,6 +49,27 @@
  #include <stdio.h>
  #include <stdarg.h>
+ #include <string.h>
 +#include <sys/resource.h>
 +/*
 + * On netbsd-4, ulimit -n is 64 by default; too few for us.
@@ -30,11 +30,11 @@ $NetBSD: patch-ay,v 1.2 2010/07/12 16:49:22 tnn Exp $
  
  #include "plstr.h"
  #include "prprf.h"
-@@ -106,6 +127,7 @@ public:
- 
+@@ -203,6 +224,7 @@ static int do_main(const char *exePath, 
  int main(int argc, char* argv[])
  {
+   char exePath[MAXPATHLEN];
 +  netbsd_fixrlimit();
-   ScopedLogging log;
  
-   nsCOMPtr<nsILocalFile> appini;
+   nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
+   if (NS_FAILED(rv)) {
diff --git a/mail/thunderbird/patches/patch-calendar_base_src_caldateTime.cpp b/mail/thunderbird/patches/patch-calendar_base_src_caldateTime.cpp
deleted file mode 100644
index 8b0382eab7a..00000000000
--- a/mail/thunderbird/patches/patch-calendar_base_src_caldateTime.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-calendar_base_src_caldateTime.cpp,v 1.1 2011/08/26 09:24:41 tnn Exp $
-
-http://hg.mozilla.org/releases/comm-aurora/rev/8c418cb8fd8e
-
---- calendar/base/src/calDateTime.cpp.orig	2011-08-12 13:52:03.000000000 +0000
-+++ calendar/base/src/calDateTime.cpp
-@@ -1,4 +1,4 @@
--/* ***** BEGIN LICENSE BLOCK *****
-+/* ***** BEGIN LICENSE BLOCK *****
-  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  *
-  * The contents of this file are subject to the Mozilla Public License Version
diff --git a/mail/thunderbird/patches/patch-mf b/mail/thunderbird/patches/patch-mf
index a38bd103151..c789951605c 100644
--- a/mail/thunderbird/patches/patch-mf
+++ b/mail/thunderbird/patches/patch-mf
@@ -1,16 +1,16 @@
-$NetBSD: patch-mf,v 1.3 2011/08/19 14:39:10 tnn Exp $
+$NetBSD: patch-mf,v 1.4 2011/11/13 16:59:58 tnn Exp $
 
 Add DragonFly support.
 Make sure nss libraries have a run path defined.
 
---- mozilla/security/coreconf/config.mk.orig	2011-08-14 01:20:32.000000000 +0000
+--- mozilla/security/coreconf/config.mk.orig	2011-11-04 21:34:14.000000000 +0000
 +++ mozilla/security/coreconf/config.mk
 @@ -63,7 +63,7 @@ endif
  #######################################################################
  
  TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              AIX RISCOS WINNT WIN95 WINCE
-+              AIX RISCOS WINNT WIN95 WINCE DragonFly
+-              AIX RISCOS WINNT WIN95 WINCE Linux
++              AIX RISCOS WINNT WIN95 WINCE Linux DragonFly
  
  ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
  include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/mail/thunderbird/patches/patch-zb b/mail/thunderbird/patches/patch-zb
index d3d18dc3c13..2595fa1e0b8 100644
--- a/mail/thunderbird/patches/patch-zb
+++ b/mail/thunderbird/patches/patch-zb
@@ -1,9 +1,9 @@
-$NetBSD: patch-zb,v 1.2 2011/08/19 14:39:10 tnn Exp $
+$NetBSD: patch-zb,v 1.3 2011/11/13 16:59:58 tnn Exp $
 
---- mail/app/Makefile.in.orig	2011-08-12 13:52:04.000000000 +0000
+--- mail/app/Makefile.in.orig	2011-11-05 09:06:10.000000000 +0000
 +++ mail/app/Makefile.in
-@@ -117,6 +117,10 @@ TK_LIBS := -framework SystemConfiguratio
- endif
+@@ -105,6 +105,10 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ TK_LIBS := -framework Cocoa $(TK_LIBS)
  endif
  
 +ifeq ($(OS_ARCH),NetBSD)
author	tnn <tnn@pkgsrc.org>	2011-11-13 16:59:58 +0000
committer	tnn <tnn@pkgsrc.org>	2011-11-13 16:59:58 +0000
commit	c8594d1c1224512e83c9f95ffef80d9409be9e92 (patch)
tree	da72e66c1b33d456f41dbe559ee56266b63ef69d /mail/thunderbird
parent	1cd5099c292a1e2ffe581b671f79ac9708d82f97 (diff)
download	pkgsrc-c8594d1c1224512e83c9f95ffef80d9409be9e92.tar.gz