summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2012-11-21 15:26:49 +0000
committerryoon <ryoon@pkgsrc.org>2012-11-21 15:26:49 +0000
commit272e8173e44865c71016041918283fc4f3e42c6a (patch)
treeb65f6227175bfdad76043ad3cccaebdae7a87bc5 /devel
parent368819d99705f1ffcae0c9217c3426f40bcd287f (diff)
downloadpkgsrc-272e8173e44865c71016041918283fc4f3e42c6a.tar.gz
Update to 17.0
* Add --enable-pulseaudio configure option (functionality is not tested) Changelog: NEW First revision of the Social API and support for Facebook Messenger NEW Click-to-play blocklisting implemented to prevent vulnerable plugin versions from running without the user's permission (see blog post) CHANGED Updated Awesome Bar experience with larger icons CHANGED Mac OS X 10.5 is no longer supported DEVELOPER JavaScript Maps and Sets are now iterable DEVELOPER SVG FillPaint and StrokePaint implemented DEVELOPER Improvements that make the Web Console, Debugger and Developer Toolbar faster and easier to use DEVELOPER New Markup panel in the Page Inspector allows easy editing of the DOM HTML5 Sandbox attribute for iframes implemented, enabling increased security FIXED Over twenty performance improvements, including fixes around the New Tab page FIXED Pointer lock doesn't work in web apps (769150) FIXED Page scrolling on sites with fixed headers (780345)
Diffstat (limited to 'devel')
-rw-r--r--devel/xulrunner/Makefile5
-rw-r--r--devel/xulrunner/PLIST206
-rw-r--r--devel/xulrunner/dist.mk8
-rw-r--r--devel/xulrunner/distinfo44
-rw-r--r--devel/xulrunner/options.mk4
-rw-r--r--devel/xulrunner/patches/patch-aa62
-rw-r--r--devel/xulrunner/patches/patch-as19
-rw-r--r--devel/xulrunner/patches/patch-bi8
-rw-r--r--devel/xulrunner/patches/patch-content_media_nsAudioStream.cpp18
-rw-r--r--devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp12
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_Makefile.in7
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__linux.cc13
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc10
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc67
-rw-r--r--devel/xulrunner/patches/patch-ipc_chromium_src_base_thread__collision__warner.h15
-rw-r--r--devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp32
-rw-r--r--devel/xulrunner/patches/patch-js_src_jsproxy.h13
-rw-r--r--devel/xulrunner/patches/patch-js_src_jsprvtd.h17
-rw-r--r--devel/xulrunner/patches/patch-media_libcubeb_src_Makefile.in30
-rw-r--r--devel/xulrunner/patches/patch-media_libsydneyaudio_src_Makefile.in36
-rw-r--r--devel/xulrunner/patches/patch-media_libvpx_vpx__config.h21
-rw-r--r--devel/xulrunner/patches/patch-media_libvpx_vpx__config__c.c21
-rw-r--r--devel/xulrunner/patches/patch-mi10
-rw-r--r--devel/xulrunner/patches/patch-toolkit_library_Makefile.in24
-rw-r--r--devel/xulrunner/patches/patch-xe14
-rw-r--r--devel/xulrunner/patches/patch-xj31
-rw-r--r--devel/xulrunner/patches/patch-xl74
-rw-r--r--devel/xulrunner/patches/patch-xm16
28 files changed, 501 insertions, 336 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index bde30199664..c9227ddf1f0 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2012/11/17 10:57:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.85 2012/11/21 15:26:49 ryoon Exp $
.include "dist.mk"
-PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION= 1
+PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//}
CATEGORIES= devel www
MAINTAINER= tnn@NetBSD.org
diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST
index e2f3aacfc72..6bc6830c1b1 100644
--- a/devel/xulrunner/PLIST
+++ b/devel/xulrunner/PLIST
@@ -1,18 +1,26 @@
-@comment $NetBSD: PLIST,v 1.47 2012/10/12 18:27:20 ryoon Exp $
+
+@comment $NetBSD: PLIST,v 1.48 2012/11/21 15:26:49 ryoon Exp $
bin/xulrunner
include/xulrunner/.mkdir.done
+include/xulrunner/AccEvent.h
+include/xulrunner/AnimationCommon.h
include/xulrunner/AudioSegment.h
include/xulrunner/BasicImplData.h
include/xulrunner/BasicLayers.h
include/xulrunner/BasicTiledThebesLayer.h
+include/xulrunner/CompositorChild.h
+include/xulrunner/CompositorParent.h
include/xulrunner/CustomQS_Canvas.h
include/xulrunner/CustomQS_Canvas2D.h
include/xulrunner/CustomQS_WebGL.h
+include/xulrunner/DOMCameraManager.h
+include/xulrunner/DeviceStorage.h
include/xulrunner/DictionaryHelpers.h
include/xulrunner/EventTracer.h
include/xulrunner/FileBlockCache.h
include/xulrunner/ForceDiscreteGPUHelperCGL.h
include/xulrunner/FrameLayerBuilder.h
+include/xulrunner/FrameMetrics.h
include/xulrunner/FramePropertyTable.h
include/xulrunner/GLContext.h
include/xulrunner/GLContextProvider.h
@@ -21,29 +29,35 @@ include/xulrunner/GLContextSymbols.h
include/xulrunner/GLDefs.h
include/xulrunner/GLLibraryLoader.h
include/xulrunner/GLXLibrary.h
+include/xulrunner/GeneratedEvents.h
include/xulrunner/GfxInfoCollector.h
+include/xulrunner/GonkIOSurfaceImage.h
include/xulrunner/IJSDebugger.h
include/xulrunner/IPC/IPCMessageUtils.h
include/xulrunner/IPC/nsGUIEventIPC.h
-include/xulrunner/ImageErrors.h
+include/xulrunner/ImageContainer.h
include/xulrunner/ImageLayers.h
include/xulrunner/ImageLogging.h
+include/xulrunner/ImageTypes.h
+include/xulrunner/InputData.h
include/xulrunner/LayerManagerOGL.h
include/xulrunner/LayerManagerOGLProgram.h
include/xulrunner/LayerManagerOGLShaders.h
include/xulrunner/LayerSorter.h
include/xulrunner/Layers.h
+include/xulrunner/LayersTypes.h
include/xulrunner/MediaEngine.h
include/xulrunner/MediaEngineDefault.h
include/xulrunner/MediaResource.h
include/xulrunner/MediaSegment.h
include/xulrunner/MediaStreamGraph.h
include/xulrunner/PCOMContentPermissionRequestChild.h
-include/xulrunner/PPrefTuple.h
-include/xulrunner/PrefTuple.h
include/xulrunner/ReadbackLayer.h
include/xulrunner/SVGAttrValueWrapper.h
+include/xulrunner/ScrollbarActivity.h
include/xulrunner/Selection.h
+include/xulrunner/SerializedLoadContext.h
+include/xulrunner/ShadowLayersManager.h
include/xulrunner/SharedBuffer.h
include/xulrunner/SharedTextureImage.h
include/xulrunner/StackArena.h
@@ -77,6 +91,7 @@ include/xulrunner/gc/Barrier.h
include/xulrunner/gc/Heap.h
include/xulrunner/gc/Root.h
include/xulrunner/gc/Statistics.h
+include/xulrunner/gc/StoreBuffer.h
include/xulrunner/gfx2DGlue.h
include/xulrunner/gfx3DMatrix.h
include/xulrunner/gfxASurface.h
@@ -126,17 +141,16 @@ include/xulrunner/graphite2/Font.h
include/xulrunner/graphite2/Log.h
include/xulrunner/graphite2/Segment.h
include/xulrunner/graphite2/Types.h
-include/xulrunner/gtk2compat.h
include/xulrunner/gtk2xtbin.h
include/xulrunner/harfbuzz/hb-blob.h
include/xulrunner/harfbuzz/hb-buffer.h
include/xulrunner/harfbuzz/hb-common.h
include/xulrunner/harfbuzz/hb-font.h
include/xulrunner/harfbuzz/hb-ot-layout.h
-include/xulrunner/harfbuzz/hb-ot-shape.h
include/xulrunner/harfbuzz/hb-ot-tag.h
include/xulrunner/harfbuzz/hb-ot.h
include/xulrunner/harfbuzz/hb-set.h
+include/xulrunner/harfbuzz/hb-shape-plan.h
include/xulrunner/harfbuzz/hb-shape.h
include/xulrunner/harfbuzz/hb-unicode.h
include/xulrunner/harfbuzz/hb-version.h
@@ -148,6 +162,7 @@ include/xulrunner/imgIContainerObserver.h
include/xulrunner/imgIDecoderObserver.h
include/xulrunner/imgIEncoder.h
include/xulrunner/imgILoader.h
+include/xulrunner/imgIOnloadBlocker.h
include/xulrunner/imgIRequest.h
include/xulrunner/imgITools.h
include/xulrunner/inICSSValueSearch.h
@@ -181,7 +196,6 @@ include/xulrunner/jsdebug.h
include/xulrunner/jsdhash.h
include/xulrunner/jsfriendapi.h
include/xulrunner/jsgc.h
-include/xulrunner/jshash.h
include/xulrunner/jslock.h
include/xulrunner/json.h
include/xulrunner/jsperf.h
@@ -199,9 +213,11 @@ include/xulrunner/mar.h
include/xulrunner/mar_cmdline.h
include/xulrunner/mozAutoDocUpdate.h
include/xulrunner/mozFlushType.h
+include/xulrunner/mozIApplication.h
include/xulrunner/mozIAsyncFavicons.h
include/xulrunner/mozIAsyncHistory.h
include/xulrunner/mozIAsyncLivemarks.h
+include/xulrunner/mozIColorAnalyzer.h
include/xulrunner/mozIJSSubScriptLoader.h
include/xulrunner/mozIPersonalDictionary.h
include/xulrunner/mozIPlacesAutoComplete.h
@@ -231,12 +247,12 @@ include/xulrunner/mozIStorageVacuumParticipant.h
include/xulrunner/mozIStorageValueArray.h
include/xulrunner/mozITXTToHTMLConv.h
include/xulrunner/mozIThirdPartyUtil.h
-include/xulrunner/mozStorage.h
include/xulrunner/mozStorageCID.h
include/xulrunner/mozStorageHelper.h
include/xulrunner/mozcontainer.h
include/xulrunner/mozilla-config.h
include/xulrunner/mozilla/AppData.h
+include/xulrunner/mozilla/AppProcessPermissions.h
include/xulrunner/mozilla/Assertions.h
include/xulrunner/mozilla/Attributes.h
include/xulrunner/mozilla/AutoRestore.h
@@ -250,6 +266,7 @@ include/xulrunner/mozilla/CharTokenizer.h
include/xulrunner/mozilla/CheckedInt.h
include/xulrunner/mozilla/ClearOnShutdown.h
include/xulrunner/mozilla/CondVar.h
+include/xulrunner/mozilla/Constants.h
include/xulrunner/mozilla/DeadlockDetector.h
include/xulrunner/mozilla/ErrorResult.h
include/xulrunner/mozilla/FileLocation.h
@@ -271,14 +288,17 @@ include/xulrunner/mozilla/IntentionalCrash.h
include/xulrunner/mozilla/LazyIdleThread.h
include/xulrunner/mozilla/Likely.h
include/xulrunner/mozilla/LinkedList.h
+include/xulrunner/mozilla/LoadContext.h
include/xulrunner/mozilla/LookAndFeel.h
include/xulrunner/mozilla/MSStdInt.h
include/xulrunner/mozilla/MapsMemoryReporter.h
+include/xulrunner/mozilla/MathAlgorithms.h
include/xulrunner/mozilla/Module.h
include/xulrunner/mozilla/ModuleLoader.h
include/xulrunner/mozilla/ModuleUtils.h
include/xulrunner/mozilla/Monitor.h
include/xulrunner/mozilla/Mutex.h
+include/xulrunner/mozilla/NullPtr.h
include/xulrunner/mozilla/OSFileConstants.h
include/xulrunner/mozilla/Observer.h
include/xulrunner/mozilla/Omnijar.h
@@ -286,9 +306,11 @@ include/xulrunner/mozilla/PaintTracker.h
include/xulrunner/mozilla/PluginLibrary.h
include/xulrunner/mozilla/PluginPRLibrary.h
include/xulrunner/mozilla/Preferences.h
+include/xulrunner/mozilla/ProcessedStack.h
include/xulrunner/mozilla/RangedPtr.h
include/xulrunner/mozilla/ReentrantMonitor.h
include/xulrunner/mozilla/RefPtr.h
+include/xulrunner/mozilla/SHA1.h
include/xulrunner/mozilla/SSE.h
include/xulrunner/mozilla/Scoped.h
include/xulrunner/mozilla/Selection.h
@@ -297,26 +319,34 @@ include/xulrunner/mozilla/Services.h
include/xulrunner/mozilla/StackWalk.h
include/xulrunner/mozilla/StandardInteger.h
include/xulrunner/mozilla/StartupTimeline.h
+include/xulrunner/mozilla/StaticPtr.h
include/xulrunner/mozilla/StringBuilder.h
include/xulrunner/mozilla/Telemetry.h
-include/xulrunner/mozilla/TelemetryHistograms.h
+include/xulrunner/mozilla/TelemetryHistogramEnums.h
include/xulrunner/mozilla/ThreadLocal.h
include/xulrunner/mozilla/TimeStamp.h
include/xulrunner/mozilla/TypeTraits.h
include/xulrunner/mozilla/Types.h
include/xulrunner/mozilla/Util.h
include/xulrunner/mozilla/VisualEventTracer.h
+include/xulrunner/mozilla/WeakPtr.h
include/xulrunner/mozilla/WidgetTraceEvent.h
+include/xulrunner/mozilla/WidgetUtils.h
include/xulrunner/mozilla/X11Util.h
include/xulrunner/mozilla/XPCOM.h
include/xulrunner/mozilla/a11y/Accessible.h
+include/xulrunner/mozilla/a11y/AccessibleWrap.h
+include/xulrunner/mozilla/a11y/DocAccessible.h
include/xulrunner/mozilla/a11y/FocusManager.h
+include/xulrunner/mozilla/a11y/HyperTextAccessible.h
+include/xulrunner/mozilla/a11y/HyperTextAccessibleWrap.h
include/xulrunner/mozilla/a11y/Role.h
include/xulrunner/mozilla/a11y/States.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/ImageLoader.h
include/xulrunner/mozilla/css/ImportRule.h
include/xulrunner/mozilla/css/Loader.h
include/xulrunner/mozilla/css/NameSpaceRule.h
@@ -324,9 +354,12 @@ include/xulrunner/mozilla/css/Rule.h
include/xulrunner/mozilla/css/StyleRule.h
include/xulrunner/mozilla/docshell/OfflineCacheUpdateChild.h
include/xulrunner/mozilla/docshell/OfflineCacheUpdateParent.h
+include/xulrunner/mozilla/dom/Activity.h
include/xulrunner/mozilla/dom/AudioChild.h
include/xulrunner/mozilla/dom/AudioParent.h
include/xulrunner/mozilla/dom/BindingUtils.h
+include/xulrunner/mozilla/dom/CSS2PropertiesBinding.h
+include/xulrunner/mozilla/dom/CSSStyleDeclarationBinding.h
include/xulrunner/mozilla/dom/CanvasRenderingContext2DBinding.h
include/xulrunner/mozilla/dom/ContentChild.h
include/xulrunner/mozilla/dom/ContentParent.h
@@ -335,23 +368,33 @@ include/xulrunner/mozilla/dom/CrashReporterChild.h
include/xulrunner/mozilla/dom/CrashReporterParent.h
include/xulrunner/mozilla/dom/DOMError.h
include/xulrunner/mozilla/dom/DOMJSClass.h
+include/xulrunner/mozilla/dom/DOMJSProxyHandler.h
include/xulrunner/mozilla/dom/DOMRequest.h
+include/xulrunner/mozilla/dom/DirectionalityUtils.h
include/xulrunner/mozilla/dom/Element.h
+include/xulrunner/mozilla/dom/Errors.msg
include/xulrunner/mozilla/dom/EventListenerBinding.h
include/xulrunner/mozilla/dom/EventTargetBinding.h
include/xulrunner/mozilla/dom/ExternalHelperAppChild.h
include/xulrunner/mozilla/dom/ExternalHelperAppParent.h
+include/xulrunner/mozilla/dom/FragmentOrElement.h
include/xulrunner/mozilla/dom/FromParser.h
include/xulrunner/mozilla/dom/FunctionBinding.h
include/xulrunner/mozilla/dom/ImageData.h
include/xulrunner/mozilla/dom/Link.h
include/xulrunner/mozilla/dom/Nullable.h
+include/xulrunner/mozilla/dom/PerformanceBinding.h
+include/xulrunner/mozilla/dom/PerformanceNavigationBinding.h
+include/xulrunner/mozilla/dom/PerformanceTimingBinding.h
+include/xulrunner/mozilla/dom/PermissionMessageUtils.h
+include/xulrunner/mozilla/dom/PrimitiveConversions.h
include/xulrunner/mozilla/dom/PrototypeList.h
include/xulrunner/mozilla/dom/RegisterBindings.h
include/xulrunner/mozilla/dom/ScreenOrientation.h
include/xulrunner/mozilla/dom/StorageChild.h
include/xulrunner/mozilla/dom/StorageParent.h
include/xulrunner/mozilla/dom/StructuredCloneTags.h
+include/xulrunner/mozilla/dom/StructuredCloneUtils.h
include/xulrunner/mozilla/dom/TabChild.h
include/xulrunner/mozilla/dom/TabMessageUtils.h
include/xulrunner/mozilla/dom/TabParent.h
@@ -367,6 +410,11 @@ include/xulrunner/mozilla/dom/battery/Constants.h
include/xulrunner/mozilla/dom/battery/Types.h
include/xulrunner/mozilla/dom/devicestorage/DeviceStorageRequestChild.h
include/xulrunner/mozilla/dom/devicestorage/DeviceStorageRequestParent.h
+include/xulrunner/mozilla/dom/file/ArchiveEvent.h
+include/xulrunner/mozilla/dom/file/ArchiveReader.h
+include/xulrunner/mozilla/dom/file/ArchiveRequest.h
+include/xulrunner/mozilla/dom/file/ArchiveZipEvent.h
+include/xulrunner/mozilla/dom/file/ArchiveZipFile.h
include/xulrunner/mozilla/dom/file/DOMFileHandle.h
include/xulrunner/mozilla/dom/file/File.h
include/xulrunner/mozilla/dom/file/FileCommon.h
@@ -393,6 +441,9 @@ include/xulrunner/mozilla/dom/indexedDB/IndexedDatabaseManager.h
include/xulrunner/mozilla/dom/indexedDB/Key.h
include/xulrunner/mozilla/dom/indexedDB/KeyPath.h
include/xulrunner/mozilla/dom/indexedDB/SerializationHelpers.h
+include/xulrunner/mozilla/dom/ipc/Blob.h
+include/xulrunner/mozilla/dom/ipc/ProcessPriorityManager.h
+include/xulrunner/mozilla/dom/ipc/nsIRemoteBlob.h
include/xulrunner/mozilla/dom/network/Constants.h
include/xulrunner/mozilla/dom/network/Types.h
include/xulrunner/mozilla/dom/network/Utils.h
@@ -439,8 +490,10 @@ 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/FileDescriptor.h
include/xulrunner/mozilla/ipc/GeckoChildProcessHost.h
include/xulrunner/mozilla/ipc/IOThreadChild.h
+include/xulrunner/mozilla/ipc/InputStreamUtils.h
include/xulrunner/mozilla/ipc/ProcessChild.h
include/xulrunner/mozilla/ipc/ProtocolUtils.h
include/xulrunner/mozilla/ipc/RPCChannel.h
@@ -455,15 +508,20 @@ include/xulrunner/mozilla/ipc/TestShellChild.h
include/xulrunner/mozilla/ipc/TestShellParent.h
include/xulrunner/mozilla/ipc/Transport.h
include/xulrunner/mozilla/ipc/Transport_posix.h
+include/xulrunner/mozilla/ipc/URIUtils.h
include/xulrunner/mozilla/ipc/XPCShellEnvironment.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/AsyncPanZoomController.h
+include/xulrunner/mozilla/layers/Axis.h
include/xulrunner/mozilla/layers/CompositorChild.h
include/xulrunner/mozilla/layers/CompositorCocoaWidgetHelper.h
include/xulrunner/mozilla/layers/CompositorParent.h
+include/xulrunner/mozilla/layers/GeckoContentController.h
+include/xulrunner/mozilla/layers/GestureEventListener.h
include/xulrunner/mozilla/layers/ImageBridgeChild.h
include/xulrunner/mozilla/layers/ImageBridgeParent.h
include/xulrunner/mozilla/layers/ImageContainerChild.h
@@ -478,6 +536,7 @@ include/xulrunner/mozilla/layers/SharedImageUtils.h
include/xulrunner/mozilla/layout/FrameChildList.h
include/xulrunner/mozilla/layout/RenderFrameChild.h
include/xulrunner/mozilla/layout/RenderFrameParent.h
+include/xulrunner/mozilla/layout/RenderFrameUtils.h
include/xulrunner/mozilla/mozPoisonWrite.h
include/xulrunner/mozilla/mozalloc.h
include/xulrunner/mozilla/mozalloc_abort.h
@@ -562,6 +621,7 @@ include/xulrunner/nsAccessNodeWrap.h
include/xulrunner/nsAccessibilityService.h
include/xulrunner/nsAgg.h
include/xulrunner/nsAlgorithm.h
+include/xulrunner/nsAnimationManager.h
include/xulrunner/nsAppDirectoryServiceDefs.h
include/xulrunner/nsAppShellCID.h
include/xulrunner/nsArenaMemoryStats.h
@@ -644,7 +704,6 @@ include/xulrunner/nsComponentManagerUtils.h
include/xulrunner/nsContentCID.h
include/xulrunner/nsContentCreatorFunctions.h
include/xulrunner/nsContentDLF.h
-include/xulrunner/nsContentErrors.h
include/xulrunner/nsContentList.h
include/xulrunner/nsContentPermissionHelper.h
include/xulrunner/nsContentPolicyUtils.h
@@ -652,7 +711,6 @@ include/xulrunner/nsContentSink.h
include/xulrunner/nsContentUtils.h
include/xulrunner/nsCoord.h
include/xulrunner/nsCopySupport.h
-include/xulrunner/nsCoreAnimationSupport.h
include/xulrunner/nsCppSharedAllocator.h
include/xulrunner/nsCrossSiteListenerProxy.h
include/xulrunner/nsCycleCollectionParticipant.h
@@ -664,7 +722,7 @@ include/xulrunner/nsDOMCSSAttrDeclaration.h
include/xulrunner/nsDOMCSSDeclaration.h
include/xulrunner/nsDOMClassInfoClasses.h
include/xulrunner/nsDOMClassInfoID.h
-include/xulrunner/nsDOMError.h
+include/xulrunner/nsDOMEvent.h
include/xulrunner/nsDOMEventTargetHelper.h
include/xulrunner/nsDOMFile.h
include/xulrunner/nsDOMJSUtils.h
@@ -672,6 +730,8 @@ include/xulrunner/nsDOMMediaQueryList.h
include/xulrunner/nsDOMMediaStream.h
include/xulrunner/nsDOMScriptObjectHolder.h
include/xulrunner/nsDOMString.h
+include/xulrunner/nsDOMTouchEvent.h
+include/xulrunner/nsDOMUIEvent.h
include/xulrunner/nsDataHashtable.h
include/xulrunner/nsDateTimeFormatCID.h
include/xulrunner/nsDebug.h
@@ -683,7 +743,6 @@ include/xulrunner/nsDeque.h
include/xulrunner/nsDetectionConfident.h
include/xulrunner/nsDeviceContext.h
include/xulrunner/nsDeviceSensors.h
-include/xulrunner/nsDeviceStorage.h
include/xulrunner/nsDirectoryService.h
include/xulrunner/nsDirectoryServiceAtomList.h
include/xulrunner/nsDirectoryServiceDefs.h
@@ -815,6 +874,8 @@ include/xulrunner/nsIAccessibleTable.h
include/xulrunner/nsIAccessibleText.h
include/xulrunner/nsIAccessibleTypes.h
include/xulrunner/nsIAccessibleValue.h
+include/xulrunner/nsIActivityProxy.h
+include/xulrunner/nsIActivityUIGlue.h
include/xulrunner/nsIAlarmHalService.h
include/xulrunner/nsIAlertsService.h
include/xulrunner/nsIAllocator.h
@@ -977,10 +1038,16 @@ include/xulrunner/nsID.h
include/xulrunner/nsIDNSListener.h
include/xulrunner/nsIDNSRecord.h
include/xulrunner/nsIDNSService.h
+include/xulrunner/nsIDOMActivity.h
+include/xulrunner/nsIDOMActivityHandlerDescription.h
+include/xulrunner/nsIDOMActivityOptions.h
+include/xulrunner/nsIDOMActivityRequestHandler.h
include/xulrunner/nsIDOMAlarmsManager.h
include/xulrunner/nsIDOMAnimationEvent.h
include/xulrunner/nsIDOMApplicationRegistry.h
include/xulrunner/nsIDOMApplicationRegistry2.h
+include/xulrunner/nsIDOMArchiveReader.h
+include/xulrunner/nsIDOMArchiveRequest.h
include/xulrunner/nsIDOMAttr.h
include/xulrunner/nsIDOMBarProp.h
include/xulrunner/nsIDOMBatteryManager.h
@@ -1000,9 +1067,11 @@ include/xulrunner/nsIDOMCSSRuleList.h
include/xulrunner/nsIDOMCSSStyleDeclaration.h
include/xulrunner/nsIDOMCSSStyleRule.h
include/xulrunner/nsIDOMCSSStyleSheet.h
+include/xulrunner/nsIDOMCSSSupportsRule.h
include/xulrunner/nsIDOMCSSUnknownRule.h
include/xulrunner/nsIDOMCSSValue.h
include/xulrunner/nsIDOMCSSValueList.h
+include/xulrunner/nsIDOMCameraManager.h
include/xulrunner/nsIDOMCanvasRenderingContext2D.h
include/xulrunner/nsIDOMCharacterData.h
include/xulrunner/nsIDOMChromeWindow.h
@@ -1038,7 +1107,9 @@ include/xulrunner/nsIDOMDeviceMotionEvent.h
include/xulrunner/nsIDOMDeviceOrientationEvent.h
include/xulrunner/nsIDOMDeviceProximityEvent.h
include/xulrunner/nsIDOMDeviceStorage.h
+include/xulrunner/nsIDOMDeviceStorageChangeEvent.h
include/xulrunner/nsIDOMDeviceStorageCursor.h
+include/xulrunner/nsIDOMDeviceStorageStat.h
include/xulrunner/nsIDOMDocument.h
include/xulrunner/nsIDOMDocumentFragment.h
include/xulrunner/nsIDOMDocumentType.h
@@ -1156,9 +1227,12 @@ include/xulrunner/nsIDOMMobileConnection.h
include/xulrunner/nsIDOMModalContentWindow.h
include/xulrunner/nsIDOMMouseEvent.h
include/xulrunner/nsIDOMMouseScrollEvent.h
+include/xulrunner/nsIDOMMozApplicationEvent.h
include/xulrunner/nsIDOMMozBrowserFrame.h
include/xulrunner/nsIDOMMozCSSKeyframeRule.h
include/xulrunner/nsIDOMMozCSSKeyframesRule.h
+include/xulrunner/nsIDOMMozContactChangeEvent.h
+include/xulrunner/nsIDOMMozSettingsEvent.h
include/xulrunner/nsIDOMMozTouchEvent.h
include/xulrunner/nsIDOMMutationEvent.h
include/xulrunner/nsIDOMMutationObserver.h
@@ -1168,6 +1242,8 @@ include/xulrunner/nsIDOMNSRGBAColor.h
include/xulrunner/nsIDOMNSXPathExpression.h
include/xulrunner/nsIDOMNamedNodeMap.h
include/xulrunner/nsIDOMNavigator.h
+include/xulrunner/nsIDOMNavigatorActivities.h
+include/xulrunner/nsIDOMNavigatorCamera.h
include/xulrunner/nsIDOMNavigatorDesktopNotification.h
include/xulrunner/nsIDOMNavigatorDeviceStorage.h
include/xulrunner/nsIDOMNavigatorGeolocation.h
@@ -1187,9 +1263,6 @@ include/xulrunner/nsIDOMPageTransitionEvent.h
include/xulrunner/nsIDOMPaintRequest.h
include/xulrunner/nsIDOMPaintRequestList.h
include/xulrunner/nsIDOMParser.h
-include/xulrunner/nsIDOMPerformance.h
-include/xulrunner/nsIDOMPerformanceNavigation.h
-include/xulrunner/nsIDOMPerformanceTiming.h
include/xulrunner/nsIDOMPkcs11.h
include/xulrunner/nsIDOMPlugin.h
include/xulrunner/nsIDOMPluginArray.h
@@ -1307,6 +1380,7 @@ include/xulrunner/nsIDOMStorageManager.h
include/xulrunner/nsIDOMStorageObsolete.h
include/xulrunner/nsIDOMStyleSheet.h
include/xulrunner/nsIDOMStyleSheetList.h
+include/xulrunner/nsIDOMTCPSocket.h
include/xulrunner/nsIDOMText.h
include/xulrunner/nsIDOMTimeEvent.h
include/xulrunner/nsIDOMTimeRanges.h
@@ -1322,6 +1396,7 @@ include/xulrunner/nsIDOMValidityState.h
include/xulrunner/nsIDOMWakeLock.h
include/xulrunner/nsIDOMWakeLockListener.h
include/xulrunner/nsIDOMWebGLRenderingContext.h
+include/xulrunner/nsIDOMWheelEvent.h
include/xulrunner/nsIDOMWindow.h
include/xulrunner/nsIDOMWindowCollection.h
include/xulrunner/nsIDOMWindowUtils.h
@@ -1458,7 +1533,6 @@ include/xulrunner/nsIFormatConverter.h
include/xulrunner/nsIFragmentContentSink.h
include/xulrunner/nsIFrame.h
include/xulrunner/nsIFrameLoader.h
-include/xulrunner/nsIFrameMessageManager.h
include/xulrunner/nsIFrameRequestCallback.h
include/xulrunner/nsIFrameTraversal.h
include/xulrunner/nsIFrameUtil.h
@@ -1519,7 +1593,8 @@ include/xulrunner/nsIINIParser.h
include/xulrunner/nsIIOService.h
include/xulrunner/nsIIOService2.h
include/xulrunner/nsIIOUtil.h
-include/xulrunner/nsIIPCSerializable.h
+include/xulrunner/nsIIPCSerializableInputStream.h
+include/xulrunner/nsIIPCSerializableURI.h
include/xulrunner/nsIIconURI.h
include/xulrunner/nsIIdentityCryptoService.h
include/xulrunner/nsIIdentityInfo.h
@@ -1588,6 +1663,7 @@ include/xulrunner/nsIMemory.h
include/xulrunner/nsIMemoryReporter.h
include/xulrunner/nsIMenuBoxObject.h
include/xulrunner/nsIMenuBuilder.h
+include/xulrunner/nsIMessageManager.h
include/xulrunner/nsIMmsService.h
include/xulrunner/nsIMobileConnectionProvider.h
include/xulrunner/nsIModule.h
@@ -1617,7 +1693,6 @@ include/xulrunner/nsINodeList.h
include/xulrunner/nsIOCSPResponder.h
include/xulrunner/nsIOS2Locale.h
include/xulrunner/nsIOSFileConstantsService.h
-include/xulrunner/nsIOSurface.h
include/xulrunner/nsIObjectFrame.h
include/xulrunner/nsIObjectInputStream.h
include/xulrunner/nsIObjectLoadingContent.h
@@ -1688,7 +1763,6 @@ include/xulrunner/nsIProfile.h
include/xulrunner/nsIProfileChangeStatus.h
include/xulrunner/nsIProfileMigrator.h
include/xulrunner/nsIProfileUnlocker.h
-${PLIST.sps}include/xulrunner/nsIProfiler.h
include/xulrunner/nsIProgrammingLanguage.h
include/xulrunner/nsIProgressEventSink.h
include/xulrunner/nsIPrompt.h
@@ -1781,7 +1855,6 @@ include/xulrunner/nsIScriptChannel.h
include/xulrunner/nsIScriptContext.h
include/xulrunner/nsIScriptElement.h
include/xulrunner/nsIScriptError.h
-include/xulrunner/nsIScriptEventHandlerOwner.h
include/xulrunner/nsIScriptExternalNameSet.h
include/xulrunner/nsIScriptGlobalObject.h
include/xulrunner/nsIScriptGlobalObjectOwner.h
@@ -1807,6 +1880,7 @@ include/xulrunner/nsISecureBrowserUI.h
include/xulrunner/nsISecurityCheckedComponent.h
include/xulrunner/nsISecurityEventSink.h
include/xulrunner/nsISecurityInfoProvider.h
+include/xulrunner/nsISecurityUITelemetry.h
include/xulrunner/nsISecurityWarningDialogs.h
include/xulrunner/nsISeekableStream.h
include/xulrunner/nsISelectControlFrame.h
@@ -1827,6 +1901,7 @@ include/xulrunner/nsISimpleEnumerator.h
include/xulrunner/nsISimpleStreamListener.h
include/xulrunner/nsISimpleTest.h
include/xulrunner/nsISimpleUnicharStreamFactory.h
+include/xulrunner/nsISiteSpecificUserAgent.h
include/xulrunner/nsISizeOf.h
include/xulrunner/nsISliderListener.h
include/xulrunner/nsISmsDatabaseService.h
@@ -1988,6 +2063,7 @@ include/xulrunner/nsIWebSocket.h
include/xulrunner/nsIWebSocketChannel.h
include/xulrunner/nsIWebSocketListener.h
include/xulrunner/nsIWidget.h
+include/xulrunner/nsIWidgetListener.h
include/xulrunner/nsIWifiEventInits.h
include/xulrunner/nsIWindowCreator.h
include/xulrunner/nsIWindowCreator2.h
@@ -2044,12 +2120,12 @@ include/xulrunner/nsIZipReader.h
include/xulrunner/nsIZipWriter.h
include/xulrunner/nsInterfaceHashtable.h
include/xulrunner/nsInterfaceRequestorAgg.h
+include/xulrunner/nsJARURI.h
include/xulrunner/nsJSON.h
include/xulrunner/nsJSPrincipals.h
include/xulrunner/nsJSProtocolHandler.h
include/xulrunner/nsLWBrkCIID.h
include/xulrunner/nsLayoutCID.h
-include/xulrunner/nsLayoutErrors.h
include/xulrunner/nsLayoutStatics.h
include/xulrunner/nsLayoutStylesheetCache.h
include/xulrunner/nsLayoutUtils.h
@@ -2059,6 +2135,7 @@ include/xulrunner/nsLiteralString.h
include/xulrunner/nsLocalFile.h
include/xulrunner/nsLocalFileUnix.h
include/xulrunner/nsLocaleCID.h
+include/xulrunner/nsMIMEInputStream.h
include/xulrunner/nsMappedAttributeElement.h
include/xulrunner/nsMargin.h
include/xulrunner/nsMathUtils.h
@@ -2073,7 +2150,6 @@ include/xulrunner/nsNSSShutDown.h
include/xulrunner/nsNativeCharsetUtils.h
include/xulrunner/nsNativeWidget.h
include/xulrunner/nsNetCID.h
-include/xulrunner/nsNetError.h
include/xulrunner/nsNetStrings.h
include/xulrunner/nsNetUtil.h
include/xulrunner/nsNodeInfoManager.h
@@ -2085,7 +2161,6 @@ include/xulrunner/nsObserverList.h
include/xulrunner/nsObserverService.h
include/xulrunner/nsOggCodecState.h
include/xulrunner/nsOggDecoder.h
-include/xulrunner/nsOggDecoderStateMachine.h
include/xulrunner/nsOpenWindowEventDetail.h
include/xulrunner/nsPIBoxObject.h
include/xulrunner/nsPICommandUpdater.h
@@ -2104,7 +2179,6 @@ include/xulrunner/nsParserCIID.h
include/xulrunner/nsParserConstants.h
include/xulrunner/nsParserUtils.h
include/xulrunner/nsPluginDirServiceProvider.h
-include/xulrunner/nsPluginError.h
include/xulrunner/nsPluginHost.h
include/xulrunner/nsPluginInstanceOwner.h
include/xulrunner/nsPluginLogging.h
@@ -2160,6 +2234,7 @@ include/xulrunner/nsSVGForeignObjectFrame.h
include/xulrunner/nsSVGIntegrationUtils.h
include/xulrunner/nsSVGRect.h
include/xulrunner/nsSVGUtils.h
+include/xulrunner/nsSandboxFlags.h
include/xulrunner/nsScannerString.h
include/xulrunner/nsScriptLoader.h
include/xulrunner/nsScriptableInputStream.h
@@ -2185,6 +2260,7 @@ include/xulrunner/nsStructuredCloneContainer.h
include/xulrunner/nsStubDocumentObserver.h
include/xulrunner/nsStubImageDecoderObserver.h
include/xulrunner/nsStubMutationObserver.h
+include/xulrunner/nsStyleAnimation.h
include/xulrunner/nsStyleChangeList.h
include/xulrunner/nsStyleConsts.h
include/xulrunner/nsStyleContext.h
@@ -2266,6 +2342,7 @@ include/xulrunner/nsWildCard.h
include/xulrunner/nsWin32Locale.h
include/xulrunner/nsWindowMemoryReporter.h
include/xulrunner/nsWrapperCache.h
+include/xulrunner/nsWrapperCacheInlines.h
include/xulrunner/nsXBLBinding.h
include/xulrunner/nsXMLNameSpaceMap.h
include/xulrunner/nsXPCOM.h
@@ -2425,6 +2502,7 @@ include/xulrunner/theora/codec.h
include/xulrunner/theora/theora.h
include/xulrunner/theora/theoradec.h
include/xulrunner/theora/theoraenc.h
+include/xulrunner/tremor/ivorbiscodec.h
include/xulrunner/txIEXSLTRegExFunctions.h
include/xulrunner/txIFunctionEvaluationContext.h
include/xulrunner/txINodeSet.h
@@ -2432,7 +2510,6 @@ include/xulrunner/txIXPathObject.h
include/xulrunner/uconvutil.h
include/xulrunner/updatedefines.h
include/xulrunner/updatelogging.h
-include/xulrunner/vorbis/codec.h
include/xulrunner/xpcIJSGetFactory.h
include/xulrunner/xpcIJSModuleLoader.h
include/xulrunner/xpcIJSWeakReference.h
@@ -2689,6 +2766,7 @@ lib/xulrunner/chrome/toolkit/content/global/aboutRights.xhtml
lib/xulrunner/chrome/toolkit/content/global/aboutSupport.js
lib/xulrunner/chrome/toolkit/content/global/aboutSupport.xhtml
lib/xulrunner/chrome/toolkit/content/global/accessibility/AccessFu.css
+lib/xulrunner/chrome/toolkit/content/global/alerts/alert.css
lib/xulrunner/chrome/toolkit/content/global/alerts/alert.js
lib/xulrunner/chrome/toolkit/content/global/alerts/alert.xul
lib/xulrunner/chrome/toolkit/content/global/appPicker.js
@@ -3122,6 +3200,7 @@ lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/rating-not-won.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/rating-won.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/selectAddons.css
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/stripes-error.png
+lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-negative-small.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-negative.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-positive.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/stripes-warning.png
@@ -3144,6 +3223,7 @@ lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginBlocked.pn
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginCrashed.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginGeneric.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginOutdated.png
+lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked-64.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/pluginDisabled.png
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric-16.png
@@ -3158,6 +3238,12 @@ lib/xulrunner/chrome/toolkit/skin/classic/mozapps/update/updates.css
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css
lib/xulrunner/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png
+lib/xulrunner/components/.mkdir.done
+lib/xulrunner/components/Activities.manifest
+lib/xulrunner/components/ActivityOptions.js
+lib/xulrunner/components/ActivityProxy.js
+lib/xulrunner/components/ActivityRequestHandler.js
+lib/xulrunner/components/ActivityWrapper.js
lib/xulrunner/components/AlarmsManager.js
lib/xulrunner/components/AlarmsManager.manifest
lib/xulrunner/components/AppProtocolHandler.js
@@ -3166,6 +3252,7 @@ lib/xulrunner/components/AppsService.js
lib/xulrunner/components/AppsService.manifest
lib/xulrunner/components/BrowserElementParent.js
lib/xulrunner/components/BrowserElementParent.manifest
+lib/xulrunner/components/ColorAnalyzer.js
lib/xulrunner/components/ConsoleAPI.js
lib/xulrunner/components/ConsoleAPI.manifest
lib/xulrunner/components/ContactManager.js
@@ -3182,9 +3269,13 @@ lib/xulrunner/components/SettingsManager.js
lib/xulrunner/components/SettingsManager.manifest
lib/xulrunner/components/SettingsService.js
lib/xulrunner/components/SettingsService.manifest
+lib/xulrunner/components/SiteSpecificUserAgent.js
+lib/xulrunner/components/SiteSpecificUserAgent.manifest
lib/xulrunner/components/SystemMessageInternal.js
lib/xulrunner/components/SystemMessageManager.js
lib/xulrunner/components/SystemMessageManager.manifest
+lib/xulrunner/components/TCPSocket.js
+lib/xulrunner/components/TCPSocket.manifest
lib/xulrunner/components/TelemetryPing.js
lib/xulrunner/components/TelemetryPing.manifest
lib/xulrunner/components/Webapps.js
@@ -3192,6 +3283,7 @@ lib/xulrunner/components/Webapps.manifest
lib/xulrunner/components/addonManager.js
lib/xulrunner/components/amContentHandler.js
lib/xulrunner/components/amWebInstallListener.js
+lib/xulrunner/components/components.manifest
${PLIST.gnome}lib/xulrunner/components/components.manifest
lib/xulrunner/components/contentAreaDropListener.js
lib/xulrunner/components/contentAreaDropListener.manifest
@@ -3203,7 +3295,7 @@ lib/xulrunner/components/interfaces.manifest
lib/xulrunner/components/jsconsole-clhandler.js
lib/xulrunner/components/jsconsole-clhandler.manifest
${PLIST.gnome}lib/xulrunner/components/libdbusservice.so
-${PLIST.gnome}lib/xulrunner/components/libmozgnome.so
+lib/xulrunner/components/libmozgnome.so
${PLIST.gnome}lib/xulrunner/components/libnkgnomevfs.so
lib/xulrunner/components/messageWakeupService.js
lib/xulrunner/components/messageWakeupService.manifest
@@ -3272,6 +3364,7 @@ lib/xulrunner/components/txEXSLTRegExFunctions.manifest
lib/xulrunner/components/xulrunner.xpt
lib/xulrunner/defaults/autoconfig/platform.js
lib/xulrunner/defaults/autoconfig/prefcalls.js
+lib/xulrunner/defaults/pref/.mkdir.done
lib/xulrunner/defaults/pref/xulrunner.js
lib/xulrunner/defaults/profile/US/chrome/userChrome-example.css
lib/xulrunner/defaults/profile/US/chrome/userContent-example.css
@@ -3329,6 +3422,8 @@ lib/xulrunner/libxpcom.so
lib/xulrunner/libxpcomglue.a
lib/xulrunner/libxpcomglue_s.a
lib/xulrunner/libxul.so
+lib/xulrunner/modules/.mkdir.done
+lib/xulrunner/modules/ActivitiesService.jsm
lib/xulrunner/modules/AddonLogging.jsm
lib/xulrunner/modules/AddonManager.jsm
lib/xulrunner/modules/AddonRepository.jsm
@@ -3340,6 +3435,9 @@ lib/xulrunner/modules/BrowserElementPromptService.jsm
lib/xulrunner/modules/CSPUtils.jsm
lib/xulrunner/modules/CertUtils.jsm
lib/xulrunner/modules/ChromeManifestParser.jsm
+lib/xulrunner/modules/ClusterLib.js
+lib/xulrunner/modules/ColorAnalyzer_worker.js
+lib/xulrunner/modules/ColorConversion.js
lib/xulrunner/modules/CommonDialog.jsm
lib/xulrunner/modules/ConsoleAPIStorage.jsm
lib/xulrunner/modules/ContactDB.jsm
@@ -3362,10 +3460,15 @@ lib/xulrunner/modules/InlineSpellChecker.jsm
lib/xulrunner/modules/LightweightThemeConsumer.jsm
lib/xulrunner/modules/LightweightThemeManager.jsm
lib/xulrunner/modules/LogUtils.jsm
+lib/xulrunner/modules/MessagePortBase.jsm
+lib/xulrunner/modules/MessagePortWorker.js
lib/xulrunner/modules/Microformats.js
+lib/xulrunner/modules/MozSocialAPI.jsm
lib/xulrunner/modules/NetUtil.jsm
+lib/xulrunner/modules/ObjectWrapper.jsm
lib/xulrunner/modules/PageMenu.jsm
lib/xulrunner/modules/PerfMeasurement.jsm
+lib/xulrunner/modules/PermissionPromptHelper.jsm
lib/xulrunner/modules/PlacesDBUtils.jsm
lib/xulrunner/modules/PlacesUtils.jsm
lib/xulrunner/modules/PluginProvider.jsm
@@ -3380,12 +3483,14 @@ lib/xulrunner/modules/Services.jsm
lib/xulrunner/modules/SettingsChangeNotifier.jsm
lib/xulrunner/modules/SettingsDB.jsm
lib/xulrunner/modules/SettingsQueue.jsm
-lib/xulrunner/modules/SocialProvider.jsm
lib/xulrunner/modules/SocialService.jsm
lib/xulrunner/modules/SpellCheckDictionaryBootstrap.js
+lib/xulrunner/modules/Task.jsm
lib/xulrunner/modules/TelemetryStopwatch.jsm
+lib/xulrunner/modules/UserAgentOverrides.jsm
lib/xulrunner/modules/WebappOSUtils.jsm
lib/xulrunner/modules/Webapps.jsm
+lib/xulrunner/modules/WebappsInstaller.jsm
lib/xulrunner/modules/WindowDraggingUtils.jsm
lib/xulrunner/modules/WorkerAPI.jsm
lib/xulrunner/modules/XPCOMUtils.jsm
@@ -3393,11 +3498,17 @@ lib/xulrunner/modules/XPIProvider.jsm
lib/xulrunner/modules/XPIProviderUtils.js
lib/xulrunner/modules/accessibility/AccessFu.jsm
lib/xulrunner/modules/accessibility/Presenters.jsm
+lib/xulrunner/modules/accessibility/TouchAdapter.jsm
lib/xulrunner/modules/accessibility/Utils.jsm
lib/xulrunner/modules/accessibility/UtteranceGenerator.jsm
lib/xulrunner/modules/accessibility/VirtualCursorController.jsm
+lib/xulrunner/modules/commonjs/loader.js
+lib/xulrunner/modules/commonjs/promise/core.js
lib/xulrunner/modules/ctypes.jsm
lib/xulrunner/modules/debug.js
+lib/xulrunner/modules/devtools/Console.jsm
+lib/xulrunner/modules/devtools/Require.jsm
+lib/xulrunner/modules/devtools/SourceMap.jsm
lib/xulrunner/modules/devtools/dbg-client.jsm
lib/xulrunner/modules/devtools/dbg-server.jsm
lib/xulrunner/modules/identity/Identity.jsm
@@ -3411,11 +3522,16 @@ lib/xulrunner/modules/jsdebugger.jsm
lib/xulrunner/modules/jwcrypto.jsm
lib/xulrunner/modules/nsFormAutoCompleteResult.jsm
lib/xulrunner/modules/osfile.jsm
-lib/xulrunner/modules/osfile/osfile_shared.jsm
+lib/xulrunner/modules/osfile/osfile_shared_allthreads.jsm
+lib/xulrunner/modules/osfile/osfile_shared_front.jsm
+lib/xulrunner/modules/osfile/osfile_unix_allthreads.jsm
lib/xulrunner/modules/osfile/osfile_unix_back.jsm
lib/xulrunner/modules/osfile/osfile_unix_front.jsm
+lib/xulrunner/modules/osfile/osfile_win_allthreads.jsm
lib/xulrunner/modules/osfile/osfile_win_back.jsm
lib/xulrunner/modules/osfile/osfile_win_front.jsm
+lib/xulrunner/modules/osfile/ospath_unix_back.jsm
+lib/xulrunner/modules/osfile/ospath_win_back.jsm
lib/xulrunner/modules/reflect.jsm
lib/xulrunner/mozilla-xremote-client
lib/xulrunner/platform.ini
@@ -3502,6 +3618,7 @@ share/idl/xulrunner/imgIContainerObserver.idl
share/idl/xulrunner/imgIDecoderObserver.idl
share/idl/xulrunner/imgIEncoder.idl
share/idl/xulrunner/imgILoader.idl
+share/idl/xulrunner/imgIOnloadBlocker.idl
share/idl/xulrunner/imgIRequest.idl
share/idl/xulrunner/imgITools.idl
share/idl/xulrunner/inICSSValueSearch.idl
@@ -3512,9 +3629,11 @@ share/idl/xulrunner/inIFlasher.idl
share/idl/xulrunner/inISearchObserver.idl
share/idl/xulrunner/inISearchProcess.idl
share/idl/xulrunner/jsdIDebuggerService.idl
+share/idl/xulrunner/mozIApplication.idl
share/idl/xulrunner/mozIAsyncFavicons.idl
share/idl/xulrunner/mozIAsyncHistory.idl
share/idl/xulrunner/mozIAsyncLivemarks.idl
+share/idl/xulrunner/mozIColorAnalyzer.idl
share/idl/xulrunner/mozIJSSubScriptLoader.idl
share/idl/xulrunner/mozIPersonalDictionary.idl
share/idl/xulrunner/mozIPlacesAutoComplete.idl
@@ -3574,6 +3693,8 @@ share/idl/xulrunner/nsIAccessibleTable.idl
share/idl/xulrunner/nsIAccessibleText.idl
share/idl/xulrunner/nsIAccessibleTypes.idl
share/idl/xulrunner/nsIAccessibleValue.idl
+share/idl/xulrunner/nsIActivityProxy.idl
+share/idl/xulrunner/nsIActivityUIGlue.idl
share/idl/xulrunner/nsIAlarmHalService.idl
share/idl/xulrunner/nsIAlertsService.idl
share/idl/xulrunner/nsIAnnotationService.idl
@@ -3713,10 +3834,16 @@ share/idl/xulrunner/nsICycleCollectorListener.idl
share/idl/xulrunner/nsIDNSListener.idl
share/idl/xulrunner/nsIDNSRecord.idl
share/idl/xulrunner/nsIDNSService.idl
+share/idl/xulrunner/nsIDOMActivity.idl
+share/idl/xulrunner/nsIDOMActivityHandlerDescription.idl
+share/idl/xulrunner/nsIDOMActivityOptions.idl
+share/idl/xulrunner/nsIDOMActivityRequestHandler.idl
share/idl/xulrunner/nsIDOMAlarmsManager.idl
share/idl/xulrunner/nsIDOMAnimationEvent.idl
share/idl/xulrunner/nsIDOMApplicationRegistry.idl
share/idl/xulrunner/nsIDOMApplicationRegistry2.idl
+share/idl/xulrunner/nsIDOMArchiveReader.idl
+share/idl/xulrunner/nsIDOMArchiveRequest.idl
share/idl/xulrunner/nsIDOMAttr.idl
share/idl/xulrunner/nsIDOMBarProp.idl
share/idl/xulrunner/nsIDOMBatteryManager.idl
@@ -3736,9 +3863,11 @@ share/idl/xulrunner/nsIDOMCSSRuleList.idl
share/idl/xulrunner/nsIDOMCSSStyleDeclaration.idl
share/idl/xulrunner/nsIDOMCSSStyleRule.idl
share/idl/xulrunner/nsIDOMCSSStyleSheet.idl
+share/idl/xulrunner/nsIDOMCSSSupportsRule.idl
share/idl/xulrunner/nsIDOMCSSUnknownRule.idl
share/idl/xulrunner/nsIDOMCSSValue.idl
share/idl/xulrunner/nsIDOMCSSValueList.idl
+share/idl/xulrunner/nsIDOMCameraManager.idl
share/idl/xulrunner/nsIDOMCanvasRenderingContext2D.idl
share/idl/xulrunner/nsIDOMCharacterData.idl
share/idl/xulrunner/nsIDOMChromeWindow.idl
@@ -3773,7 +3902,9 @@ share/idl/xulrunner/nsIDOMDeviceMotionEvent.idl
share/idl/xulrunner/nsIDOMDeviceOrientationEvent.idl
share/idl/xulrunner/nsIDOMDeviceProximityEvent.idl
share/idl/xulrunner/nsIDOMDeviceStorage.idl
+share/idl/xulrunner/nsIDOMDeviceStorageChangeEvent.idl
share/idl/xulrunner/nsIDOMDeviceStorageCursor.idl
+share/idl/xulrunner/nsIDOMDeviceStorageStat.idl
share/idl/xulrunner/nsIDOMDocument.idl
share/idl/xulrunner/nsIDOMDocumentFragment.idl
share/idl/xulrunner/nsIDOMDocumentType.idl
@@ -3891,9 +4022,12 @@ share/idl/xulrunner/nsIDOMMobileConnection.idl
share/idl/xulrunner/nsIDOMModalContentWindow.idl
share/idl/xulrunner/nsIDOMMouseEvent.idl
share/idl/xulrunner/nsIDOMMouseScrollEvent.idl
+share/idl/xulrunner/nsIDOMMozApplicationEvent.idl
share/idl/xulrunner/nsIDOMMozBrowserFrame.idl
share/idl/xulrunner/nsIDOMMozCSSKeyframeRule.idl
share/idl/xulrunner/nsIDOMMozCSSKeyframesRule.idl
+share/idl/xulrunner/nsIDOMMozContactChangeEvent.idl
+share/idl/xulrunner/nsIDOMMozSettingsEvent.idl
share/idl/xulrunner/nsIDOMMozTouchEvent.idl
share/idl/xulrunner/nsIDOMMutationEvent.idl
share/idl/xulrunner/nsIDOMMutationObserver.idl
@@ -3903,6 +4037,8 @@ share/idl/xulrunner/nsIDOMNSRGBAColor.idl
share/idl/xulrunner/nsIDOMNSXPathExpression.idl
share/idl/xulrunner/nsIDOMNamedNodeMap.idl
share/idl/xulrunner/nsIDOMNavigator.idl
+share/idl/xulrunner/nsIDOMNavigatorActivities.idl
+share/idl/xulrunner/nsIDOMNavigatorCamera.idl
share/idl/xulrunner/nsIDOMNavigatorDesktopNotification.idl
share/idl/xulrunner/nsIDOMNavigatorDeviceStorage.idl
share/idl/xulrunner/nsIDOMNavigatorGeolocation.idl
@@ -3922,9 +4058,6 @@ share/idl/xulrunner/nsIDOMPageTransitionEvent.idl
share/idl/xulrunner/nsIDOMPaintRequest.idl
share/idl/xulrunner/nsIDOMPaintRequestList.idl
share/idl/xulrunner/nsIDOMParser.idl
-share/idl/xulrunner/nsIDOMPerformance.idl
-share/idl/xulrunner/nsIDOMPerformanceNavigation.idl
-share/idl/xulrunner/nsIDOMPerformanceTiming.idl
share/idl/xulrunner/nsIDOMPkcs11.idl
share/idl/xulrunner/nsIDOMPlugin.idl
share/idl/xulrunner/nsIDOMPluginArray.idl
@@ -4041,6 +4174,7 @@ share/idl/xulrunner/nsIDOMStorageManager.idl
share/idl/xulrunner/nsIDOMStorageObsolete.idl
share/idl/xulrunner/nsIDOMStyleSheet.idl
share/idl/xulrunner/nsIDOMStyleSheetList.idl
+share/idl/xulrunner/nsIDOMTCPSocket.idl
share/idl/xulrunner/nsIDOMText.idl
share/idl/xulrunner/nsIDOMTimeEvent.idl
share/idl/xulrunner/nsIDOMTimeRanges.idl
@@ -4056,6 +4190,7 @@ share/idl/xulrunner/nsIDOMValidityState.idl
share/idl/xulrunner/nsIDOMWakeLock.idl
share/idl/xulrunner/nsIDOMWakeLockListener.idl
share/idl/xulrunner/nsIDOMWebGLRenderingContext.idl
+share/idl/xulrunner/nsIDOMWheelEvent.idl
share/idl/xulrunner/nsIDOMWindow.idl
share/idl/xulrunner/nsIDOMWindowCollection.idl
share/idl/xulrunner/nsIDOMWindowUtils.idl
@@ -4178,7 +4313,6 @@ share/idl/xulrunner/nsIFormSigningDialog.idl
share/idl/xulrunner/nsIFormSubmitObserver.idl
share/idl/xulrunner/nsIFormatConverter.idl
share/idl/xulrunner/nsIFrameLoader.idl
-share/idl/xulrunner/nsIFrameMessageManager.idl
share/idl/xulrunner/nsIFrameRequestCallback.idl
share/idl/xulrunner/nsIGConfService.idl
share/idl/xulrunner/nsIGIOService.idl
@@ -4232,7 +4366,6 @@ share/idl/xulrunner/nsIINIParser.idl
share/idl/xulrunner/nsIIOService.idl
share/idl/xulrunner/nsIIOService2.idl
share/idl/xulrunner/nsIIOUtil.idl
-share/idl/xulrunner/nsIIPCSerializable.idl
share/idl/xulrunner/nsIIconURI.idl
share/idl/xulrunner/nsIIdentityCryptoService.idl
share/idl/xulrunner/nsIIdentityInfo.idl
@@ -4288,6 +4421,7 @@ share/idl/xulrunner/nsIMemory.idl
share/idl/xulrunner/nsIMemoryReporter.idl
share/idl/xulrunner/nsIMenuBoxObject.idl
share/idl/xulrunner/nsIMenuBuilder.idl
+share/idl/xulrunner/nsIMessageManager.idl
share/idl/xulrunner/nsIMmsService.idl
share/idl/xulrunner/nsIMobileConnectionProvider.idl
share/idl/xulrunner/nsIModule.idl
@@ -4367,7 +4501,7 @@ share/idl/xulrunner/nsIProfile.idl
share/idl/xulrunner/nsIProfileChangeStatus.idl
share/idl/xulrunner/nsIProfileMigrator.idl
share/idl/xulrunner/nsIProfileUnlocker.idl
-${PLIST.sps}share/idl/xulrunner/nsIProfiler.idl
+${PLIST.sps}include/xulrunner/nsIProfiler.h
share/idl/xulrunner/nsIProgrammingLanguage.idl
share/idl/xulrunner/nsIProgressEventSink.idl
share/idl/xulrunner/nsIPrompt.idl
@@ -4465,6 +4599,7 @@ share/idl/xulrunner/nsISecureBrowserUI.idl
share/idl/xulrunner/nsISecurityCheckedComponent.idl
share/idl/xulrunner/nsISecurityEventSink.idl
share/idl/xulrunner/nsISecurityInfoProvider.idl
+share/idl/xulrunner/nsISecurityUITelemetry.idl
share/idl/xulrunner/nsISecurityWarningDialogs.idl
share/idl/xulrunner/nsISeekableStream.idl
share/idl/xulrunner/nsISelection.idl
@@ -4484,6 +4619,7 @@ share/idl/xulrunner/nsISimpleEnumerator.idl
share/idl/xulrunner/nsISimpleStreamListener.idl
share/idl/xulrunner/nsISimpleTest.idl
share/idl/xulrunner/nsISimpleUnicharStreamFactory.idl
+share/idl/xulrunner/nsISiteSpecificUserAgent.idl
share/idl/xulrunner/nsISliderListener.idl
share/idl/xulrunner/nsISmsDatabaseService.idl
share/idl/xulrunner/nsISmsRequestManager.idl
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index 0e6bc043fea..d2f13cd18ae 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,12 +1,12 @@
-# $NetBSD: dist.mk,v 1.36 2012/10/27 16:38:00 ryoon Exp $
+# $NetBSD: dist.mk,v 1.37 2012/11/21 15:26:49 ryoon Exp $
#
# used by devel/xulrunner/Makefile
# used by www/firefox/Makefile
DISTNAME= firefox-${FIREFOX_VER}.source
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 16.0
-MOZ_BRANCH_MINOR= .2
+MOZ_BRANCH= 17.0
+MOZ_BRANCH_MINOR= esr
MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} \
${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.bz2
@@ -14,4 +14,4 @@ EXTRACT_SUFX= .tar.bz2
DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo
PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches
-WRKSRC= ${WRKDIR}/mozilla-release
+WRKSRC= ${WRKDIR}/mozilla-esr17
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 4d3b2fe95ed..58f1535adb7 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.83 2012/11/17 10:57:48 ryoon Exp $
+$NetBSD: distinfo,v 1.84 2012/11/21 15:26:49 ryoon Exp $
-SHA1 (firefox-16.0.2.source.tar.bz2) = 0ffe96896583e92561b341330ab09ddc50140dd1
-RMD160 (firefox-16.0.2.source.tar.bz2) = 74424c68e594fff842104385bb6c6f2a3a034fd2
-Size (firefox-16.0.2.source.tar.bz2) = 89452077 bytes
-SHA1 (patch-aa) = 3ed2da1996745e2056fbdb2f9272908cb5d5ff14
+SHA1 (firefox-17.0esr.source.tar.bz2) = d8d1d51b2d2accf3432fc23a77215274f12b7c70
+RMD160 (firefox-17.0esr.source.tar.bz2) = 03640f39920ac2d3786eb0b570ff3626d3407135
+Size (firefox-17.0esr.source.tar.bz2) = 90860545 bytes
+SHA1 (patch-aa) = 736eff19f8a9a69adc9a23834c1edf69d4d94ce5
SHA1 (patch-ab) = b0d7975a291c63e07773e13b023f71e88c883128
SHA1 (patch-ac) = 18640ddf00b7da9276fd67d95bd6f1b191a99d4f
SHA1 (patch-ad) = cf84430cb1d9c22caf6beaa89288f90577ae6352
@@ -17,7 +17,7 @@ SHA1 (patch-al) = 140f77112c463df90fe0dcd4173c5d6945395d4f
SHA1 (patch-am) = edf385051147a8d255a6c0737f574fa353b53d38
SHA1 (patch-an) = a6e6072403a9d3295ec861275abd4587a8bca97d
SHA1 (patch-ao) = 1f0791171392922e1a6a19c0a06c1e2a9b98e030
-SHA1 (patch-as) = 806c264a3957593b69d7c5677af49490fc913151
+SHA1 (patch-as) = c8e3aa309ae5115a8f4c17d477674f93afead538
SHA1 (patch-at) = bd72ea66e1e4baed7f16d81ed8668b5f549ebfa3
SHA1 (patch-au) = 6ee00994f01a1d63635d92a2df7b306ff5c6ad2a
SHA1 (patch-av) = 8b79660aeb6a7d80daae01dff410e343803aa9d0
@@ -29,29 +29,30 @@ SHA1 (patch-ba) = 6a5ae4c5251aea60650c3a7dff63076062c86dd3
SHA1 (patch-bd) = c8ed2110c8b699d6880723dccf62e6976edfa65e
SHA1 (patch-bf) = 7d18ec3cad441174a71770e7fa22b1cd2029d55b
SHA1 (patch-bg) = a629ee2d31aefb366ed50a1e7bd5dba51a39dc68
-SHA1 (patch-bi) = cba9c0dbea450201f349e912462c7ae1ed0793e8
+SHA1 (patch-bi) = 6ae67da19d32bc3e7fc09a32c50c4635f28fe1e6
SHA1 (patch-build_autoconf_nss.m4) = b4da991ed606fcadcb6582b4c7213e1c83ee811f
SHA1 (patch-config_baseconfig.mk) = 8fc7a064bda66c91488e27e7d49e615e49540c7d
SHA1 (patch-config_system-headers) = d7d4b5ba0677cbb92dc2ca70cd387b7d88b79f63
-SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 50da056101c2719b46fd13ee4028f1a6582c2c97
+SHA1 (patch-content_media_nsAudioStream.cpp) = 75c9fc45d464ee332271142c3e29b826b6254d49
+SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 66d023227b46582d30961cfac15506b9f29c23de
SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = cba2ea71973b3717b29052e131eb278cec972ebd
SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 775c13ca6a77b3f39f23e15fbbcf4b1cae4e9478
-SHA1 (patch-ipc_chromium_Makefile.in) = 4fbd046e80824669547d5dcb809a3126ce2b96b8
+SHA1 (patch-ipc_chromium_Makefile.in) = c2d339b32050e772dea05790d61f291d9a52e06f
SHA1 (patch-ipc_chromium_chromium-config.mk) = 24b1fe7cc7f3f14dd8a79f8eedf6f3638c304020
SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 0b8e231055cde854f31b9aa44392692a53d806f0
SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 46bf793870b4fbc2c8594186eea6bd3c7db885e9
SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 767160e3099d7bd4eb58dc24ed207417acdf098a
SHA1 (patch-ipc_chromium_src_base_dir__reader__posix.h) = d6dd15f644de3fa755f8c9be9190eb4092295091
-SHA1 (patch-ipc_chromium_src_base_file__util__linux.cc) = f5a4b391c5c21708c51ad94d6cd02156be78c999
SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 96a5a0d4b61ec69b80db3c9ff212d7a7a3d506f6
SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = c53a8962a197a3160087ad31e1a55f647a8d8fc8
SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 1f6eb9d0da16b415df6c2ced4e507d1cbf7dfdae
-SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 771bcb1d149b5bdaf1c94bd231ccc8c032721a80
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = e4560021d85abf96182b8e0c0a5a52e1213fdb31
SHA1 (patch-ipc_chromium_src_base_process__util.h) = f0e705d9e7951d12225ad132f462527651d3b1be
-SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 1cb9b20816fc749f4f376cd98383ec0a7575c6f3
+SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = c3e578b78234bee0b48b20affcb057497d94f3bf
SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 4644a4a2f37fae689b5997eda1c9b548372fa252
SHA1 (patch-ipc_chromium_src_base_ref__counted.h) = 89d6be3faaed51c7ed2e49ee8698d730916ce12f
SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = ce9b899f181d8339110d3a9a151bff9ab734df42
+SHA1 (patch-ipc_chromium_src_base_thread__collision__warner.h) = 232c10f763875930fb7de39555629f4c4fc15f35
SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 986f4a648d812c67248bd5e2c7b96963f2aa1a03
SHA1 (patch-ipc_chromium_src_build_build__config.h) = 041342ccb534e8e3b07cf454e1f3bd61372b376b
SHA1 (patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h) = 3cd047d60e91d85458812796950c4eb8b153bd0b
@@ -59,25 +60,23 @@ SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = 2b176b9bc68
SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 2258766f2c57323c90fadfc7b95e0a1b04ca4655
SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = 84a078bdf4e8478bac30a3ff85ff286081a866db
SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 15146bd327bb51b8de0783ff28b70201e3bfa532
-SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = abee0bd47a76448cd5709a34ed5ac0d56d00ac6f
+SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = be69744c199bae64c41455ff31efe2498b859414
SHA1 (patch-ipc_glue_SharedMemorySysV.h) = c82d7fd5f1a099da175107401c725cfd5ea81845
SHA1 (patch-js_src_config_system-headers) = 86f1aa66f8a35d6967c2cd03d05b6dd57209a690
SHA1 (patch-js_src_jscpucfg.h) = afce65ca5964fb732d96cf22902f89cd02aedf0d
SHA1 (patch-js_src_jsgc.cpp) = 0e617094a4b7d87cdf801d9bc4ac1f52d909a12a
SHA1 (patch-js_src_jsinterp.cpp) = bee8bdde7dd951dbfbe5b049eb502f7412fbf8e6
-SHA1 (patch-js_src_jsproxy.h) = 74b3ab7856530a9c7ed2d9b12b47b0eeffb0d1ae
-SHA1 (patch-js_src_jsprvtd.h) = 3891d3a3f3a449d95f051da3a7365a1f1963f2b8
SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = f2b12fa554ec319b5848b1cc13ec17ef967b08d7
SHA1 (patch-mb) = d1348344ad269df7008d857417551c594c9b9195
SHA1 (patch-md) = 1369069901aacaa47d76753772236fe159d42362
SHA1 (patch-me) = 93d5ef914cb00389cd5c2d92d228f47ec2436cb3
+SHA1 (patch-media_libcubeb_src_Makefile.in) = a5026b121bca81043340104d331b6343953d5dc8
+SHA1 (patch-media_libsydneyaudio_src_Makefile.in) = 7e55e41cdbcd193f57beb417e4b5c3511e8ddae0
SHA1 (patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c) = 75b828c074ccc71ff430795e2b044bebd8ff69eb
-SHA1 (patch-media_libvpx_vpx__config.h) = 251abb1115e7081b5c71451a17b82054b12ccce9
-SHA1 (patch-media_libvpx_vpx__config__c.c) = 4d625aa3ba8e69df4e02ad8a86276b9f3ecb6bb3
SHA1 (patch-mf) = c871b1164d046ea94413ef743f84be67e739f595
SHA1 (patch-mg) = 22dde266ee9d46d8de574103d1cc7035092e1b0a
SHA1 (patch-mh) = 8c56d7467e90944be186300386b6a5106e087ac7
-SHA1 (patch-mi) = 22d905c8a0880480714ffca4ec0e1f3168475170
+SHA1 (patch-mi) = 56bf4b5900eef022e9959e9287dadd479a725ed6
SHA1 (patch-mj) = a29a3b2189103526d0cc040459d6f0b11b77f837
SHA1 (patch-mk) = d9f0663d3d2762963f4c018a028eb5346106edb8
SHA1 (patch-ml) = 71c4eb8822755dd17cd4add11687d8cf52a12f6f
@@ -92,18 +91,19 @@ SHA1 (patch-pd) = c6b261264770c8a5eda31690b37f7eb992333f2a
SHA1 (patch-pg) = a89cb4b92f974d32d4a309a4628f32aff306de71
SHA1 (patch-rc) = 13b0253d166cac6b4b1e7efaba006e37015cbbdb
SHA1 (patch-storage_src_Makefile.in) = 3f9a4bc71a6b64df819bbce6dbae18705d2183ac
+SHA1 (patch-toolkit_library_Makefile.in) = 4193e7bafdac62a84c5a5ce4a21f0c616ce51362
SHA1 (patch-toolkit_toolkit-tiers.mk) = 7c878d6d4a2ad3ddaa353d6f56d4954b7861d1ad
SHA1 (patch-xa) = 5b66ed59bc9603a059e11695ae4c380093b36157
SHA1 (patch-xb) = 45e1b549551d2cc9da65b2693daf696fc65f1f38
SHA1 (patch-xc) = 08de89bfc136e7bf9e30833866eeeaef2060bc19
SHA1 (patch-xd) = 4cb58b22dec1b05f75954d439c2b2b52e7a2f00a
-SHA1 (patch-xe) = 6b5280a0f30c5f02a137a986e82cb2957b74cf95
+SHA1 (patch-xe) = c0a1860c4f566e3a8a21e1e813c4812970bc4d3d
SHA1 (patch-xf) = 507fe6d488c75c754177eb6aead27846512fda1f
SHA1 (patch-xg) = be3d4307a239e5bc8fbadde53a46a4de3faa4bb4
-SHA1 (patch-xj) = 5cf280cc2373c73949068c0eaad0a823999d264f
+SHA1 (patch-xj) = 6c8767ea4b39431ca82807f31f234f2cc61d832b
SHA1 (patch-xk) = cc196485c4e61cf655445910ee069352e3174756
-SHA1 (patch-xl) = 1ad5e95ce8b79ebd3f1f2cbd694c61e821ef8996
-SHA1 (patch-xm) = 051b5e7cca12fd7b922b5e54c58ec5f54d8c18fa
+SHA1 (patch-xl) = bb190eab6e68508e10da5d454b8dcbaebca4a3b0
+SHA1 (patch-xm) = aab7aa76909b520b9c1fdc5a27c4ec440e060cce
SHA1 (patch-xn) = 27ca333ce018a5f72278461a55d141c063ac98ca
SHA1 (patch-xo) = 3d875dad673a47b2059b8eea9f41fe9e370295d5
SHA1 (patch-xpcom_Makefile.in) = c44608dc176900c3ce49fb7059e42e404a7c6df3
diff --git a/devel/xulrunner/options.mk b/devel/xulrunner/options.mk
index d2b93a28b83..06327385e15 100644
--- a/devel/xulrunner/options.mk
+++ b/devel/xulrunner/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2012/04/26 13:30:29 ryoon Exp $
+# $NetBSD: options.mk,v 1.14 2012/11/21 15:26:49 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xulrunner
PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome pulseaudio
@@ -41,5 +41,5 @@ CONFIGURE_ARGS+= --enable-install-strip
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
-ALL_ENV+= PKGSRC_PULSEAUDIO=1
+CONFIGURE_ARGS+= --enable-pulseaudio
.endif
diff --git a/devel/xulrunner/patches/patch-aa b/devel/xulrunner/patches/patch-aa
index 45308515199..865dd7f6306 100644
--- a/devel/xulrunner/patches/patch-aa
+++ b/devel/xulrunner/patches/patch-aa
@@ -1,25 +1,18 @@
---- configure.in.orig 2012-10-24 16:32:27.000000000 +0200
-+++ configure.in 2012-11-12 11:29:00.000000000 +0100
-@@ -2040,7 +2040,7 @@ case "$target" in
- MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
- ;;
-
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
- if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
- DLL_SUFFIX=".so.1.0"
- DSO_LDOPTS="-shared"
-@@ -2048,6 +2048,9 @@ case "$target" in
- if test ! "$GNU_CC"; then
- DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
+$NetBSD: patch-aa,v 1.14 2012/11/21 15:26:49 ryoon Exp $
+
+--- configure.in.orig 2012-11-19 15:42:04.000000000 +0000
++++ configure.in
+@@ -2080,6 +2080,9 @@ ia64*-hpux*)
+ if test -z "$MC"; then
+ MC=mc.exe
fi
+ if test "$LIBRUNPATH"; then
+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
+ fi
;;
-
- ia64*-hpux*)
-@@ -3027,6 +3030,9 @@ dnl ====================================
+ *-mingw*)
+ DSO_CFLAGS=
+@@ -2979,6 +2982,9 @@ dnl ====================================
case $target in
*-hpux11.*)
;;
@@ -29,7 +22,7 @@
*)
AC_CHECK_LIB(c_r, gethostbyname_r)
;;
-@@ -3328,6 +3334,9 @@ AC_CACHE_CHECK(
+@@ -3279,6 +3285,9 @@ AC_CACHE_CHECK(
#ifdef linux
#define _BSD_SOURCE 1
#endif
@@ -39,7 +32,7 @@
#include <resolv.h>
],
[int foo = res_ninit(&_res);],
-@@ -3992,6 +4001,14 @@ if test -n "$YASM"; then
+@@ -3947,6 +3956,14 @@ if test -n "$YASM"; then
_YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
fi
@@ -54,7 +47,18 @@
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
-@@ -5438,11 +5455,11 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE
+@@ -5158,8 +5175,8 @@ fi
+
+ AC_SUBST(MOZ_WEBRTC)
+
+-case "$target_cpu" in
+-arm*)
++case "$target" in
++arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
+ MOZ_SAMPLE_TYPE_S16LE=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
+ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
+@@ -5356,11 +5373,11 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE
dnl See if we have assembly on this platform.
case "$OS_ARCH:$CPU_ARCH" in
@@ -68,21 +72,3 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
;;
-@@ -5841,7 +5858,7 @@ if test -n "$MOZ_CRASHREPORTER"; then
- AC_MSG_ERROR([Breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH. Use --disable-crashreporter.])
- fi
-
-- if test "$OS_ARCH" == "WINNT" -a -z "$HAVE_64BIT_OS"; then
-+ if test "$OS_ARCH" = "WINNT" -a -z "$HAVE_64BIT_OS"; then
- MOZ_CRASHREPORTER_INJECTOR=1
- AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR)
- fi
-@@ -9105,6 +9122,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`
-+ AC_MSG_WARN([pkgsrc: adding run path to NSPR_LIBS for bundled NSPR.])
-+ NSPR_LIBS="-Wl,-R${prefix}/lib/\${MOZILLA_PKG_NAME} ${NSPR_LIBS}"
- $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk
- NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags`
- $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk
diff --git a/devel/xulrunner/patches/patch-as b/devel/xulrunner/patches/patch-as
index 9dc0ed2b1e9..78b56a869bb 100644
--- a/devel/xulrunner/patches/patch-as
+++ b/devel/xulrunner/patches/patch-as
@@ -1,19 +1,10 @@
-$NetBSD: patch-as,v 1.8 2012/10/12 18:27:20 ryoon Exp $
+$NetBSD: patch-as,v 1.9 2012/11/21 15:26:50 ryoon Exp $
Treat DragonFly like FreeBSD.
---- js/src/configure.in.orig 2012-10-02 14:37:27.000000000 +0000
+--- js/src/configure.in.orig 2012-11-19 17:00:00.000000000 +0000
+++ js/src/configure.in
-@@ -1679,7 +1679,7 @@ case "$target" in
- MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
- ;;
-
--*-freebsd*)
-+*-freebsd*|*-dragonfly*)
- if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
- DLL_SUFFIX=".so.1.0"
- DSO_LDOPTS="-shared"
-@@ -2783,7 +2783,7 @@ then
+@@ -2701,7 +2701,7 @@ then
fi
case "$target" in
@@ -21,8 +12,8 @@ Treat DragonFly like FreeBSD.
+ *-*-freebsd*|*-dragonfly*)
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
- dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -3626,7 +3626,7 @@ if test "$MOZ_MEMORY"; then
+ dnl -pthread links in -lpthread, so don't specify it explicitly.
+@@ -3545,7 +3545,7 @@ if test "$MOZ_MEMORY"; then
*-darwin*)
AC_DEFINE(MOZ_MEMORY_DARWIN)
;;
diff --git a/devel/xulrunner/patches/patch-bi b/devel/xulrunner/patches/patch-bi
index 7afcf2056d2..f87612f6d40 100644
--- a/devel/xulrunner/patches/patch-bi
+++ b/devel/xulrunner/patches/patch-bi
@@ -1,6 +1,6 @@
-$NetBSD: patch-bi,v 1.5 2012/08/28 23:27:10 ryoon Exp $
+$NetBSD: patch-bi,v 1.6 2012/11/21 15:26:50 ryoon Exp $
---- gfx/angle/src/compiler/osinclude.h.orig 2012-08-24 22:55:30.000000000 +0000
+--- gfx/angle/src/compiler/osinclude.h.orig 2012-11-19 17:03:13.000000000 +0000
+++ gfx/angle/src/compiler/osinclude.h
@@ -16,6 +16,7 @@
#define ANGLE_OS_WIN
@@ -8,5 +8,5 @@ $NetBSD: patch-bi,v 1.5 2012/08/28 23:27:10 ryoon Exp $
defined(__FreeBSD__) || defined(__OpenBSD__) || \
+ defined(__NetBSD__) || defined(__DragonFly__) || \
defined(__sun) || defined(ANDROID) || \
- defined(__GLIBC__) || defined(__GNU__)
- #define ANGLE_OS_POSIX
+ defined(__GLIBC__) || defined(__GNU__) || \
+ defined(__QNX__)
diff --git a/devel/xulrunner/patches/patch-content_media_nsAudioStream.cpp b/devel/xulrunner/patches/patch-content_media_nsAudioStream.cpp
new file mode 100644
index 00000000000..a23ef3e3c4f
--- /dev/null
+++ b/devel/xulrunner/patches/patch-content_media_nsAudioStream.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-content_media_nsAudioStream.cpp,v 1.1 2012/11/21 15:26:50 ryoon Exp $
+
+* Bug 685258 - Pulse audio backend does not check provided playback and crashes
+
+--- content/media/nsAudioStream.cpp.orig 2012-11-13 14:56:39.000000000 +0000
++++ content/media/nsAudioStream.cpp
+@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref
+ gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
+ }
+ } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
++#if defined(__FreeBSD__) && __FreeBSD_version < 800097
++ bool value = Preferences::GetBool(aPref, false);
++#else
+ bool value = Preferences::GetBool(aPref, true);
++#endif
+ mozilla::MutexAutoLock lock(*gAudioPrefsLock);
+ gUseCubeb = value;
+ } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) {
diff --git a/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp b/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
index 7acd266ef30..295252256af 100644
--- a/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
+++ b/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/08/28 23:27:10 ryoon Exp $
+$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.4 2012/11/21 15:26:50 ryoon Exp $
---- dom/plugins/ipc/PluginModuleChild.cpp.orig 2012-08-24 22:55:28.000000000 +0000
+--- dom/plugins/ipc/PluginModuleChild.cpp.orig 2012-11-19 17:09:26.000000000 +0000
+++ dom/plugins/ipc/PluginModuleChild.cpp
@@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -10,7 +10,7 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/08/28 23:27:10 r
#include <QtCore/QTimer>
#include "nsQAppInstance.h"
#include "NestedLoopTimer.h"
-@@ -192,7 +193,7 @@ PluginModuleChild::Init(const std::strin
+@@ -196,7 +197,7 @@ PluginModuleChild::Init(const std::strin
// TODO: use PluginPRLibrary here
@@ -19,7 +19,7 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/08/28 23:27:10 r
mShutdownFunc =
(NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
-@@ -1811,7 +1812,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
+@@ -1827,7 +1828,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
PLUGIN_LOG_DEBUG_METHOD;
AssertPluginThread();
@@ -28,8 +28,8 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/08/28 23:27:10 r
return true;
#elif defined(OS_WIN) || defined(OS_MACOSX)
*_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1840,7 +1841,7 @@ PluginModuleChild::AnswerNP_Initialize(c
- SendBackUpXResources(FileDescriptor(xSocketFd, false/*don't close*/));
+@@ -1856,7 +1857,7 @@ PluginModuleChild::AnswerNP_Initialize(c
+ SendBackUpXResources(FileDescriptor(xSocketFd));
#endif
-#if defined(OS_LINUX)
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in b/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in
index 2a045d83398..ecc6e5adfeb 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in
+++ b/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-ipc_chromium_Makefile.in,v 1.4 2012/08/28 23:27:10 ryoon Exp $
+$NetBSD: patch-ipc_chromium_Makefile.in,v 1.5 2012/11/21 15:26:50 ryoon Exp $
---- ipc/chromium/Makefile.in.orig 2012-08-24 22:55:37.000000000 +0000
+--- ipc/chromium/Makefile.in.orig 2012-10-23 19:42:37.000000000 +0000
+++ ipc/chromium/Makefile.in
-@@ -243,6 +243,34 @@ endif
+@@ -240,6 +240,33 @@ endif
endif # } OS_LINUX
@@ -10,7 +10,6 @@ $NetBSD: patch-ipc_chromium_Makefile.in,v 1.4 2012/08/28 23:27:10 ryoon Exp $
+
+CPPSRCS += \
+ atomicops_internals_x86_gcc.cc \
-+ file_util_linux.cc \
+ process_util_bsd.cc \
+ time_posix.cc \
+ $(NULL)
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__linux.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__linux.cc
deleted file mode 100644
index aa4eebcbcdb..00000000000
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__linux.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util__linux.cc,v 1.2 2012/08/28 23:27:10 ryoon Exp $
-
---- ipc/chromium/src/base/file_util_linux.cc.orig 2012-08-24 22:55:37.000000000 +0000
-+++ ipc/chromium/src/base/file_util_linux.cc
-@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) {
- }
-
- bool GetShmemTempDir(FilePath* path) {
--#ifdef ANDROID
-+#if defined(ANDROID) || defined(OS_BSD)
- return GetTempDir(path);
- #else
- *path = FilePath("/dev/shm");
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
index 6d991ec5b78..92dbc60fbcf 100644
--- 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
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.7 2012/08/28 23:27:10 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.8 2012/11/21 15:26:50 ryoon Exp $
---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-08-24 22:55:37.000000000 +0000
+--- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-11-19 17:13:26.000000000 +0000
+++ ipc/chromium/src/base/platform_thread_posix.cc
@@ -9,16 +9,30 @@
@@ -60,7 +60,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.7 2012/08/28
#elif defined(OS_LINUX)
return syscall(__NR_gettid);
#endif
-@@ -83,10 +108,10 @@ void PlatformThread::SetName(const char*
+@@ -83,9 +108,9 @@ void PlatformThread::SetName(const char*
// Note that glibc also has a 'pthread_setname_np' api, but it may not be
// available everywhere and it's only benefit over using prctl directly is
// that it can set the name of threads other than the current thread.
@@ -68,9 +68,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.7 2012/08/28
+#if defined(OS_BSD) && !defined(OS_NETBSD)
pthread_set_name_np(pthread_self(), name);
-#elif defined(__NetBSD__)
-- pthread_setname_np(pthread_self(), "%s", name);
+#elif defined(OS_NETBSD)
-+ pthread_setname_np(pthread_self(), "%s", (void *)name);
+ pthread_setname_np(pthread_self(), "%s", (void *)name);
#else
prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
- #endif
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
index 67117b9fbed..d683e98452f 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.8 2012/08/31 11:52:13 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.9 2012/11/21 15:26:50 ryoon Exp $
---- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-08-28 18:53:59.000000000 +0000
+--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,318 @@
+@@ -0,0 +1,367 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -37,6 +37,20 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.8 2012/08/31 11:5
+#define HAVE_POSIX_SPAWN 1
+#endif
+
++/*
++ * On platforms that are not gonk based, we fall back to an arbitrary
++ * UID. This is generally the UID for user `nobody', albeit it is not
++ * always the case.
++ */
++
++#if defined(OS_NETBSD) || defined(OS_OPENBSD)
++# define CHILD_UNPRIVILEGED_UID 32767
++# define CHILD_UNPRIVILEGED_GID 32767
++#else
++# define CHILD_UNPRIVILEGED_UID 65534
++# define CHILD_UNPRIVILEGED_GID 65534
++#endif
++
+#ifndef __dso_public
+# ifdef __exported
+# define __dso_public __exported
@@ -85,6 +99,17 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.8 2012/08/31 11:5
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
++ return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++ SAME_PRIVILEGES_AS_PARENT,
++ wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++ const file_handle_mapping_vector& fds_to_remap,
++ const environment_map& env_vars_to_set,
++ ChildPrivileges privs,
++ bool wait, ProcessHandle* process_handle,
++ ProcessArchitecture arch) {
+ bool retval = true;
+
+ char* argv_copy[argv.size() + 1];
@@ -199,6 +224,17 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.8 2012/08/31 11:5
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
++ return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++ SAME_PRIVILEGES_AS_PARENT,
++ wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++ const file_handle_mapping_vector& fds_to_remap,
++ const environment_map& env_vars_to_set,
++ ChildPrivileges privs,
++ bool wait, ProcessHandle* process_handle,
++ ProcessArchitecture arch) {
+ scoped_array<char*> argv_cstr(new char*[argv.size() + 1]);
+ // Illegal to allocate memory after fork and before execvp
+ InjectiveMultimap fd_shuffle1, fd_shuffle2;
@@ -221,19 +257,32 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.8 2012/08/31 11:5
+
+ CloseSuperfluousFds(fd_shuffle2);
+
++ for (size_t i = 0; i < argv.size(); i++)
++ argv_cstr[i] = const_cast<char*>(argv[i].c_str());
++ argv_cstr[argv.size()] = NULL;
++
++ if (privs == UNPRIVILEGED) {
++ if (setgid(CHILD_UNPRIVILEGED_GID) != 0) {
++ DLOG(ERROR) << "FAILED TO setgid() CHILD PROCESS, path: " << argv_cstr[0];
++ _exit(127);
++ }
++ if (setuid(CHILD_UNPRIVILEGED_UID) != 0) {
++ DLOG(ERROR) << "FAILED TO setuid() CHILD PROCESS, path: " << argv_cstr[0];
++ _exit(127);
++ }
++ if (chdir("/") != 0)
++ gProcessLog.print("==> could not chdir()\n");
++ }
++
+ for (environment_map::const_iterator it = env_vars_to_set.begin();
+ it != env_vars_to_set.end(); ++it) {
+ if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/))
+ _exit(127);
+ }
-+
-+ for (size_t i = 0; i < argv.size(); i++)
-+ argv_cstr[i] = const_cast<char*>(argv[i].c_str());
-+ argv_cstr[argv.size()] = NULL;
-+ execvp(argv_cstr[0], argv_cstr.get());
++ execv(argv_cstr[0], argv_cstr.get());
+ // if we get here, we're in serious trouble and should complain loudly
+ DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0];
-+ exit(127);
++ _exit(127);
+ } else {
+ gProcessLog.print("==> process %d launched child process %d\n",
+ GetCurrentProcId(), pid);
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_thread__collision__warner.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_thread__collision__warner.h
new file mode 100644
index 00000000000..ea18f3f7a00
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_thread__collision__warner.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-ipc_chromium_src_base_thread__collision__warner.h,v 1.1 2012/11/21 15:26:50 ryoon Exp $
+
+* Fix debug build, patch is provided from martin@
+
+--- ipc/chromium/src/base/thread_collision_warner.h.orig 2012-10-23 19:42:37.000000000 +0000
++++ ipc/chromium/src/base/thread_collision_warner.h
+@@ -101,7 +101,7 @@
+ // Defines a class member that acts like a mutex. It is used only as a
+ // verification tool.
+ #define DFAKE_MUTEX(obj) \
+- mutable base::ThreadCollisionWarner obj
++ mutable base::ThreadCollisionWarner obj;
+ // Asserts the call is never called simultaneously in two threads. Used at
+ // member function scope.
+ #define DFAKE_SCOPED_LOCK(obj) \
diff --git a/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
index 71eb212f885..f17374a9a68 100644
--- a/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
+++ b/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
@@ -1,17 +1,31 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.4 2012/08/28 23:27:10 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.5 2012/11/21 15:26:50 ryoon Exp $
---- ipc/glue/GeckoChildProcessHost.cpp.orig 2012-08-24 22:55:37.000000000 +0000
+--- ipc/glue/GeckoChildProcessHost.cpp.orig 2012-11-19 15:42:29.000000000 +0000
+++ ipc/glue/GeckoChildProcessHost.cpp
-@@ -410,7 +410,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -4,7 +4,13 @@
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
++#if defined(__NetBSD__)
++_Pragma("GCC visibility push(default)")
++#endif
+ #include "GeckoChildProcessHost.h"
++#if defined(__NetBSD__)
++_Pragma("GCC visibility pop")
++#endif
+
+ #include "base/command_line.h"
+ #include "base/path_service.h"
+@@ -437,7 +443,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
// and passing wstrings from one config to the other is unsafe. So
// we split the logic here.
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
base::environment_map newEnvVars;
- // XPCOM may not be initialized in some subprocesses. We don't want
- // to initialize XPCOM just for the directory service, especially
-@@ -425,8 +425,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
+ base::ChildPrivileges privs = kLowRightsSubprocesses ?
+ base::UNPRIVILEGED :
+@@ -455,8 +461,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
if (NS_SUCCEEDED(rv)) {
nsCString path;
greDir->GetNativePath(path);
@@ -22,7 +36,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.4 2012/08/28 23:27:10 ryoo
path += "/lib";
# endif // MOZ_WIDGET_ANDROID
const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-@@ -537,7 +537,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -575,7 +581,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
childArgv.push_back(pidstring);
#if defined(MOZ_CRASHREPORTER)
@@ -31,12 +45,12 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.4 2012/08/28 23:27:10 ryoo
int childCrashFd, childCrashRemapFd;
if (!CrashReporter::CreateNotificationPipeForChild(
&childCrashFd, &childCrashRemapFd))
-@@ -574,7 +574,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -612,7 +618,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
#endif
base::LaunchApp(childArgv, mFileMap,
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- newEnvVars,
+ newEnvVars, privs,
#endif
false, &process, arch);
diff --git a/devel/xulrunner/patches/patch-js_src_jsproxy.h b/devel/xulrunner/patches/patch-js_src_jsproxy.h
deleted file mode 100644
index 3a67397cb33..00000000000
--- a/devel/xulrunner/patches/patch-js_src_jsproxy.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-js_src_jsproxy.h,v 1.1 2012/11/11 22:26:00 joerg Exp $
-
---- js/src/jsproxy.h.orig 2012-10-24 14:32:54.000000000 +0000
-+++ js/src/jsproxy.h
-@@ -13,7 +13,7 @@
-
- namespace js {
-
--class Wrapper;
-+class JS_PUBLIC_API(Wrapper);
-
- /*
- * A proxy is a JSObject that implements generic behavior by providing custom
diff --git a/devel/xulrunner/patches/patch-js_src_jsprvtd.h b/devel/xulrunner/patches/patch-js_src_jsprvtd.h
deleted file mode 100644
index 2add79b8e12..00000000000
--- a/devel/xulrunner/patches/patch-js_src_jsprvtd.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-js_src_jsprvtd.h,v 1.1 2012/11/11 22:26:00 joerg Exp $
-
---- js/src/jsprvtd.h.orig 2012-10-24 14:32:54.000000000 +0000
-+++ js/src/jsprvtd.h
-@@ -146,9 +146,9 @@ struct TreeContext;
- class UpvarCookie;
-
- class Proxy;
--class BaseProxyHandler;
--class DirectWrapper;
--class CrossCompartmentWrapper;
-+class JS_PUBLIC_API(BaseProxyHandler);
-+class JS_PUBLIC_API(DirectWrapper);
-+class JS_PUBLIC_API(CrossCompartmentWrapper);
-
- class TempAllocPolicy;
- class RuntimeAllocPolicy;
diff --git a/devel/xulrunner/patches/patch-media_libcubeb_src_Makefile.in b/devel/xulrunner/patches/patch-media_libcubeb_src_Makefile.in
new file mode 100644
index 00000000000..2169f9cdd1b
--- /dev/null
+++ b/devel/xulrunner/patches/patch-media_libcubeb_src_Makefile.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-media_libcubeb_src_Makefile.in,v 1.1 2012/11/21 15:26:50 ryoon Exp $
+
+Add adds --enable-alsa and makes --enable-pulseaudio also work with media.use_cubeb=false (aka libsydneyaudio)
+
+--- media/libcubeb/src/Makefile.in.orig 2012-10-23 19:42:48.000000000 +0000
++++ media/libcubeb/src/Makefile.in
+@@ -24,10 +24,6 @@ endif
+
+ ifeq ($(OS_TARGET),Android)
+ # No Android implementation of libcubeb yet.
+-else ifeq ($(OS_TARGET),Linux)
+-CSRCS = \
+- cubeb_alsa.c \
+- $(NULL)
+ endif
+
+ ifeq ($(OS_TARGET),Darwin)
+@@ -42,6 +38,12 @@ CSRCS = \
+ $(NULL)
+ endif
+
++ifdef MOZ_ALSA
++CSRCS = \
++ cubeb_alsa.c \
++ $(NULL)
++endif
++
+ ifdef MOZ_PULSEAUDIO
+ CSRCS = \
+ cubeb_pulse.c \
diff --git a/devel/xulrunner/patches/patch-media_libsydneyaudio_src_Makefile.in b/devel/xulrunner/patches/patch-media_libsydneyaudio_src_Makefile.in
new file mode 100644
index 00000000000..9339b25b4c7
--- /dev/null
+++ b/devel/xulrunner/patches/patch-media_libsydneyaudio_src_Makefile.in
@@ -0,0 +1,36 @@
+$NetBSD: patch-media_libsydneyaudio_src_Makefile.in,v 1.1 2012/11/21 15:26:50 ryoon Exp $
+
+adds --enable-alsa and makes --enable-pulseaudio also work with media.use_cubeb=false (aka libsydneyaudio)
+
+--- media/libsydneyaudio/src/Makefile.in.orig 2012-11-19 18:26:45.000000000 +0000
++++ media/libsydneyaudio/src/Makefile.in
+@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android
+ CSRCS = \
+ sydney_audio_android.c \
+ $(NULL)
+-else ifeq ($(OS_ARCH),Linux)
+-CSRCS = \
+- sydney_audio_alsa.c \
+- $(NULL)
+ endif
+
+ ifeq ($(OS_ARCH),WINNT)
+@@ -68,6 +64,18 @@ CSRCS = \
+ $(NULL)
+ endif
+
++ifdef MOZ_ALSA
++CSRCS = \
++ sydney_audio_alsa.c \
++ $(NULL)
++endif
++
++ifdef MOZ_PULSEAUDIO
++CSRCS = \
++ sydney_audio_pulseaudio.c \
++ $(NULL)
++endif
++
+ ifeq ($(OS_ARCH),WINNT)
+ OS_LIBS += winmm.lib
+ endif
diff --git a/devel/xulrunner/patches/patch-media_libvpx_vpx__config.h b/devel/xulrunner/patches/patch-media_libvpx_vpx__config.h
deleted file mode 100644
index 2235c2ac793..00000000000
--- a/devel/xulrunner/patches/patch-media_libvpx_vpx__config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-media_libvpx_vpx__config.h,v 1.3 2012/08/28 23:27:10 ryoon Exp $
-
---- media/libvpx/vpx_config.h.orig 2012-08-24 22:55:55.000000000 +0000
-+++ media/libvpx/vpx_config.h
-@@ -16,12 +16,12 @@
- /* 32 bit MacOS. */
- #include "vpx_config_x86-darwin9-gcc.h"
-
--#elif defined(__linux__) && defined(__i386__)
--/* 32 bit Linux. */
-+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__i386__)
-+/* 32 bit Linux or some BSD. */
- #include "vpx_config_x86-linux-gcc.h"
-
--#elif defined(__linux__) && defined(__x86_64__)
--/* 64 bit Linux. */
-+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__x86_64__)
-+/* 64 bit Linux or some BSD. */
- #include "vpx_config_x86_64-linux-gcc.h"
-
- #elif defined(__sun) && defined(__i386)
diff --git a/devel/xulrunner/patches/patch-media_libvpx_vpx__config__c.c b/devel/xulrunner/patches/patch-media_libvpx_vpx__config__c.c
deleted file mode 100644
index a90dc24781d..00000000000
--- a/devel/xulrunner/patches/patch-media_libvpx_vpx__config__c.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-media_libvpx_vpx__config__c.c,v 1.3 2012/08/28 23:27:10 ryoon Exp $
-
---- media/libvpx/vpx_config_c.c.orig 2012-08-24 22:55:55.000000000 +0000
-+++ media/libvpx/vpx_config_c.c
-@@ -15,12 +15,12 @@
- /* 32 bit MacOS. */
- #include "vpx_config_x86-darwin9-gcc.c"
-
--#elif defined(__linux__) && defined(__i386__)
--/* 32 bit Linux. */
-+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__i386__)
-+/* 32 bit Linux or BSD. */
- #include "vpx_config_x86-linux-gcc.c"
-
--#elif defined(__linux__) && defined(__x86_64__)
--/* 64 bit Linux. */
-+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__x86_64__)
-+/* 64 bit Linux or BSD. */
- #include "vpx_config_x86_64-linux-gcc.c"
-
- #elif defined(__sun) && defined(__i386)
diff --git a/devel/xulrunner/patches/patch-mi b/devel/xulrunner/patches/patch-mi
index d174e487dc2..168a7bba5a0 100644
--- a/devel/xulrunner/patches/patch-mi
+++ b/devel/xulrunner/patches/patch-mi
@@ -1,13 +1,13 @@
-$NetBSD: patch-mi,v 1.4 2012/08/28 23:27:10 ryoon Exp $
+$NetBSD: patch-mi,v 1.5 2012/11/21 15:26:50 ryoon Exp $
---- config/config.mk.orig 2012-08-24 22:55:19.000000000 +0000
+--- config/config.mk.orig 2012-10-23 19:42:27.000000000 +0000
+++ config/config.mk
-@@ -97,7 +97,7 @@ endif
+@@ -92,7 +92,7 @@ AUTOCONF_TOOLS = $(topsrcdir)/build/auto
# but save the version to allow multiple versions of the same base
# platform to be built in the same tree.
#
--ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
-+ifneq (,$(filter DragonFly FreeBSD HP-UX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
+-ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
++ifneq (,$(filter DragonFly FreeBSD HP-UX Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
OS_RELEASE := $(basename $(OS_RELEASE))
# Allow the user to ignore the OS_VERSION, which is usually irrelevant.
diff --git a/devel/xulrunner/patches/patch-toolkit_library_Makefile.in b/devel/xulrunner/patches/patch-toolkit_library_Makefile.in
new file mode 100644
index 00000000000..8e3b47cf5b4
--- /dev/null
+++ b/devel/xulrunner/patches/patch-toolkit_library_Makefile.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-toolkit_library_Makefile.in,v 1.1 2012/11/21 15:26:50 ryoon Exp $
+
+adds --enable-alsa and makes --enable-pulseaudio
+also work with media.use_cubeb=false (aka libsydneyaudio)
+
+--- toolkit/library/Makefile.in.orig 2012-11-19 18:26:45.000000000 +0000
++++ toolkit/library/Makefile.in
+@@ -371,14 +371,11 @@ endif
+
+ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
+
+-ifdef MOZ_SYDNEYAUDIO
+-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
++ifdef MOZ_ALSA
+ EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
+ endif
+-endif
+-
+ ifdef MOZ_PULSEAUDIO
+-ifdef MOZ_CUBEB
+ EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
+ endif
+ endif
diff --git a/devel/xulrunner/patches/patch-xe b/devel/xulrunner/patches/patch-xe
index 316e5f9d155..57080ecd2ed 100644
--- a/devel/xulrunner/patches/patch-xe
+++ b/devel/xulrunner/patches/patch-xe
@@ -1,8 +1,6 @@
-$NetBSD: patch-xe,v 1.3 2012/08/28 23:27:10 ryoon Exp $
+$NetBSD: patch-xe,v 1.4 2012/11/21 15:26:50 ryoon Exp $
-NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad.
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2012-08-24 22:56:10.000000000 +0000
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2012-11-19 17:32:09.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
@@ -100,6 +100,15 @@ extern "C" {
}
@@ -18,10 +16,10 @@ NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad.
+#endif
+
XPTC_PUBLIC_API(nsresult)
- XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
- PRUint32 paramCount, nsXPTCVariant* params)
-@@ -107,30 +116,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR
- PRUint32 result;
+ XPTC_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
+ uint32_t paramCount, nsXPTCVariant* params)
+@@ -107,30 +116,30 @@ XPTC_InvokeByIndex(nsISupports* that, ui
+ uint32_t result;
__asm__ __volatile__(
- "movl %4, sp@-\n\t"
diff --git a/devel/xulrunner/patches/patch-xj b/devel/xulrunner/patches/patch-xj
index 9e01bda10b8..8dff184587b 100644
--- a/devel/xulrunner/patches/patch-xj
+++ b/devel/xulrunner/patches/patch-xj
@@ -1,8 +1,8 @@
-$NetBSD: patch-xj,v 1.2 2012/08/28 23:27:10 ryoon Exp $
+$NetBSD: patch-xj,v 1.3 2012/11/21 15:26:50 ryoon Exp $
NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2012-08-24 22:56:10.000000000 +0000
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2012-11-19 17:35:17.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
@@ -6,6 +6,7 @@
// Implement shared vtbl methods.
@@ -18,9 +18,9 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
nsXPTCMiniVariant* dispatchParams = NULL;
- nsIInterfaceInfo* iface_info = NULL;
const nsXPTMethodInfo* info;
- PRUint32 paramCount;
- PRUint32 i;
-@@ -44,12 +44,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+ uint32_t paramCount;
+ uint32_t i;
+@@ -44,11 +44,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
NS_ASSERTION(self,"no self");
@@ -29,13 +29,12 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
- if (! iface_info)
- return NS_ERROR_UNEXPECTED;
-
-- iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
+ self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+ iface_info->GetMethodInfo(uint16_t(methodIndex), &info);
NS_ASSERTION(info,"no method info");
if (! info)
- return NS_ERROR_UNEXPECTED;
-@@ -84,8 +79,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
+@@ -84,8 +80,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+ if ((uint32_t) ap & 4) ap++; // doubles are 8-byte aligned on stack
dp->val.d = *(double*) ap;
ap += 2;
+#if __GXX_ABI_VERSION < 100
@@ -45,7 +44,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
}
continue;
}
-@@ -95,8 +92,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -95,8 +93,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
else {
dp->val.f = *(float*) ap;
ap += 1;
@@ -56,20 +55,20 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
}
continue;
}
-@@ -144,9 +143,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -144,9 +144,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
}
}
-- result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
+- result = self->CallMethod((uint16_t) methodIndex, info, dispatchParams);
-
- NS_RELEASE(iface_info);
+ result = self->mOuter->CallMethod((PRUint16) methodIndex,
-+ info,
-+ dispatchParams);
++ info,
++ dispatchParams);
if (dispatchParams != paramBuffer)
delete [] dispatchParams;
-@@ -160,7 +159,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -160,7 +160,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
// however, it's quick, dirty, and'll break when the ABI changes on
// us, which is what we want ;-).
@@ -80,7 +79,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
__asm__ ( \
".section \".text\" \n\t" \
".align 2 \n\t" \
-@@ -171,6 +172,46 @@ __asm__ (
+@@ -171,6 +173,46 @@ __asm__ (
"li 11,"#n" \n\t" \
"b SharedStub@local \n" \
);
diff --git a/devel/xulrunner/patches/patch-xl b/devel/xulrunner/patches/patch-xl
index 14a619ad26c..60bfbdd962f 100644
--- a/devel/xulrunner/patches/patch-xl
+++ b/devel/xulrunner/patches/patch-xl
@@ -1,10 +1,10 @@
-$NetBSD: patch-xl,v 1.3 2012/08/28 23:27:10 ryoon Exp $
+$NetBSD: patch-xl,v 1.4 2012/11/21 15:26:50 ryoon Exp $
NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2012-08-24 22:56:10.000000000 +0000
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2012-11-19 17:41:53.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
-@@ -20,41 +20,41 @@
+@@ -20,41 +20,42 @@
.section ".text"
.align 2
@@ -12,10 +12,21 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
- .type XPTC_InvokeByIndex,@function
+ .globl NS_InvokeByIndex_P
+ .type NS_InvokeByIndex_P,@function
++
++//
++// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
++// PRUint32 paramCount, nsXPTCVariant* params)
++//
++
++NS_InvokeByIndex_P:
++ stwu sp,-32(sp) // setup standard stack frame
++ mflr r0 // save LR
++ stw r3,8(sp) // r3 <= that
++ stw r4,12(sp) // r4 <= methodIndex
-#
--# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
--# PRUint32 paramCount, nsXPTCVariant* params)
+-# XPTC_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
+-# uint32_t paramCount, nsXPTCVariant* params)
-#
-
-XPTC_InvokeByIndex:
@@ -23,16 +34,6 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
- mflr r0 # save LR
- stw r3,8(sp) # r3 <= that
- stw r4,12(sp) # r4 <= methodIndex
-+//
-+// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+// PRUint32 paramCount, nsXPTCVariant* params)
-+//
-+
-+NS_InvokeByIndex_P:
-+ stwu sp,-32(sp) // setup standard stack frame
-+ mflr r0 // save LR
-+ stw r3,8(sp) // r3 <= that
-+ stw r4,12(sp) // r4 <= methodIndex
stw r30,16(sp)
stw r31,20(sp)
@@ -71,46 +72,3 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
lfd f2,40(r30)
lfd f3,48(r30)
lfd f4,56(r30)
-@@ -63,18 +63,13 @@ XPTC_InvokeByIndex:
- lfd f7,80(r30)
- lfd f8,88(r30)
-
-- lwz r3,8(r31) # r3 <= that
-- lwz r4,12(r31) # r4 <= methodIndex
-- lwz r5,0(r3) # r5 <= vtable ( == *that )
-- slwi r4,r4,3 # convert to offset ( *= 8 )
-- addi r4,r4,8 # skip first two vtable entries
-- add r4,r4,r5
-- lhz r0,0(r4) # virtual base offset
-- extsh r0,r0
-- add r3,r3,r0
-- lwz r0,4(r4) # r0 <= methodpointer ( == vtable + offset )
-+ lwz r3,8(r31) // r3 <= that
-+ lwz r4,12(r31) // r4 <= methodIndex
-+ lwz r5,0(r3) // r5 <= vtable ( == *that )
-+ slwi r4,r4,2 // convert to offset ( *= 4 )
-+ lwzx r0,r4,r5 // r0 <= methodpointer ( == vtable + offset )
-
-- lwz r4,4(r30) # load GP regs with method parameters
-+ lwz r4,4(r30) // load GP regs with method parameters
- lwz r5,8(r30)
- lwz r6,12(r30)
- lwz r7,16(r30)
-@@ -82,13 +77,13 @@ XPTC_InvokeByIndex:
- lwz r9,24(r30)
- lwz r10,28(r30)
-
-- mtlr r0 # copy methodpointer to LR
-- blrl # call method
-+ mtlr r0 // copy methodpointer to LR
-+ blrl // call method
-
-- lwz r30,16(r31) # restore r30 & r31
-+ lwz r30,16(r31) // restore r30 & r31
- lwz r31,20(r31)
-
-- lwz r11,0(sp) # clean up the stack
-+ lwz r11,0(sp) // clean up the stack
- lwz r0,4(r11)
- mtlr r0
- mr sp,r11
diff --git a/devel/xulrunner/patches/patch-xm b/devel/xulrunner/patches/patch-xm
index a54554947f6..c49dc70fb2e 100644
--- a/devel/xulrunner/patches/patch-xm
+++ b/devel/xulrunner/patches/patch-xm
@@ -1,8 +1,8 @@
-$NetBSD: patch-xm,v 1.3 2012/10/10 11:59:26 jmmv Exp $
+$NetBSD: patch-xm,v 1.4 2012/11/21 15:26:50 ryoon Exp $
NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla.
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2012-10-10 00:45:21.000000000 +0000
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2012-11-19 17:52:51.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
@@ -5,9 +5,9 @@
@@ -16,8 +16,8 @@ NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla.
// access. The parameters for the method are read from the
// nsXPTCVariant* and prepared for the native ABI. For the Linux/PPC
// ABI this means that the first 8 integral and floating point
-@@ -69,8 +69,10 @@ invoke_copy_to_stack(PRUint32* d,
- if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
+@@ -69,8 +69,10 @@ invoke_copy_to_stack(uint32_t* d,
+ if ((uint32_t) d & 4) d++; // doubles are 8-byte aligned on stack
*((double*) d) = s->val.d;
d += 2;
+#if __GXX_ABI_VERSION < 100
@@ -27,7 +27,7 @@ NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla.
}
}
else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-@@ -79,8 +81,10 @@ invoke_copy_to_stack(PRUint32* d,
+@@ -79,8 +81,10 @@ invoke_copy_to_stack(uint32_t* d,
else {
*((float*) d) = s->val.f;
d += 1;
@@ -38,12 +38,12 @@ NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla.
}
}
else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
-@@ -107,6 +111,6 @@ invoke_copy_to_stack(PRUint32* d,
+@@ -107,6 +111,6 @@ invoke_copy_to_stack(uint32_t* d,
}
extern "C"
-XPTC_PUBLIC_API(nsresult)
--XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+-XPTC_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
+EXPORT_XPCOM_API(nsresult)
+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
- PRUint32 paramCount, nsXPTCVariant* params);
+ uint32_t paramCount, nsXPTCVariant* params);