summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2011-07-11 12:46:14 +0000
committertnn <tnn@pkgsrc.org>2011-07-11 12:46:14 +0000
commit02b3efac460bf6475b27ddee73702acaa0e46748 (patch)
tree2ff2775115302ce58db6abbef203b1986ecc7b2c /devel
parentd1f0985daa3a43eb210d7500f91a12927b700e41 (diff)
downloadpkgsrc-02b3efac460bf6475b27ddee73702acaa0e46748.tar.gz
Update to firefox-5.0. Changes:
Added support for CSS animations The Do-Not-Track header preference has been moved to increase discoverability Tuned HTTP idle connection logic for increased performance Improved canvas, JavaScript, memory, and networking performance Improved standards support for HTML5, XHR, MathML, SMIL, and canvas Improved spell checking for some locales Improved desktop environment integration for Linux users WebGL content can no longer load cross-domain textures Background tabs have setTimeout and setInterval clamped to 1000ms to improve performance Fixed several stability issues Fixed several security issues
Diffstat (limited to 'devel')
-rw-r--r--devel/xulrunner/PLIST188
-rw-r--r--devel/xulrunner/buildlink3.mk4
-rw-r--r--devel/xulrunner/dist.mk10
-rw-r--r--devel/xulrunner/distinfo30
-rw-r--r--devel/xulrunner/mozilla-common.mk5
-rw-r--r--devel/xulrunner/patches/patch-al8
-rw-r--r--devel/xulrunner/patches/patch-au2
-rw-r--r--devel/xulrunner/patches/patch-bf14
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc35
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util.h15
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc14
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc24
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_sys__info__posix.cc37
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h13
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h34
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h13
-rw-r--r--devel/xulrunner/patches/patch-js_src_jsdbgapi.cpp37
-rw-r--r--devel/xulrunner/patches/patch-js_src_jsval.h15
-rw-r--r--devel/xulrunner/patches/patch-js_src_xpconnect_src_xpcprivate.h18
-rw-r--r--devel/xulrunner/patches/patch-mb22
-rw-r--r--devel/xulrunner/patches/patch-mm8
-rw-r--r--devel/xulrunner/patches/patch-rc8
-rw-r--r--devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk13
23 files changed, 397 insertions, 170 deletions
diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST
index 9932036fe87..2938f3a757e 100644
--- a/devel/xulrunner/PLIST
+++ b/devel/xulrunner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2011/05/02 20:37:37 tnn Exp $
+@comment $NetBSD: PLIST,v 1.29 2011/07/11 12:46:14 tnn Exp $
bin/xulrunner
${PLIST.jit}include/xulrunner/Allocator.h
${PLIST.jit}include/xulrunner/Assembler.h
@@ -18,6 +18,8 @@ include/xulrunner/GLContextProviderImpl.h
include/xulrunner/GLContextSymbols.h
include/xulrunner/GLDefs.h
include/xulrunner/GLXLibrary.h
+include/xulrunner/IPC/IPCMessageUtils.h
+include/xulrunner/IPC/ShadowLayerUtils.h
include/xulrunner/IPC/nsGUIEventIPC.h
include/xulrunner/ImageErrors.h
include/xulrunner/ImageLayers.h
@@ -31,10 +33,12 @@ include/xulrunner/NSReg.h
${PLIST.jit}include/xulrunner/Native.h
${PLIST.jit}include/xulrunner/NativeCommon.h
${PLIST.jit}include/xulrunner/Native${NANOJIT_ARCH}.h
+include/xulrunner/PCOMContentPermissionRequestChild.h
include/xulrunner/PPrefTuple.h
include/xulrunner/PrefTuple.h
include/xulrunner/ReadbackLayer.h
${PLIST.jit}include/xulrunner/RegAlloc.h
+include/xulrunner/TabMessageUtils.h
${PLIST.jit}include/xulrunner/VMPI.h
include/xulrunner/VerReg.h
include/xulrunner/VideoUtils.h
@@ -110,6 +114,7 @@ include/xulrunner/gfxPlatform.h
include/xulrunner/gfxPlatformGtk.h
include/xulrunner/gfxPoint.h
include/xulrunner/gfxRect.h
+include/xulrunner/gfxSharedImageSurface.h
include/xulrunner/gfxSkipChars.h
include/xulrunner/gfxTeeSurface.h
include/xulrunner/gfxTextRunCache.h
@@ -122,9 +127,6 @@ include/xulrunner/gfxXlibNativeRenderer.h
include/xulrunner/gfxXlibSurface.h
include/xulrunner/gfxidltypes.h
include/xulrunner/gtk2xtbin.h
-include/xulrunner/gtkmozembed.h
-include/xulrunner/gtkmozembed_glue.cpp
-include/xulrunner/gtkmozembed_internal.h
include/xulrunner/harfbuzz/hb-blob.h
include/xulrunner/harfbuzz/hb-buffer.h
include/xulrunner/harfbuzz/hb-common.h
@@ -196,9 +198,11 @@ include/xulrunner/jsiter.h
include/xulrunner/jslock.h
include/xulrunner/jslong.h
include/xulrunner/jsmath.h
+include/xulrunner/jsnum.h
include/xulrunner/jsobj.h
include/xulrunner/jsobjinlines.h
include/xulrunner/json.h
+include/xulrunner/jsonparser.h
include/xulrunner/jsopcode.h
include/xulrunner/jsopcode.tbl
include/xulrunner/jsopcodeinlines.h
@@ -331,16 +335,35 @@ include/xulrunner/mozilla/SSE.h
include/xulrunner/mozilla/ServiceList.h
include/xulrunner/mozilla/Services.h
include/xulrunner/mozilla/TimeStamp.h
+include/xulrunner/mozilla/Util.h
include/xulrunner/mozilla/X11Util.h
include/xulrunner/mozilla/XPCOM.h
+include/xulrunner/mozilla/arm.h
include/xulrunner/mozilla/chrome/RegistryMessageUtils.h
include/xulrunner/mozilla/css/Declaration.h
+include/xulrunner/mozilla/css/GroupRule.h
+include/xulrunner/mozilla/css/ImportRule.h
include/xulrunner/mozilla/css/Loader.h
+include/xulrunner/mozilla/css/NameSpaceRule.h
+include/xulrunner/mozilla/css/StyleRule.h
+include/xulrunner/mozilla/docshell/OfflineCacheUpdateChild.h
+include/xulrunner/mozilla/docshell/OfflineCacheUpdateParent.h
+include/xulrunner/mozilla/dom/AudioChild.h
+include/xulrunner/mozilla/dom/AudioParent.h
+include/xulrunner/mozilla/dom/ContentChild.h
+include/xulrunner/mozilla/dom/ContentParent.h
+include/xulrunner/mozilla/dom/ContentProcess.h
+include/xulrunner/mozilla/dom/CrashReporterChild.h
+include/xulrunner/mozilla/dom/CrashReporterParent.h
include/xulrunner/mozilla/dom/Element.h
include/xulrunner/mozilla/dom/ExternalHelperAppChild.h
include/xulrunner/mozilla/dom/ExternalHelperAppParent.h
include/xulrunner/mozilla/dom/FromParser.h
include/xulrunner/mozilla/dom/Link.h
+include/xulrunner/mozilla/dom/StorageChild.h
+include/xulrunner/mozilla/dom/StorageParent.h
+include/xulrunner/mozilla/dom/TabChild.h
+include/xulrunner/mozilla/dom/TabParent.h
include/xulrunner/mozilla/dom/indexedDB/IDBCursor.h
include/xulrunner/mozilla/dom/indexedDB/IDBDatabase.h
include/xulrunner/mozilla/dom/indexedDB/IDBEvents.h
@@ -354,20 +377,95 @@ include/xulrunner/mozilla/dom/indexedDB/IndexedDatabase.h
include/xulrunner/mozilla/dom/indexedDB/IndexedDatabaseManager.h
include/xulrunner/mozilla/dom/indexedDB/Key.h
include/xulrunner/mozilla/dom/indexedDB/LazyIdleThread.h
+include/xulrunner/mozilla/gfx/SharedDIB.h
+include/xulrunner/mozilla/ipc/AsyncChannel.h
+include/xulrunner/mozilla/ipc/BrowserProcessSubThread.h
include/xulrunner/mozilla/ipc/DocumentRendererChild.h
include/xulrunner/mozilla/ipc/DocumentRendererNativeIDChild.h
include/xulrunner/mozilla/ipc/DocumentRendererNativeIDParent.h
include/xulrunner/mozilla/ipc/DocumentRendererParent.h
include/xulrunner/mozilla/ipc/DocumentRendererShmemChild.h
include/xulrunner/mozilla/ipc/DocumentRendererShmemParent.h
+include/xulrunner/mozilla/ipc/GeckoChildProcessHost.h
+include/xulrunner/mozilla/ipc/IOThreadChild.h
+include/xulrunner/mozilla/ipc/ProcessChild.h
+include/xulrunner/mozilla/ipc/ProtocolUtils.h
+include/xulrunner/mozilla/ipc/RPCChannel.h
+include/xulrunner/mozilla/ipc/ScopedXREEmbed.h
+include/xulrunner/mozilla/ipc/SharedMemory.h
+include/xulrunner/mozilla/ipc/SharedMemoryBasic.h
+include/xulrunner/mozilla/ipc/SharedMemoryBasic_chromium.h
+include/xulrunner/mozilla/ipc/SharedMemorySysV.h
+include/xulrunner/mozilla/ipc/Shmem.h
+include/xulrunner/mozilla/ipc/SyncChannel.h
+include/xulrunner/mozilla/ipc/TestShellChild.h
+include/xulrunner/mozilla/ipc/TestShellParent.h
+include/xulrunner/mozilla/ipc/XPCShellEnvironment.h
+include/xulrunner/mozilla/jetpack/Handle.h
+include/xulrunner/mozilla/jetpack/JetpackActorCommon.h
+include/xulrunner/mozilla/jetpack/JetpackChild.h
+include/xulrunner/mozilla/jetpack/JetpackParent.h
+include/xulrunner/mozilla/jetpack/JetpackProcessChild.h
+include/xulrunner/mozilla/jetpack/JetpackProcessParent.h
+include/xulrunner/mozilla/jetpack/JetpackService.h
+include/xulrunner/mozilla/jsipc/CPOWTypes.h
+include/xulrunner/mozilla/jsipc/ContextWrapperChild.h
+include/xulrunner/mozilla/jsipc/ContextWrapperParent.h
+include/xulrunner/mozilla/jsipc/ObjectWrapperChild.h
+include/xulrunner/mozilla/jsipc/ObjectWrapperParent.h
+include/xulrunner/mozilla/layers/ShadowLayerUtilsX11.h
+include/xulrunner/mozilla/layers/ShadowLayers.h
+include/xulrunner/mozilla/layers/ShadowLayersChild.h
+include/xulrunner/mozilla/layers/ShadowLayersParent.h
+include/xulrunner/mozilla/layout/RenderFrameChild.h
+include/xulrunner/mozilla/layout/RenderFrameParent.h
include/xulrunner/mozilla/mozalloc.h
include/xulrunner/mozilla/mozalloc_abort.h
include/xulrunner/mozilla/mozalloc_macro_wrappers.h
include/xulrunner/mozilla/mozalloc_oom.h
include/xulrunner/mozilla/mozalloc_undef_macro_wrappers.h
+include/xulrunner/mozilla/net/ChannelEventQueue.h
+include/xulrunner/mozilla/net/CookieServiceChild.h
+include/xulrunner/mozilla/net/CookieServiceParent.h
+include/xulrunner/mozilla/net/FTPChannelChild.h
+include/xulrunner/mozilla/net/FTPChannelParent.h
include/xulrunner/mozilla/net/HttpBaseChannel.h
+include/xulrunner/mozilla/net/HttpChannelChild.h
+include/xulrunner/mozilla/net/HttpChannelParent.h
+include/xulrunner/mozilla/net/NeckoChild.h
include/xulrunner/mozilla/net/NeckoCommon.h
+include/xulrunner/mozilla/net/NeckoMessageUtils.h
+include/xulrunner/mozilla/net/NeckoParent.h
+include/xulrunner/mozilla/net/PHttpChannelParams.h
+include/xulrunner/mozilla/net/WyciwygChannelChild.h
+include/xulrunner/mozilla/net/WyciwygChannelParent.h
include/xulrunner/mozilla/places/History.h
+include/xulrunner/mozilla/plugins/AStream.h
+include/xulrunner/mozilla/plugins/BrowserStreamChild.h
+include/xulrunner/mozilla/plugins/BrowserStreamParent.h
+include/xulrunner/mozilla/plugins/ChildAsyncCall.h
+include/xulrunner/mozilla/plugins/ChildTimer.h
+include/xulrunner/mozilla/plugins/NPEventAndroid.h
+include/xulrunner/mozilla/plugins/NPEventOSX.h
+include/xulrunner/mozilla/plugins/NPEventWindows.h
+include/xulrunner/mozilla/plugins/NPEventX11.h
+include/xulrunner/mozilla/plugins/PluginIdentifierChild.h
+include/xulrunner/mozilla/plugins/PluginIdentifierParent.h
+include/xulrunner/mozilla/plugins/PluginInstanceChild.h
+include/xulrunner/mozilla/plugins/PluginInstanceParent.h
+include/xulrunner/mozilla/plugins/PluginMessageUtils.h
+include/xulrunner/mozilla/plugins/PluginModuleChild.h
+include/xulrunner/mozilla/plugins/PluginModuleParent.h
+include/xulrunner/mozilla/plugins/PluginProcessChild.h
+include/xulrunner/mozilla/plugins/PluginProcessParent.h
+include/xulrunner/mozilla/plugins/PluginScriptableObjectChild.h
+include/xulrunner/mozilla/plugins/PluginScriptableObjectParent.h
+include/xulrunner/mozilla/plugins/PluginScriptableObjectUtils-inl.h
+include/xulrunner/mozilla/plugins/PluginScriptableObjectUtils.h
+include/xulrunner/mozilla/plugins/PluginStreamChild.h
+include/xulrunner/mozilla/plugins/PluginStreamParent.h
+include/xulrunner/mozilla/plugins/StreamNotifyChild.h
+include/xulrunner/mozilla/plugins/StreamNotifyParent.h
include/xulrunner/mozilla/scache/StartupCache.h
include/xulrunner/mozilla/scache/StartupCacheUtils.h
include/xulrunner/mozilla/storage.h
@@ -417,7 +515,6 @@ include/xulrunner/nsAttrName.h
include/xulrunner/nsAudioAvailableEventManager.h
include/xulrunner/nsAudioStream.h
include/xulrunner/nsAutoJSValHolder.h
-include/xulrunner/nsAutoLock.h
include/xulrunner/nsAutoPtr.h
include/xulrunner/nsAutoRef.h
include/xulrunner/nsBaseHashtable.h
@@ -450,7 +547,6 @@ include/xulrunner/nsCSSPseudoClasses.h
include/xulrunner/nsCSSPseudoElementList.h
include/xulrunner/nsCSSPseudoElements.h
include/xulrunner/nsCSSRuleProcessor.h
-include/xulrunner/nsCSSStruct.h
include/xulrunner/nsCSSStyleSheet.h
include/xulrunner/nsCSSValue.h
include/xulrunner/nsCTooltipTextProvider.h
@@ -485,6 +581,7 @@ include/xulrunner/nsContentCreatorFunctions.h
include/xulrunner/nsContentDLF.h
include/xulrunner/nsContentErrors.h
include/xulrunner/nsContentList.h
+include/xulrunner/nsContentPermissionHelper.h
include/xulrunner/nsContentPolicyUtils.h
include/xulrunner/nsContentUtils.h
include/xulrunner/nsCoord.h
@@ -551,6 +648,7 @@ include/xulrunner/nsFrameTraversal.h
include/xulrunner/nsGTKToolkit.h
include/xulrunner/nsGUIEvent.h
include/xulrunner/nsGeoPosition.h
+include/xulrunner/nsGeoPositionIPCSerialiser.h
include/xulrunner/nsGfxCIID.h
include/xulrunner/nsGkAtomList.h
include/xulrunner/nsGkAtoms.h
@@ -564,6 +662,7 @@ include/xulrunner/nsGridRowLeafFrame.h
include/xulrunner/nsGridRowLeafLayout.h
include/xulrunner/nsHTMLAudioElement.h
include/xulrunner/nsHTMLCanvasElement.h
+include/xulrunner/nsHTMLDNSPrefetch.h
include/xulrunner/nsHTMLFormControlAccessible.h
include/xulrunner/nsHTMLImageAccessibleWrap.h
include/xulrunner/nsHTMLMediaElement.h
@@ -581,6 +680,10 @@ include/xulrunner/nsHashSets.h
include/xulrunner/nsHashtable.h
include/xulrunner/nsHtml5Module.h
include/xulrunner/nsHtml5SVGLoadDispatcher.h
+include/xulrunner/nsHttp.h
+include/xulrunner/nsHttpAtomList.h
+include/xulrunner/nsHttpHeaderArray.h
+include/xulrunner/nsHttpResponseHead.h
include/xulrunner/nsHyperTextAccessible.h
include/xulrunner/nsHyperTextAccessibleWrap.h
include/xulrunner/nsIASN1Object.h
@@ -670,14 +773,10 @@ include/xulrunner/nsICMSSecureMessage.h
include/xulrunner/nsICRLInfo.h
include/xulrunner/nsICRLManager.h
include/xulrunner/nsICSSDeclaration.h
-include/xulrunner/nsICSSGroupRule.h
-include/xulrunner/nsICSSImportRule.h
include/xulrunner/nsICSSLoaderObserver.h
-include/xulrunner/nsICSSNameSpaceRule.h
include/xulrunner/nsICSSPseudoComparator.h
include/xulrunner/nsICSSRule.h
include/xulrunner/nsICSSRuleList.h
-include/xulrunner/nsICSSStyleRule.h
include/xulrunner/nsICSSStyleRuleDOMWrapper.h
include/xulrunner/nsICache.h
include/xulrunner/nsICacheEntryDescriptor.h
@@ -707,9 +806,9 @@ include/xulrunner/nsICharsetDetectionAdaptor.h
include/xulrunner/nsICharsetDetectionObserver.h
include/xulrunner/nsICharsetDetector.h
include/xulrunner/nsICharsetResolver.h
+include/xulrunner/nsIChildChannel.h
include/xulrunner/nsIChromeRegistry.h
include/xulrunner/nsICipherInfo.h
-include/xulrunner/nsICiter.h
include/xulrunner/nsIClassInfo.h
include/xulrunner/nsIClassInfoImpl.h
include/xulrunner/nsIClientAuthDialogs.h
@@ -781,13 +880,13 @@ include/xulrunner/nsIDNSListener.h
include/xulrunner/nsIDNSRecord.h
include/xulrunner/nsIDNSService.h
include/xulrunner/nsIDOM3Attr.h
-include/xulrunner/nsIDOM3Document.h
include/xulrunner/nsIDOM3DocumentEvent.h
include/xulrunner/nsIDOM3EventTarget.h
include/xulrunner/nsIDOM3Node.h
include/xulrunner/nsIDOM3Text.h
include/xulrunner/nsIDOM3TypeInfo.h
include/xulrunner/nsIDOMAbstractView.h
+include/xulrunner/nsIDOMAnimationEvent.h
include/xulrunner/nsIDOMAttr.h
include/xulrunner/nsIDOMBarProp.h
include/xulrunner/nsIDOMBeforeUnloadEvent.h
@@ -828,7 +927,6 @@ include/xulrunner/nsIDOMCryptoDialogs.h
include/xulrunner/nsIDOMDOMConfiguration.h
include/xulrunner/nsIDOMDOMException.h
include/xulrunner/nsIDOMDOMImplementation.h
-include/xulrunner/nsIDOMDOMImplementationLS.h
include/xulrunner/nsIDOMDOMSettableTokenList.h
include/xulrunner/nsIDOMDOMStringList.h
include/xulrunner/nsIDOMDOMTokenList.h
@@ -852,6 +950,7 @@ include/xulrunner/nsIDOMElementTimeControl.h
include/xulrunner/nsIDOMEntity.h
include/xulrunner/nsIDOMEntityReference.h
include/xulrunner/nsIDOMEvent.h
+include/xulrunner/nsIDOMEventException.h
include/xulrunner/nsIDOMEventGroup.h
include/xulrunner/nsIDOMEventListener.h
include/xulrunner/nsIDOMEventTarget.h
@@ -936,21 +1035,13 @@ include/xulrunner/nsIDOMHTMLTableSectionElem.h
include/xulrunner/nsIDOMHTMLTextAreaElement.h
include/xulrunner/nsIDOMHTMLTitleElement.h
include/xulrunner/nsIDOMHTMLUListElement.h
+include/xulrunner/nsIDOMHTMLUnknownElement.h
include/xulrunner/nsIDOMHTMLVideoElement.h
include/xulrunner/nsIDOMHistory.h
include/xulrunner/nsIDOMJSWindow.h
include/xulrunner/nsIDOMKeyEvent.h
include/xulrunner/nsIDOMKeyListener.h
-include/xulrunner/nsIDOMLSException.h
-include/xulrunner/nsIDOMLSInput.h
-include/xulrunner/nsIDOMLSLoadEvent.h
-include/xulrunner/nsIDOMLSOutput.h
-include/xulrunner/nsIDOMLSParser.h
-include/xulrunner/nsIDOMLSParserFilter.h
include/xulrunner/nsIDOMLSProgressEvent.h
-include/xulrunner/nsIDOMLSResourceResolver.h
-include/xulrunner/nsIDOMLSSerializer.h
-include/xulrunner/nsIDOMLSSerializerFilter.h
include/xulrunner/nsIDOMLinkStyle.h
include/xulrunner/nsIDOMLoadListener.h
include/xulrunner/nsIDOMLoadStatus.h
@@ -965,6 +1056,8 @@ include/xulrunner/nsIDOMMouseEvent.h
include/xulrunner/nsIDOMMouseListener.h
include/xulrunner/nsIDOMMouseMotionListener.h
include/xulrunner/nsIDOMMouseScrollEvent.h
+include/xulrunner/nsIDOMMozCSSKeyframeRule.h
+include/xulrunner/nsIDOMMozCSSKeyframesRule.h
include/xulrunner/nsIDOMMozTouchEvent.h
include/xulrunner/nsIDOMMutationEvent.h
include/xulrunner/nsIDOMNSDocument.h
@@ -1236,7 +1329,6 @@ include/xulrunner/nsIExternalProtocolHandler.h
include/xulrunner/nsIExternalProtocolService.h
include/xulrunner/nsIExternalSharingAppService.h
include/xulrunner/nsIExternalURLHandlerService.h
-include/xulrunner/nsIFIXptr.h
include/xulrunner/nsIFTPChannel.h
include/xulrunner/nsIFactory.h
include/xulrunner/nsIFastLoadFileControl.h
@@ -1297,7 +1389,6 @@ include/xulrunner/nsIHTMLCollection.h
include/xulrunner/nsIHTMLContentSink.h
include/xulrunner/nsIHTMLDocument.h
include/xulrunner/nsIHTMLEditor.h
-include/xulrunner/nsIHTMLEditor_MOZILLA_2_0_BRANCH.h
include/xulrunner/nsIHTMLInlineTableEditor.h
include/xulrunner/nsIHTMLObjectResizeListener.h
include/xulrunner/nsIHTMLObjectResizer.h
@@ -1369,6 +1460,8 @@ include/xulrunner/nsIJSEventListener.h
include/xulrunner/nsIJSNativeInitializer.h
include/xulrunner/nsIJSON.h
include/xulrunner/nsIJSRuntimeService.h
+include/xulrunner/nsIJetpack.h
+include/xulrunner/nsIJetpackService.h
include/xulrunner/nsIKeyModule.h
include/xulrunner/nsIKeygenThread.h
include/xulrunner/nsILanguageAtomService.h
@@ -1410,7 +1503,6 @@ include/xulrunner/nsIMenuBoxObject.h
include/xulrunner/nsIMenuFrame.h
include/xulrunner/nsIMenuRollup.h
include/xulrunner/nsIMicrosummaryService.h
-include/xulrunner/nsIModifyableXPointer.h
include/xulrunner/nsIModule.h
include/xulrunner/nsIMultiPartChannel.h
include/xulrunner/nsIMultiplexInputStream.h
@@ -1450,6 +1542,8 @@ include/xulrunner/nsIPKCS11ModuleDB.h
include/xulrunner/nsIPKCS11Slot.h
include/xulrunner/nsIPKIParamBlock.h
include/xulrunner/nsIPageSequenceFrame.h
+include/xulrunner/nsIParentChannel.h
+include/xulrunner/nsIParentRedirectingChannel.h
include/xulrunner/nsIParentalControlsService.h
include/xulrunner/nsIParser.h
include/xulrunner/nsIParserFilter.h
@@ -1555,6 +1649,7 @@ include/xulrunner/nsIRangeUtils.h
include/xulrunner/nsIReadConfig.h
include/xulrunner/nsIRecentBadCertsService.h
include/xulrunner/nsIRecyclingAllocator.h
+include/xulrunner/nsIRedirectChannelRegistrar.h
include/xulrunner/nsIRedirectResultListener.h
include/xulrunner/nsIReflowCallback.h
include/xulrunner/nsIRefreshURI.h
@@ -1636,7 +1731,6 @@ include/xulrunner/nsISecurityInfoProvider.h
include/xulrunner/nsISecurityWarningDialogs.h
include/xulrunner/nsISeekableStream.h
include/xulrunner/nsISelectControlFrame.h
-include/xulrunner/nsISelectElement.h
include/xulrunner/nsISelection.h
include/xulrunner/nsISelection2.h
include/xulrunner/nsISelection3.h
@@ -1839,7 +1933,6 @@ include/xulrunner/nsIXPCScriptable.h
include/xulrunner/nsIXPCSecurityManager.h
include/xulrunner/nsIXPConnect.h
include/xulrunner/nsIXPathEvaluatorInternal.h
-include/xulrunner/nsIXPointer.h
include/xulrunner/nsIXSLTException.h
include/xulrunner/nsIXSLTProcessor.h
include/xulrunner/nsIXSLTProcessorObsolete.h
@@ -1867,7 +1960,6 @@ include/xulrunner/nsIXULWindow.h
include/xulrunner/nsIZipReader.h
include/xulrunner/nsIZipWriter.h
include/xulrunner/nsImageMapUtils.h
-include/xulrunner/nsInt64.h
include/xulrunner/nsInterfaceHashtable.h
include/xulrunner/nsInterfaceRequestorAgg.h
include/xulrunner/nsJSON.h
@@ -2055,6 +2147,7 @@ include/xulrunner/nsUCvTW2CID.h
include/xulrunner/nsUCvTWCID.h
include/xulrunner/nsURIHashKey.h
include/xulrunner/nsURILoader.h
+include/xulrunner/nsURLHelper.h
include/xulrunner/nsUTF8Utils.h
include/xulrunner/nsUnicharUtilCIID.h
include/xulrunner/nsUnicharUtils.h
@@ -2371,6 +2464,7 @@ include/xulrunner/xptcstubsdecl.inc
include/xulrunner/xptcstubsdef.inc
include/xulrunner/xptinfo.h
include/xulrunner/xrecore.h
+include/xulrunner/ycbcr_to_rgb565.h
include/xulrunner/yuv_convert.h
include/xulrunner/yuv_row.h
include/xulrunner/zipstruct.h
@@ -2389,6 +2483,7 @@ lib/xulrunner-sdk/lib
lib/xulrunner-sdk/sdk/lib/libcrmf.a
lib/xulrunner-sdk/sdk/lib/libmozalloc.so
lib/xulrunner-sdk/sdk/lib/libmozreg_s.a
+lib/xulrunner-sdk/sdk/lib/libmozreg_s.a.desc
lib/xulrunner-sdk/sdk/lib/libnspr4.so
lib/xulrunner-sdk/sdk/lib/libnss.a
lib/xulrunner-sdk/sdk/lib/libnssutil.a
@@ -2397,6 +2492,7 @@ lib/xulrunner-sdk/sdk/lib/libplds4.so
lib/xulrunner-sdk/sdk/lib/libsmime.a
lib/xulrunner-sdk/sdk/lib/libssl.a
lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a
+lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a.desc
lib/xulrunner-sdk/sdk/lib/libxpcom.so
lib/xulrunner-sdk/sdk/lib/libxpcomglue.a
lib/xulrunner-sdk/sdk/lib/libxpcomglue_s.a
@@ -2439,6 +2535,8 @@ lib/xulrunner/components/jsconsole-clhandler.manifest
${PLIST.gnome}lib/xulrunner/components/libdbusservice.so
${PLIST.gnome}lib/xulrunner/components/libmozgnome.so
${PLIST.gnome}lib/xulrunner/components/libnkgnomevfs.so
+lib/xulrunner/components/messageWakeupService.js
+lib/xulrunner/components/messageWakeupService.manifest
lib/xulrunner/components/nsBadCertHandler.js
lib/xulrunner/components/nsBadCertHandler.manifest
lib/xulrunner/components/nsBlocklistService.js
@@ -2514,7 +2612,6 @@ lib/xulrunner/defaults/profile/localstore.rdf
lib/xulrunner/dependentlibs.list
lib/xulrunner/dictionaries/en-US.aff
lib/xulrunner/dictionaries/en-US.dic
-lib/xulrunner/gre.d/${PKGVERSION}.system.conf
lib/xulrunner/greprefs.js
lib/xulrunner/icons/document.png
lib/xulrunner/icons/updater.png
@@ -2545,6 +2642,7 @@ lib/xulrunner/modules/AddonUpdateChecker.jsm
lib/xulrunner/modules/CSPUtils.jsm
lib/xulrunner/modules/CertUtils.jsm
lib/xulrunner/modules/CommonDialog.jsm
+lib/xulrunner/modules/Dict.jsm
lib/xulrunner/modules/DownloadLastDir.jsm
lib/xulrunner/modules/DownloadPaths.jsm
lib/xulrunner/modules/DownloadUtils.jsm
@@ -2573,11 +2671,11 @@ lib/xulrunner/modules/nsFormAutoCompleteResult.jsm
lib/xulrunner/modules/utils.js
lib/xulrunner/mozilla-xremote-client
lib/xulrunner/platform.ini
+lib/xulrunner/plugin-container
lib/xulrunner/res/EditorOverride.css
lib/xulrunner/res/contenteditable.css
lib/xulrunner/res/designmode.css
-lib/xulrunner/res/dtd/mathml.dtd
-lib/xulrunner/res/dtd/xhtml11.dtd
+lib/xulrunner/res/dtd/htmlmathml-f.ent
lib/xulrunner/res/entityTables/html40Latin1.properties
lib/xulrunner/res/entityTables/html40Special.properties
lib/xulrunner/res/entityTables/html40Symbols.properties
@@ -2782,9 +2880,9 @@ share/idl/xulrunner/nsIChannelEventSink.idl
share/idl/xulrunner/nsIChannelPolicy.idl
share/idl/xulrunner/nsICharsetConverterManager.idl
share/idl/xulrunner/nsICharsetResolver.idl
+share/idl/xulrunner/nsIChildChannel.idl
share/idl/xulrunner/nsIChromeRegistry.idl
share/idl/xulrunner/nsICipherInfo.idl
-share/idl/xulrunner/nsICiter.idl
share/idl/xulrunner/nsIClassInfo.idl
share/idl/xulrunner/nsIClientAuthDialogs.idl
share/idl/xulrunner/nsIClipboard.idl
@@ -2847,13 +2945,13 @@ share/idl/xulrunner/nsIDNSListener.idl
share/idl/xulrunner/nsIDNSRecord.idl
share/idl/xulrunner/nsIDNSService.idl
share/idl/xulrunner/nsIDOM3Attr.idl
-share/idl/xulrunner/nsIDOM3Document.idl
share/idl/xulrunner/nsIDOM3DocumentEvent.idl
share/idl/xulrunner/nsIDOM3EventTarget.idl
share/idl/xulrunner/nsIDOM3Node.idl
share/idl/xulrunner/nsIDOM3Text.idl
share/idl/xulrunner/nsIDOM3TypeInfo.idl
share/idl/xulrunner/nsIDOMAbstractView.idl
+share/idl/xulrunner/nsIDOMAnimationEvent.idl
share/idl/xulrunner/nsIDOMAttr.idl
share/idl/xulrunner/nsIDOMBarProp.idl
share/idl/xulrunner/nsIDOMBeforeUnloadEvent.idl
@@ -2891,7 +2989,6 @@ share/idl/xulrunner/nsIDOMCryptoDialogs.idl
share/idl/xulrunner/nsIDOMDOMConfiguration.idl
share/idl/xulrunner/nsIDOMDOMException.idl
share/idl/xulrunner/nsIDOMDOMImplementation.idl
-share/idl/xulrunner/nsIDOMDOMImplementationLS.idl
share/idl/xulrunner/nsIDOMDOMSettableTokenList.idl
share/idl/xulrunner/nsIDOMDOMStringList.idl
share/idl/xulrunner/nsIDOMDOMTokenList.idl
@@ -2915,6 +3012,7 @@ share/idl/xulrunner/nsIDOMElementTimeControl.idl
share/idl/xulrunner/nsIDOMEntity.idl
share/idl/xulrunner/nsIDOMEntityReference.idl
share/idl/xulrunner/nsIDOMEvent.idl
+share/idl/xulrunner/nsIDOMEventException.idl
share/idl/xulrunner/nsIDOMEventGroup.idl
share/idl/xulrunner/nsIDOMEventListener.idl
share/idl/xulrunner/nsIDOMEventTarget.idl
@@ -2997,20 +3095,12 @@ share/idl/xulrunner/nsIDOMHTMLTableSectionElem.idl
share/idl/xulrunner/nsIDOMHTMLTextAreaElement.idl
share/idl/xulrunner/nsIDOMHTMLTitleElement.idl
share/idl/xulrunner/nsIDOMHTMLUListElement.idl
+share/idl/xulrunner/nsIDOMHTMLUnknownElement.idl
share/idl/xulrunner/nsIDOMHTMLVideoElement.idl
share/idl/xulrunner/nsIDOMHistory.idl
share/idl/xulrunner/nsIDOMJSWindow.idl
share/idl/xulrunner/nsIDOMKeyEvent.idl
-share/idl/xulrunner/nsIDOMLSException.idl
-share/idl/xulrunner/nsIDOMLSInput.idl
-share/idl/xulrunner/nsIDOMLSLoadEvent.idl
-share/idl/xulrunner/nsIDOMLSOutput.idl
-share/idl/xulrunner/nsIDOMLSParser.idl
-share/idl/xulrunner/nsIDOMLSParserFilter.idl
share/idl/xulrunner/nsIDOMLSProgressEvent.idl
-share/idl/xulrunner/nsIDOMLSResourceResolver.idl
-share/idl/xulrunner/nsIDOMLSSerializer.idl
-share/idl/xulrunner/nsIDOMLSSerializerFilter.idl
share/idl/xulrunner/nsIDOMLinkStyle.idl
share/idl/xulrunner/nsIDOMLoadStatus.idl
share/idl/xulrunner/nsIDOMLocation.idl
@@ -3022,6 +3112,8 @@ share/idl/xulrunner/nsIDOMMimeTypeArray.idl
share/idl/xulrunner/nsIDOMModalContentWindow.idl
share/idl/xulrunner/nsIDOMMouseEvent.idl
share/idl/xulrunner/nsIDOMMouseScrollEvent.idl
+share/idl/xulrunner/nsIDOMMozCSSKeyframeRule.idl
+share/idl/xulrunner/nsIDOMMozCSSKeyframesRule.idl
share/idl/xulrunner/nsIDOMMozTouchEvent.idl
share/idl/xulrunner/nsIDOMMutationEvent.idl
share/idl/xulrunner/nsIDOMNSDocument.idl
@@ -3278,7 +3370,6 @@ share/idl/xulrunner/nsIExternalProtocolHandler.idl
share/idl/xulrunner/nsIExternalProtocolService.idl
share/idl/xulrunner/nsIExternalSharingAppService.idl
share/idl/xulrunner/nsIExternalURLHandlerService.idl
-share/idl/xulrunner/nsIFIXptr.idl
share/idl/xulrunner/nsIFTPChannel.idl
share/idl/xulrunner/nsIFactory.idl
share/idl/xulrunner/nsIFastLoadFileControl.idl
@@ -3325,7 +3416,6 @@ share/idl/xulrunner/nsIGlobalHistory3.idl
share/idl/xulrunner/nsIGnomeVFSService.idl
share/idl/xulrunner/nsIHTMLAbsPosEditor.idl
share/idl/xulrunner/nsIHTMLEditor.idl
-share/idl/xulrunner/nsIHTMLEditor_MOZILLA_2_0_BRANCH.idl
share/idl/xulrunner/nsIHTMLInlineTableEditor.idl
share/idl/xulrunner/nsIHTMLObjectResizeListener.idl
share/idl/xulrunner/nsIHTMLObjectResizer.idl
@@ -3389,6 +3479,8 @@ share/idl/xulrunner/nsIJARURI.idl
share/idl/xulrunner/nsIJSContextStack.idl
share/idl/xulrunner/nsIJSON.idl
share/idl/xulrunner/nsIJSRuntimeService.idl
+share/idl/xulrunner/nsIJetpack.idl
+share/idl/xulrunner/nsIJetpackService.idl
share/idl/xulrunner/nsIKeyModule.idl
share/idl/xulrunner/nsIKeygenThread.idl
share/idl/xulrunner/nsILineInputStream.idl
@@ -3416,7 +3508,6 @@ share/idl/xulrunner/nsIMemory.idl
share/idl/xulrunner/nsIMemoryReporter.idl
share/idl/xulrunner/nsIMenuBoxObject.idl
share/idl/xulrunner/nsIMicrosummaryService.idl
-share/idl/xulrunner/nsIModifyableXPointer.idl
share/idl/xulrunner/nsIModule.idl
share/idl/xulrunner/nsIMultiPartChannel.idl
share/idl/xulrunner/nsIMultiplexInputStream.idl
@@ -3445,6 +3536,8 @@ share/idl/xulrunner/nsIPKCS11Module.idl
share/idl/xulrunner/nsIPKCS11ModuleDB.idl
share/idl/xulrunner/nsIPKCS11Slot.idl
share/idl/xulrunner/nsIPKIParamBlock.idl
+share/idl/xulrunner/nsIParentChannel.idl
+share/idl/xulrunner/nsIParentRedirectingChannel.idl
share/idl/xulrunner/nsIParentalControlsService.idl
share/idl/xulrunner/nsIPermission.idl
share/idl/xulrunner/nsIPermissionManager.idl
@@ -3532,6 +3625,7 @@ share/idl/xulrunner/nsIRandomGenerator.idl
share/idl/xulrunner/nsIReadConfig.idl
share/idl/xulrunner/nsIRecentBadCertsService.idl
share/idl/xulrunner/nsIRecyclingAllocator.idl
+share/idl/xulrunner/nsIRedirectChannelRegistrar.idl
share/idl/xulrunner/nsIRedirectResultListener.idl
share/idl/xulrunner/nsIRefreshURI.idl
share/idl/xulrunner/nsIRelativeFilePref.idl
@@ -3589,7 +3683,6 @@ share/idl/xulrunner/nsISecurityEventSink.idl
share/idl/xulrunner/nsISecurityInfoProvider.idl
share/idl/xulrunner/nsISecurityWarningDialogs.idl
share/idl/xulrunner/nsISeekableStream.idl
-share/idl/xulrunner/nsISelectElement.idl
share/idl/xulrunner/nsISelection.idl
share/idl/xulrunner/nsISelection2.idl
share/idl/xulrunner/nsISelection3.idl
@@ -3756,7 +3849,6 @@ share/idl/xulrunner/nsIXPCScriptNotify.idl
share/idl/xulrunner/nsIXPCScriptable.idl
share/idl/xulrunner/nsIXPCSecurityManager.idl
share/idl/xulrunner/nsIXPConnect.idl
-share/idl/xulrunner/nsIXPointer.idl
share/idl/xulrunner/nsIXSLTException.idl
share/idl/xulrunner/nsIXSLTProcessor.idl
share/idl/xulrunner/nsIXSLTProcessorObsolete.idl
diff --git a/devel/xulrunner/buildlink3.mk b/devel/xulrunner/buildlink3.mk
index 90ef17e633a..35b8fc93866 100644
--- a/devel/xulrunner/buildlink3.mk
+++ b/devel/xulrunner/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.13 2011/04/26 14:16:36 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2011/07/11 12:46:14 tnn Exp $
BUILDLINK_TREE+= xulrunner
.if !defined(XULRUNNER_BUILDLINK3_MK)
XULRUNNER_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=2.0
+BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=5.0
BUILDLINK_PKGSRCDIR.xulrunner?= ../../devel/xulrunner
pkgbase := xulrunner
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index 57ed68c303b..af598e70141 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.21 2011/05/02 20:37:37 tnn Exp $
+# $NetBSD: dist.mk,v 1.22 2011/07/11 12:46:14 tnn Exp $
#
# used by devel/nspr/Makefile
# used by devel/nss/Makefile
@@ -6,13 +6,13 @@
# used by www/firefox/Makefile
DISTNAME= firefox-${FIREFOX_VER}.source
-FIREFOX_VER= 4.0${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 2.0
-MOZ_BRANCH_MINOR= .1
+FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
+MOZ_BRANCH= 5.0
+MOZ_BRANCH_MINOR= # empty
MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.bz2
DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo
PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches
-WRKSRC= ${WRKDIR}/mozilla-${MOZ_BRANCH}
+WRKSRC= ${WRKDIR}/mozilla-release
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index cacd76b47c5..73aa63c9707 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2011/05/02 20:37:37 tnn Exp $
+$NetBSD: distinfo,v 1.45 2011/07/11 12:46:14 tnn Exp $
-SHA1 (firefox-4.0.1.source.tar.bz2) = c89bc5106266aa0097a7be15be84555bd2649f03
-RMD160 (firefox-4.0.1.source.tar.bz2) = 63faaae78b56db407a34454986361212382c838e
-Size (firefox-4.0.1.source.tar.bz2) = 65980273 bytes
+SHA1 (firefox-5.0.source.tar.bz2) = 22b7b4751173c2142a0f09cca1aebc717d97b45a
+RMD160 (firefox-5.0.source.tar.bz2) = 93d97a01f572f3688b0065c903afc3d7f9260179
+Size (firefox-5.0.source.tar.bz2) = 68782151 bytes
SHA1 (patch-aa) = cbf636b05f5bb2165fa335dab83d25e78053cdb2
SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997
SHA1 (patch-ac) = 3d031c52056a4792119104e3c6a6f2377d00d04a
@@ -14,7 +14,7 @@ SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac
SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
SHA1 (patch-aj) = 78803641532203f878fc99ead9a440b8bf425aeb
SHA1 (patch-ak) = 5c08fcfa1eeecb7c7f33c8fe21f8bb48feb001c8
-SHA1 (patch-al) = 7f369b954c413bd52f89236c5dfcc237d72150a5
+SHA1 (patch-al) = a8397fe9087a088169c639b42522306824f013b7
SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3
@@ -29,14 +29,19 @@ SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4
SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
SHA1 (patch-bd) = e09718d6492739a66dc5e21d3ed2cc1a404acd30
SHA1 (patch-be) = 723d74807830632ecd3b88e8271d91d73ac81be4
-SHA1 (patch-bf) = 8d8b2868040ff043ebdbb09fc37d9ae2b598d70d
+SHA1 (patch-bf) = 9a2e7a40e7d6cf01df384bf5e71b15a7c3f94cc0
SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759
SHA1 (patch-bi) = a79369cf0c7370a8655fe414cdb7c8ddb4c2d495
-SHA1 (patch-js_src_jsdbgapi.cpp) = 849dc847c3e635326fbc09e4304d9d82532915a1
-SHA1 (patch-js_src_jsval.h) = 07aaa247ed7a0d3c075fa6574b67b3f7c73be381
-SHA1 (patch-js_src_xpconnect_src_xpcprivate.h) = 58322122cdb96e16b1bb1a6fbc4bce6e182d1d75
+SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = fcb4313d2a77c73df717138e33a3bc74841f06c4
+SHA1 (patch-ipc_chromium_src_base_file__util.h) = 1385e427cc8c0c14cd67763aea85d78b99901de7
+SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = f3e0891320d2658db2bf33b57e6287f4380c855e
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = bfcea1298c2d2c7d65570be3a5529adbf711dea3
+SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 4d6e4724bc2473325fc9e62ab2321155a06c65d6
+SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 15b35884249077eb879371b8b63d2f8aa4ee68b5
+SHA1 (patch-ipc_chromium_src_build_build__config.h) = 3fa5e85df6425f3b5f6f97180f502c543a278f3e
+SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 27ac2b7dbe1b325ad833ffc2bf17003a5f6a6f88
SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
-SHA1 (patch-mb) = 97e2b454f190ebc639908ee93c9f1217e0c147db
+SHA1 (patch-mb) = 131abc07f378cefcc8c2871e4fd20f306e3af61a
SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff
@@ -46,7 +51,7 @@ SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
-SHA1 (patch-mm) = cceb70da3e30c23c88aacb2693ba1a2d27fade63
+SHA1 (patch-mm) = f103ec94a9d4c6c910eb9da9cc3df486b8294415
SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203
SHA1 (patch-mp) = 18d2490b6bcd4f017cbf2734a920c3830bfe8856
SHA1 (patch-pa) = 11d8ec21533250a962d846e1d06b6a61722fcd60
@@ -54,7 +59,8 @@ SHA1 (patch-pb) = 9662aa24ed81760e9cdaffec17592cfe9bbbab22
SHA1 (patch-pc) = a0fbd378e0209259c97c8e24c8eccc02b543e08f
SHA1 (patch-pd) = e1b0d5b91c65cc3945eea3488ca0126a3461cea0
SHA1 (patch-pg) = fbf4ae0f334b97f201d05f9bdfd8a2643aeb33ea
-SHA1 (patch-rc) = 3dcccdff2d15145f91f1abae26f28e598942cd5c
+SHA1 (patch-rc) = fb3ae1a38eabf3f7c47e86d8ff62f79496b9bf67
+SHA1 (patch-toolkit_toolkit-tiers.mk) = 53bbd10f337907d4a74a661719ab6637090b74c8
SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72
SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201
SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965
diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk
index c5e9629000a..4b4f3bfaee6 100644
--- a/devel/xulrunner/mozilla-common.mk
+++ b/devel/xulrunner/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.21 2011/05/01 13:52:34 cegger Exp $
+# $NetBSD: mozilla-common.mk,v 1.22 2011/07/11 12:46:14 tnn Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -30,11 +30,11 @@ CONFIGURE_ARGS+= --disable-system-cairo
CONFIGURE_ARGS+= --disable-system-pixman
CONFIGURE_ARGS+= --with-system-jpeg
CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2
+CONFIGURE_ARGS+= --with-system-libevent
CONFIGURE_ARGS+= --enable-system-sqlite
CONFIGURE_ARGS+= --disable-crashreporter
CONFIGURE_ARGS+= --disable-libnotify
CONFIGURE_ARGS+= --disable-necko-wifi
-CONFIGURE_ARGS+= --disable-ipc # no chromium platform support on BSD
SUBST_CLASSES+= fix-paths
SUBST_STAGE.fix-paths= pre-configure
@@ -88,6 +88,7 @@ PREFER.bzip2?= pkgsrc
BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.4
CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al
.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/devel/xulrunner/patches/patch-al b/devel/xulrunner/patches/patch-al
index c4c54dda16f..58a0fcaf0bc 100644
--- a/devel/xulrunner/patches/patch-al
+++ b/devel/xulrunner/patches/patch-al
@@ -1,9 +1,9 @@
-$NetBSD: patch-al,v 1.3 2011/04/26 14:16:36 tnn Exp $
+$NetBSD: patch-al,v 1.4 2011/07/11 12:46:14 tnn Exp $
---- storage/src/mozStorageConnection.cpp.orig 2010-08-24 21:32:09.000000000 +0000
+--- storage/src/mozStorageConnection.cpp.orig 2011-06-15 21:57:54.000000000 +0000
+++ storage/src/mozStorageConnection.cpp
-@@ -405,6 +405,11 @@ Connection::initialize(nsIFile *aDatabas
- break;
+@@ -595,6 +595,11 @@ Connection::initialize(nsIFile *aDatabas
+ (void)::NS_RegisterMemoryReporter(mMemoryReporters[i]);
}
+ // XXX tnn: the configure script demands that sqlite3 is compiled with
diff --git a/devel/xulrunner/patches/patch-au b/devel/xulrunner/patches/patch-au
index 4b55d23dee6..2c6ecf76526 100644
--- a/devel/xulrunner/patches/patch-au
+++ b/devel/xulrunner/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.2 2011/04/26 14:16:36 tnn Exp $
+$NetBSD: patch-au,v 1.3 2011/07/11 12:46:14 tnn Exp $
- Fix device name on NetBSD
- SOUND_VERSION just isn't a reliable way to detect features supported by
diff --git a/devel/xulrunner/patches/patch-bf b/devel/xulrunner/patches/patch-bf
index 1477106f961..60999e9fd37 100644
--- a/devel/xulrunner/patches/patch-bf
+++ b/devel/xulrunner/patches/patch-bf
@@ -1,13 +1,13 @@
-$NetBSD: patch-bf,v 1.2 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-bf,v 1.3 2011/07/11 12:46:14 tnn Exp $
---- js/src/jsnativestack.cpp.orig 2010-06-29 09:41:37.000000000 +0000
+--- js/src/jsnativestack.cpp.orig 2011-06-15 21:57:29.000000000 +0000
+++ js/src/jsnativestack.cpp
-@@ -170,7 +170,7 @@ GetNativeStackBaseImpl()
- # else
- pthread_attr_t sattr;
+@@ -145,7 +145,7 @@ GetNativeStackBaseImpl()
pthread_attr_init(&sattr);
--# if defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
-+# if defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
+ # if defined(__OpenBSD__)
+ stack_t ss;
+-# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
++# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
/* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */
pthread_attr_get_np(thread, &sattr);
# else
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
new file mode 100644
index 00000000000..3053dfd7dc1
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
@@ -0,0 +1,35 @@
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.1 2011/07/11 12:46:14 tnn Exp $
+
+--- ipc/chromium/src/base/debug_util_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000
++++ ipc/chromium/src/base/debug_util_posix.cc
+@@ -11,10 +11,10 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#ifndef ANDROID
++#ifdef __linux__
+ #include <execinfo.h>
+-#include <sys/sysctl.h>
+ #endif
++#include <sys/sysctl.h>
+
+ #include "base/basictypes.h"
+ #include "base/eintr_wrapper.h"
+@@ -119,7 +119,7 @@ StackTrace::StackTrace() {
+ const int kMaxCallers = 256;
+
+ void* callers[kMaxCallers];
+-#ifndef ANDROID
++#ifdef __GLIBC__
+ int count = backtrace(callers, kMaxCallers);
+ #else
+ int count = 0;
+@@ -138,7 +138,7 @@ StackTrace::StackTrace() {
+
+ void StackTrace::PrintBacktrace() {
+ fflush(stderr);
+-#ifndef ANDROID
++#ifdef __GLIBC__
+ backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
+ #endif
+ }
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util.h
new file mode 100644
index 00000000000..d5665d3eede
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.1 2011/07/11 12:46:14 tnn Exp $
+
+--- ipc/chromium/src/base/file_util.h.orig 2011-06-15 21:57:27.000000000 +0000
++++ ipc/chromium/src/base/file_util.h
+@@ -15,8 +15,9 @@
+ #elif defined(ANDROID)
+ #include <sys/stat.h>
+ #elif defined(OS_POSIX)
+-#include <fts.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
++#include <fts.h>
+ #endif
+
+ #include <stdio.h>
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc
new file mode 100644
index 00000000000..7beb1ffb1cd
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1 2011/07/11 12:46:14 tnn Exp $
+
+--- ipc/chromium/src/base/file_util_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000
++++ ipc/chromium/src/base/file_util_posix.cc
+@@ -30,6 +30,9 @@
+ #include "base/string_util.h"
+ #include "base/time.h"
+
++#ifndef __linux__
++#define stat64 stat
++#endif
+ namespace file_util {
+
+ #if defined(GOOGLE_CHROME_BUILD)
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
new file mode 100644
index 00000000000..55903619c55
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.1 2011/07/11 12:46:14 tnn Exp $
+
+--- ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000
++++ ipc/chromium/src/base/platform_thread_posix.cc
+@@ -9,6 +9,8 @@
+
+ #if defined(OS_MACOSX)
+ #include <mach/mach.h>
++#elif defined(OS_NETBSD)
++#include <lwp.h>
+ #elif defined(OS_LINUX)
+ #include <sys/syscall.h>
+ #include <unistd.h>
+@@ -33,6 +35,10 @@ PlatformThreadId PlatformThread::Current
+ // into the kernel.
+ #if defined(OS_MACOSX)
+ return mach_thread_self();
++#elif defined(OS_NETBSD)
++ return _lwp_self();
++#elif defined(OS_DRAGONFLY)
++#error No DragonFly support. hint: look at FreeBSD ports.
+ #elif defined(OS_LINUX)
+ return syscall(__NR_gettid);
+ #endif
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
new file mode 100644
index 00000000000..772f5db42ab
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
@@ -0,0 +1,37 @@
+$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.1 2011/07/11 12:46:14 tnn Exp $
+
+--- ipc/chromium/src/base/sys_info_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000
++++ ipc/chromium/src/base/sys_info_posix.cc
+@@ -18,6 +18,11 @@
+ #include <mach/mach_init.h>
+ #endif
+
++#if defined(OS_NETBSD)
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#endif
++
+ #include "base/logging.h"
+ #include "base/string_util.h"
+
+@@ -52,6 +57,20 @@ int64 SysInfo::AmountOfPhysicalMemory()
+ }
+
+ return static_cast<int64>(hostinfo.max_mem);
++#elif defined(OS_NETBSD)
++ int mib[2];
++ int rc;
++ int64_t memSize;
++ size_t len = sizeof(memSize);
++
++ mib[0] = CTL_HW;
++ mib[1] = HW_PHYSMEM64;
++ rc = sysctl( mib, 2, &memSize, &len, NULL, 0 );
++ if (-1 != rc) {
++ return memSize;
++ }
++ return 0;
++
+ #else
+ long pages = sysconf(_SC_PHYS_PAGES);
+ long page_size = sysconf(_SC_PAGE_SIZE);
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
new file mode 100644
index 00000000000..83951d1145d
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.1 2011/07/11 12:46:14 tnn Exp $
+
+--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-06-15 21:57:27.000000000 +0000
++++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h
+@@ -34,7 +34,7 @@
+ #include "base/third_party/nspr/prcpucfg_win.h"
+ #elif defined(__APPLE__)
+ #include "base/third_party/nspr/prcpucfg_mac.h"
+-#elif defined(__linux__) || defined(ANDROID)
++#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include "base/third_party/nspr/prcpucfg_linux.h"
+ #else
+ #error Provide a prcpucfg.h appropriate for your platform
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h b/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h
new file mode 100644
index 00000000000..b33651d997d
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h
@@ -0,0 +1,34 @@
+$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.1 2011/07/11 12:46:14 tnn Exp $
+
+--- ipc/chromium/src/build/build_config.h.orig 2011-06-15 21:57:27.000000000 +0000
++++ ipc/chromium/src/build/build_config.h
+@@ -19,6 +19,10 @@
+ #define OS_MACOSX 1
+ #elif defined(__linux__) || defined(ANDROID)
+ #define OS_LINUX 1
++#elif defined(__NetBSD__)
++#define OS_NETBSD 1
++#elif defined(__DragonFly__)
++#define OS_DRAGONFLY 1
+ #elif defined(_WIN32)
+ #define OS_WIN 1
+ #else
+@@ -27,7 +31,7 @@
+
+ // For access to standard POSIX features, use OS_POSIX instead of a more
+ // specific macro.
+-#if defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DRAGONFLY)
+ #define OS_POSIX 1
+ #endif
+
+@@ -60,6 +64,9 @@
+ #elif defined(__ppc__)
+ #define ARCH_CPU_PPC 1
+ #define ARCH_CPU_32_BITS 1
++#elif defined(__sparc64__)
++#define ARCH_CPU_SPARC 1
++#define ARCH_CPU_64_BITS 1
+ #else
+ #error Please add support for your architecture in build/build_config.h
+ #endif
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h b/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
new file mode 100644
index 00000000000..3cbf68acce4
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.1 2011/07/11 12:46:14 tnn Exp $
+
+--- ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig 2011-06-15 21:57:27.000000000 +0000
++++ ipc/chromium/src/chrome/common/ipc_channel_posix.h
+@@ -92,7 +92,7 @@ class Channel::ChannelImpl : public Mess
+ };
+
+ // This is a control message buffer large enough to hold kMaxReadFDs
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_NETBSD)
+ // TODO(agl): OSX appears to have non-constant CMSG macros!
+ char input_cmsg_buf_[1024];
+ #else
diff --git a/devel/xulrunner/patches/patch-js_src_jsdbgapi.cpp b/devel/xulrunner/patches/patch-js_src_jsdbgapi.cpp
deleted file mode 100644
index bb44618bf98..00000000000
--- a/devel/xulrunner/patches/patch-js_src_jsdbgapi.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-js_src_jsdbgapi.cpp,v 1.2 2011/04/26 14:43:32 tnn Exp $
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=637437
-
---- js/src/jsdbgapi.cpp
-+++ js/src/jsdbgapi.cpp
-@@ -111,28 +111,26 @@ JS_SetRuntimeDebugMode(JSRuntime *rt, JS
- {
- rt->debugMode = debug;
- }
-
- #ifdef DEBUG
- static bool
- CompartmentHasLiveScripts(JSCompartment *comp)
- {
--#ifdef JS_METHODJIT
--# ifdef JS_THREADSAFE
-+#if defined(JS_METHODJIT) && defined(JS_THREADSAFE)
- jsword currentThreadId = reinterpret_cast<jsword>(js_CurrentThreadId());
--# endif
- #endif
-
- // Unsynchronized context iteration is technically a race; but this is only
- // for debug asserts where such a race would be rare
- JSContext *iter = NULL;
- JSContext *icx;
- while ((icx = JS_ContextIterator(comp->rt, &iter))) {
--#ifdef JS_THREADSAFE
-+#if defined(JS_METHODJIT) && defined(JS_THREADSAFE)
- if (JS_GetContextThread(icx) != currentThreadId)
- continue;
- #endif
- for (AllFramesIter i(icx); !i.done(); ++i) {
- JSScript *script = i.fp()->maybeScript();
- if (script && script->compartment == comp)
- return JS_TRUE;
- }
diff --git a/devel/xulrunner/patches/patch-js_src_jsval.h b/devel/xulrunner/patches/patch-js_src_jsval.h
deleted file mode 100644
index f08704613b6..00000000000
--- a/devel/xulrunner/patches/patch-js_src_jsval.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_jsval.h,v 1.1 2011/04/26 14:16:37 tnn Exp $
-
-# Attachment #517107 from
-# https://bugzilla.mozilla.org/show_bug.cgi?id=618485
-
---- js/src/jsval.h.orig 2011-02-23 05:53:35.000000000 +0000
-+++ js/src/jsval.h
-@@ -346,6 +346,7 @@ typedef union jsval_layout
- union {
- int32 i32;
- uint32 u32;
-+ jsuword word;
- JSWhyMagic why;
- } payload;
- } s;
diff --git a/devel/xulrunner/patches/patch-js_src_xpconnect_src_xpcprivate.h b/devel/xulrunner/patches/patch-js_src_xpconnect_src_xpcprivate.h
deleted file mode 100644
index eec876f4444..00000000000
--- a/devel/xulrunner/patches/patch-js_src_xpconnect_src_xpcprivate.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-js_src_xpconnect_src_xpcprivate.h,v 1.1 2011/04/26 14:16:37 tnn Exp $
-
-fix sparc64 strict alignment issue, from martin@
-
---- js/src/xpconnect/src/xpcprivate.h.orig 2011-02-23 05:53:38.000000000 +0000
-+++ js/src/xpconnect/src/xpcprivate.h
-@@ -1270,7 +1270,10 @@ private:
- // string class members since we don't want to pay the cost of
- // calling the constructors and destructors when the strings
- // aren't being used.
-- char mStringWrapperData[sizeof(StringWrapperEntry) * XPCCCX_STRING_CACHE_SIZE];
-+ union {
-+ char store[sizeof(StringWrapperEntry) * XPCCCX_STRING_CACHE_SIZE];
-+ void *dummy_to_force_alignement;
-+ } mStringWrapperData;
- };
-
- class XPCLazyCallContext
diff --git a/devel/xulrunner/patches/patch-mb b/devel/xulrunner/patches/patch-mb
index b4b24b368ff..06ae79686e1 100644
--- a/devel/xulrunner/patches/patch-mb
+++ b/devel/xulrunner/patches/patch-mb
@@ -1,8 +1,8 @@
-$NetBSD: patch-mb,v 1.5 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-mb,v 1.6 2011/07/11 12:46:14 tnn Exp $
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-04-21 09:07:48.000000000 +0000
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-06-15 21:58:01.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -83,7 +83,7 @@ endif
+@@ -97,7 +97,7 @@ endif
endif
endif
@@ -11,7 +11,7 @@ $NetBSD: patch-mb,v 1.5 2011/04/26 14:16:37 tnn Exp $
ifeq (86,$(findstring 86,$(OS_TEST)))
CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
endif
-@@ -92,7 +92,7 @@ endif
+@@ -106,7 +106,7 @@ endif
# New code for Linux, et. al., with gcc
# Migrate other platforms here after testing
#
@@ -20,7 +20,7 @@ $NetBSD: patch-mb,v 1.5 2011/04/26 14:16:37 tnn Exp $
# Linux/x86-64
ifeq (x86_64,$(OS_TEST))
CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
-@@ -110,12 +110,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin
+@@ -124,12 +124,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin
endif
endif
#
@@ -30,10 +30,10 @@ $NetBSD: patch-mb,v 1.5 2011/04/26 14:16:37 tnn Exp $
-CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
-endif
-#
- # BeOS/Intel (uses the same unixish_x86 code)
+ # Neutrino/Intel (uses the same unixish_x86 code)
#
- ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -210,7 +204,7 @@ endif
+ ifeq ($(OS_TARGET),NTO)
+@@ -212,7 +206,7 @@ endif
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -42,7 +42,7 @@ $NetBSD: patch-mb,v 1.5 2011/04/26 14:16:37 tnn Exp $
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -265,7 +259,7 @@ endif
+@@ -269,7 +263,7 @@ endif
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -51,7 +51,7 @@ $NetBSD: patch-mb,v 1.5 2011/04/26 14:16:37 tnn Exp $
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -350,9 +344,10 @@ endif
+@@ -359,9 +353,10 @@ endif
#
# NetBSD/PPC
#
@@ -63,7 +63,7 @@ $NetBSD: patch-mb,v 1.5 2011/04/26 14:16:37 tnn Exp $
endif
#
-@@ -424,6 +419,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c
+@@ -433,6 +428,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c
ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
endif
#
diff --git a/devel/xulrunner/patches/patch-mm b/devel/xulrunner/patches/patch-mm
index 7492dae4c42..86486cd042b 100644
--- a/devel/xulrunner/patches/patch-mm
+++ b/devel/xulrunner/patches/patch-mm
@@ -1,8 +1,8 @@
-$NetBSD: patch-mm,v 1.5 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-mm,v 1.6 2011/07/11 12:46:14 tnn Exp $
---- toolkit/library/Makefile.in.orig 2011-01-22 00:30:16.000000000 +0000
+--- toolkit/library/Makefile.in.orig 2011-06-15 21:58:10.000000000 +0000
+++ toolkit/library/Makefile.in
-@@ -246,6 +246,13 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -216,6 +216,13 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
@@ -14,5 +14,5 @@ $NetBSD: patch-mm,v 1.5 2011/04/26 14:16:37 tnn Exp $
+endif
+
ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32)
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp)
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
diff --git a/devel/xulrunner/patches/patch-rc b/devel/xulrunner/patches/patch-rc
index f74e08013af..3adce9b02cc 100644
--- a/devel/xulrunner/patches/patch-rc
+++ b/devel/xulrunner/patches/patch-rc
@@ -1,10 +1,10 @@
-$NetBSD: patch-rc,v 1.4 2011/05/02 20:37:37 tnn Exp $
+$NetBSD: patch-rc,v 1.5 2011/07/11 12:46:14 tnn Exp $
---- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2011-04-14 05:28:21.000000000 +0000
+--- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2011-01-22 00:24:21.000000000 +0000
+++ browser/branding/unofficial/locales/en-US/brand.dtd
@@ -1,4 +1,4 @@
--<!ENTITY brandShortName "Tumucumaque">
--<!ENTITY brandFullName "Tumucumaque">
+-<!ENTITY brandShortName "Mozilla Developer Preview">
+-<!ENTITY brandFullName "Mozilla Developer Preview">
+<!ENTITY brandShortName "Browser">
+<!ENTITY brandFullName "Browser">
<!ENTITY vendorShortName "mozilla.org">
diff --git a/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk b/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk
new file mode 100644
index 00000000000..de087c681cf
--- /dev/null
+++ b/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.1 2011/07/11 12:46:14 tnn Exp $
+
+--- toolkit/toolkit-tiers.mk.orig 2011-06-15 21:57:56.000000000 +0000
++++ toolkit/toolkit-tiers.mk
+@@ -90,7 +90,7 @@ ifndef MOZ_NATIVE_BZ2
+ tier_platform_dirs += modules/libbz2
+ endif
+ tier_platform_dirs += modules/libmar
+-tier_platform_dirs += other-licenses/bsdiff
++#tier_platform_dirs += other-licenses/bsdiff
+ endif
+
+ tier_platform_dirs += gfx/qcms