diff options
Diffstat (limited to 'devel')
119 files changed, 552 insertions, 1956 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index b07534b0fdd..8835128cfc6 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2013/01/05 08:07:00 sbd Exp $ +# $NetBSD: Makefile,v 1.88 2013/01/10 15:01:29 ryoon Exp $ .include "dist.mk" PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//} -PKGREVISION= 2 CATEGORIES= devel www MAINTAINER= tnn@NetBSD.org @@ -53,6 +52,7 @@ PLIST.vorbis= yes pre-configure: cd ${WRKSRC} && autoconf cd ${WRKSRC}/js/src && autoconf + mkdir ${WRKSRC}/js/src/.deps post-install: # XXX fix the pkg-config files instead diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST index aa0cf7a522f..4ef72e1fb6b 100644 --- a/devel/xulrunner/PLIST +++ b/devel/xulrunner/PLIST @@ -1,17 +1,22 @@ -@comment $NetBSD: PLIST,v 1.49 2013/01/05 08:07:00 sbd Exp $ +@comment $NetBSD: PLIST,v 1.50 2013/01/10 15:01:29 ryoon Exp $ bin/xulrunner -include/xulrunner/.mkdir.done include/xulrunner/AccEvent.h include/xulrunner/AnimationCommon.h +include/xulrunner/AudioChannelAgent.h +include/xulrunner/AudioChannelCommon.h +include/xulrunner/AudioChannelService.h +include/xulrunner/AudioChannelServiceChild.h include/xulrunner/AudioSegment.h include/xulrunner/BasicImplData.h include/xulrunner/BasicLayers.h include/xulrunner/BasicTiledThebesLayer.h +include/xulrunner/CameraCommon.h +include/xulrunner/Composer2D.h include/xulrunner/CompositorChild.h include/xulrunner/CompositorParent.h +include/xulrunner/CryptoTask.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 @@ -31,8 +36,8 @@ include/xulrunner/GLXLibrary.h include/xulrunner/GeneratedEvents.h include/xulrunner/GfxInfoCollector.h include/xulrunner/GonkIOSurfaceImage.h +include/xulrunner/GonkNativeWindow.h include/xulrunner/IJSDebugger.h -include/xulrunner/IPC/IPCMessageUtils.h include/xulrunner/IPC/nsGUIEventIPC.h include/xulrunner/ImageContainer.h include/xulrunner/ImageLayers.h @@ -43,6 +48,7 @@ include/xulrunner/LayerManagerOGL.h include/xulrunner/LayerManagerOGLProgram.h include/xulrunner/LayerManagerOGLShaders.h include/xulrunner/LayerSorter.h +include/xulrunner/LayerTreeInvalidation.h include/xulrunner/Layers.h include/xulrunner/LayersTypes.h include/xulrunner/MediaEngine.h @@ -54,12 +60,14 @@ include/xulrunner/MediaStreamGraph.h include/xulrunner/PCOMContentPermissionRequestChild.h include/xulrunner/ReadbackLayer.h include/xulrunner/SVGAttrValueWrapper.h +include/xulrunner/ScopedNSSTypes.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/SpecialSystemDirectory.h include/xulrunner/StackArena.h include/xulrunner/StreamBuffer.h include/xulrunner/TexturePoolOGL.h @@ -68,6 +76,8 @@ include/xulrunner/VideoFrameContainer.h include/xulrunner/VideoSegment.h include/xulrunner/VideoUtils.h include/xulrunner/WebGLContext.h +include/xulrunner/WebGLElementArrayCache.h +include/xulrunner/WebGLExtensions.h include/xulrunner/XPCJSMemoryReporter.h include/xulrunner/a11yGeneric.h include/xulrunner/amIInstallTrigger.h @@ -128,6 +138,7 @@ include/xulrunner/gfxQuad.h include/xulrunner/gfxQuaternion.h include/xulrunner/gfxRect.h include/xulrunner/gfxReusableSurfaceWrapper.h +include/xulrunner/gfxSVGGlyphs.h include/xulrunner/gfxSharedImageSurface.h include/xulrunner/gfxSkipChars.h include/xulrunner/gfxTeeSurface.h @@ -165,6 +176,8 @@ include/xulrunner/imgILoader.h include/xulrunner/imgIOnloadBlocker.h include/xulrunner/imgIRequest.h include/xulrunner/imgITools.h +include/xulrunner/imgLoader.h +include/xulrunner/imgRequest.h include/xulrunner/inICSSValueSearch.h include/xulrunner/inIDOMUtils.h include/xulrunner/inIDOMView.h @@ -172,7 +185,14 @@ include/xulrunner/inIDeepTreeWalker.h include/xulrunner/inIFlasher.h include/xulrunner/inISearchObserver.h include/xulrunner/inISearchProcess.h +include/xulrunner/ipc/IPCMessageUtils.h include/xulrunner/jArray.h +include/xulrunner/jconfig.h +include/xulrunner/jerror.h +include/xulrunner/jinclude.h +include/xulrunner/jmorecfg.h +include/xulrunner/jpegint.h +include/xulrunner/jpeglib.h ${PLIST.jemalloc}include/xulrunner/jemalloc.h ${PLIST.jemalloc}include/xulrunner/jemalloc_types.h include/xulrunner/js-config.h @@ -185,8 +205,6 @@ include/xulrunner/js/Utility.h include/xulrunner/js/Vector.h include/xulrunner/jsalloc.h include/xulrunner/jsapi.h -include/xulrunner/jsatom.h -include/xulrunner/jsatom.tbl include/xulrunner/jsclass.h include/xulrunner/jsclist.h include/xulrunner/jscpucfg.h @@ -200,7 +218,7 @@ include/xulrunner/jslock.h include/xulrunner/json.h include/xulrunner/jsperf.h include/xulrunner/jsprf.h -include/xulrunner/jsproto.tbl +include/xulrunner/jsprototypes.h include/xulrunner/jsproxy.h include/xulrunner/jsprvtd.h include/xulrunner/jspubtd.h @@ -214,6 +232,7 @@ include/xulrunner/mar_cmdline.h include/xulrunner/mozAutoDocUpdate.h include/xulrunner/mozFlushType.h include/xulrunner/mozIApplication.h +include/xulrunner/mozIApplicationClearPrivateDataParams.h include/xulrunner/mozIAsyncFavicons.h include/xulrunner/mozIAsyncHistory.h include/xulrunner/mozIAsyncLivemarks.h @@ -272,7 +291,6 @@ include/xulrunner/mozilla/ErrorResult.h include/xulrunner/mozilla/FileLocation.h include/xulrunner/mozilla/FileUtils.h include/xulrunner/mozilla/FloatingPoint.h -include/xulrunner/mozilla/FunctionTimer.h include/xulrunner/mozilla/GenericFactory.h include/xulrunner/mozilla/GuardObjects.h include/xulrunner/mozilla/Hal.h @@ -293,6 +311,7 @@ include/xulrunner/mozilla/LookAndFeel.h include/xulrunner/mozilla/MSStdInt.h include/xulrunner/mozilla/MapsMemoryReporter.h include/xulrunner/mozilla/MathAlgorithms.h +include/xulrunner/mozilla/MemoryInfoDumper.h include/xulrunner/mozilla/Module.h include/xulrunner/mozilla/ModuleLoader.h include/xulrunner/mozilla/ModuleUtils.h @@ -355,12 +374,25 @@ 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/AudioBuffer.h +include/xulrunner/mozilla/dom/AudioBufferBinding.h +include/xulrunner/mozilla/dom/AudioBufferSourceNode.h +include/xulrunner/mozilla/dom/AudioBufferSourceNodeBinding.h include/xulrunner/mozilla/dom/AudioChild.h +include/xulrunner/mozilla/dom/AudioContextBinding.h +include/xulrunner/mozilla/dom/AudioDestinationNode.h +include/xulrunner/mozilla/dom/AudioDestinationNodeBinding.h +include/xulrunner/mozilla/dom/AudioNode.h +include/xulrunner/mozilla/dom/AudioNodeBinding.h include/xulrunner/mozilla/dom/AudioParent.h +include/xulrunner/mozilla/dom/AudioSourceNode.h +include/xulrunner/mozilla/dom/AudioSourceNodeBinding.h include/xulrunner/mozilla/dom/BindingUtils.h +include/xulrunner/mozilla/dom/BlobBinding.h include/xulrunner/mozilla/dom/CSS2PropertiesBinding.h include/xulrunner/mozilla/dom/CSSStyleDeclarationBinding.h include/xulrunner/mozilla/dom/CanvasRenderingContext2DBinding.h +include/xulrunner/mozilla/dom/ClientRectListBinding.h include/xulrunner/mozilla/dom/ContentChild.h include/xulrunner/mozilla/dom/ContentParent.h include/xulrunner/mozilla/dom/ContentProcess.h @@ -370,19 +402,30 @@ 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/DOMSettableTokenListBinding.h +include/xulrunner/mozilla/dom/DOMTokenListBinding.h include/xulrunner/mozilla/dom/DirectionalityUtils.h include/xulrunner/mozilla/dom/Element.h +include/xulrunner/mozilla/dom/EncodingUtils.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/FileListBinding.h +include/xulrunner/mozilla/dom/FileReaderSyncBinding.h include/xulrunner/mozilla/dom/FragmentOrElement.h include/xulrunner/mozilla/dom/FromParser.h include/xulrunner/mozilla/dom/FunctionBinding.h +include/xulrunner/mozilla/dom/HTMLCollectionBinding.h +include/xulrunner/mozilla/dom/HTMLOptionsCollectionBinding.h +include/xulrunner/mozilla/dom/HTMLPropertiesCollectionBinding.h include/xulrunner/mozilla/dom/ImageData.h include/xulrunner/mozilla/dom/Link.h +include/xulrunner/mozilla/dom/NodeListBinding.h +include/xulrunner/mozilla/dom/NonRefcountedDOMObject.h include/xulrunner/mozilla/dom/Nullable.h +include/xulrunner/mozilla/dom/PaintRequestListBinding.h include/xulrunner/mozilla/dom/PerformanceBinding.h include/xulrunner/mozilla/dom/PerformanceNavigationBinding.h include/xulrunner/mozilla/dom/PerformanceTimingBinding.h @@ -390,24 +433,37 @@ 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/SVGLengthListBinding.h +include/xulrunner/mozilla/dom/SVGNumberListBinding.h +include/xulrunner/mozilla/dom/SVGPathSegListBinding.h +include/xulrunner/mozilla/dom/SVGPointListBinding.h +include/xulrunner/mozilla/dom/SVGTransformListBinding.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/TabContext.h include/xulrunner/mozilla/dom/TabMessageUtils.h include/xulrunner/mozilla/dom/TabParent.h +include/xulrunner/mozilla/dom/TextDecoder.h +include/xulrunner/mozilla/dom/TextDecoderBinding.h +include/xulrunner/mozilla/dom/TextEncoder.h +include/xulrunner/mozilla/dom/TextEncoderBinding.h include/xulrunner/mozilla/dom/TypedArray.h include/xulrunner/mozilla/dom/UnionConversions.h include/xulrunner/mozilla/dom/UnionTypes.h include/xulrunner/mozilla/dom/WebGLRenderingContextBinding.h +include/xulrunner/mozilla/dom/WebSocketBinding.h include/xulrunner/mozilla/dom/XMLHttpRequestBinding.h include/xulrunner/mozilla/dom/XMLHttpRequestEventTargetBinding.h include/xulrunner/mozilla/dom/XMLHttpRequestUploadBinding.h include/xulrunner/mozilla/dom/alarm/AlarmHalService.h include/xulrunner/mozilla/dom/battery/Constants.h include/xulrunner/mozilla/dom/battery/Types.h +include/xulrunner/mozilla/dom/bluetooth/BluetoothCommon.h +include/xulrunner/mozilla/dom/bluetooth/ipc/BluetoothMessageUtils.h include/xulrunner/mozilla/dom/devicestorage/DeviceStorageRequestChild.h include/xulrunner/mozilla/dom/devicestorage/DeviceStorageRequestParent.h include/xulrunner/mozilla/dom/file/ArchiveEvent.h @@ -445,6 +501,8 @@ 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/TCPSocketChild.h +include/xulrunner/mozilla/dom/network/TCPSocketParent.h include/xulrunner/mozilla/dom/network/Types.h include/xulrunner/mozilla/dom/network/Utils.h include/xulrunner/mozilla/dom/power/PowerManagerService.h @@ -454,13 +512,16 @@ include/xulrunner/mozilla/dom/sms/SmsChild.h include/xulrunner/mozilla/dom/sms/SmsMessage.h include/xulrunner/mozilla/dom/sms/SmsParent.h include/xulrunner/mozilla/dom/sms/SmsRequest.h -include/xulrunner/mozilla/dom/sms/SmsRequestManager.h include/xulrunner/mozilla/dom/sms/SmsServicesFactory.h include/xulrunner/mozilla/dom/sms/Types.h +include/xulrunner/mozilla/dom/time/DateCacheCleaner.h +include/xulrunner/mozilla/dom/time/TimeChangeObserver.h +include/xulrunner/mozilla/dom/time/TimeService.h include/xulrunner/mozilla/dom/workers/Workers.h include/xulrunner/mozilla/dom/workers/bindings/DOMBindingBase.h include/xulrunner/mozilla/dom/workers/bindings/EventListenerManager.h include/xulrunner/mozilla/dom/workers/bindings/EventTarget.h +include/xulrunner/mozilla/dom/workers/bindings/FileReaderSync.h include/xulrunner/mozilla/dom/workers/bindings/WorkerFeature.h include/xulrunner/mozilla/dom/workers/bindings/XMLHttpRequest.h include/xulrunner/mozilla/dom/workers/bindings/XMLHttpRequestEventTarget.h @@ -478,7 +539,9 @@ include/xulrunner/mozilla/gfx/Matrix.h include/xulrunner/mozilla/gfx/PathHelpers.h include/xulrunner/mozilla/gfx/Point.h include/xulrunner/mozilla/gfx/Rect.h +include/xulrunner/mozilla/gfx/Scale.h include/xulrunner/mozilla/gfx/SharedDIB.h +include/xulrunner/mozilla/gfx/Tools.h include/xulrunner/mozilla/gfx/Types.h include/xulrunner/mozilla/gfx/UserData.h include/xulrunner/mozilla/ipc/AsyncChannel.h @@ -533,6 +596,7 @@ include/xulrunner/mozilla/layers/ShadowLayersChild.h include/xulrunner/mozilla/layers/ShadowLayersManager.h include/xulrunner/mozilla/layers/ShadowLayersParent.h include/xulrunner/mozilla/layers/SharedImageUtils.h +include/xulrunner/mozilla/layers/ShmemYCbCrImage.h include/xulrunner/mozilla/layout/FrameChildList.h include/xulrunner/mozilla/layout/RenderFrameChild.h include/xulrunner/mozilla/layout/RenderFrameParent.h @@ -622,9 +686,12 @@ include/xulrunner/nsAccessibilityService.h include/xulrunner/nsAgg.h include/xulrunner/nsAlgorithm.h include/xulrunner/nsAnimationManager.h +include/xulrunner/nsAnonymousTemporaryFile.h include/xulrunner/nsAppDirectoryServiceDefs.h include/xulrunner/nsAppShellCID.h +include/xulrunner/nsApplicationCacheService.h include/xulrunner/nsArenaMemoryStats.h +include/xulrunner/nsArray.h include/xulrunner/nsArrayEnumerator.h include/xulrunner/nsArrayUtils.h include/xulrunner/nsAsyncDOMEvent.h @@ -635,6 +702,7 @@ include/xulrunner/nsAtomicRefcnt.h include/xulrunner/nsAttrAndChildArray.h include/xulrunner/nsAttrName.h include/xulrunner/nsAttrValue.h +include/xulrunner/nsAttrValueInlines.h include/xulrunner/nsAudioAvailableEventManager.h include/xulrunner/nsAudioStream.h include/xulrunner/nsAutoJSValHolder.h @@ -645,6 +713,7 @@ include/xulrunner/nsBidi.h include/xulrunner/nsBidiPresUtils.h include/xulrunner/nsBidiUtils.h include/xulrunner/nsBindingManager.h +include/xulrunner/nsBlobProtocolHandler.h include/xulrunner/nsBoundingMetrics.h include/xulrunner/nsBuiltinDecoder.h include/xulrunner/nsBuiltinDecoderReader.h @@ -748,7 +817,9 @@ include/xulrunner/nsDirectoryServiceAtomList.h include/xulrunner/nsDirectoryServiceDefs.h include/xulrunner/nsDirectoryServiceUtils.h include/xulrunner/nsDisplayItemTypes.h +include/xulrunner/nsDisplayItemTypesList.h include/xulrunner/nsDisplayList.h +include/xulrunner/nsDisplayListInvalidation.h include/xulrunner/nsDocLoader.h include/xulrunner/nsDocShellCID.h include/xulrunner/nsDocShellLoadTypes.h @@ -784,6 +855,7 @@ include/xulrunner/nsFrameSelection.h include/xulrunner/nsFrameTraversal.h include/xulrunner/nsGTKToolkit.h include/xulrunner/nsGUIEvent.h +include/xulrunner/nsGZFileWriter.h include/xulrunner/nsGenericElement.h include/xulrunner/nsGenericHTMLElement.h include/xulrunner/nsGeoPosition.h @@ -899,6 +971,7 @@ include/xulrunner/nsIAsyncVerifyRedirectCallback.h include/xulrunner/nsIAtom.h include/xulrunner/nsIAtomService.h include/xulrunner/nsIAttribute.h +include/xulrunner/nsIAudioChannelAgent.h include/xulrunner/nsIAuthInformation.h include/xulrunner/nsIAuthModule.h include/xulrunner/nsIAuthPrompt.h @@ -961,6 +1034,7 @@ include/xulrunner/nsICertOverrideService.h include/xulrunner/nsICertPickDialogs.h include/xulrunner/nsICertTree.h include/xulrunner/nsICertificateDialogs.h +include/xulrunner/nsICertificatePrincipal.h include/xulrunner/nsIChannel.h include/xulrunner/nsIChannelEventSink.h include/xulrunner/nsIChannelPolicy.h @@ -1099,7 +1173,9 @@ include/xulrunner/nsIDOMDOMSettableTokenList.h include/xulrunner/nsIDOMDOMStringList.h include/xulrunner/nsIDOMDOMStringMap.h include/xulrunner/nsIDOMDOMTokenList.h +include/xulrunner/nsIDOMDataChannel.h include/xulrunner/nsIDOMDataContainerEvent.h +include/xulrunner/nsIDOMDataErrorEvent.h include/xulrunner/nsIDOMDataTransfer.h include/xulrunner/nsIDOMDesktopNotification.h include/xulrunner/nsIDOMDeviceLightEvent.h @@ -1223,7 +1299,6 @@ include/xulrunner/nsIDOMMediaStream.h include/xulrunner/nsIDOMMessageEvent.h include/xulrunner/nsIDOMMimeType.h include/xulrunner/nsIDOMMimeTypeArray.h -include/xulrunner/nsIDOMMobileConnection.h include/xulrunner/nsIDOMModalContentWindow.h include/xulrunner/nsIDOMMouseEvent.h include/xulrunner/nsIDOMMouseScrollEvent.h @@ -1233,7 +1308,6 @@ 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 include/xulrunner/nsIDOMNSEditableElement.h @@ -1250,6 +1324,7 @@ include/xulrunner/nsIDOMNavigatorGeolocation.h include/xulrunner/nsIDOMNavigatorNetwork.h include/xulrunner/nsIDOMNavigatorSms.h include/xulrunner/nsIDOMNavigatorSystemMessages.h +include/xulrunner/nsIDOMNavigatorTime.h include/xulrunner/nsIDOMNavigatorUserMedia.h include/xulrunner/nsIDOMNode.h include/xulrunner/nsIDOMNodeFilter.h @@ -1263,6 +1338,7 @@ include/xulrunner/nsIDOMPageTransitionEvent.h include/xulrunner/nsIDOMPaintRequest.h include/xulrunner/nsIDOMPaintRequestList.h include/xulrunner/nsIDOMParser.h +include/xulrunner/nsIDOMPermissionSettings.h include/xulrunner/nsIDOMPkcs11.h include/xulrunner/nsIDOMPlugin.h include/xulrunner/nsIDOMPluginArray.h @@ -1273,6 +1349,7 @@ include/xulrunner/nsIDOMProcessingInstruction.h include/xulrunner/nsIDOMProgressEvent.h include/xulrunner/nsIDOMPropertyNodeList.h include/xulrunner/nsIDOMRGBColor.h +include/xulrunner/nsIDOMRTCPeerConnection.h include/xulrunner/nsIDOMRange.h include/xulrunner/nsIDOMRect.h include/xulrunner/nsIDOMSVGAElement.h @@ -1383,6 +1460,7 @@ include/xulrunner/nsIDOMStyleSheetList.h include/xulrunner/nsIDOMTCPSocket.h include/xulrunner/nsIDOMText.h include/xulrunner/nsIDOMTimeEvent.h +include/xulrunner/nsIDOMTimeManager.h include/xulrunner/nsIDOMTimeRanges.h include/xulrunner/nsIDOMToString.h include/xulrunner/nsIDOMTouchEvent.h @@ -1469,9 +1547,7 @@ include/xulrunner/nsIEditor.h include/xulrunner/nsIEditorBoxObject.h include/xulrunner/nsIEditorDocShell.h include/xulrunner/nsIEditorIMESupport.h -include/xulrunner/nsIEditorLogging.h include/xulrunner/nsIEditorMailSupport.h -include/xulrunner/nsIEditorObserver.h include/xulrunner/nsIEditorSpellCheck.h include/xulrunner/nsIEditorStyleSheets.h include/xulrunner/nsIEffectiveTLDService.h @@ -1539,6 +1615,7 @@ include/xulrunner/nsIFrameUtil.h include/xulrunner/nsIGConfService.h include/xulrunner/nsIGIOService.h include/xulrunner/nsIGSettingsService.h +include/xulrunner/nsIGZFileWriter.h include/xulrunner/nsIGenKeypairInfoDlg.h include/xulrunner/nsIGeolocationProvider.h include/xulrunner/nsIGfxInfo.h @@ -1663,9 +1740,9 @@ include/xulrunner/nsIMemory.h include/xulrunner/nsIMemoryReporter.h include/xulrunner/nsIMenuBoxObject.h include/xulrunner/nsIMenuBuilder.h +include/xulrunner/nsIMessageLoop.h include/xulrunner/nsIMessageManager.h include/xulrunner/nsIMmsService.h -include/xulrunner/nsIMobileConnectionProvider.h include/xulrunner/nsIModule.h include/xulrunner/nsIMozBrowserFrame.h include/xulrunner/nsIMultiPartChannel.h @@ -1720,6 +1797,7 @@ include/xulrunner/nsIParserUtils.h include/xulrunner/nsIPercentHeightObserver.h include/xulrunner/nsIPermission.h include/xulrunner/nsIPermissionManager.h +include/xulrunner/nsIPermissionPromptService.h include/xulrunner/nsIPersistentProperties2.h include/xulrunner/nsIPhonetic.h include/xulrunner/nsIPipe.h @@ -1755,6 +1833,7 @@ include/xulrunner/nsIPrintStatusFeedback.h include/xulrunner/nsIPrintingPrompt.h include/xulrunner/nsIPrintingPromptService.h include/xulrunner/nsIPrivacyTransitionObserver.h +include/xulrunner/nsIPrivateBrowsingChannel.h include/xulrunner/nsIPrivateBrowsingService.h include/xulrunner/nsIPrivateTextEvent.h include/xulrunner/nsIPrivateTextRange.h @@ -1782,7 +1861,6 @@ include/xulrunner/nsIProtocolProxyService.h include/xulrunner/nsIProtocolProxyService2.h include/xulrunner/nsIProxiedChannel.h include/xulrunner/nsIProxiedProtocolHandler.h -include/xulrunner/nsIProxyAutoConfig.h include/xulrunner/nsIProxyInfo.h include/xulrunner/nsIQueryContentEventResult.h include/xulrunner/nsIRDFCompositeDataSource.h @@ -1810,6 +1888,7 @@ include/xulrunner/nsIRadioVisitor.h include/xulrunner/nsIRandomGenerator.h include/xulrunner/nsIReadConfig.h include/xulrunner/nsIRecentBadCertsService.h +include/xulrunner/nsIRecoveryService.h include/xulrunner/nsIRedirectChannelRegistrar.h include/xulrunner/nsIRedirectResultListener.h include/xulrunner/nsIReflowCallback.h @@ -1906,7 +1985,7 @@ include/xulrunner/nsISiteSpecificUserAgent.h include/xulrunner/nsISizeOf.h include/xulrunner/nsISliderListener.h include/xulrunner/nsISmsDatabaseService.h -include/xulrunner/nsISmsRequestManager.h +include/xulrunner/nsISmsRequest.h include/xulrunner/nsISmsService.h include/xulrunner/nsISocketProvider.h include/xulrunner/nsISocketProviderService.h @@ -1953,6 +2032,8 @@ include/xulrunner/nsISyncJPAKE.h include/xulrunner/nsISyncStreamListener.h include/xulrunner/nsISystemMessagesInternal.h include/xulrunner/nsISystemProxySettings.h +include/xulrunner/nsITCPSocketChild.h +include/xulrunner/nsITCPSocketParent.h include/xulrunner/nsITXTToHTMLConv.h include/xulrunner/nsITabChild.h include/xulrunner/nsITabParent.h @@ -1973,6 +2054,7 @@ include/xulrunner/nsIThread.h include/xulrunner/nsIThreadInternal.h include/xulrunner/nsIThreadManager.h include/xulrunner/nsIThreadPool.h +include/xulrunner/nsITimeService.h include/xulrunner/nsITimedChannel.h include/xulrunner/nsITimer.h include/xulrunner/nsITokenDialogs.h @@ -2060,7 +2142,6 @@ include/xulrunner/nsIWebProgress.h include/xulrunner/nsIWebProgressListener.h include/xulrunner/nsIWebProgressListener2.h include/xulrunner/nsIWebShellServices.h -include/xulrunner/nsIWebSocket.h include/xulrunner/nsIWebSocketChannel.h include/xulrunner/nsIWebSocketListener.h include/xulrunner/nsIWidget.h @@ -2122,9 +2203,11 @@ include/xulrunner/nsIZipWriter.h include/xulrunner/nsInterfaceHashtable.h include/xulrunner/nsInterfaceRequestorAgg.h include/xulrunner/nsJARURI.h +include/xulrunner/nsJSEnvironment.h include/xulrunner/nsJSON.h include/xulrunner/nsJSPrincipals.h include/xulrunner/nsJSProtocolHandler.h +include/xulrunner/nsJSUtils.h include/xulrunner/nsLWBrkCIID.h include/xulrunner/nsLayoutCID.h include/xulrunner/nsLayoutStatics.h @@ -2142,6 +2225,7 @@ include/xulrunner/nsMargin.h include/xulrunner/nsMathUtils.h include/xulrunner/nsMediaCache.h include/xulrunner/nsMediaDecoder.h +include/xulrunner/nsMediaSniffer.h include/xulrunner/nsMemory.h include/xulrunner/nsMimeTypes.h include/xulrunner/nsMultiplexInputStream.h @@ -2325,6 +2409,7 @@ include/xulrunner/nsURIHashKey.h include/xulrunner/nsURILoader.h include/xulrunner/nsURLHelper.h include/xulrunner/nsUTF8Utils.h +include/xulrunner/nsUnicharInputStream.h include/xulrunner/nsUnicharUtilCIID.h include/xulrunner/nsUnicharUtils.h include/xulrunner/nsUnicodeNormalizer.h @@ -2387,14 +2472,11 @@ include/xulrunner/sampler.h ${PLIST.sps}include/xulrunner/shared-libraries.h include/xulrunner/skia/Sk64.h include/xulrunner/skia/SkAdvancedTypefaceMetrics.h -include/xulrunner/skia/SkAutoKern.h include/xulrunner/skia/SkBitmap.h include/xulrunner/skia/SkBlitRow.h -include/xulrunner/skia/SkBlitter.h include/xulrunner/skia/SkBlurDrawLooper.h include/xulrunner/skia/SkBlurMaskFilter.h include/xulrunner/skia/SkBounder.h -include/xulrunner/skia/SkBuffer.h include/xulrunner/skia/SkCanvas.h include/xulrunner/skia/SkChunkAlloc.h include/xulrunner/skia/SkClipStack.h @@ -2402,31 +2484,28 @@ include/xulrunner/skia/SkColor.h include/xulrunner/skia/SkColorFilter.h include/xulrunner/skia/SkColorPriv.h include/xulrunner/skia/SkColorShader.h +include/xulrunner/skia/SkColorTable.h include/xulrunner/skia/SkComposeShader.h include/xulrunner/skia/SkDashPathEffect.h include/xulrunner/skia/SkData.h include/xulrunner/skia/SkDeferredCanvas.h include/xulrunner/skia/SkDeque.h -include/xulrunner/skia/SkDescriptor.h include/xulrunner/skia/SkDevice.h -include/xulrunner/skia/SkDeviceProfile.h include/xulrunner/skia/SkDither.h include/xulrunner/skia/SkDraw.h include/xulrunner/skia/SkDrawFilter.h include/xulrunner/skia/SkDrawLooper.h -include/xulrunner/skia/SkEdgeClipper.h include/xulrunner/skia/SkEmptyShader.h include/xulrunner/skia/SkEndian.h -include/xulrunner/skia/SkFDot6.h include/xulrunner/skia/SkFixed.h include/xulrunner/skia/SkFlattenable.h include/xulrunner/skia/SkFloatBits.h include/xulrunner/skia/SkFloatingPoint.h include/xulrunner/skia/SkFontHost.h include/xulrunner/skia/SkGeometry.h -include/xulrunner/skia/SkGlobals.h include/xulrunner/skia/SkGradientShader.h include/xulrunner/skia/SkGraphics.h +include/xulrunner/skia/SkInstCnt.h include/xulrunner/skia/SkLayerDrawLooper.h include/xulrunner/skia/SkLayerRasterizer.h include/xulrunner/skia/SkLineClipper.h @@ -2439,38 +2518,28 @@ include/xulrunner/skia/SkMatrix.h include/xulrunner/skia/SkMetaData.h include/xulrunner/skia/SkMorphologyImageFilter.h include/xulrunner/skia/SkOSFile.h -include/xulrunner/skia/SkOrderedReadBuffer.h -include/xulrunner/skia/SkOrderedWriteBuffer.h include/xulrunner/skia/SkPackBits.h include/xulrunner/skia/SkPaint.h include/xulrunner/skia/SkPath.h include/xulrunner/skia/SkPathEffect.h include/xulrunner/skia/SkPathMeasure.h -include/xulrunner/skia/SkPerspIter.h include/xulrunner/skia/SkPicture.h include/xulrunner/skia/SkPixelRef.h include/xulrunner/skia/SkPoint.h include/xulrunner/skia/SkPostConfig.h include/xulrunner/skia/SkPreConfig.h -include/xulrunner/skia/SkPtrRecorder.h include/xulrunner/skia/SkRandom.h include/xulrunner/skia/SkRasterizer.h include/xulrunner/skia/SkReader32.h include/xulrunner/skia/SkRect.h include/xulrunner/skia/SkRefCnt.h -include/xulrunner/skia/SkRefDict.h include/xulrunner/skia/SkRegion.h -include/xulrunner/skia/SkRelay.h include/xulrunner/skia/SkScalar.h include/xulrunner/skia/SkScalarCompare.h -include/xulrunner/skia/SkScalerContext.h -include/xulrunner/skia/SkScan.h include/xulrunner/skia/SkShader.h -include/xulrunner/skia/SkShape.h include/xulrunner/skia/SkSize.h include/xulrunner/skia/SkStream.h include/xulrunner/skia/SkString.h -include/xulrunner/skia/SkStroke.h include/xulrunner/skia/SkTDArray.h include/xulrunner/skia/SkTDStack.h include/xulrunner/skia/SkTDict.h @@ -2548,7 +2617,6 @@ lib/xulrunner/LICENSE lib/xulrunner/README.xulrunner lib/xulrunner/bin lib/xulrunner/chrome.manifest -lib/xulrunner/chrome/.mkdir.done lib/xulrunner/chrome/en-US.manifest lib/xulrunner/chrome/en-US/locale/en-US/alerts/notificationNames.properties lib/xulrunner/chrome/en-US/locale/en-US/autoconfig/autoconfig.properties @@ -2593,6 +2661,7 @@ lib/xulrunner/chrome/en-US/locale/en-US/global/customizeToolbar.dtd lib/xulrunner/chrome/en-US/locale/en-US/global/customizeToolbar.properties lib/xulrunner/chrome/en-US/locale/en-US/global/dateFormat.properties lib/xulrunner/chrome/en-US/locale/en-US/global/datetimepicker.dtd +lib/xulrunner/chrome/en-US/locale/en-US/global/devtools/debugger.properties lib/xulrunner/chrome/en-US/locale/en-US/global/dialog.properties lib/xulrunner/chrome/en-US/locale/en-US/global/dialogOverlay.dtd lib/xulrunner/chrome/en-US/locale/en-US/global/dom/dom.properties @@ -2644,6 +2713,7 @@ lib/xulrunner/chrome/en-US/locale/en-US/global/tree.dtd lib/xulrunner/chrome/en-US/locale/en-US/global/videocontrols.dtd lib/xulrunner/chrome/en-US/locale/en-US/global/viewSource.dtd lib/xulrunner/chrome/en-US/locale/en-US/global/viewSource.properties +lib/xulrunner/chrome/en-US/locale/en-US/global/webapps.properties lib/xulrunner/chrome/en-US/locale/en-US/global/wizard.dtd lib/xulrunner/chrome/en-US/locale/en-US/global/wizard.properties lib/xulrunner/chrome/en-US/locale/en-US/global/xbl.properties @@ -2770,6 +2840,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/accessibility/content-script.js 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 @@ -2834,10 +2905,13 @@ lib/xulrunner/chrome/toolkit/content/global/customizeCharset.xul lib/xulrunner/chrome/toolkit/content/global/customizeToolbar.css lib/xulrunner/chrome/toolkit/content/global/customizeToolbar.js lib/xulrunner/chrome/toolkit/content/global/customizeToolbar.xul +lib/xulrunner/chrome/toolkit/content/global/devicestorage.properties lib/xulrunner/chrome/toolkit/content/global/devtools/dbg-browser-actors.js +lib/xulrunner/chrome/toolkit/content/global/devtools/dbg-profiler-actors.js lib/xulrunner/chrome/toolkit/content/global/devtools/dbg-script-actors.js lib/xulrunner/chrome/toolkit/content/global/devtools/dbg-server.js lib/xulrunner/chrome/toolkit/content/global/devtools/dbg-transport.js +lib/xulrunner/chrome/toolkit/content/global/devtools/dbg-webconsole-actors.js lib/xulrunner/chrome/toolkit/content/global/dialogOverlay.js lib/xulrunner/chrome/toolkit/content/global/dialogOverlay.xul lib/xulrunner/chrome/toolkit/content/global/directionDetector.html @@ -2992,8 +3066,6 @@ lib/xulrunner/chrome/toolkit/res/quirk.css lib/xulrunner/chrome/toolkit/res/ua.css lib/xulrunner/chrome/toolkit/res/viewsource.css lib/xulrunner/chrome/toolkit/skin/classic/global/Filepicker.png -lib/xulrunner/chrome/toolkit/skin/classic/global/TopLevelImageDocument.css -lib/xulrunner/chrome/toolkit/skin/classic/global/TopLevelVideoDocument.css lib/xulrunner/chrome/toolkit/skin/classic/global/about.css lib/xulrunner/chrome/toolkit/skin/classic/global/aboutCache.css lib/xulrunner/chrome/toolkit/skin/classic/global/aboutCacheEntry.css @@ -3106,9 +3178,13 @@ lib/xulrunner/chrome/toolkit/skin/classic/global/inContentUI.css lib/xulrunner/chrome/toolkit/skin/classic/global/inContentUI/background-texture.png lib/xulrunner/chrome/toolkit/skin/classic/global/linkTree.css lib/xulrunner/chrome/toolkit/skin/classic/global/listbox.css +lib/xulrunner/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css +lib/xulrunner/chrome/toolkit/skin/classic/global/media/TopLevelVideoDocument.css lib/xulrunner/chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png lib/xulrunner/chrome/toolkit/skin/classic/global/media/error.png lib/xulrunner/chrome/toolkit/skin/classic/global/media/fullscreenButton.png +lib/xulrunner/chrome/toolkit/skin/classic/global/media/imagedoc-darknoise.png +lib/xulrunner/chrome/toolkit/skin/classic/global/media/imagedoc-lightnoise.png lib/xulrunner/chrome/toolkit/skin/classic/global/media/muteButton.png lib/xulrunner/chrome/toolkit/skin/classic/global/media/noAudio.png lib/xulrunner/chrome/toolkit/skin/classic/global/media/pauseButton.png @@ -3242,7 +3318,6 @@ 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 @@ -3268,6 +3343,12 @@ lib/xulrunner/components/GPSDGeolocationProvider.manifest lib/xulrunner/components/Identity.manifest lib/xulrunner/components/NetworkGeolocationProvider.js lib/xulrunner/components/NetworkGeolocationProvider.manifest +lib/xulrunner/components/PeerConnection.js +lib/xulrunner/components/PeerConnection.manifest +lib/xulrunner/components/PermissionPromptService.js +lib/xulrunner/components/PermissionPromptService.manifest +lib/xulrunner/components/PermissionSettings.js +lib/xulrunner/components/PermissionSettings.manifest lib/xulrunner/components/PlacesCategoriesStarter.js lib/xulrunner/components/SettingsManager.js lib/xulrunner/components/SettingsManager.manifest @@ -3280,6 +3361,7 @@ lib/xulrunner/components/SystemMessageManager.js lib/xulrunner/components/SystemMessageManager.manifest lib/xulrunner/components/TCPSocket.js lib/xulrunner/components/TCPSocket.manifest +lib/xulrunner/components/TCPSocketParentIntermediary.js lib/xulrunner/components/TelemetryPing.js lib/xulrunner/components/TelemetryPing.manifest lib/xulrunner/components/Webapps.js @@ -3336,8 +3418,6 @@ lib/xulrunner/components/nsPlacesAutoComplete.manifest lib/xulrunner/components/nsPlacesExpiration.js lib/xulrunner/components/nsPrompter.js lib/xulrunner/components/nsPrompter.manifest -lib/xulrunner/components/nsProxyAutoConfig.js -lib/xulrunner/components/nsProxyAutoConfig.manifest lib/xulrunner/components/nsSearchService.js lib/xulrunner/components/nsSearchSuggestions.js lib/xulrunner/components/nsTaggingService.js @@ -3368,7 +3448,6 @@ 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 @@ -3426,7 +3505,6 @@ 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 @@ -3434,6 +3512,8 @@ lib/xulrunner/modules/AddonRepository.jsm lib/xulrunner/modules/AddonUpdateChecker.jsm lib/xulrunner/modules/AlarmDB.jsm lib/xulrunner/modules/AlarmService.jsm +lib/xulrunner/modules/AppsServiceChild.jsm +lib/xulrunner/modules/AppsUtils.jsm lib/xulrunner/modules/BookmarkHTMLUtils.jsm lib/xulrunner/modules/BrowserElementPromptService.jsm lib/xulrunner/modules/CSPUtils.jsm @@ -3448,31 +3528,36 @@ lib/xulrunner/modules/ContactDB.jsm lib/xulrunner/modules/ContactService.jsm lib/xulrunner/modules/DOMIdentity.jsm lib/xulrunner/modules/DOMRequestHelper.jsm +lib/xulrunner/modules/DeferredTask.jsm lib/xulrunner/modules/Dict.jsm lib/xulrunner/modules/DownloadLastDir.jsm lib/xulrunner/modules/DownloadPaths.jsm lib/xulrunner/modules/DownloadUtils.jsm lib/xulrunner/modules/FileUtils.jsm +lib/xulrunner/modules/ForgetAboutSite.jsm lib/xulrunner/modules/FrameWorker.jsm lib/xulrunner/modules/Geometry.jsm lib/xulrunner/modules/ISO8601DateUtils.jsm -lib/xulrunner/modules/Identity.jsm -lib/xulrunner/modules/IdentityProvider.jsm -lib/xulrunner/modules/IdentityStore.jsm lib/xulrunner/modules/IndexedDBHelper.jsm lib/xulrunner/modules/InlineSpellChecker.jsm lib/xulrunner/modules/LightweightThemeConsumer.jsm +lib/xulrunner/modules/LightweightThemeImageOptimizer.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/OfflineCacheInstaller.jsm lib/xulrunner/modules/PageMenu.jsm lib/xulrunner/modules/PerfMeasurement.jsm lib/xulrunner/modules/PermissionPromptHelper.jsm +lib/xulrunner/modules/PermissionSettings.jsm +lib/xulrunner/modules/PermissionsInstaller.jsm +lib/xulrunner/modules/PhoneNumber.jsm +lib/xulrunner/modules/PhoneNumberMetaData.jsm +lib/xulrunner/modules/PhoneNumberUtils.jsm lib/xulrunner/modules/PlacesDBUtils.jsm lib/xulrunner/modules/PlacesUtils.jsm lib/xulrunner/modules/PluginProvider.jsm @@ -3481,16 +3566,17 @@ lib/xulrunner/modules/PopupNotifications.jsm lib/xulrunner/modules/PrivateBrowsingUtils.jsm ${PLIST.sps}lib/xulrunner/modules/Profiler.jsm lib/xulrunner/modules/PropertyListUtils.jsm -lib/xulrunner/modules/RelyingParty.jsm -lib/xulrunner/modules/Sandbox.jsm lib/xulrunner/modules/Services.jsm lib/xulrunner/modules/SettingsChangeNotifier.jsm lib/xulrunner/modules/SettingsDB.jsm lib/xulrunner/modules/SettingsQueue.jsm lib/xulrunner/modules/SocialService.jsm lib/xulrunner/modules/SpellCheckDictionaryBootstrap.js +lib/xulrunner/modules/SystemMessagePermissionsChecker.jsm lib/xulrunner/modules/Task.jsm lib/xulrunner/modules/TelemetryStopwatch.jsm +lib/xulrunner/modules/Troubleshoot.jsm +lib/xulrunner/modules/UpdateChannel.jsm lib/xulrunner/modules/UserAgentOverrides.jsm lib/xulrunner/modules/WebappOSUtils.jsm lib/xulrunner/modules/Webapps.jsm @@ -3501,31 +3587,40 @@ lib/xulrunner/modules/XPCOMUtils.jsm lib/xulrunner/modules/XPIProvider.jsm lib/xulrunner/modules/XPIProviderUtils.js lib/xulrunner/modules/accessibility/AccessFu.jsm +lib/xulrunner/modules/accessibility/EventManager.jsm lib/xulrunner/modules/accessibility/Presenters.jsm lib/xulrunner/modules/accessibility/TouchAdapter.jsm +lib/xulrunner/modules/accessibility/TraversalRules.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/NetworkHelper.jsm lib/xulrunner/modules/devtools/Require.jsm lib/xulrunner/modules/devtools/SourceMap.jsm +lib/xulrunner/modules/devtools/WebConsoleClient.jsm +lib/xulrunner/modules/devtools/WebConsoleUtils.jsm +lib/xulrunner/modules/devtools/_Promise.jsm lib/xulrunner/modules/devtools/dbg-client.jsm lib/xulrunner/modules/devtools/dbg-server.jsm lib/xulrunner/modules/identity/Identity.jsm lib/xulrunner/modules/identity/IdentityProvider.jsm lib/xulrunner/modules/identity/IdentityStore.jsm +lib/xulrunner/modules/identity/IdentityUtils.jsm lib/xulrunner/modules/identity/LogUtils.jsm +lib/xulrunner/modules/identity/MinimalIdentity.jsm lib/xulrunner/modules/identity/RelyingParty.jsm lib/xulrunner/modules/identity/Sandbox.jsm lib/xulrunner/modules/identity/jwcrypto.jsm lib/xulrunner/modules/jsdebugger.jsm -lib/xulrunner/modules/jwcrypto.jsm +lib/xulrunner/modules/mcc_iso3166_table.jsm lib/xulrunner/modules/nsFormAutoCompleteResult.jsm lib/xulrunner/modules/osfile.jsm +lib/xulrunner/modules/osfile/osfile_async_front.jsm +lib/xulrunner/modules/osfile/osfile_async_worker.js lib/xulrunner/modules/osfile/osfile_shared_allthreads.jsm lib/xulrunner/modules/osfile/osfile_shared_front.jsm lib/xulrunner/modules/osfile/osfile_unix_allthreads.jsm @@ -3609,7 +3704,6 @@ lib/xulrunner/updater lib/xulrunner/xpcom-config.h lib/xulrunner/xulrunner lib/xulrunner/xulrunner-stub -share/idl/xulrunner/.mkdir.done share/idl/xulrunner/IJSDebugger.idl share/idl/xulrunner/amIInstallTrigger.idl share/idl/xulrunner/amIWebInstallListener.idl @@ -3635,6 +3729,7 @@ share/idl/xulrunner/inISearchObserver.idl share/idl/xulrunner/inISearchProcess.idl share/idl/xulrunner/jsdIDebuggerService.idl share/idl/xulrunner/mozIApplication.idl +share/idl/xulrunner/mozIApplicationClearPrivateDataParams.idl share/idl/xulrunner/mozIAsyncFavicons.idl share/idl/xulrunner/mozIAsyncHistory.idl share/idl/xulrunner/mozIAsyncLivemarks.idl @@ -3719,6 +3814,7 @@ share/idl/xulrunner/nsIAsyncStreamCopier.idl share/idl/xulrunner/nsIAsyncVerifyRedirectCallback.idl share/idl/xulrunner/nsIAtom.idl share/idl/xulrunner/nsIAtomService.idl +share/idl/xulrunner/nsIAudioChannelAgent.idl share/idl/xulrunner/nsIAuthInformation.idl share/idl/xulrunner/nsIAuthModule.idl share/idl/xulrunner/nsIAuthPrompt.idl @@ -3772,6 +3868,7 @@ share/idl/xulrunner/nsICertOverrideService.idl share/idl/xulrunner/nsICertPickDialogs.idl share/idl/xulrunner/nsICertTree.idl share/idl/xulrunner/nsICertificateDialogs.idl +share/idl/xulrunner/nsICertificatePrincipal.idl share/idl/xulrunner/nsIChannel.idl share/idl/xulrunner/nsIChannelEventSink.idl share/idl/xulrunner/nsIChannelPolicy.idl @@ -3899,7 +3996,9 @@ share/idl/xulrunner/nsIDOMDOMSettableTokenList.idl share/idl/xulrunner/nsIDOMDOMStringList.idl share/idl/xulrunner/nsIDOMDOMStringMap.idl share/idl/xulrunner/nsIDOMDOMTokenList.idl +share/idl/xulrunner/nsIDOMDataChannel.idl share/idl/xulrunner/nsIDOMDataContainerEvent.idl +share/idl/xulrunner/nsIDOMDataErrorEvent.idl share/idl/xulrunner/nsIDOMDataTransfer.idl share/idl/xulrunner/nsIDOMDesktopNotification.idl share/idl/xulrunner/nsIDOMDeviceLightEvent.idl @@ -4023,7 +4122,6 @@ share/idl/xulrunner/nsIDOMMediaStream.idl share/idl/xulrunner/nsIDOMMessageEvent.idl share/idl/xulrunner/nsIDOMMimeType.idl share/idl/xulrunner/nsIDOMMimeTypeArray.idl -share/idl/xulrunner/nsIDOMMobileConnection.idl share/idl/xulrunner/nsIDOMModalContentWindow.idl share/idl/xulrunner/nsIDOMMouseEvent.idl share/idl/xulrunner/nsIDOMMouseScrollEvent.idl @@ -4033,7 +4131,6 @@ 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 share/idl/xulrunner/nsIDOMNSEditableElement.idl @@ -4050,6 +4147,7 @@ share/idl/xulrunner/nsIDOMNavigatorGeolocation.idl share/idl/xulrunner/nsIDOMNavigatorNetwork.idl share/idl/xulrunner/nsIDOMNavigatorSms.idl share/idl/xulrunner/nsIDOMNavigatorSystemMessages.idl +share/idl/xulrunner/nsIDOMNavigatorTime.idl share/idl/xulrunner/nsIDOMNavigatorUserMedia.idl share/idl/xulrunner/nsIDOMNode.idl share/idl/xulrunner/nsIDOMNodeFilter.idl @@ -4063,6 +4161,7 @@ share/idl/xulrunner/nsIDOMPageTransitionEvent.idl share/idl/xulrunner/nsIDOMPaintRequest.idl share/idl/xulrunner/nsIDOMPaintRequestList.idl share/idl/xulrunner/nsIDOMParser.idl +share/idl/xulrunner/nsIDOMPermissionSettings.idl share/idl/xulrunner/nsIDOMPkcs11.idl share/idl/xulrunner/nsIDOMPlugin.idl share/idl/xulrunner/nsIDOMPluginArray.idl @@ -4073,6 +4172,7 @@ share/idl/xulrunner/nsIDOMProcessingInstruction.idl share/idl/xulrunner/nsIDOMProgressEvent.idl share/idl/xulrunner/nsIDOMPropertyNodeList.idl share/idl/xulrunner/nsIDOMRGBColor.idl +share/idl/xulrunner/nsIDOMRTCPeerConnection.idl share/idl/xulrunner/nsIDOMRange.idl share/idl/xulrunner/nsIDOMRect.idl share/idl/xulrunner/nsIDOMSVGAElement.idl @@ -4182,6 +4282,7 @@ share/idl/xulrunner/nsIDOMStyleSheetList.idl share/idl/xulrunner/nsIDOMTCPSocket.idl share/idl/xulrunner/nsIDOMText.idl share/idl/xulrunner/nsIDOMTimeEvent.idl +share/idl/xulrunner/nsIDOMTimeManager.idl share/idl/xulrunner/nsIDOMTimeRanges.idl share/idl/xulrunner/nsIDOMToString.idl share/idl/xulrunner/nsIDOMTouchEvent.idl @@ -4262,9 +4363,7 @@ share/idl/xulrunner/nsIEditor.idl share/idl/xulrunner/nsIEditorBoxObject.idl share/idl/xulrunner/nsIEditorDocShell.idl share/idl/xulrunner/nsIEditorIMESupport.idl -share/idl/xulrunner/nsIEditorLogging.idl share/idl/xulrunner/nsIEditorMailSupport.idl -share/idl/xulrunner/nsIEditorObserver.idl share/idl/xulrunner/nsIEditorSpellCheck.idl share/idl/xulrunner/nsIEditorStyleSheets.idl share/idl/xulrunner/nsIEffectiveTLDService.idl @@ -4322,6 +4421,7 @@ share/idl/xulrunner/nsIFrameRequestCallback.idl share/idl/xulrunner/nsIGConfService.idl share/idl/xulrunner/nsIGIOService.idl share/idl/xulrunner/nsIGSettingsService.idl +share/idl/xulrunner/nsIGZFileWriter.idl share/idl/xulrunner/nsIGenKeypairInfoDlg.idl share/idl/xulrunner/nsIGeolocationProvider.idl share/idl/xulrunner/nsIGfxInfo.idl @@ -4426,9 +4526,9 @@ share/idl/xulrunner/nsIMemory.idl share/idl/xulrunner/nsIMemoryReporter.idl share/idl/xulrunner/nsIMenuBoxObject.idl share/idl/xulrunner/nsIMenuBuilder.idl +share/idl/xulrunner/nsIMessageLoop.idl share/idl/xulrunner/nsIMessageManager.idl share/idl/xulrunner/nsIMmsService.idl -share/idl/xulrunner/nsIMobileConnectionProvider.idl share/idl/xulrunner/nsIModule.idl share/idl/xulrunner/nsIMozBrowserFrame.idl share/idl/xulrunner/nsIMultiPartChannel.idl @@ -4469,6 +4569,7 @@ share/idl/xulrunner/nsIParentalControlsService.idl share/idl/xulrunner/nsIParserUtils.idl share/idl/xulrunner/nsIPermission.idl share/idl/xulrunner/nsIPermissionManager.idl +share/idl/xulrunner/nsIPermissionPromptService.idl share/idl/xulrunner/nsIPersistentProperties2.idl share/idl/xulrunner/nsIPhonetic.idl share/idl/xulrunner/nsIPipe.idl @@ -4500,6 +4601,7 @@ share/idl/xulrunner/nsIPrintStatusFeedback.idl share/idl/xulrunner/nsIPrintingPrompt.idl share/idl/xulrunner/nsIPrintingPromptService.idl share/idl/xulrunner/nsIPrivacyTransitionObserver.idl +share/idl/xulrunner/nsIPrivateBrowsingChannel.idl share/idl/xulrunner/nsIPrivateBrowsingService.idl share/idl/xulrunner/nsIProcess.idl share/idl/xulrunner/nsIProfile.idl @@ -4525,7 +4627,6 @@ share/idl/xulrunner/nsIProtocolProxyService.idl share/idl/xulrunner/nsIProtocolProxyService2.idl share/idl/xulrunner/nsIProxiedChannel.idl share/idl/xulrunner/nsIProxiedProtocolHandler.idl -share/idl/xulrunner/nsIProxyAutoConfig.idl share/idl/xulrunner/nsIProxyInfo.idl share/idl/xulrunner/nsIQueryContentEventResult.idl share/idl/xulrunner/nsIRDFCompositeDataSource.idl @@ -4550,6 +4651,7 @@ share/idl/xulrunner/nsIRDFXMLSource.idl share/idl/xulrunner/nsIRandomGenerator.idl share/idl/xulrunner/nsIReadConfig.idl share/idl/xulrunner/nsIRecentBadCertsService.idl +share/idl/xulrunner/nsIRecoveryService.idl share/idl/xulrunner/nsIRedirectChannelRegistrar.idl share/idl/xulrunner/nsIRedirectResultListener.idl share/idl/xulrunner/nsIRefreshURI.idl @@ -4627,7 +4729,7 @@ 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 +share/idl/xulrunner/nsISmsRequest.idl share/idl/xulrunner/nsISmsService.idl share/idl/xulrunner/nsISocketProvider.idl share/idl/xulrunner/nsISocketProviderService.idl @@ -4663,6 +4765,8 @@ share/idl/xulrunner/nsISyncJPAKE.idl share/idl/xulrunner/nsISyncStreamListener.idl share/idl/xulrunner/nsISystemMessagesInternal.idl share/idl/xulrunner/nsISystemProxySettings.idl +share/idl/xulrunner/nsITCPSocketChild.idl +share/idl/xulrunner/nsITCPSocketParent.idl share/idl/xulrunner/nsITXTToHTMLConv.idl share/idl/xulrunner/nsITabChild.idl share/idl/xulrunner/nsITabParent.idl @@ -4676,6 +4780,7 @@ share/idl/xulrunner/nsIThread.idl share/idl/xulrunner/nsIThreadInternal.idl share/idl/xulrunner/nsIThreadManager.idl share/idl/xulrunner/nsIThreadPool.idl +share/idl/xulrunner/nsITimeService.idl share/idl/xulrunner/nsITimedChannel.idl share/idl/xulrunner/nsITimer.idl share/idl/xulrunner/nsITokenDialogs.idl @@ -4754,7 +4859,6 @@ share/idl/xulrunner/nsIWebPageDescriptor.idl share/idl/xulrunner/nsIWebProgress.idl share/idl/xulrunner/nsIWebProgressListener.idl share/idl/xulrunner/nsIWebProgressListener2.idl -share/idl/xulrunner/nsIWebSocket.idl share/idl/xulrunner/nsIWebSocketChannel.idl share/idl/xulrunner/nsIWebSocketListener.idl share/idl/xulrunner/nsIWifiEventInits.idl diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk index d416a14307f..acfa45116ae 100644 --- a/devel/xulrunner/dist.mk +++ b/devel/xulrunner/dist.mk @@ -1,17 +1,17 @@ -# $NetBSD: dist.mk,v 1.39 2012/12/05 11:47:14 ryoon Exp $ +# $NetBSD: dist.mk,v 1.40 2013/01/10 15:01:30 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= 17.0.1 -MOZ_BRANCH_MINOR= esr -MASTER_SITES= ${MASTER_SITE_MOZILLA_ESR:=firefox/releases/${FIREFOX_VER}/source/} \ +MOZ_BRANCH= 18.0 +MOZ_BRANCH_MINOR= +MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} \ ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.bz2 DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches -WRKSRC= ${WRKDIR}/mozilla-esr17 +WRKSRC= ${WRKDIR}/mozilla-release diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index 3486edbcf55..5ffdc90609d 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,116 +1,78 @@ -$NetBSD: distinfo,v 1.89 2013/01/05 08:02:16 sbd Exp $ +$NetBSD: distinfo,v 1.90 2013/01/10 15:01:30 ryoon Exp $ -SHA1 (firefox-17.0.1esr.source.tar.bz2) = 06373c132ca07a6e2dbb5fe1a2552519ba91ee37 -RMD160 (firefox-17.0.1esr.source.tar.bz2) = a85fc33defda9c514f46623672d61358397e58f1 -Size (firefox-17.0.1esr.source.tar.bz2) = 90861856 bytes -SHA1 (patch-aa) = a8422401e1908e4564afac7e017bf0643f7ac911 -SHA1 (patch-ab) = b0d7975a291c63e07773e13b023f71e88c883128 -SHA1 (patch-ac) = 18640ddf00b7da9276fd67d95bd6f1b191a99d4f -SHA1 (patch-ad) = cf84430cb1d9c22caf6beaa89288f90577ae6352 -SHA1 (patch-ae) = 2d1ffba3f41564d672d05968ff09b188c904fd73 -SHA1 (patch-af) = 3dc276155f456a66ce0db9d1a0427d8f11cb74aa -SHA1 (patch-ag) = c236c83c7b6a64c19c01010d19cad0120250047c -SHA1 (patch-ai) = ec2a8bce48ec8a27066667d367cf1bac4874462b -SHA1 (patch-aj) = 25008e1761306f90a31b4e2bff4dc52b2d8167de -SHA1 (patch-ak) = 7cebf3e58ad14598fbe98c3d730c8a548c0bda1e -SHA1 (patch-al) = 140f77112c463df90fe0dcd4173c5d6945395d4f -SHA1 (patch-am) = edf385051147a8d255a6c0737f574fa353b53d38 -SHA1 (patch-an) = a6e6072403a9d3295ec861275abd4587a8bca97d -SHA1 (patch-ao) = 1f0791171392922e1a6a19c0a06c1e2a9b98e030 -SHA1 (patch-as) = c8e3aa309ae5115a8f4c17d477674f93afead538 -SHA1 (patch-at) = bd72ea66e1e4baed7f16d81ed8668b5f549ebfa3 -SHA1 (patch-au) = 6ee00994f01a1d63635d92a2df7b306ff5c6ad2a -SHA1 (patch-av) = 8b79660aeb6a7d80daae01dff410e343803aa9d0 -SHA1 (patch-aw) = 574722c44e9a961f92b35e797def541fbd8fddf5 -SHA1 (patch-ax) = d3d0a10222c7d826d74651153e65a10800dc1b8e -SHA1 (patch-ay) = 1e554e23ea357204e98c7f7cdf52ea38e6d9be6a -SHA1 (patch-az) = 65fbb56de12fe648cb731ee75b0d05090c03a78f -SHA1 (patch-ba) = 6a5ae4c5251aea60650c3a7dff63076062c86dd3 -SHA1 (patch-bd) = c8ed2110c8b699d6880723dccf62e6976edfa65e -SHA1 (patch-bf) = 7d18ec3cad441174a71770e7fa22b1cd2029d55b -SHA1 (patch-bg) = a629ee2d31aefb366ed50a1e7bd5dba51a39dc68 -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-content_media_nsAudioStream.cpp) = 75c9fc45d464ee332271142c3e29b826b6254d49 -SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 66d023227b46582d30961cfac15506b9f29c23de -SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = cba2ea71973b3717b29052e131eb278cec972ebd -SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__head.h) = a50b21dc02ee5ae2b053ba574b592679350396ad -SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__name.h) = a13668dbb5f1b6099b1701291f28b2b272b35353 -SHA1 (patch-gfx_skia_src_sfnt_SkSFNTHeader.h) = c3f6c6d11201c0fae4e3978a370f48eefbc09370 -SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 775c13ca6a77b3f39f23e15fbbcf4b1cae4e9478 -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) = c00b594a40c4222261a0ad4f7ddbc804028aec16 -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__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) = e4560021d85abf96182b8e0c0a5a52e1213fdb31 -SHA1 (patch-ipc_chromium_src_base_process__util.h) = f0e705d9e7951d12225ad132f462527651d3b1be -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 -SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = 2b176b9bc689cec41542aa00f5201e27ca694594 -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) = 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_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-mf) = c871b1164d046ea94413ef743f84be67e739f595 -SHA1 (patch-mg) = 22dde266ee9d46d8de574103d1cc7035092e1b0a -SHA1 (patch-mh) = 8c56d7467e90944be186300386b6a5106e087ac7 -SHA1 (patch-mi) = 56bf4b5900eef022e9959e9287dadd479a725ed6 -SHA1 (patch-mj) = a29a3b2189103526d0cc040459d6f0b11b77f837 -SHA1 (patch-mk) = d9f0663d3d2762963f4c018a028eb5346106edb8 -SHA1 (patch-ml) = 71c4eb8822755dd17cd4add11687d8cf52a12f6f -SHA1 (patch-mm) = 2ba1f9bd6836141d819abf046c4b0b3431d777f9 -SHA1 (patch-mn) = 621eeb1c76e52b61f8c8b11e6708131900fd5df7 -SHA1 (patch-mp) = 2dc3ae213ce41b5c68105b8d90ef1ce81f0029bc -SHA1 (patch-netwerk_protocol_http_HttpChannelParent.cpp) = bf2e996bcc652cca29ca84d9c371b42627a512a9 -SHA1 (patch-pa) = 9915705356618a279157faa0b717fa723fb3f9e7 -SHA1 (patch-pb) = 071ab20321db75dfa42b904da591a36d7717e175 -SHA1 (patch-pc) = 4adf1ca58e0cda1e04916f90b3539b1ab5311915 -SHA1 (patch-pd) = c6b261264770c8a5eda31690b37f7eb992333f2a -SHA1 (patch-pg) = a89cb4b92f974d32d4a309a4628f32aff306de71 -SHA1 (patch-rc) = 13b0253d166cac6b4b1e7efaba006e37015cbbdb -SHA1 (patch-storage_src_Makefile.in) = 3f9a4bc71a6b64df819bbce6dbae18705d2183ac -SHA1 (patch-toolkit_components_osfile_osfileutils.cpp) = 08935fcd03e3047317df3fe115596383b008c2e9 -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) = c0a1860c4f566e3a8a21e1e813c4812970bc4d3d -SHA1 (patch-xf) = 507fe6d488c75c754177eb6aead27846512fda1f -SHA1 (patch-xg) = be3d4307a239e5bc8fbadde53a46a4de3faa4bb4 -SHA1 (patch-xj) = 6c8767ea4b39431ca82807f31f234f2cc61d832b -SHA1 (patch-xk) = cc196485c4e61cf655445910ee069352e3174756 -SHA1 (patch-xl) = bb190eab6e68508e10da5d454b8dcbaebca4a3b0 -SHA1 (patch-xm) = aab7aa76909b520b9c1fdc5a27c4ec440e060cce -SHA1 (patch-xn) = 27ca333ce018a5f72278461a55d141c063ac98ca -SHA1 (patch-xo) = 3d875dad673a47b2059b8eea9f41fe9e370295d5 -SHA1 (patch-xpcom_Makefile.in) = c44608dc176900c3ce49fb7059e42e404a7c6df3 -SHA1 (patch-xpcom_ds_TimeStamp.h) = 99a590ea3cf6ada0c6e8781f5b39bff46a6990b9 -SHA1 (patch-xpcom_idl-parser_Makefile.in) = 0382a7ab00c2e7245f5ddbbe5a50036a8ae418ef -SHA1 (patch-xpcom_typelib_xpidl_Makefile.in) = 4821d564e467494f65e70bb9ecec7cac2754ca0c +SHA1 (firefox-18.0.source.tar.bz2) = 3356562e69d699e5901df5a4da4e2e59dd1e7f57 +RMD160 (firefox-18.0.source.tar.bz2) = 572f473a8779d56a41b6deb7725b33d42d01bb83 +Size (firefox-18.0.source.tar.bz2) = 96948716 bytes +SHA1 (patch-aa) = 115ed7c263cbf213d608761ae1f5b14a3b10df90 +SHA1 (patch-ab) = b60129618bb0945b65636f99980bdc026ec16fd9 +SHA1 (patch-ac) = 609a094d01878da0bdfb008a0cb30b96bdb4c6ce +SHA1 (patch-ae) = adbf406cf3158ff2ecb847673d9d91edb200f034 +SHA1 (patch-ag) = 3e6f3e2e9d0c7c498fbc39eabae798d1a7f8fb12 +SHA1 (patch-ai) = d36a7af304bb5b63c7af4d82c97a30eaf9447123 +SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be +SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2 +SHA1 (patch-am) = c5aa36638b666d99d4510f345802de259579e884 +SHA1 (patch-an) = 4c8ca17d259f56863d6066f1e3de0d81fefdcd6c +SHA1 (patch-ao) = 178ce783f329e945f3437a927c8b8b97dce659be +SHA1 (patch-as) = 1cd7a9c7e1cf7603f2d72111f3abc9d3747a9c32 +SHA1 (patch-at) = c5cb543ab423657d546559de0603356c9bc2f2f3 +SHA1 (patch-au) = d577fc9a0091915e36d67a6ad82f0e7bfc107e7b +SHA1 (patch-av) = 20dcf216808667d71e527a6126b1a9b76130a13b +SHA1 (patch-aw) = 237be5fa18846b51b67ef2c2ea5f4fb427c529aa +SHA1 (patch-ax) = f5cf522e27651fb65b9c5e9a8f855f5be85d3c49 +SHA1 (patch-ay) = 70c68275b6dc41e66fcf8330e9ebcc4743363926 +SHA1 (patch-az) = 2012a7fef2eac59f48ff21fea0e205e89b313e46 +SHA1 (patch-ba) = 1692053c1b0e65dd38bcf37cc1a80390cce081eb +SHA1 (patch-bd) = 1a24cb9e4dc312725d0a6ffdf202b6f3e98d17fb +SHA1 (patch-bf) = a965a69f9441fb4cd2c158a317dbae0156b2e8a5 +SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d +SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85 +SHA1 (patch-build_autoconf_nss.m4) = 4731f46a41f6d4ff31a6da07c9badb328a0f676f +SHA1 (patch-config_baseconfig.mk) = 4f8e966e5e9684c165929d02f82099fb4befcc75 +SHA1 (patch-config_system-headers) = efd98efa4c141f03d73b1b0afa5437a19987805c +SHA1 (patch-dom_system_OSFileConstants.cpp) = 692f3c538311fdae777ada67fc1362513c06bc10 +SHA1 (patch-gfx_skia_Makefile.in) = ddc7e4a375f4cfd7dd76c5b37835bbcd3ad13cf1 +SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__head.h) = 493fced792610ea1ce5ab6b1e043ef36b33f8279 +SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__name.h) = 61a6611b3dd08f5bd56681244eefbfa3f209f6a1 +SHA1 (patch-gfx_skia_src_sfnt_SkSFNTHeader.h) = 9d997d23ed80370e5b36648b9b35d80c5db88be8 +SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 1ebc8e894e9d63961f49ba0798ad3eed100d95a6 +SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 2c64811cc18813330ac6b4c4a846942fb4b480d6 +SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = faed34d94646453cd01acbdec1da2d9ec0f3d05f +SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 4025c0a4e149d9b2087331e10b342734fa77a905 +SHA1 (patch-js_src_config_system-headers) = 8d578675746d6292100c8d40435073c7a2cce832 +SHA1 (patch-js_src_jscpucfg.h) = e879a06e59537c730f01c2b5aa3fe7a3ffdabb2a +SHA1 (patch-js_src_jsgc.cpp) = c514b7fb84002a1909638cd7f3386931cb0f2551 +SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = f9b13d9e7910613c82f6b1ee4131a6c4eb1d4580 +SHA1 (patch-mb) = 9d13c8eae6ea4a2993aa991d27f1fb5c671339ef +SHA1 (patch-md) = 7fd607a3edd2ea5f7a5671fc6d06fba69c46c36f +SHA1 (patch-me) = 2ff755782bd35caded8934000d039976dad44103 +SHA1 (patch-media_libcubeb_src_Makefile.in) = a24f1a79a14b1933286cd85618fbe91db109176d +SHA1 (patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c) = 69fa597e345c61a7352d5a3fcc29f8644b65d575 +SHA1 (patch-mp) = 4910e468bce689f02dc6a0d9ee92a827c9f5cf7b +SHA1 (patch-netwerk_protocol_http_HttpChannelParent.cpp) = 00b8402cedea55b8e883f4806bba4fece97efa2a +SHA1 (patch-pa) = 8045cf02d83e87684b497dd30e890107f76a3bdf +SHA1 (patch-pb) = 7665d8156fa734cdc2e1746558cc08b7eefce98e +SHA1 (patch-pc) = 099a4f6ac32fd2f45c91eb525750bde96684693a +SHA1 (patch-pd) = 9750259906ee270f6898e3c77288aa5260d6e9a7 +SHA1 (patch-pg) = d6d6071cbe8a771873e1537034c0bb9186f8e245 +SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121 +SHA1 (patch-storage_src_Makefile.in) = c987de5895680b05104287c9c5b4f87786789bc8 +SHA1 (patch-toolkit_components_osfile_osfileutils.cpp) = baeaad49f79f8478a47e84879a2eaa4b57514f73 +SHA1 (patch-toolkit_library_Makefile.in) = 9206b614833cdd27f9d29c478ab0490eea709983 +SHA1 (patch-toolkit_toolkit-tiers.mk) = 59e5174edd04f3c4e5d6ebb450a42e4e1dee0801 +SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = 77ceac37b1b96451228e53e40066853fd7cca58c +SHA1 (patch-xa) = 9182485283599a96663358bdc680c5cdb1d94a78 +SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa +SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9 +SHA1 (patch-xd) = 5fcb512091db8193ade345ece8eb2909f0a278e7 +SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f +SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf +SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488 +SHA1 (patch-xj) = c373bb0135ef042d07c98e648dce1612a0b47efe +SHA1 (patch-xk) = 3accd4080f4576391f06a0a16a8fb477b2d7b3e3 +SHA1 (patch-xl) = e7dbe631e8d1fcee48054c0cb8ff01169cfcb744 +SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657 +SHA1 (patch-xn) = c042e39d93706934ec03c78be3dc6e224ac62c0e +SHA1 (patch-xo) = aae6107dcfaf731bd3e9962d953fb8701fc5f163 +SHA1 (patch-xpcom_Makefile.in) = 08e50b00af1a6d1ab6ac02e5f273896a355a4372 +SHA1 (patch-xpcom_ds_TimeStamp.h) = a1fb060f91720eb330f102b28d9373bbdbe96e30 diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk index ea4b99f1fba..5280c12499d 100644 --- a/devel/xulrunner/mozilla-common.mk +++ b/devel/xulrunner/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.37 2012/10/31 11:19:54 asau Exp $ +# $NetBSD: mozilla-common.mk,v 1.38 2013/01/10 15:01:30 ryoon Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -29,7 +29,8 @@ CONFIGURE_ARGS+= --enable-system-hunspell CONFIGURE_ARGS+= --enable-system-ffi CONFIGURE_ARGS+= --with-system-nss CONFIGURE_ARGS+= --with-system-nspr -CONFIGURE_ARGS+= --with-system-jpeg +## xulrunner-18.0 or later really requires libjpeg-turbo +#CONFIGURE_ARGS+= --with-system-jpeg CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2 CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent} CONFIGURE_ARGS+= --enable-system-sqlite @@ -100,7 +101,8 @@ BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 .include "../../devel/nspr/buildlink3.mk" .include "../../devel/nss/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" +## xulrunner-18.0 or later really requires libjpeg-turbo +#.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 .include "../../graphics/cairo/buildlink3.mk" diff --git a/devel/xulrunner/patches/patch-aa b/devel/xulrunner/patches/patch-aa index 375bb95872b..c6e4a4c206b 100644 --- a/devel/xulrunner/patches/patch-aa +++ b/devel/xulrunner/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.15 2013/01/05 08:02:16 sbd Exp $ +$NetBSD: patch-aa,v 1.16 2013/01/10 15:01:30 ryoon Exp $ ---- configure.in.orig 2012-11-29 04:43:55.000000000 +0000 +--- configure.in.orig 2013-01-04 23:44:28.000000000 +0000 +++ configure.in -@@ -2080,6 +2080,9 @@ ia64*-hpux*) +@@ -2137,6 +2137,9 @@ ia64*-hpux*) if test -z "$MC"; then MC=mc.exe fi @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.15 2013/01/05 08:02:16 sbd Exp $ ;; *-mingw*) DSO_CFLAGS= -@@ -2979,6 +2982,9 @@ dnl ==================================== +@@ -3075,6 +3078,9 @@ dnl ==================================== case $target in *-hpux11.*) ;; @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.15 2013/01/05 08:02:16 sbd Exp $ *) AC_CHECK_LIB(c_r, gethostbyname_r) ;; -@@ -3279,6 +3285,9 @@ AC_CACHE_CHECK( +@@ -3376,6 +3382,9 @@ AC_CACHE_CHECK( #ifdef linux #define _BSD_SOURCE 1 #endif @@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.15 2013/01/05 08:02:16 sbd Exp $ #include <resolv.h> ], [int foo = res_ninit(&_res);], -@@ -3947,6 +3956,14 @@ if test -n "$YASM"; then +@@ -4042,6 +4051,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -47,32 +47,18 @@ $NetBSD: patch-aa,v 1.15 2013/01/05 08:02:16 sbd Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -5158,8 +5175,8 @@ fi - - AC_SUBST(MOZ_WEBRTC) +@@ -5283,8 +5300,8 @@ AC_SUBST(MOZ_WEBRTC_IN_LIBXUL) + AC_SUBST(MOZ_SCTP) + AC_SUBST(MOZ_SRTP) -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 -- Linux:x86) -+ Linux:x86|DragonFly:x86|*BSD:i386) - VPX_ASFLAGS="-f elf32 -rnasm -pnasm" - VPX_X86_ASM=1 - ;; -- Linux:x86_64) -+ Linux:x86_64|DragonFly:x86_64|*BSD:x86_64) - VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" - VPX_X86_ASM=1 - ;; -@@ -8544,6 +8561,7 @@ AC_SUBST(MOZ_VP8_ERROR_CONCEALMENT) + MOZ_SAMPLE_TYPE_S16=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_S16) + AC_SUBST(MOZ_SAMPLE_TYPE_S16) +@@ -8690,6 +8707,7 @@ AC_SUBST(MOZ_VP8_ERROR_CONCEALMENT) AC_SUBST(MOZ_VP8_ENCODER) AC_SUBST(MOZ_VP8) AC_SUBST(MOZ_OGG) diff --git a/devel/xulrunner/patches/patch-ab b/devel/xulrunner/patches/patch-ab index 27ec5375d24..a4e4ff10beb 100644 --- a/devel/xulrunner/patches/patch-ab +++ b/devel/xulrunner/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.5 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ab,v 1.6 2013/01/10 15:01:30 ryoon Exp $ ---- nsprpub/pr/include/md/_netbsd.h.orig 2012-08-24 22:55:59.000000000 +0000 +--- nsprpub/pr/include/md/_netbsd.h.orig 2013-01-04 23:44:43.000000000 +0000 +++ nsprpub/pr/include/md/_netbsd.h @@ -47,7 +47,7 @@ #define HAVE_DLL diff --git a/devel/xulrunner/patches/patch-ac b/devel/xulrunner/patches/patch-ac index e1a3bd1b70b..963e7dbe65c 100644 --- a/devel/xulrunner/patches/patch-ac +++ b/devel/xulrunner/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.5 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ac,v 1.6 2013/01/10 15:01:30 ryoon Exp $ ---- nsprpub/configure.in.orig 2012-08-24 22:55:59.000000000 +0000 +--- nsprpub/configure.in.orig 2013-01-04 23:44:43.000000000 +0000 +++ nsprpub/configure.in @@ -36,7 +36,7 @@ OBJDIR_NAME=. OBJDIR_SUFFIX=OBJ @@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.5 2012/08/28 23:27:10 ryoon Exp $ ;; *-hpux*) -@@ -2110,6 +2137,7 @@ mips-nec-sysv*) +@@ -2069,6 +2096,7 @@ tools are selected during the Xcode/Deve AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -53,7 +53,7 @@ $NetBSD: patch-ac,v 1.5 2012/08/28 23:27:10 ryoon Exp $ if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi -@@ -2918,7 +2946,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2787,7 +2815,7 @@ if test -n "$USE_PTHREADS"; then if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then ac_cv_have_dash_pthread=yes case "$target_os" in @@ -62,7 +62,7 @@ $NetBSD: patch-ac,v 1.5 2012/08/28 23:27:10 ryoon Exp $ # Freebsd doesn't use -pthread for compiles, it uses them for linking ;; *) -@@ -2956,7 +2984,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2825,7 +2853,7 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS= fi ;; @@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.5 2012/08/28 23:27:10 ryoon Exp $ AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -3037,7 +3065,7 @@ case "$target" in +@@ -2906,7 +2934,7 @@ case "$target" in AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; diff --git a/devel/xulrunner/patches/patch-ad b/devel/xulrunner/patches/patch-ad deleted file mode 100644 index 7a999f8bff2..00000000000 --- a/devel/xulrunner/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2012/08/28 23:27:10 ryoon Exp $ - ---- xpcom/io/nsLocalFileUnix.h.orig 2012-08-24 22:56:10.000000000 +0000 -+++ xpcom/io/nsLocalFileUnix.h -@@ -52,7 +52,7 @@ - #endif - - // so we can statfs on freebsd --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || ((defined(__DragonFly__) || defined(__NetBSD__)) && !defined(HAVE_STATVFS)) - #define HAVE_SYS_STATFS_H - #define STATFS statfs - #include <sys/param.h> diff --git a/devel/xulrunner/patches/patch-ae b/devel/xulrunner/patches/patch-ae index 69232c48f82..030f932c4e3 100644 --- a/devel/xulrunner/patches/patch-ae +++ b/devel/xulrunner/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.6 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ae,v 1.7 2013/01/10 15:01:30 ryoon Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig 2012-08-24 22:55:59.000000000 +0000 +--- nsprpub/pr/src/misc/prnetdb.c.orig 2013-01-04 23:44:43.000000000 +0000 +++ nsprpub/pr/src/misc/prnetdb.c @@ -73,7 +73,7 @@ PRLock *_pr_dnsLock = NULL; || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \ diff --git a/devel/xulrunner/patches/patch-af b/devel/xulrunner/patches/patch-af deleted file mode 100644 index ecaabf6780b..00000000000 --- a/devel/xulrunner/patches/patch-af +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-af,v 1.3 2012/08/28 23:27:10 ryoon Exp $ - ---- config/mkdepend/imakemdep.h.orig 2012-08-24 22:55:19.000000000 +0000 -+++ config/mkdepend/imakemdep.h -@@ -235,7 +235,7 @@ in this Software without prior written a - #ifdef _CRAY - #define DEFAULT_CPP "/lib/pcpp" - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - #define DEFAULT_CPP "/usr/libexec/cpp" - #endif - #ifdef MACH -@@ -273,7 +273,7 @@ char *cpp_argv[ARGUMENTS] = { - #ifdef unix - "-Uunix", /* remove unix symbol so that filename unix.c okay */ - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) -+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) || defined(__DragonFly__) - # ifdef __i386__ - "-D__i386__", - # endif -@@ -713,6 +713,9 @@ struct symtab predefs[] = { - #ifdef __sgi - {"__sgi", "1"}, - #endif -+#ifdef __DragonFly__ -+ {"__DragonFly__", "1"}, -+#endif - #ifdef __FreeBSD__ - {"__FreeBSD__", "1"}, - #endif diff --git a/devel/xulrunner/patches/patch-ag b/devel/xulrunner/patches/patch-ag index 2432639c84e..ecd5989e69d 100644 --- a/devel/xulrunner/patches/patch-ag +++ b/devel/xulrunner/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.5 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ag,v 1.6 2013/01/10 15:01:30 ryoon Exp $ ---- nsprpub/pr/include/md/_freebsd.h.orig 2012-08-24 22:55:59.000000000 +0000 +--- nsprpub/pr/include/md/_freebsd.h.orig 2013-01-04 23:44:43.000000000 +0000 +++ nsprpub/pr/include/md/_freebsd.h @@ -47,7 +47,7 @@ #define _PR_HAVE_LARGE_OFF_T diff --git a/devel/xulrunner/patches/patch-ai b/devel/xulrunner/patches/patch-ai index 5d41c9c3412..b5a8a753df3 100644 --- a/devel/xulrunner/patches/patch-ai +++ b/devel/xulrunner/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ai,v 1.4 2013/01/10 15:01:30 ryoon Exp $ ---- dbm/src/mktemp.c.orig 2012-08-24 22:55:25.000000000 +0000 +--- dbm/src/mktemp.c.orig 2013-01-04 23:44:30.000000000 +0000 +++ dbm/src/mktemp.c -@@ -92,7 +92,7 @@ mktemp(char *path) +@@ -84,7 +84,7 @@ mkstempflags(char *path, int extraFlags) static int _gettemp(char *path, register int *doopen, int extraFlags) { diff --git a/devel/xulrunner/patches/patch-aj b/devel/xulrunner/patches/patch-aj deleted file mode 100644 index ec1ae482a21..00000000000 --- a/devel/xulrunner/patches/patch-aj +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aj,v 1.5 2012/08/28 23:27:10 ryoon Exp $ - ---- profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2012-08-24 22:56:00.000000000 +0000 -+++ profile/dirserviceprovider/src/nsProfileLock.cpp -@@ -391,6 +391,7 @@ nsresult nsProfileLock::LockWithSymlink( - #endif - sigfillset(&act.sa_mask); - -+#ifndef DEBUG - #define CATCH_SIGNAL(signame) \ - PR_BEGIN_MACRO \ - if (sigaction(signame, NULL, &oldact) == 0 && \ -@@ -409,6 +410,7 @@ PR_BEGIN_MACRO - CATCH_SIGNAL(SIGTERM); - - #undef CATCH_SIGNAL -+#endif - } - } - } diff --git a/devel/xulrunner/patches/patch-ak b/devel/xulrunner/patches/patch-ak index 9267e31f9f4..c9cfd9e85f2 100644 --- a/devel/xulrunner/patches/patch-ak +++ b/devel/xulrunner/patches/patch-ak @@ -1,6 +1,6 @@ -$NetBSD: patch-ak,v 1.7 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ak,v 1.8 2013/01/10 15:01:30 ryoon Exp $ ---- js/src/ctypes/libffi/configure.orig 2012-08-24 22:55:39.000000000 +0000 +--- js/src/ctypes/libffi/configure.orig 2013-01-04 23:44:34.000000000 +0000 +++ js/src/ctypes/libffi/configure @@ -11278,7 +11278,7 @@ case "$host" in powerpc-*-aix* | rs6000-*-aix*) diff --git a/devel/xulrunner/patches/patch-al b/devel/xulrunner/patches/patch-al index ce2608fca93..3b7c9387aef 100644 --- a/devel/xulrunner/patches/patch-al +++ b/devel/xulrunner/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.7 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-al,v 1.8 2013/01/10 15:01:30 ryoon Exp $ ---- storage/src/mozStorageConnection.cpp.orig 2012-08-24 22:56:03.000000000 +0000 +--- storage/src/mozStorageConnection.cpp.orig 2013-01-04 23:44:44.000000000 +0000 +++ storage/src/mozStorageConnection.cpp -@@ -680,6 +680,11 @@ Connection::initialize(nsIFile *aDatabas +@@ -584,6 +584,11 @@ Connection::initialize(nsIFile *aDatabas break; } diff --git a/devel/xulrunner/patches/patch-am b/devel/xulrunner/patches/patch-am index c7355f152eb..d4267ef571a 100644 --- a/devel/xulrunner/patches/patch-am +++ b/devel/xulrunner/patches/patch-am @@ -1,12 +1,12 @@ -$NetBSD: patch-am,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-am,v 1.4 2013/01/10 15:01:30 ryoon Exp $ SHA1_Update conflicts with openssl which may be dynamically loaded at runtime via libcups or libgssapi so causing a crash due to using the wrong binding. So rename here to avoid conflict. ---- security/nss/lib/freebl/blapi.h.orig 2012-08-24 22:56:01.000000000 +0000 +--- security/nss/lib/freebl/blapi.h.orig 2013-01-04 23:44:43.000000000 +0000 +++ security/nss/lib/freebl/blapi.h -@@ -1043,6 +1043,8 @@ extern void SHA1_DestroyContext(SHA1Cont +@@ -1010,6 +1010,8 @@ extern void SHA1_DestroyContext(SHA1Cont */ extern void SHA1_Begin(SHA1Context *cx); diff --git a/devel/xulrunner/patches/patch-an b/devel/xulrunner/patches/patch-an index d93178f1811..26a46255096 100644 --- a/devel/xulrunner/patches/patch-an +++ b/devel/xulrunner/patches/patch-an @@ -1,12 +1,12 @@ -$NetBSD: patch-an,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-an,v 1.4 2013/01/10 15:01:30 ryoon Exp $ SHA1_Update conflicts with openssl which may be dynamically loaded at runtime via libcups or libgssapi so causing a crash due to using the wrong binding. So rename here to avoid conflict. ---- security/nss/lib/freebl/sha-fast-amd64-sun.s.orig 2012-08-24 22:56:01.000000000 +0000 +--- security/nss/lib/freebl/sha-fast-amd64-sun.s.orig 2013-01-04 23:44:43.000000000 +0000 +++ security/nss/lib/freebl/sha-fast-amd64-sun.s -@@ -1712,9 +1712,9 @@ shaCompress: +@@ -1680,9 +1680,9 @@ shaCompress: .LFE7: .size shaCompress, .-shaCompress .align 16 @@ -19,7 +19,7 @@ the wrong binding. So rename here to avoid conflict. .LFB5: pushq %rbp .LCFI5: -@@ -1800,7 +1800,7 @@ SHA1_Update: +@@ -1768,7 +1768,7 @@ SHA1_Update: call shaCompress jmp .L245 .LFE5: @@ -28,7 +28,7 @@ the wrong binding. So rename here to avoid conflict. .section .rodata .align 32 .type bulk_pad.0, @object -@@ -1902,7 +1902,7 @@ SHA1_End: +@@ -1870,7 +1870,7 @@ SHA1_End: subl %r8d, %edx andl $63, %edx incl %edx @@ -37,7 +37,7 @@ the wrong binding. So rename here to avoid conflict. movq %rbx, %rdi movq %r12, %rsi shrq $32, %rdi -@@ -2018,7 +2018,7 @@ SHA1_HashBuf: +@@ -1986,7 +1986,7 @@ SHA1_HashBuf: movl %r12d, %edx movq %r13, %rsi movq %rbx, %rdi diff --git a/devel/xulrunner/patches/patch-ao b/devel/xulrunner/patches/patch-ao index 133a3a68c66..b5424d2131c 100644 --- a/devel/xulrunner/patches/patch-ao +++ b/devel/xulrunner/patches/patch-ao @@ -1,9 +1,9 @@ -$NetBSD: patch-ao,v 1.5 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ao,v 1.6 2013/01/10 15:01:30 ryoon Exp $ ---- toolkit/mozapps/installer/packager.mk.orig 2012-08-24 22:56:07.000000000 +0000 +--- toolkit/mozapps/installer/packager.mk.orig 2013-01-04 23:44:45.000000000 +0000 +++ toolkit/mozapps/installer/packager.mk -@@ -905,8 +905,8 @@ endif - (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ +@@ -893,8 +893,8 @@ endif + (cd $(DIST)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ (cd $(DESTDIR)$(installdir) && tar -xf -) $(NSINSTALL) -D $(DESTDIR)$(bindir) - $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) diff --git a/devel/xulrunner/patches/patch-as b/devel/xulrunner/patches/patch-as index 78b56a869bb..ecc24d51f53 100644 --- a/devel/xulrunner/patches/patch-as +++ b/devel/xulrunner/patches/patch-as @@ -1,10 +1,10 @@ -$NetBSD: patch-as,v 1.9 2012/11/21 15:26:50 ryoon Exp $ +$NetBSD: patch-as,v 1.10 2013/01/10 15:01:30 ryoon Exp $ Treat DragonFly like FreeBSD. ---- js/src/configure.in.orig 2012-11-19 17:00:00.000000000 +0000 +--- js/src/configure.in.orig 2013-01-04 23:44:34.000000000 +0000 +++ js/src/configure.in -@@ -2701,7 +2701,7 @@ then +@@ -2718,7 +2718,7 @@ then fi case "$target" in @@ -13,7 +13,7 @@ Treat DragonFly like FreeBSD. AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lpthread, so don't specify it explicitly. -@@ -3545,7 +3545,7 @@ if test "$MOZ_MEMORY"; then +@@ -3577,7 +3577,7 @@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; diff --git a/devel/xulrunner/patches/patch-at b/devel/xulrunner/patches/patch-at index a18b583835f..beba33caf94 100644 --- a/devel/xulrunner/patches/patch-at +++ b/devel/xulrunner/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.8 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-at,v 1.9 2013/01/10 15:01:30 ryoon Exp $ ---- gfx/qcms/qcmstypes.h.orig 2012-08-24 22:55:34.000000000 +0000 +--- gfx/qcms/qcmstypes.h.orig 2013-01-04 23:44:33.000000000 +0000 +++ gfx/qcms/qcmstypes.h -@@ -10,6 +10,8 @@ +@@ -11,6 +11,8 @@ #if defined (__SVR4) && defined (__sun) /* int_types.h gets included somehow, so avoid redefining the types differently */ #include <sys/int_types.h> diff --git a/devel/xulrunner/patches/patch-au b/devel/xulrunner/patches/patch-au index 3982b26af43..db76afd14bf 100644 --- a/devel/xulrunner/patches/patch-au +++ b/devel/xulrunner/patches/patch-au @@ -1,10 +1,10 @@ -$NetBSD: patch-au,v 1.6 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-au,v 1.7 2013/01/10 15:01:30 ryoon Exp $ - Fix device name on NetBSD - SOUND_VERSION just isn't a reliable way to detect features supported by particular OSS implementation. ---- media/libsydneyaudio/src/sydney_audio_oss.c.orig 2012-08-24 22:55:55.000000000 +0000 +--- media/libsydneyaudio/src/sydney_audio_oss.c.orig 2013-01-04 23:44:40.000000000 +0000 +++ media/libsydneyaudio/src/sydney_audio_oss.c @@ -23,7 +23,7 @@ // support only versions newer than 3.6.1 diff --git a/devel/xulrunner/patches/patch-av b/devel/xulrunner/patches/patch-av index 03d3a4b8c85..a57b6e1ee10 100644 --- a/devel/xulrunner/patches/patch-av +++ b/devel/xulrunner/patches/patch-av @@ -1,6 +1,6 @@ -$NetBSD: patch-av,v 1.4 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-av,v 1.5 2013/01/10 15:01:30 ryoon Exp $ ---- xulrunner/app/nsXULRunnerApp.cpp.orig 2012-08-24 22:56:10.000000000 +0000 +--- xulrunner/app/nsXULRunnerApp.cpp.orig 2013-01-04 23:44:47.000000000 +0000 +++ xulrunner/app/nsXULRunnerApp.cpp @@ -6,6 +6,27 @@ #include "nsXPCOMGlue.h" diff --git a/devel/xulrunner/patches/patch-aw b/devel/xulrunner/patches/patch-aw index 613ac1be9ea..4fd37914eb1 100644 --- a/devel/xulrunner/patches/patch-aw +++ b/devel/xulrunner/patches/patch-aw @@ -1,6 +1,6 @@ -$NetBSD: patch-aw,v 1.5 2012/10/12 18:27:20 ryoon Exp $ +$NetBSD: patch-aw,v 1.6 2013/01/10 15:01:30 ryoon Exp $ ---- xulrunner/stub/nsXULStub.cpp.orig 2012-10-04 15:51:30.000000000 +0000 +--- xulrunner/stub/nsXULStub.cpp.orig 2013-01-04 23:44:47.000000000 +0000 +++ xulrunner/stub/nsXULStub.cpp @@ -11,6 +11,29 @@ #include "nsIFile.h" diff --git a/devel/xulrunner/patches/patch-ax b/devel/xulrunner/patches/patch-ax index bc3a8fb80ba..2cb1973f7c8 100644 --- a/devel/xulrunner/patches/patch-ax +++ b/devel/xulrunner/patches/patch-ax @@ -1,6 +1,6 @@ -$NetBSD: patch-ax,v 1.6 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ax,v 1.7 2013/01/10 15:01:30 ryoon Exp $ ---- xpcom/base/nsStackWalk.cpp.orig 2012-08-24 22:56:10.000000000 +0000 +--- xpcom/base/nsStackWalk.cpp.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/base/nsStackWalk.cpp @@ -23,7 +23,7 @@ struct CriticalAddress { }; diff --git a/devel/xulrunner/patches/patch-ay b/devel/xulrunner/patches/patch-ay index f2515610972..a55b0291617 100644 --- a/devel/xulrunner/patches/patch-ay +++ b/devel/xulrunner/patches/patch-ay @@ -1,6 +1,6 @@ -$NetBSD: patch-ay,v 1.6 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ay,v 1.7 2013/01/10 15:01:30 ryoon Exp $ ---- browser/app/nsBrowserApp.cpp.orig 2012-08-24 22:55:17.000000000 +0000 +--- browser/app/nsBrowserApp.cpp.orig 2013-01-04 23:44:27.000000000 +0000 +++ browser/app/nsBrowserApp.cpp @@ -14,6 +14,31 @@ #include <sys/resource.h> @@ -34,7 +34,7 @@ $NetBSD: patch-ay,v 1.6 2012/08/28 23:27:10 ryoon Exp $ #ifdef XP_MACOSX #include "MacQuirks.h" #endif -@@ -196,6 +221,9 @@ int main(int argc, char* argv[]) +@@ -204,6 +229,9 @@ int main(int argc, char* argv[]) #ifdef XP_MACOSX TriggerQuirks(); #endif diff --git a/devel/xulrunner/patches/patch-az b/devel/xulrunner/patches/patch-az index c4aa211b4fb..06be39f7512 100644 --- a/devel/xulrunner/patches/patch-az +++ b/devel/xulrunner/patches/patch-az @@ -1,8 +1,8 @@ -$NetBSD: patch-az,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-az,v 1.4 2013/01/10 15:01:30 ryoon Exp $ ---- nsprpub/pr/src/pthreads/ptthread.c.orig 2012-08-24 22:55:59.000000000 +0000 +--- nsprpub/pr/src/pthreads/ptthread.c.orig 2013-01-04 23:44:43.000000000 +0000 +++ nsprpub/pr/src/pthreads/ptthread.c -@@ -1038,12 +1038,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn +@@ -1043,12 +1043,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn _exit(status); } diff --git a/devel/xulrunner/patches/patch-ba b/devel/xulrunner/patches/patch-ba index 0488b103b6c..c7869b6a5f3 100644 --- a/devel/xulrunner/patches/patch-ba +++ b/devel/xulrunner/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-ba,v 1.4 2013/01/10 15:01:30 ryoon Exp $ pthread_t may be 64-bit, avoid casting it. ---- nsprpub/pr/include/private/pprthred.h.orig 2012-08-24 22:55:59.000000000 +0000 +--- nsprpub/pr/include/private/pprthred.h.orig 2013-01-04 23:44:43.000000000 +0000 +++ nsprpub/pr/include/private/pprthred.h @@ -19,6 +19,8 @@ #include <os2.h> diff --git a/devel/xulrunner/patches/patch-bd b/devel/xulrunner/patches/patch-bd index e393497d936..c983ff68170 100644 --- a/devel/xulrunner/patches/patch-bd +++ b/devel/xulrunner/patches/patch-bd @@ -1,6 +1,6 @@ -$NetBSD: patch-bd,v 1.4 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-bd,v 1.5 2013/01/10 15:01:30 ryoon Exp $ ---- js/src/ctypes/CTypes.cpp.orig 2012-08-24 22:55:39.000000000 +0000 +--- js/src/ctypes/CTypes.cpp.orig 2013-01-04 23:44:34.000000000 +0000 +++ js/src/ctypes/CTypes.cpp @@ -5,6 +5,23 @@ diff --git a/devel/xulrunner/patches/patch-bf b/devel/xulrunner/patches/patch-bf index 33254b98914..91a0e16c56a 100644 --- a/devel/xulrunner/patches/patch-bf +++ b/devel/xulrunner/patches/patch-bf @@ -1,6 +1,6 @@ -$NetBSD: patch-bf,v 1.8 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-bf,v 1.9 2013/01/10 15:01:30 ryoon Exp $ ---- js/src/jsnativestack.cpp.orig 2012-08-24 22:55:40.000000000 +0000 +--- js/src/jsnativestack.cpp.orig 2013-01-04 23:44:35.000000000 +0000 +++ js/src/jsnativestack.cpp @@ -19,10 +19,16 @@ #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) diff --git a/devel/xulrunner/patches/patch-bg b/devel/xulrunner/patches/patch-bg index 73c4f1d255e..ce8b7aef267 100644 --- a/devel/xulrunner/patches/patch-bg +++ b/devel/xulrunner/patches/patch-bg @@ -1,6 +1,6 @@ -$NetBSD: patch-bg,v 1.4 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-bg,v 1.5 2013/01/10 15:01:30 ryoon Exp $ ---- storage/src/SQLiteMutex.h.orig 2012-08-24 22:56:03.000000000 +0000 +--- storage/src/SQLiteMutex.h.orig 2013-01-04 23:44:44.000000000 +0000 +++ storage/src/SQLiteMutex.h @@ -108,15 +108,19 @@ public: void assertCurrentThreadOwns() diff --git a/devel/xulrunner/patches/patch-bi b/devel/xulrunner/patches/patch-bi index f87612f6d40..31763ffb231 100644 --- a/devel/xulrunner/patches/patch-bi +++ b/devel/xulrunner/patches/patch-bi @@ -1,6 +1,6 @@ -$NetBSD: patch-bi,v 1.6 2012/11/21 15:26:50 ryoon Exp $ +$NetBSD: patch-bi,v 1.7 2013/01/10 15:01:30 ryoon Exp $ ---- gfx/angle/src/compiler/osinclude.h.orig 2012-11-19 17:03:13.000000000 +0000 +--- gfx/angle/src/compiler/osinclude.h.orig 2013-01-04 23:44:32.000000000 +0000 +++ gfx/angle/src/compiler/osinclude.h @@ -16,6 +16,7 @@ #define ANGLE_OS_WIN diff --git a/devel/xulrunner/patches/patch-build_autoconf_nss.m4 b/devel/xulrunner/patches/patch-build_autoconf_nss.m4 index 4a12e1ca0da..a060fab1e87 100644 --- a/devel/xulrunner/patches/patch-build_autoconf_nss.m4 +++ b/devel/xulrunner/patches/patch-build_autoconf_nss.m4 @@ -1,6 +1,6 @@ -$NetBSD: patch-build_autoconf_nss.m4,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-build_autoconf_nss.m4,v 1.4 2013/01/10 15:01:30 ryoon Exp $ ---- build/autoconf/nss.m4.orig 2012-08-24 22:55:19.000000000 +0000 +--- build/autoconf/nss.m4.orig 2013-01-04 23:44:28.000000000 +0000 +++ build/autoconf/nss.m4 @@ -22,18 +22,18 @@ AC_ARG_WITH(nss-exec-prefix, if test -n "$nss_config_exec_prefix"; then diff --git a/devel/xulrunner/patches/patch-config_baseconfig.mk b/devel/xulrunner/patches/patch-config_baseconfig.mk index 3cb77e4419c..fe988866e4e 100644 --- a/devel/xulrunner/patches/patch-config_baseconfig.mk +++ b/devel/xulrunner/patches/patch-config_baseconfig.mk @@ -1,6 +1,6 @@ -$NetBSD: patch-config_baseconfig.mk,v 1.1 2012/10/12 18:27:20 ryoon Exp $ +$NetBSD: patch-config_baseconfig.mk,v 1.2 2013/01/10 15:01:30 ryoon Exp $ ---- config/baseconfig.mk.orig 2012-10-02 14:37:17.000000000 +0000 +--- config/baseconfig.mk.orig 2013-01-04 23:44:28.000000000 +0000 +++ config/baseconfig.mk @@ -1,9 +1,9 @@ INCLUDED_AUTOCONF_MK = 1 diff --git a/devel/xulrunner/patches/patch-config_system-headers b/devel/xulrunner/patches/patch-config_system-headers index 65f87a5072a..a26dc784634 100644 --- a/devel/xulrunner/patches/patch-config_system-headers +++ b/devel/xulrunner/patches/patch-config_system-headers @@ -1,8 +1,8 @@ -$NetBSD: patch-config_system-headers,v 1.2 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-config_system-headers,v 1.3 2013/01/10 15:01:30 ryoon Exp $ ---- config/system-headers.orig 2012-08-24 22:55:19.000000000 +0000 +--- config/system-headers.orig 2013-01-04 23:44:28.000000000 +0000 +++ config/system-headers -@@ -1059,3 +1059,7 @@ gst/gst.h +@@ -1119,6 +1119,10 @@ gst/gst.h gst/app/gstappsink.h gst/app/gstappsrc.h gst/video/video.h @@ -10,3 +10,6 @@ $NetBSD: patch-config_system-headers,v 1.2 2012/08/28 23:27:10 ryoon Exp $ +sys/user.h +kvm.h +spawn.h + sys/msg.h + sys/ipc.h + sys/thr.h diff --git a/devel/xulrunner/patches/patch-content_media_nsAudioStream.cpp b/devel/xulrunner/patches/patch-content_media_nsAudioStream.cpp deleted file mode 100644 index a23ef3e3c4f..00000000000 --- a/devel/xulrunner/patches/patch-content_media_nsAudioStream.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$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 deleted file mode 100644 index 295252256af..00000000000 --- a/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp +++ /dev/null @@ -1,39 +0,0 @@ -$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-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/. */ - - #ifdef MOZ_WIDGET_QT -+#include <unistd.h> // for _exit() - #include <QtCore/QTimer> - #include "nsQAppInstance.h" - #include "NestedLoopTimer.h" -@@ -196,7 +197,7 @@ PluginModuleChild::Init(const std::strin - - // TODO: use PluginPRLibrary here - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - mShutdownFunc = - (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown"); - -@@ -1827,7 +1828,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin - PLUGIN_LOG_DEBUG_METHOD; - AssertPluginThread(); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - return true; - #elif defined(OS_WIN) || defined(OS_MACOSX) - *_retval = mGetEntryPointsFunc(&mFunctions); -@@ -1856,7 +1857,7 @@ PluginModuleChild::AnswerNP_Initialize(c - SendBackUpXResources(FileDescriptor(xSocketFd)); - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - *_retval = mInitializeFunc(&sBrowserFuncs, &mFunctions); - return true; - #elif defined(OS_WIN) || defined(OS_MACOSX) diff --git a/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.h b/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.h deleted file mode 100644 index a23a7d5b6e9..00000000000 --- a/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.h,v 1.3 2012/08/28 23:27:10 ryoon Exp $ - ---- dom/plugins/ipc/PluginModuleChild.h.orig 2012-08-24 22:55:28.000000000 +0000 -+++ dom/plugins/ipc/PluginModuleChild.h -@@ -330,7 +330,7 @@ private: - - // we get this from the plugin - NP_PLUGINSHUTDOWN mShutdownFunc; --#ifdef OS_LINUX -+#if defined(OS_LINUX) || defined(OS_BSD) - NP_PLUGINUNIXINIT mInitializeFunc; - #elif defined(OS_WIN) || defined(OS_MACOSX) - NP_PLUGININIT mInitializeFunc; diff --git a/devel/xulrunner/patches/patch-dom_system_OSFileConstants.cpp b/devel/xulrunner/patches/patch-dom_system_OSFileConstants.cpp new file mode 100644 index 00000000000..9d116130074 --- /dev/null +++ b/devel/xulrunner/patches/patch-dom_system_OSFileConstants.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.1 2013/01/10 15:01:30 ryoon Exp $ + +--- dom/system/OSFileConstants.cpp.orig 2013-01-04 23:44:31.000000000 +0000 ++++ dom/system/OSFileConstants.cpp +@@ -41,6 +41,11 @@ + #include "OSFileConstants.h" + #include "nsIOSFileConstantsService.h" + ++#if defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#define __dd_fd dd_fd ++#endif ++ + /** + * This module defines the basic libc constants (error numbers, open modes, + * etc.) used by OS.File and possibly other OS-bound JavaScript libraries. diff --git a/devel/xulrunner/patches/patch-gfx_skia_Makefile.in b/devel/xulrunner/patches/patch-gfx_skia_Makefile.in new file mode 100644 index 00000000000..19173d2e127 --- /dev/null +++ b/devel/xulrunner/patches/patch-gfx_skia_Makefile.in @@ -0,0 +1,16 @@ +$NetBSD: patch-gfx_skia_Makefile.in,v 1.1 2013/01/10 15:01:30 ryoon Exp $ + +--- gfx/skia/Makefile.in.orig 2013-01-04 23:44:33.000000000 +0000 ++++ gfx/skia/Makefile.in +@@ -355,10 +355,9 @@ CPPSRCS += \ + SkMMapStream.cpp \ + SkOSFile.cpp \ + $(NULL) +-ifeq (Linux,$(OS_TARGET)) ++ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET)))) + CPPSRCS += \ + SkFontHost_linux.cpp \ +- SkFontHost_tables.cpp \ + SkTime_Unix.cpp \ + $(NULL) + endif diff --git a/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkOTTable__head.h b/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkOTTable__head.h index 0a773fdbe09..8f90f328ccc 100644 --- a/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkOTTable__head.h +++ b/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkOTTable__head.h @@ -1,8 +1,8 @@ -$NetBSD: patch-gfx_skia_src_sfnt_SkOTTable__head.h,v 1.1 2013/01/02 02:31:04 ryoon Exp $ +$NetBSD: patch-gfx_skia_src_sfnt_SkOTTable__head.h,v 1.2 2013/01/10 15:01:30 ryoon Exp $ * Fix build with NetBSD 5's gcc ---- gfx/skia/src/sfnt/SkOTTable_head.h.orig 2012-11-29 04:44:13.000000000 +0000 +--- gfx/skia/src/sfnt/SkOTTable_head.h.orig 2013-01-04 23:44:33.000000000 +0000 +++ gfx/skia/src/sfnt/SkOTTable_head.h @@ -12,7 +12,7 @@ #include "SkOTTableTypes.h" @@ -12,8 +12,8 @@ $NetBSD: patch-gfx_skia_src_sfnt_SkOTTable__head.h,v 1.1 2013/01/02 02:31:04 ryo +#pragma pack(1) struct SkOTTableHead { - SK_OT_Fixed version; -@@ -134,7 +134,7 @@ struct SkOTTableHead { + static const SK_OT_CHAR TAG0 = 'h'; +@@ -140,7 +140,7 @@ struct SkOTTableHead { } glyphDataFormat; }; diff --git a/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkOTTable__name.h b/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkOTTable__name.h index d2e690491d6..1f5a3e6ba76 100644 --- a/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkOTTable__name.h +++ b/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkOTTable__name.h @@ -1,8 +1,8 @@ -$NetBSD: patch-gfx_skia_src_sfnt_SkOTTable__name.h,v 1.1 2013/01/02 02:31:04 ryoon Exp $ +$NetBSD: patch-gfx_skia_src_sfnt_SkOTTable__name.h,v 1.2 2013/01/10 15:01:30 ryoon Exp $ * Fix build with NetBSD 5's gcc ---- gfx/skia/src/sfnt/SkOTTable_name.h.orig 2012-11-29 04:44:13.000000000 +0000 +--- gfx/skia/src/sfnt/SkOTTable_name.h.orig 2013-01-04 23:44:33.000000000 +0000 +++ gfx/skia/src/sfnt/SkOTTable_name.h @@ -12,7 +12,7 @@ #include "SkOTTableTypes.h" @@ -12,8 +12,8 @@ $NetBSD: patch-gfx_skia_src_sfnt_SkOTTable__name.h,v 1.1 2013/01/02 02:31:04 ryo +#pragma pack(1) struct SkOTTableName { - SK_OT_USHORT format; -@@ -493,7 +493,7 @@ struct SkOTTableNameRecord { + static const SK_OT_CHAR TAG0 = 'n'; +@@ -499,7 +499,7 @@ struct SkOTTableNameRecord { SK_OT_USHORT offset; //From start of storage area. }; diff --git a/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkSFNTHeader.h b/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkSFNTHeader.h index 1cb85ab8803..5116d782794 100644 --- a/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkSFNTHeader.h +++ b/devel/xulrunner/patches/patch-gfx_skia_src_sfnt_SkSFNTHeader.h @@ -1,8 +1,8 @@ -$NetBSD: patch-gfx_skia_src_sfnt_SkSFNTHeader.h,v 1.1 2013/01/02 02:31:04 ryoon Exp $ +$NetBSD: patch-gfx_skia_src_sfnt_SkSFNTHeader.h,v 1.2 2013/01/10 15:01:30 ryoon Exp $ * Fix build wth NetBSD 5's gcc ---- gfx/skia/src/sfnt/SkSFNTHeader.h.orig 2012-11-29 04:44:13.000000000 +0000 +--- gfx/skia/src/sfnt/SkSFNTHeader.h.orig 2013-01-04 23:44:33.000000000 +0000 +++ gfx/skia/src/sfnt/SkSFNTHeader.h @@ -15,7 +15,7 @@ typedef uint16_t SK_SFNT_USHORT; @@ -13,7 +13,7 @@ $NetBSD: patch-gfx_skia_src_sfnt_SkSFNTHeader.h,v 1.1 2013/01/02 02:31:04 ryoon struct SkSFNTHeader { SK_SFNT_ULONG fontType; -@@ -37,7 +37,7 @@ struct SkSFNTTableDirectoryEntry { +@@ -61,7 +61,7 @@ struct SkSFNTTableDirectoryEntry { SK_SFNT_ULONG logicalLength; }; diff --git a/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp b/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp index 54e318f97b6..b3da8599ad7 100644 --- a/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp +++ b/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp @@ -1,36 +1,36 @@ -$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.4 2013/01/10 15:01:30 ryoon Exp $ ---- gfx/thebes/gfxPlatform.cpp.orig 2012-08-24 22:55:35.000000000 +0000 +--- gfx/thebes/gfxPlatform.cpp.orig 2013-01-04 23:44:33.000000000 +0000 +++ gfx/thebes/gfxPlatform.cpp -@@ -443,6 +443,7 @@ void SourceBufferDestroy(void *srcBuffer - static_cast<SourceSurface*>(srcBuffer)->Release(); +@@ -507,11 +507,9 @@ void SourceBufferDestroy(void *srcSurfUD + delete static_cast<SourceSurfaceUserData*>(srcSurfUD); } -+#ifdef MOZ_TREE_CAIRO - void SourceSnapshotDetached(cairo_surface_t *nullSurf) +-void SourceSnapshotDetached(cairo_surface_t *nullSurf) ++void SourceSnapshotDetached(void *nullSurf) { - gfxImageSurface* origSurf = -@@ -450,6 +451,7 @@ void SourceSnapshotDetached(cairo_surfac - +- gfxImageSurface* origSurf = +- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); +- ++ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf); origSurf->SetData(&kSourceSurface, NULL, NULL); } -+#endif - RefPtr<SourceSurface> - gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) -@@ -544,6 +546,7 @@ gfxPlatform::GetSourceSurfaceForSurface( +@@ -626,14 +624,9 @@ gfxPlatform::GetSourceSurfaceForSurface( } -+ #ifdef MOZ_TREE_CAIRO - cairo_surface_t *nullSurf = - cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); - cairo_surface_set_user_data(nullSurf, -@@ -552,6 +555,7 @@ gfxPlatform::GetSourceSurfaceForSurface( - NULL); - cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); - cairo_surface_destroy(nullSurf); -+ #endif +- cairo_surface_t *nullSurf = +- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); +- cairo_surface_set_user_data(nullSurf, +- &kSourceSurface, +- imgSurface, +- NULL); +- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); +- cairo_surface_destroy(nullSurf); ++ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", ++ (const unsigned char *) "data", 4, ++ SourceSnapshotDetached, imgSurface.get()); } - srcBuffer->AddRef(); + SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData; diff --git a/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in b/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in deleted file mode 100644 index ecc6e5adfeb..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ipc_chromium_Makefile.in,v 1.5 2012/11/21 15:26:50 ryoon Exp $ - ---- ipc/chromium/Makefile.in.orig 2012-10-23 19:42:37.000000000 +0000 -+++ ipc/chromium/Makefile.in -@@ -240,6 +240,33 @@ endif - - endif # } OS_LINUX - -+ifdef OS_BSD # { -+ -+CPPSRCS += \ -+ atomicops_internals_x86_gcc.cc \ -+ process_util_bsd.cc \ -+ time_posix.cc \ -+ $(NULL) -+ -+ifdef MOZ_ENABLE_GTK2 -+CPPSRCS += \ -+ message_pump_glib.cc \ -+ $(NULL) -+endif -+ -+ifdef MOZ_ENABLE_QT -+MOCSRCS = \ -+ moc_message_pump_qt.cc \ -+ $(NULL) -+ -+CPPSRCS += \ -+ $(MOCSRCS) \ -+ message_pump_qt.cc \ -+ $(NULL) -+endif -+ -+endif # } OS_BSD -+ - # libevent - - ifndef MOZ_NATIVE_LIBEVENT # { diff --git a/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk b/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk deleted file mode 100644 index fad2b8faa97..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.5 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/chromium-config.mk.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/chromium-config.mk -@@ -24,17 +24,6 @@ LOCAL_INCLUDES += \ - -I$(DEPTH)/ipc/ipdl/_ipdlheaders \ - $(NULL) - --ifeq ($(OS_ARCH),Darwin) # { -- --OS_MACOSX = 1 --OS_POSIX = 1 -- --DEFINES += \ -- -DOS_MACOSX=1 \ -- -DOS_POSIX=1 \ -- $(NULL) -- --else # } { - ifeq ($(OS_ARCH),WINNT) # { - OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp) - -@@ -61,13 +50,65 @@ DEFINES += -DCOMPILER_MSVC - endif - - else # } { -- --OS_LINUX = 1 - OS_POSIX = 1 -+DEFINES += -DOS_POSIX=1 -+ -+ifeq ($(OS_ARCH),Darwin) # { -+ -+OS_MACOSX = 1 -+DEFINES += \ -+ -DOS_MACOSX=1 \ -+ $(NULL) -+ -+else # } { -+ifeq ($(OS_ARCH),DragonFly) # { -+ -+OS_DRAGONFLY = 1 -+OS_BSD = 1 -+OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+DEFINES += \ -+ -DOS_DRAGONFLY=1 \ -+ -DOS_BSD=1 \ -+ $(NULL) -+ -+else # } { -+ifeq ($(OS_ARCH),FreeBSD) # { -+ -+OS_FREEBSD = 1 -+OS_BSD = 1 -+OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+DEFINES += \ -+ -DOS_FREEBSD=1 \ -+ -DOS_BSD=1 \ -+ $(NULL) - -+else # } { -+ifeq ($(OS_ARCH),NetBSD) # { -+ -+OS_NETBSD = 1 -+OS_BSD = 1 -+OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+DEFINES += \ -+ -DOS_NETBSD=1 \ -+ -DOS_BSD=1 \ -+ $(NULL) -+ -+else # } { -+ifeq ($(OS_ARCH),OpenBSD) # { -+ -+OS_OPENBSD = 1 -+OS_BSD = 1 -+OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+DEFINES += \ -+ -DOS_OPENBSD=1 \ -+ -DOS_BSD=1 \ -+ $(NULL) -+ -+else # } { -+ -+OS_LINUX = 1 - DEFINES += \ - -DOS_LINUX=1 \ -- -DOS_POSIX=1 \ - $(NULL) - - # NB: to stop gcc warnings about exporting template instantiation -@@ -75,4 +116,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$( - - endif # } - endif # } -+endif # } -+endif # } -+endif # } -+endif # } - diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_base__paths.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_base__paths.h deleted file mode 100644 index 2f3bfd7b7ac..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_base__paths.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_base__paths.h,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/base/base_paths.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/base/base_paths.h -@@ -13,7 +13,7 @@ - #include "base/base_paths_win.h" - #elif defined(OS_MACOSX) - #include "base/base_paths_mac.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "base/base_paths_linux.h" - #endif - #include "base/path_service.h" diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posix.cc deleted file mode 100644 index 418cbd88935..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posix.cc +++ /dev/null @@ -1,82 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_debug__util__posix.cc,v 1.2 2013/01/04 17:16:54 ryoon Exp $ - -# Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 - ---- ipc/chromium/src/base/debug_util_posix.cc.orig 2012-11-29 04:44:15.000000000 +0000 -+++ ipc/chromium/src/base/debug_util_posix.cc -@@ -5,7 +5,7 @@ - #include "build/build_config.h" - #include "base/debug_util.h" - --#define MOZ_HAVE_EXECINFO_H (!defined(ANDROID) && !defined(__OpenBSD__)) -+#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID)) - - #include <errno.h> - #include <fcntl.h> -@@ -17,9 +17,16 @@ - #include <unistd.h> - #if MOZ_HAVE_EXECINFO_H - #include <execinfo.h> -+#endif -+ -+#if defined(OS_MACOSX) || defined(OS_BSD) - #include <sys/sysctl.h> - #endif - -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+#include <sys/user.h> -+#endif -+ - #include "base/basictypes.h" - #include "base/eintr_wrapper.h" - #include "base/logging.h" -@@ -32,7 +39,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u - return false; - } - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - - // Based on Apple's recommended method as described in - // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -51,14 +58,22 @@ bool DebugUtil::BeingDebugged() { - // we're looking for information about a specific process ID. - int mib[] = { - CTL_KERN, -+#if defined(OS_NETBSD) -+ KERN_PROC2, -+#else - KERN_PROC, -+#endif - KERN_PROC_PID, - getpid() - }; - - // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and - // binary interfaces may change. -+#if defined(OS_NETBSD) -+ struct kinfo_proc2 info; -+#else - struct kinfo_proc info; -+#endif - size_t info_size = sizeof(info); - - int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0); -@@ -71,7 +86,17 @@ bool DebugUtil::BeingDebugged() { - - // This process is being debugged if the P_TRACED flag is set. - is_set = true; -+#if defined(OS_DRAGONFLY) -+ being_debugged = (info.kp_flags & P_TRACED) != 0; -+#elif defined(OS_FREEBSD) -+ being_debugged = (info.ki_flag & P_TRACED) != 0; -+#elif defined(OS_OPENBSD) -+ being_debugged = (info.p_flag & P_TRACED) != 0; -+#elif defined(OS_NETBSD) -+ being_debugged = (info.p_flag & P_TRACED) != 0; -+#else - being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; -+#endif - return being_debugged; - } - diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h index d230002e985..0dd5ec8d5fa 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h @@ -1,8 +1,11 @@ -$NetBSD: patch-ipc_chromium_src_base_dir__reader__bsd.h,v 1.3 2012/09/02 05:45:29 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_dir__reader__bsd.h,v 1.4 2013/01/10 15:01:30 ryoon Exp $ ---- ipc/chromium/src/base/dir_reader_bsd.h.orig 2012-08-28 18:53:58.000000000 +0000 +--- ipc/chromium/src/base/dir_reader_bsd.h.orig 2013-01-04 23:44:34.000000000 +0000 +++ ipc/chromium/src/base/dir_reader_bsd.h -@@ -0,0 +1,112 @@ +@@ -110,3 +110,115 @@ class DirReaderBSD { + } // namespace base + + #endif // BASE_DIR_READER_BSD_H_ +// Copyright (c) 2010 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. diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__posix.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__posix.h deleted file mode 100644 index b6e28312272..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__posix.h +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_dir__reader__posix.h,v 1.2 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/base/dir_reader_posix.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/base/dir_reader_posix.h -@@ -18,16 +18,20 @@ - // seems worse than falling back to enumerating all file descriptors so we will - // probably never implement this on the Mac. - --#if defined(OS_LINUX) && !defined(OS_OPENBSD) -+#if defined(OS_LINUX) - #include "base/dir_reader_linux.h" -+#elif defined(OS_BSD) -+#include "base/dir_reader_bsd.h" - #else - #include "base/dir_reader_fallback.h" - #endif - - namespace base { - --#if defined(OS_LINUX) && !defined(OS_OPENBSD) -+#if defined(OS_LINUX) - typedef DirReaderLinux DirReaderPosix; -+#elif defined(OS_BSD) -+typedef DirReaderBSD DirReaderPosix; - #else - typedef DirReaderFallback DirReaderPosix; - #endif diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc deleted file mode 100644 index d9de7476c05..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.5 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/base/file_util_posix.cc.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/base/file_util_posix.cc -@@ -31,7 +31,7 @@ - #include "base/time.h" - - // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine --#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#ifndef HAVE_STAT64 - #define stat64 stat - #endif - diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_message__loop.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_message__loop.cc deleted file mode 100644 index 3621e78af74..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_message__loop.cc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/base/message_loop.cc.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/base/message_loop.cc -@@ -19,7 +19,7 @@ - #if defined(OS_POSIX) - #include "base/message_pump_libevent.h" - #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #ifdef MOZ_WIDGET_GTK2 - #include "base/message_pump_glib.h" - #endif -@@ -119,7 +119,7 @@ MessageLoop::MessageLoop(Type type) - if (type_ == TYPE_UI) { - #if defined(OS_MACOSX) - pump_ = base::MessagePumpMac::Create(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - pump_ = new base::MessagePumpForUI(); - #endif // OS_LINUX - } else if (type_ == TYPE_IO) { diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread.h deleted file mode 100644 index 416a793534e..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/base/platform_thread.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/base/platform_thread.h -@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // - #elif defined(OS_POSIX) - #include <pthread.h> - typedef pthread_t PlatformThreadHandle; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - #include <unistd.h> - typedef pid_t PlatformThreadId; -+#elif defined(OS_BSD) -+typedef lwpid_t PlatformThreadId; - #elif defined(OS_MACOSX) - #include <mach/mach.h> - typedef mach_port_t PlatformThreadId; 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 deleted file mode 100644 index 92dbc60fbcf..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc +++ /dev/null @@ -1,74 +0,0 @@ -$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-11-19 17:13:26.000000000 +0000 -+++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,16 +9,30 @@ - - #if defined(OS_MACOSX) - #include <mach/mach.h> -+#elif defined(OS_NETBSD) -+#include <lwp.h> - #elif defined(OS_LINUX) - #include <sys/syscall.h> --#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) - #include <sys/prctl.h> --#elif !defined(__NetBSD__) --#include <pthread_np.h> -+#elif defined(OS_FREEBSD) -+#include <sys/param.h> -+#if __FreeBSD_version > 802500 -+#include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") - #endif -+#endif -+ -+#if !defined(OS_MACOSX) - #include <unistd.h> - #endif - -+#if defined(OS_BSD) && !defined(OS_NETBSD) -+#include <pthread_np.h> -+#endif -+ - #if defined(OS_MACOSX) - namespace base { - void InitThreading(); -@@ -38,9 +52,20 @@ PlatformThreadId PlatformThread::Current - // into the kernel. - #if defined(OS_MACOSX) - return mach_thread_self(); --#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) -- // TODO(BSD): find a better thread ID -- return (intptr_t)(pthread_self()); -+#elif defined(OS_NETBSD) -+ return _lwp_self(); -+#elif defined(OS_DRAGONFLY) -+ return lwp_gettid(); -+#elif defined(OS_FREEBSD) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif -+#elif defined(OS_OPENBSD) -+ return (intptr_t) (pthread_self()); - #elif defined(OS_LINUX) - return syscall(__NR_gettid); - #endif -@@ -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. --#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) -+#if defined(OS_BSD) && !defined(OS_NETBSD) - pthread_set_name_np(pthread_self(), name); --#elif defined(__NetBSD__) -+#elif defined(OS_NETBSD) - pthread_setname_np(pthread_self(), "%s", (void *)name); - #else - prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0); diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h deleted file mode 100644 index f520b95a962..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.5 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/base/process_util.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/base/process_util.h -@@ -280,6 +280,7 @@ class NamedProcessIterator { - const ProcessEntry* NextProcessEntry(); - - private: -+#if !defined(OS_BSD) - // Determines whether there's another process (regardless of executable) - // left in the list of all processes. Returns true and sets entry_ to - // that process's info if there is one, false otherwise. -@@ -292,18 +293,24 @@ class NamedProcessIterator { - void InitProcessEntry(ProcessEntry* entry); - - std::wstring executable_name_; -+#endif - - #if defined(OS_WIN) - HANDLE snapshot_; - bool started_iteration_; - #elif defined(OS_LINUX) - DIR *procfs_dir_; -+#elif defined(OS_BSD) -+ std::vector<ProcessEntry> content; -+ size_t nextEntry; - #elif defined(OS_MACOSX) - std::vector<kinfo_proc> kinfo_procs_; - size_t index_of_kinfo_proc_; - #endif -+#if !defined(OS_BSD) - ProcessEntry entry_; - const ProcessFilter* filter_; -+#endif - - DISALLOW_EVIL_CONSTRUCTORS(NamedProcessIterator); - }; 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 deleted file mode 100644 index d683e98452f..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc +++ /dev/null @@ -1,372 +0,0 @@ -$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-04-01 00:04:28.000000000 +0000 -+++ ipc/chromium/src/base/process_util_bsd.cc -@@ -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. -+ -+// derived from process_util_linux.cc and process_util_mac.cc -+ -+#include "base/process_util.h" -+ -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <sys/wait.h> -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+#include <sys/user.h> -+#endif -+ -+#include <ctype.h> -+#include <fcntl.h> -+#include <kvm.h> -+#include <unistd.h> -+ -+#include <string> -+ -+#include "base/debug_util.h" -+#include "base/eintr_wrapper.h" -+#include "base/file_util.h" -+#include "base/logging.h" -+#include "base/string_tokenizer.h" -+#include "base/string_util.h" -+ -+#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \ -+ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500) -+#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 -+# else -+# define __dso_public __attribute__((__visibility__("default"))) -+# endif -+#endif -+ -+#ifdef HAVE_POSIX_SPAWN -+#include <spawn.h> -+extern "C" char **environ __dso_public; -+#endif -+ -+namespace { -+ -+enum ParsingState { -+ KEY_NAME, -+ KEY_VALUE -+}; -+ -+static mozilla::EnvironmentLog gProcessLog("MOZ_PROCESS_LOG"); -+ -+} // namespace -+ -+namespace base { -+ -+#ifdef HAVE_POSIX_SPAWN -+ -+void FreeEnvVarsArray(char* array[], int length) -+{ -+ for (int i = 0; i < length; i++) { -+ free(array[i]); -+ } -+ delete[] array; -+} -+ -+bool LaunchApp(const std::vector<std::string>& argv, -+ const file_handle_mapping_vector& fds_to_remap, -+ bool wait, ProcessHandle* process_handle) { -+ return LaunchApp(argv, fds_to_remap, environment_map(), -+ 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, -+ 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]; -+ for (size_t i = 0; i < argv.size(); i++) { -+ argv_copy[i] = const_cast<char*>(argv[i].c_str()); -+ } -+ argv_copy[argv.size()] = NULL; -+ -+ // Make sure we don't leak any FDs to the child process by marking all FDs -+ // as close-on-exec. -+ SetAllFDsToCloseOnExec(); -+ -+ // Copy environment to a new char array and add the variables -+ // in env_vars_to_set. -+ // Existing variables are overwritten by env_vars_to_set. -+ int pos = 0; -+ environment_map combined_env_vars = env_vars_to_set; -+ while(environ[pos] != NULL) { -+ std::string varString = environ[pos]; -+ std::string varName = varString.substr(0, varString.find_first_of('=')); -+ std::string varValue = varString.substr(varString.find_first_of('=') + 1); -+ if (combined_env_vars.find(varName) == combined_env_vars.end()) { -+ combined_env_vars[varName] = varValue; -+ } -+ pos++; -+ } -+ int varsLen = combined_env_vars.size() + 1; -+ -+ char** vars = new char*[varsLen]; -+ int i = 0; -+ for (environment_map::const_iterator it = combined_env_vars.begin(); -+ it != combined_env_vars.end(); ++it) { -+ std::string entry(it->first); -+ entry += "="; -+ entry += it->second; -+ vars[i] = strdup(entry.c_str()); -+ i++; -+ } -+ vars[i] = NULL; -+ -+ posix_spawn_file_actions_t file_actions; -+ if (posix_spawn_file_actions_init(&file_actions) != 0) { -+ FreeEnvVarsArray(vars, varsLen); -+ return false; -+ } -+ -+ // Turn fds_to_remap array into a set of dup2 calls. -+ for (file_handle_mapping_vector::const_iterator it = fds_to_remap.begin(); -+ it != fds_to_remap.end(); -+ ++it) { -+ int src_fd = it->first; -+ int dest_fd = it->second; -+ -+ if (src_fd == dest_fd) { -+ int flags = fcntl(src_fd, F_GETFD); -+ if (flags != -1) { -+ fcntl(src_fd, F_SETFD, flags & ~FD_CLOEXEC); -+ } -+ } else { -+ if (posix_spawn_file_actions_adddup2(&file_actions, src_fd, dest_fd) != 0) { -+ posix_spawn_file_actions_destroy(&file_actions); -+ FreeEnvVarsArray(vars, varsLen); -+ return false; -+ } -+ } -+ } -+ -+ pid_t pid = 0; -+ int spawn_succeeded = (posix_spawnp(&pid, -+ argv_copy[0], -+ &file_actions, -+ NULL, -+ argv_copy, -+ vars) == 0); -+ -+ FreeEnvVarsArray(vars, varsLen); -+ -+ posix_spawn_file_actions_destroy(&file_actions); -+ -+ bool process_handle_valid = pid > 0; -+ if (!spawn_succeeded || !process_handle_valid) { -+ retval = false; -+ } else { -+ if (wait) -+ HANDLE_EINTR(waitpid(pid, 0, 0)); -+ -+ if (process_handle) -+ *process_handle = pid; -+ } -+ -+ return retval; -+} -+ -+bool LaunchApp(const CommandLine& cl, -+ bool wait, bool start_hidden, ProcessHandle* process_handle) { -+ // TODO(playmobil): Do we need to respect the start_hidden flag? -+ file_handle_mapping_vector no_files; -+ return LaunchApp(cl.argv(), no_files, wait, process_handle); -+} -+ -+#else // no posix_spawn, use fork/exec -+ -+bool LaunchApp(const std::vector<std::string>& argv, -+ const file_handle_mapping_vector& fds_to_remap, -+ bool wait, ProcessHandle* process_handle) { -+ return LaunchApp(argv, fds_to_remap, environment_map(), -+ 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, -+ 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; -+ fd_shuffle1.reserve(fds_to_remap.size()); -+ fd_shuffle2.reserve(fds_to_remap.size()); -+ -+ pid_t pid = fork(); -+ if (pid < 0) -+ return false; -+ -+ if (pid == 0) { -+ for (file_handle_mapping_vector::const_iterator -+ it = fds_to_remap.begin(); it != fds_to_remap.end(); ++it) { -+ fd_shuffle1.push_back(InjectionArc(it->first, it->second, false)); -+ fd_shuffle2.push_back(InjectionArc(it->first, it->second, false)); -+ } -+ -+ if (!ShuffleFileDescriptors(&fd_shuffle1)) -+ _exit(127); -+ -+ 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); -+ } -+ 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); -+ } else { -+ gProcessLog.print("==> process %d launched child process %d\n", -+ GetCurrentProcId(), pid); -+ if (wait) -+ HANDLE_EINTR(waitpid(pid, 0, 0)); -+ -+ if (process_handle) -+ *process_handle = pid; -+ } -+ -+ return true; -+} -+ -+bool LaunchApp(const CommandLine& cl, -+ bool wait, bool start_hidden, -+ ProcessHandle* process_handle) { -+ file_handle_mapping_vector no_files; -+ return LaunchApp(cl.argv(), no_files, wait, process_handle); -+} -+ -+#endif -+ -+NamedProcessIterator::NamedProcessIterator(const std::wstring& executable_name, -+ const ProcessFilter* filter) -+{ -+ int numEntries; -+ kvm_t *kvm; -+ std::string exe(WideToASCII(executable_name)); -+ -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+ kvm = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL); -+ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), &numEntries); -+ if (procs != NULL && numEntries > 0) { -+ for (int i = 0; i < numEntries; i++) { -+# if defined(OS_DRAGONFLY) -+ if (exe != procs[i].kp_comm) continue; -+ if (filter && !filter->Includes(procs[i].kp_pid, procs[i].kp_ppid)) continue; -+ ProcessEntry e; -+ e.pid = procs[i].kp_pid; -+ e.ppid = procs[i].kp_ppid; -+ strlcpy(e.szExeFile, procs[i].kp_comm, sizeof e.szExeFile); -+ content.push_back(e); -+# elif defined(OS_FREEBSD) -+ if (exe != procs[i].ki_comm) continue; -+ if (filter && !filter->Includes(procs[i].ki_pid, procs[i].ki_ppid)) continue; -+ ProcessEntry e; -+ e.pid = procs[i].ki_pid; -+ e.ppid = procs[i].ki_ppid; -+ strlcpy(e.szExeFile, procs[i].ki_comm, sizeof e.szExeFile); -+ content.push_back(e); -+# endif -+#else -+ kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); -+#if defined(OS_OPENBSD) -+ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); -+#else -+ struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); -+#endif -+ if (procs != NULL && numEntries > 0) { -+ for (int i = 0; i < numEntries; i++) { -+ if (exe != procs[i].p_comm) continue; -+ if (filter && !filter->Includes(procs[i].p_pid, procs[i].p_ppid)) continue; -+ ProcessEntry e; -+ e.pid = procs[i].p_pid; -+ e.ppid = procs[i].p_ppid; -+ strlcpy(e.szExeFile, procs[i].p_comm, sizeof e.szExeFile); -+ content.push_back(e); -+#endif -+ } -+ } -+ nextEntry = 0; -+ kvm_close(kvm); -+} -+ -+NamedProcessIterator::~NamedProcessIterator() { -+} -+ -+const ProcessEntry* NamedProcessIterator::NextProcessEntry() { -+ if (nextEntry >= content.size()) return NULL; -+ return &content[nextEntry++]; -+} -+ -+bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const { -+ return false; -+} -+ -+} // namespace base diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__posix.cc deleted file mode 100644 index 57333ae27df..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__posix.cc +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util__posix.cc,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/base/process_util_posix.cc.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/base/process_util_posix.cc -@@ -116,6 +116,11 @@ void CloseSuperfluousFds(const base::Inj - #elif defined(OS_MACOSX) - static const rlim_t kSystemDefaultMaxFds = 256; - static const char kFDDir[] = "/dev/fd"; -+#elif defined(OS_BSD) -+ // the getrlimit below should never fail, so whatever .. -+ static const rlim_t kSystemDefaultMaxFds = 1024; -+ // at least /dev/fd will exist -+ static const char kFDDir[] = "/dev/fd"; - #endif - - // Get the maximum number of FDs possible. -@@ -199,7 +204,7 @@ void CloseSuperfluousFds(const base::Inj - void SetAllFDsToCloseOnExec() { - #if defined(OS_LINUX) - const char fd_dir[] = "/proc/self/fd"; --#elif defined(OS_MACOSX) -+#elif defined(OS_MACOSX) || defined(OS_BSD) - const char fd_dir[] = "/dev/fd"; - #endif - ScopedDIR dir_closer(opendir(fd_dir)); diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_sys__info__posix.cc deleted file mode 100644 index 9ac7d1c7e20..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_sys__info__posix.cc +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.5 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/base/sys_info_posix.cc.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/base/sys_info_posix.cc -@@ -18,6 +18,11 @@ - #include <mach/mach_init.h> - #endif - -+#if defined(OS_NETBSD) -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#endif -+ - #include "base/logging.h" - #include "base/string_util.h" - -@@ -26,7 +31,11 @@ namespace base { - int SysInfo::NumberOfProcessors() { - // It seems that sysconf returns the number of "logical" processors on both - // mac and linux. So we get the number of "online logical" processors. -+#ifdef _SC_NPROCESSORS_ONLN - static long res = sysconf(_SC_NPROCESSORS_ONLN); -+#else -+ static long res = 1; -+#endif - if (res == -1) { - NOTREACHED(); - return 1; -@@ -52,6 +61,20 @@ int64 SysInfo::AmountOfPhysicalMemory() - } - - return static_cast<int64>(hostinfo.max_mem); -+#elif defined(OS_NETBSD) -+ int mib[2]; -+ int rc; -+ int64_t memSize; -+ size_t len = sizeof(memSize); -+ -+ mib[0] = CTL_HW; -+ mib[1] = HW_PHYSMEM64; -+ rc = sysctl( mib, 2, &memSize, &len, NULL, 0 ); -+ if (-1 != rc) { -+ return memSize; -+ } -+ return 0; -+ - #else - long pages = sysconf(_SC_PHYS_PAGES); - long page_size = sysconf(_SC_PAGE_SIZE); diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_thread__collision__warner.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_thread__collision__warner.h deleted file mode 100644 index ea18f3f7a00..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_thread__collision__warner.h +++ /dev/null @@ -1,15 +0,0 @@ -$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_chromium_src_base_time__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_time__posix.cc deleted file mode 100644 index a6d5c9f738a..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_time__posix.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_time__posix.cc,v 1.2 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/base/time_posix.cc.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/base/time_posix.cc -@@ -167,7 +167,7 @@ TimeTicks TimeTicks::Now() { - // With numer and denom = 1 (the expected case), the 64-bit absolute time - // reported in nanoseconds is enough to last nearly 585 years. - --#elif defined(__OpenBSD__) || defined(OS_POSIX) && \ -+#elif defined(OS_OPENBSD) || defined(OS_POSIX) && \ - defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 - - struct timespec ts; diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h b/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h deleted file mode 100644 index 40fddac7a17..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.7 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/build/build_config.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/build/build_config.h -@@ -19,6 +19,12 @@ - #define OS_MACOSX 1 - #elif defined(__linux__) || defined(ANDROID) - #define OS_LINUX 1 -+#elif defined(__DragonFly__) -+#define OS_DRAGONFLY 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 - #elif defined(__OpenBSD__) - #define OS_OPENBSD 1 - #elif defined(_WIN32) -@@ -27,9 +33,16 @@ - #error Please add support for your platform in build/build_config.h - #endif - -+// For access to standard BSD features, use OS_BSD instead of a -+// more specific macro. -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ -+ || defined(OS_NETBSD) || defined(OS_OPENBSD) -+#define OS_BSD 1 -+#endif -+ - // For access to standard POSIX features, use OS_POSIX instead of a more - // specific macro. --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #define OS_POSIX 1 - #endif - diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h b/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h deleted file mode 100644 index 35e0e753c39..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h,v 1.2 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/chrome/common/file_descriptor_set_posix.h -@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::R - // In debugging mode, it's a fatal error to try and add more than this number - // of descriptors to a FileDescriptorSet. - enum { -- MAX_DESCRIPTORS_PER_MESSAGE = 4, -+ MAX_DESCRIPTORS_PER_MESSAGE = 4 - }; - - // --------------------------------------------------------------------------- diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc deleted file mode 100644 index d36e4b00052..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc,v 1.2 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc -@@ -7,6 +7,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <stddef.h> -+#include <unistd.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/stat.h> diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h b/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h deleted file mode 100644 index 70e568f11dc..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/chrome/common/ipc_channel_posix.h -@@ -95,7 +95,7 @@ class Channel::ChannelImpl : public Mess - }; - - // This is a control message buffer large enough to hold kMaxReadFDs --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_NETBSD) - // TODO(agl): OSX appears to have non-constant CMSG macros! - char input_cmsg_buf_[1024]; - #else diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__message__utils.h b/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__message__utils.h deleted file mode 100644 index dae71b40bb0..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__message__utils.h +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/chrome/common/ipc_message_utils.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/chrome/common/ipc_message_utils.h -@@ -195,7 +195,7 @@ struct ParamTraits<unsigned long long> { - }; - #endif - --#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) - // There size_t is a synonym for |unsigned long| ... - template <> - struct ParamTraits<size_t> { -@@ -248,7 +248,7 @@ struct ParamTraits<uint32> { - }; - #endif // defined(OS_MACOSX) - --#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) - // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| - template <> - struct ParamTraits<int64> { diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h b/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h deleted file mode 100644 index 2d1f8a72094..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/chromium/src/chrome/common/transport_dib.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/chromium/src/chrome/common/transport_dib.h -@@ -7,7 +7,7 @@ - - #include "base/basictypes.h" - --#if defined(OS_WIN) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) - #include "base/shared_memory.h" - #endif - -@@ -66,7 +66,7 @@ class TransportDIB { - uint32 sequence_num; - }; - typedef HandleAndSequenceNum Id; --#elif defined(OS_MACOSX) -+#elif defined(OS_MACOSX) || defined(OS_BSD) - typedef base::SharedMemoryHandle Handle; - // On Mac, the inode number of the backing file is used as an id. - typedef base::SharedMemoryId Id; -@@ -108,7 +108,7 @@ class TransportDIB { - - private: - TransportDIB(); --#if defined(OS_WIN) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) - explicit TransportDIB(base::SharedMemoryHandle dib); - base::SharedMemory shared_memory_; - uint32 sequence_num_; diff --git a/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp index f17374a9a68..672b4e5b50a 100644 --- a/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp +++ b/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.5 2012/11/21 15:26:50 ryoon Exp $ +$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.6 2013/01/10 15:01:31 ryoon Exp $ ---- ipc/glue/GeckoChildProcessHost.cpp.orig 2012-11-19 15:42:29.000000000 +0000 +--- ipc/glue/GeckoChildProcessHost.cpp.orig 2013-01-04 23:44:34.000000000 +0000 +++ ipc/glue/GeckoChildProcessHost.cpp @@ -4,7 +4,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -16,41 +16,3 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.5 2012/11/21 15:26:50 ryoo #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; - base::ChildPrivileges privs = kLowRightsSubprocesses ? - base::UNPRIVILEGED : -@@ -455,8 +461,8 @@ GeckoChildProcessHost::PerformAsyncLaunc - if (NS_SUCCEEDED(rv)) { - nsCString path; - greDir->GetNativePath(path); --# ifdef OS_LINUX --# ifdef MOZ_WIDGET_ANDROID -+# if defined(OS_LINUX) || defined(OS_BSD) -+# if defined(MOZ_WIDGET_ANDROID) || defined(OS_BSD) - path += "/lib"; - # endif // MOZ_WIDGET_ANDROID - const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH"); -@@ -575,7 +581,7 @@ GeckoChildProcessHost::PerformAsyncLaunc - childArgv.push_back(pidstring); - - #if defined(MOZ_CRASHREPORTER) --# if defined(OS_LINUX) -+# if defined(OS_LINUX) || defined(OS_BSD) - int childCrashFd, childCrashRemapFd; - if (!CrashReporter::CreateNotificationPipeForChild( - &childCrashFd, &childCrashRemapFd)) -@@ -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, privs, - #endif - false, &process, arch); diff --git a/devel/xulrunner/patches/patch-ipc_glue_SharedMemorySysV.h b/devel/xulrunner/patches/patch-ipc_glue_SharedMemorySysV.h deleted file mode 100644 index 151b29d904d..00000000000 --- a/devel/xulrunner/patches/patch-ipc_glue_SharedMemorySysV.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_glue_SharedMemorySysV.h,v 1.2 2012/08/28 23:27:10 ryoon Exp $ - ---- ipc/glue/SharedMemorySysV.h.orig 2012-08-24 22:55:37.000000000 +0000 -+++ ipc/glue/SharedMemorySysV.h -@@ -8,7 +8,7 @@ - #ifndef mozilla_ipc_SharedMemorySysV_h - #define mozilla_ipc_SharedMemorySysV_h - --#if defined(OS_LINUX) && !defined(ANDROID) -+#if (defined(OS_LINUX) && !defined(ANDROID)) || defined(OS_BSD) - - // SysV shared memory isn't available on Windows, but we define the - // following macro so that #ifdefs are clearer (compared to #ifdef diff --git a/devel/xulrunner/patches/patch-ipc_ipdl_ipdl_lower.py b/devel/xulrunner/patches/patch-ipc_ipdl_ipdl_lower.py new file mode 100644 index 00000000000..6a13bb0d2a0 --- /dev/null +++ b/devel/xulrunner/patches/patch-ipc_ipdl_ipdl_lower.py @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_ipdl_ipdl_lower.py,v 1.1 2013/01/10 15:01:31 ryoon Exp $ + +--- ipc/ipdl/ipdl/lower.py.orig 2013-01-04 23:44:34.000000000 +0000 ++++ ipc/ipdl/ipdl/lower.py +@@ -1797,7 +1797,7 @@ def _generateMessageClass(clsname, msgid + StmtExpr(ExprCall( + ExprVar('StringAppendF'), + args=[ ExprAddrOf(msgvar), +- ExprLiteral.String('[time:%" PRId64 "][%d]'), ++ ExprLiteral.String('[time:%\\" PRId64 \\"][%d]'), + ExprCall(ExprVar('PR_Now')), + ExprCall(ExprVar('base::GetCurrentProcId')) ])), + appendToMsg(pfxvar), diff --git a/devel/xulrunner/patches/patch-js_src_config_system-headers b/devel/xulrunner/patches/patch-js_src_config_system-headers index e65c4337d8b..cbf39d6d9fe 100644 --- a/devel/xulrunner/patches/patch-js_src_config_system-headers +++ b/devel/xulrunner/patches/patch-js_src_config_system-headers @@ -1,8 +1,8 @@ -$NetBSD: patch-js_src_config_system-headers,v 1.2 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-js_src_config_system-headers,v 1.3 2013/01/10 15:01:31 ryoon Exp $ ---- js/src/config/system-headers.orig 2012-08-24 22:55:39.000000000 +0000 +--- js/src/config/system-headers.orig 2013-01-04 23:44:34.000000000 +0000 +++ js/src/config/system-headers -@@ -1059,3 +1059,7 @@ gst/gst.h +@@ -1119,6 +1119,10 @@ gst/gst.h gst/app/gstappsink.h gst/app/gstappsrc.h gst/video/video.h @@ -10,3 +10,6 @@ $NetBSD: patch-js_src_config_system-headers,v 1.2 2012/08/28 23:27:10 ryoon Exp +sys/user.h +kvm.h +spawn.h + sys/msg.h + sys/ipc.h + sys/thr.h diff --git a/devel/xulrunner/patches/patch-js_src_jscpucfg.h b/devel/xulrunner/patches/patch-js_src_jscpucfg.h index 9e727fbb4f8..7af2c01bb42 100644 --- a/devel/xulrunner/patches/patch-js_src_jscpucfg.h +++ b/devel/xulrunner/patches/patch-js_src_jscpucfg.h @@ -1,7 +1,7 @@ -$NetBSD: patch-js_src_jscpucfg.h,v 1.4 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-js_src_jscpucfg.h,v 1.5 2013/01/10 15:01:31 ryoon Exp $ ---- js/src/jscpucfg.h.orig 2012-08-24 22:55:40.000000000 +0000 +--- js/src/jscpucfg.h.orig 2013-01-04 23:44:35.000000000 +0000 +++ js/src/jscpucfg.h @@ -44,6 +44,21 @@ # define IS_BIG_ENDIAN 1 diff --git a/devel/xulrunner/patches/patch-js_src_jsgc.cpp b/devel/xulrunner/patches/patch-js_src_jsgc.cpp index 7ecfbf304ad..d4ed0c38cf8 100644 --- a/devel/xulrunner/patches/patch-js_src_jsgc.cpp +++ b/devel/xulrunner/patches/patch-js_src_jsgc.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-js_src_jsgc.cpp,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-js_src_jsgc.cpp,v 1.4 2013/01/10 15:01:31 ryoon Exp $ http://gnats.netbsd.org/46622 ---- js/src/jsgc.cpp.orig 2012-08-24 22:55:40.000000000 +0000 +--- js/src/jsgc.cpp.orig 2013-01-04 23:44:35.000000000 +0000 +++ js/src/jsgc.cpp -@@ -2635,8 +2635,12 @@ GetCPUCount() +@@ -2905,8 +2905,12 @@ GetCPUCount() GetSystemInfo(&sysinfo); ncpus = unsigned(sysinfo.dwNumberOfProcessors); # else diff --git a/devel/xulrunner/patches/patch-js_src_jsinterp.cpp b/devel/xulrunner/patches/patch-js_src_jsinterp.cpp deleted file mode 100644 index cbab29f6ced..00000000000 --- a/devel/xulrunner/patches/patch-js_src_jsinterp.cpp +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-js_src_jsinterp.cpp,v 1.1 2012/11/11 22:26:00 joerg Exp $ - ---- js/src/jsinterp.cpp.orig 2012-11-04 13:25:04.000000000 +0000 -+++ js/src/jsinterp.cpp -@@ -3684,6 +3684,7 @@ BEGIN_CASE(JSOP_LEAVEBLOCK) - BEGIN_CASE(JSOP_LEAVEFORLETIN) - BEGIN_CASE(JSOP_LEAVEBLOCKEXPR) - { -+ { - DebugOnly<uint32_t> blockDepth = regs.fp()->blockChain().stackDepth(); - - regs.fp()->popBlock(cx); -@@ -3698,7 +3699,9 @@ BEGIN_CASE(JSOP_LEAVEBLOCKEXPR) - regs.sp -= GET_UINT16(regs.pc); - JS_ASSERT(regs.stackDepth() == blockDepth + 1); - regs.sp[-1] = *vp; -- } else { -+ } -+ } -+ if (op != JSOP_LEAVEBLOCK && op != JSOP_LEAVEBLOCKEXPR) { - /* Another op will pop; nothing to do here. */ - len = JSOP_LEAVEFORLETIN_LENGTH; - DO_NEXT_OP(len); diff --git a/devel/xulrunner/patches/patch-js_src_methodjit_MethodJIT.cpp b/devel/xulrunner/patches/patch-js_src_methodjit_MethodJIT.cpp index 2fe47ebf4a3..4edede4dd86 100644 --- a/devel/xulrunner/patches/patch-js_src_methodjit_MethodJIT.cpp +++ b/devel/xulrunner/patches/patch-js_src_methodjit_MethodJIT.cpp @@ -1,11 +1,11 @@ -$NetBSD: patch-js_src_methodjit_MethodJIT.cpp,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-js_src_methodjit_MethodJIT.cpp,v 1.4 2013/01/10 15:01:31 ryoon Exp $ # This does not only apply to linux, but all ELF platforms (otherwise the # generated code will not be PIC) ---- js/src/methodjit/MethodJIT.cpp.orig 2012-08-24 22:55:40.000000000 +0000 +--- js/src/methodjit/MethodJIT.cpp.orig 2013-01-04 23:44:35.000000000 +0000 +++ js/src/methodjit/MethodJIT.cpp -@@ -135,7 +135,7 @@ PopActiveVMFrame(VMFrame &f) +@@ -142,7 +142,7 @@ PopActiveVMFrame(VMFrame &f) JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); diff --git a/devel/xulrunner/patches/patch-mb b/devel/xulrunner/patches/patch-mb index 9cf624ef8d1..19d27a8cadb 100644 --- a/devel/xulrunner/patches/patch-mb +++ b/devel/xulrunner/patches/patch-mb @@ -1,6 +1,6 @@ -$NetBSD: patch-mb,v 1.9 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-mb,v 1.10 2013/01/10 15:01:31 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2012-08-24 22:56:10.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -50,7 +50,7 @@ endif endif diff --git a/devel/xulrunner/patches/patch-md b/devel/xulrunner/patches/patch-md index 63e67e53fc3..a80a68b055a 100644 --- a/devel/xulrunner/patches/patch-md +++ b/devel/xulrunner/patches/patch-md @@ -1,10 +1,10 @@ -$NetBSD: patch-md,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-md,v 1.4 2013/01/10 15:01:31 ryoon Exp $ ???. from www/firefox/patch-ax. ---- security/coreconf/SunOS5.mk.orig 2012-08-24 22:56:00.000000000 +0000 +--- security/coreconf/SunOS5.mk.orig 2013-01-04 23:44:43.000000000 +0000 +++ security/coreconf/SunOS5.mk -@@ -147,6 +147,10 @@ endif +@@ -115,6 +115,10 @@ endif endif DSO_LDOPTS += -z combreloc -z defs -z ignore diff --git a/devel/xulrunner/patches/patch-me b/devel/xulrunner/patches/patch-me index 1f07dd2babd..3988da70b33 100644 --- a/devel/xulrunner/patches/patch-me +++ b/devel/xulrunner/patches/patch-me @@ -1,10 +1,10 @@ -$NetBSD: patch-me,v 1.7 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-me,v 1.8 2013/01/10 15:01:31 ryoon Exp $ Add DragonFly support. ---- security/nss/lib/freebl/Makefile.orig 2012-08-24 22:56:01.000000000 +0000 +--- security/nss/lib/freebl/Makefile.orig 2013-01-04 23:44:43.000000000 +0000 +++ security/nss/lib/freebl/Makefile -@@ -279,7 +279,7 @@ endif +@@ -255,7 +255,7 @@ endif # to bind the blapi function references in FREEBLVector vector # (ldvector.c) to the blapi functions defined in the freebl # shared libraries. diff --git a/devel/xulrunner/patches/patch-media_libcubeb_src_Makefile.in b/devel/xulrunner/patches/patch-media_libcubeb_src_Makefile.in index 2169f9cdd1b..ec8f516d61a 100644 --- a/devel/xulrunner/patches/patch-media_libcubeb_src_Makefile.in +++ b/devel/xulrunner/patches/patch-media_libcubeb_src_Makefile.in @@ -1,12 +1,12 @@ -$NetBSD: patch-media_libcubeb_src_Makefile.in,v 1.1 2012/11/21 15:26:50 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_Makefile.in,v 1.2 2013/01/10 15:01:31 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.orig 2013-01-04 23:44:40.000000000 +0000 +++ media/libcubeb/src/Makefile.in -@@ -24,10 +24,6 @@ endif - - ifeq ($(OS_TARGET),Android) +@@ -29,10 +29,6 @@ CSRCS = \ + $(NULL) + endif # No Android implementation of libcubeb yet. -else ifeq ($(OS_TARGET),Linux) -CSRCS = \ @@ -15,7 +15,7 @@ Add adds --enable-alsa and makes --enable-pulseaudio also work with media.use_cu endif ifeq ($(OS_TARGET),Darwin) -@@ -42,6 +38,12 @@ CSRCS = \ +@@ -47,6 +43,12 @@ CSRCS = \ $(NULL) endif diff --git a/devel/xulrunner/patches/patch-media_libsydneyaudio_src_Makefile.in b/devel/xulrunner/patches/patch-media_libsydneyaudio_src_Makefile.in deleted file mode 100644 index 9339b25b4c7..00000000000 --- a/devel/xulrunner/patches/patch-media_libsydneyaudio_src_Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ -$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_libsydneyaudio_src_sydney_audio_pulseaudio.c b/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c index 92638a8cc57..e2c572f5c38 100644 --- a/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c +++ b/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c @@ -1,6 +1,6 @@ -$NetBSD: patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c,v 1.4 2013/01/10 15:01:31 ryoon Exp $ ---- media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig 2012-08-24 22:55:55.000000000 +0000 +--- media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig 2013-01-04 23:44:40.000000000 +0000 +++ media/libsydneyaudio/src/sydney_audio_pulseaudio.c @@ -6,7 +6,9 @@ #include <stdio.h> diff --git a/devel/xulrunner/patches/patch-mf b/devel/xulrunner/patches/patch-mf deleted file mode 100644 index 6563df00f3c..00000000000 --- a/devel/xulrunner/patches/patch-mf +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-mf,v 1.7 2012/08/28 23:27:10 ryoon Exp $ - -Add DragonFly support. -Make sure nss libraries have a run path defined. - ---- security/coreconf/config.mk.orig 2012-08-24 22:56:00.000000000 +0000 -+++ security/coreconf/config.mk -@@ -63,7 +63,7 @@ endif - ####################################################################### - - TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ -- AIX RISCOS WINNT WIN95 WINCE Linux -+ AIX RISCOS WINNT WIN95 WINCE Linux DragonFly - - ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) - include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk -@@ -207,3 +207,4 @@ endif - DEFINES += -DUSE_UTIL_DIRECTLY - USE_UTIL_DIRECTLY = 1 - -+EXTRA_SHARED_LIBS += -Wl,-R${PREFIX}/lib/${MOZILLA_PKG_NAME} diff --git a/devel/xulrunner/patches/patch-mg b/devel/xulrunner/patches/patch-mg deleted file mode 100644 index 2a6da71a232..00000000000 --- a/devel/xulrunner/patches/patch-mg +++ /dev/null @@ -1,90 +0,0 @@ -$NetBSD: patch-mg,v 1.3 2012/08/28 23:27:10 ryoon Exp $ - -Add DragonFly support. - ---- security/coreconf/DragonFly.mk.orig 2012-08-28 18:54:10.000000000 +0000 -+++ security/coreconf/DragonFly.mk -@@ -0,0 +1,83 @@ -+# -+# The contents of this file are subject to the Mozilla Public -+# License Version 1.1 (the "License"); you may not use this file -+# except in compliance with the License. You may obtain a copy of -+# the License at http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS -+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+# implied. See the License for the specific language governing -+# rights and limitations under the License. -+# -+# The Original Code is the Netscape security libraries. -+# -+# The Initial Developer of the Original Code is Netscape -+# Communications Corporation. Portions created by Netscape are -+# Copyright (C) 1994-2000 Netscape Communications Corporation. All -+# Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the -+# terms of the GNU General Public License Version 2 or later (the -+# "GPL"), in which case the provisions of the GPL are applicable -+# instead of those above. If you wish to allow use of your -+# version of this file only under the terms of the GPL and not to -+# allow others to use your version of this file under the MPL, -+# indicate your decision by deleting the provisions above and -+# replace them with the notice and other provisions required by -+# the GPL. If you do not delete the provisions above, a recipient -+# may use your version of this file under either the MPL or the -+# GPL. -+# -+# Config stuff for DragonFly -+# -+ -+include $(CORE_DEPTH)/coreconf/UNIX.mk -+ -+DEFAULT_COMPILER = gcc -+CC = gcc -+CCC = g++ -+RANLIB = ranlib -+ -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+else -+CPU_ARCH = x86 -+endif -+ -+OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -+ -+DSO_CFLAGS = -fPIC -+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) -+ -+# -+# The default implementation strategy for FreeBSD is pthreads. -+# -+ifndef CLASSIC_NSPR -+USE_PTHREADS = 1 -+DEFINES += -D_THREAD_SAFE -D_REENTRANT -+OS_LIBS += -pthread -+DSO_LDOPTS += -pthread -+endif -+ -+ARCH = freebsd -+ -+MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+DLL_SUFFIX = so -+ -+ifdef LIBRUNPATH -+DSO_LDOPTS += -Wl,-R$(LIBRUNPATH) -+endif -+ -+MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifdef MAPFILE -+# Add LD options to restrict exported symbols to those in the map file -+endif -+# Change PROCESS to put the mapfile in the correct format for this platform -+PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ -+ -+G++INCLUDES = -I/usr/include/g++ -+ -+INCLUDES += -I/usr/X11R6/include diff --git a/devel/xulrunner/patches/patch-mh b/devel/xulrunner/patches/patch-mh deleted file mode 100644 index a49b98a83ca..00000000000 --- a/devel/xulrunner/patches/patch-mh +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mh,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - ---- security/nss/lib/Makefile.orig 2012-08-24 22:56:01.000000000 +0000 -+++ security/nss/lib/Makefile -@@ -70,7 +70,7 @@ endif - - ifndef MOZILLA_CLIENT - ifeq ($(OS_ARCH),Linux) --SYSINIT_SRCDIR = sysinit # Add the sysinit directory to DIRS. -+#SYSINIT_SRCDIR = sysinit # Add the sysinit directory to DIRS. - endif - endif - diff --git a/devel/xulrunner/patches/patch-mi b/devel/xulrunner/patches/patch-mi deleted file mode 100644 index 168a7bba5a0..00000000000 --- a/devel/xulrunner/patches/patch-mi +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mi,v 1.5 2012/11/21 15:26:50 ryoon Exp $ - ---- config/config.mk.orig 2012-10-23 19:42:27.000000000 +0000 -+++ config/config.mk -@@ -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 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-mj b/devel/xulrunner/patches/patch-mj deleted file mode 100644 index 6f79510e48f..00000000000 --- a/devel/xulrunner/patches/patch-mj +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mj,v 1.3 2012/08/28 23:27:10 ryoon Exp $ - -Add DragonFly support. - ---- security/coreconf/arch.mk.orig 2012-08-24 22:56:00.000000000 +0000 -+++ security/coreconf/arch.mk -@@ -146,7 +146,7 @@ endif - # IRIX 6.5-ALPHA-1289139620. - # - --ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH))) -+ifeq (,$(filter-out Linux DragonFly FreeBSD IRIX,$(OS_ARCH))) - OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//') - endif - diff --git a/devel/xulrunner/patches/patch-mk b/devel/xulrunner/patches/patch-mk deleted file mode 100644 index ad1ce9dff61..00000000000 --- a/devel/xulrunner/patches/patch-mk +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-mk,v 1.6 2012/08/28 23:27:10 ryoon Exp $ - -* Conditional for NetBSD and DragonFly -* From https://bugzilla.mozilla.org/show_bug.cgi?id=736961 - ---- config/rules.mk.orig 2012-08-24 22:55:19.000000000 +0000 -+++ config/rules.mk -@@ -454,6 +454,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic - endif - endif - -+ifeq ($(OS_ARCH),DragonFly) -+ifdef IS_COMPONENT -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif -+endif -+ - ifeq ($(OS_ARCH),NetBSD) - ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST))) - ifeq ($(MODULE),layout) -@@ -463,6 +469,10 @@ endif - endif - endif - -+ifeq ($(OS_ARCH),NetBSD) -+EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner -+endif -+ - # - # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag - # which uses internal symbols first diff --git a/devel/xulrunner/patches/patch-ml b/devel/xulrunner/patches/patch-ml deleted file mode 100644 index b306570c19a..00000000000 --- a/devel/xulrunner/patches/patch-ml +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ml,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - ---- js/src/Makefile.in.orig 2012-08-24 22:55:38.000000000 +0000 -+++ js/src/Makefile.in -@@ -678,6 +678,9 @@ endif # _MSC_VER - ifeq ($(OS_ARCH),FreeBSD) - EXTRA_LIBS += -pthread - endif -+ifeq ($(OS_ARCH),DragonFly) -+EXTRA_LIBS += -pthread -+endif - ifeq ($(OS_ARCH),Linux) - EXTRA_LIBS += -ldl - endif diff --git a/devel/xulrunner/patches/patch-mm b/devel/xulrunner/patches/patch-mm deleted file mode 100644 index a8adae6c247..00000000000 --- a/devel/xulrunner/patches/patch-mm +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-mm,v 1.16 2012/08/28 23:27:10 ryoon Exp $ - ---- toolkit/library/Makefile.in.orig 2012-08-24 22:56:06.000000000 +0000 -+++ toolkit/library/Makefile.in -@@ -535,6 +535,25 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle - endif - endif - -+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) -+OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+# keep `environ' unresolved, see bug 14426 for binutils -+EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -+endif -+ -+ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH))) -+EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3 -+endif -+ -+ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) -+ifeq ($(OS_ARCH),NetBSD) -+EXTRA_DSO_LDOPTS += -lossaudio -+endif -+ifdef PKGSRC_PULSEAUDIO -+EXTRA_DSO_LDOPTS += -lpulse -+endif -+endif -+ - ifeq ($(OS_ARCH),WINNT) - OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs) - ifdef MOZ_CRASHREPORTER diff --git a/devel/xulrunner/patches/patch-mn b/devel/xulrunner/patches/patch-mn deleted file mode 100644 index 3938b86e11d..00000000000 --- a/devel/xulrunner/patches/patch-mn +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mn,v 1.6 2012/08/28 23:27:10 ryoon Exp $ - -Make sure we link correctly with sqlite3 from pkgsrc. - ---- security/nss/lib/softoken/config.mk.orig 2012-08-24 22:56:01.000000000 +0000 -+++ security/nss/lib/softoken/config.mk -@@ -80,7 +80,7 @@ else - # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. - EXTRA_SHARED_LIBS += \ - -L$(DIST)/lib \ -- -l$(SQLITE_LIB_NAME) \ -+ `pkg-config --libs sqlite3` \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ - -L$(NSPR_LIB_DIR) \ diff --git a/devel/xulrunner/patches/patch-mp b/devel/xulrunner/patches/patch-mp index 7c51610bcc2..0bc39baedf4 100644 --- a/devel/xulrunner/patches/patch-mp +++ b/devel/xulrunner/patches/patch-mp @@ -1,17 +1,34 @@ -$NetBSD: patch-mp,v 1.7 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-mp,v 1.8 2013/01/10 15:01:31 ryoon Exp $ ---- media/libsydneyaudio/src/Makefile.in.orig 2012-08-24 22:55:55.000000000 +0000 +--- media/libsydneyaudio/src/Makefile.in.orig 2013-01-04 23:44:40.000000000 +0000 +++ media/libsydneyaudio/src/Makefile.in -@@ -72,6 +72,12 @@ ifeq ($(OS_ARCH),WINNT) - OS_LIBS += winmm.lib +@@ -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 PKGSRC_PULSEAUDIO ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO +CSRCS = \ + sydney_audio_pulseaudio.c \ + $(NULL) +endif + - include $(topsrcdir)/config/rules.mk - - LOCAL_INCLUDES += -I$(srcdir)/../include + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif diff --git a/devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp b/devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp index d0f5499306a..4fa09e5c2c4 100644 --- a/devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp +++ b/devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp @@ -1,11 +1,11 @@ -$NetBSD: patch-netwerk_protocol_http_HttpChannelParent.cpp,v 1.4 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-netwerk_protocol_http_HttpChannelParent.cpp,v 1.5 2013/01/10 15:01:31 ryoon Exp $ * Fix build with gcc<4.5, for example, DragonFly 3.0.1. See https://bugzilla.mozilla.org/show_bug.cgi?id=621446 ---- netwerk/protocol/http/HttpChannelParent.cpp.orig 2012-08-24 22:55:58.000000000 +0000 +--- netwerk/protocol/http/HttpChannelParent.cpp.orig 2013-01-04 23:44:42.000000000 +0000 +++ netwerk/protocol/http/HttpChannelParent.cpp -@@ -299,6 +299,13 @@ HttpChannelParent::RecvUpdateAssociatedC +@@ -334,6 +334,13 @@ HttpChannelParent::RecvUpdateAssociatedC return true; } diff --git a/devel/xulrunner/patches/patch-pa b/devel/xulrunner/patches/patch-pa index 4ca2e1e6093..e6f74b74dd0 100644 --- a/devel/xulrunner/patches/patch-pa +++ b/devel/xulrunner/patches/patch-pa @@ -1,6 +1,6 @@ -$NetBSD: patch-pa,v 1.6 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-pa,v 1.7 2013/01/10 15:01:31 ryoon Exp $ ---- xulrunner/installer/mozilla-js.pc.in.orig 2012-08-24 22:56:10.000000000 +0000 +--- xulrunner/installer/mozilla-js.pc.in.orig 2013-01-04 23:44:47.000000000 +0000 +++ xulrunner/installer/mozilla-js.pc.in @@ -6,5 +6,5 @@ Name: JavaScript Description: The Mozilla JavaScript Library diff --git a/devel/xulrunner/patches/patch-pb b/devel/xulrunner/patches/patch-pb index 865090d7343..54af53e1d00 100644 --- a/devel/xulrunner/patches/patch-pb +++ b/devel/xulrunner/patches/patch-pb @@ -1,6 +1,6 @@ -$NetBSD: patch-pb,v 1.7 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-pb,v 1.8 2013/01/10 15:01:31 ryoon Exp $ ---- xulrunner/installer/libxul.pc.in.orig 2012-08-24 22:56:10.000000000 +0000 +--- xulrunner/installer/libxul.pc.in.orig 2013-01-04 23:44:47.000000000 +0000 +++ xulrunner/installer/libxul.pc.in @@ -7,5 +7,5 @@ Name: libxul Description: The Mozilla Runtime and Embedding Engine diff --git a/devel/xulrunner/patches/patch-pc b/devel/xulrunner/patches/patch-pc index 95712d1b712..ee97fc9daee 100644 --- a/devel/xulrunner/patches/patch-pc +++ b/devel/xulrunner/patches/patch-pc @@ -1,6 +1,6 @@ -$NetBSD: patch-pc,v 1.6 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-pc,v 1.7 2013/01/10 15:01:31 ryoon Exp $ ---- xulrunner/installer/libxul-embedding.pc.in.orig 2012-08-24 22:56:10.000000000 +0000 +--- xulrunner/installer/libxul-embedding.pc.in.orig 2013-01-04 23:44:47.000000000 +0000 +++ xulrunner/installer/libxul-embedding.pc.in @@ -6,5 +6,6 @@ idldir=%idldir% Name: libxul-embedding diff --git a/devel/xulrunner/patches/patch-pd b/devel/xulrunner/patches/patch-pd index 6ed6fe71514..854a7552462 100644 --- a/devel/xulrunner/patches/patch-pd +++ b/devel/xulrunner/patches/patch-pd @@ -1,6 +1,6 @@ -$NetBSD: patch-pd,v 1.7 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-pd,v 1.8 2013/01/10 15:01:31 ryoon Exp $ ---- xulrunner/installer/mozilla-nss.pc.in.orig 2012-08-24 22:56:10.000000000 +0000 +--- xulrunner/installer/mozilla-nss.pc.in.orig 2013-01-04 23:44:47.000000000 +0000 +++ xulrunner/installer/mozilla-nss.pc.in @@ -6,5 +6,5 @@ Name: NSS Description: Mozilla Network Security Services diff --git a/devel/xulrunner/patches/patch-pg b/devel/xulrunner/patches/patch-pg index 9f6a30b3861..13ea987916a 100644 --- a/devel/xulrunner/patches/patch-pg +++ b/devel/xulrunner/patches/patch-pg @@ -1,6 +1,6 @@ -$NetBSD: patch-pg,v 1.6 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-pg,v 1.7 2013/01/10 15:01:31 ryoon Exp $ ---- xulrunner/installer/mozilla-nspr.pc.in.orig 2012-08-24 22:56:10.000000000 +0000 +--- xulrunner/installer/mozilla-nspr.pc.in.orig 2013-01-04 23:44:47.000000000 +0000 +++ xulrunner/installer/mozilla-nspr.pc.in @@ -5,7 +5,5 @@ includedir=%includedir% Name: NSPR diff --git a/devel/xulrunner/patches/patch-rc b/devel/xulrunner/patches/patch-rc index 7321cd554f8..19798bb020a 100644 --- a/devel/xulrunner/patches/patch-rc +++ b/devel/xulrunner/patches/patch-rc @@ -1,6 +1,6 @@ -$NetBSD: patch-rc,v 1.7 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-rc,v 1.8 2013/01/10 15:01:31 ryoon Exp $ ---- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2012-08-24 22:55:17.000000000 +0000 +--- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2013-01-04 23:44:28.000000000 +0000 +++ browser/branding/unofficial/locales/en-US/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/devel/xulrunner/patches/patch-storage_src_Makefile.in b/devel/xulrunner/patches/patch-storage_src_Makefile.in index e6fe17a6635..e7ca8f2ce82 100644 --- a/devel/xulrunner/patches/patch-storage_src_Makefile.in +++ b/devel/xulrunner/patches/patch-storage_src_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-storage_src_Makefile.in,v 1.4 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-storage_src_Makefile.in,v 1.5 2013/01/10 15:01:31 ryoon Exp $ * Support jemalloc on *BSD ---- storage/src/Makefile.in.orig 2012-08-24 22:56:03.000000000 +0000 +--- storage/src/Makefile.in.orig 2013-01-04 23:44:44.000000000 +0000 +++ storage/src/Makefile.in @@ -34,6 +34,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY endif diff --git a/devel/xulrunner/patches/patch-toolkit_components_osfile_osfileutils.cpp b/devel/xulrunner/patches/patch-toolkit_components_osfile_osfileutils.cpp index 7b9e6660416..68463c40e1f 100644 --- a/devel/xulrunner/patches/patch-toolkit_components_osfile_osfileutils.cpp +++ b/devel/xulrunner/patches/patch-toolkit_components_osfile_osfileutils.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-toolkit_components_osfile_osfileutils.cpp,v 1.1 2012/12/04 20:28:45 ryoon Exp $ +$NetBSD: patch-toolkit_components_osfile_osfileutils.cpp,v 1.2 2013/01/10 15:01:31 ryoon Exp $ http://gnats.netbsd.org/47233 ---- toolkit/components/osfile/osfileutils.cpp.orig 2012-11-19 15:43:22.000000000 +0000 +--- toolkit/components/osfile/osfileutils.cpp.orig 2013-01-04 23:44:44.000000000 +0000 +++ toolkit/components/osfile/osfileutils.cpp @@ -7,6 +7,10 @@ #include "nsCOMPtr.h" diff --git a/devel/xulrunner/patches/patch-toolkit_library_Makefile.in b/devel/xulrunner/patches/patch-toolkit_library_Makefile.in index 8e3b47cf5b4..aca8af81f8c 100644 --- a/devel/xulrunner/patches/patch-toolkit_library_Makefile.in +++ b/devel/xulrunner/patches/patch-toolkit_library_Makefile.in @@ -1,13 +1,13 @@ -$NetBSD: patch-toolkit_library_Makefile.in,v 1.1 2012/11/21 15:26:50 ryoon Exp $ +$NetBSD: patch-toolkit_library_Makefile.in,v 1.2 2013/01/10 15:01:31 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.orig 2013-01-04 23:44:45.000000000 +0000 +++ toolkit/library/Makefile.in -@@ -371,14 +371,11 @@ endif +@@ -409,14 +409,11 @@ endif + endif - EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) -ifdef MOZ_SYDNEYAUDIO -ifeq ($(OS_ARCH),Linux) diff --git a/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk b/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk index f1f95eb577c..ec11625a833 100644 --- a/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk +++ b/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk @@ -1,8 +1,8 @@ -$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.5 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.6 2013/01/10 15:01:31 ryoon Exp $ ---- toolkit/toolkit-tiers.mk.orig 2012-08-24 22:56:08.000000000 +0000 +--- toolkit/toolkit-tiers.mk.orig 2013-01-04 23:44:46.000000000 +0000 +++ toolkit/toolkit-tiers.mk -@@ -47,7 +47,7 @@ ifdef MOZ_UPDATER +@@ -43,7 +43,7 @@ ifdef MOZ_UPDATER ifndef MOZ_NATIVE_BZ2 tier_platform_dirs += modules/libbz2 endif diff --git a/devel/xulrunner/patches/patch-toolkit_xre_nsAppRunner.cpp b/devel/xulrunner/patches/patch-toolkit_xre_nsAppRunner.cpp new file mode 100644 index 00000000000..8d391b492f8 --- /dev/null +++ b/devel/xulrunner/patches/patch-toolkit_xre_nsAppRunner.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-toolkit_xre_nsAppRunner.cpp,v 1.1 2013/01/10 15:01:31 ryoon Exp $ + +--- toolkit/xre/nsAppRunner.cpp.orig 2013-01-04 23:44:46.000000000 +0000 ++++ toolkit/xre/nsAppRunner.cpp +@@ -3826,7 +3826,7 @@ XREMain::XRE_main(int argc, char* argv[] + ScopedLogging log; + + #if defined(MOZ_WIDGET_GTK) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. diff --git a/devel/xulrunner/patches/patch-xa b/devel/xulrunner/patches/patch-xa index 4faf9e39586..c4d7f0a1d1b 100644 --- a/devel/xulrunner/patches/patch-xa +++ b/devel/xulrunner/patches/patch-xa @@ -1,8 +1,8 @@ -$NetBSD: patch-xa,v 1.2 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xa,v 1.3 2013/01/10 15:01:31 ryoon Exp $ NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig 2012-08-28 18:54:12.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig 2013-01-09 15:25:54.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s @@ -0,0 +1,112 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/devel/xulrunner/patches/patch-xb b/devel/xulrunner/patches/patch-xb index 552c541dcf6..be3b73e085b 100644 --- a/devel/xulrunner/patches/patch-xb +++ b/devel/xulrunner/patches/patch-xb @@ -1,8 +1,8 @@ -$NetBSD: patch-xb,v 1.2 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xb,v 1.3 2013/01/10 15:01:31 ryoon Exp $ NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2012-08-28 18:54:12.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2013-01-09 15:25:54.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp @@ -0,0 +1,84 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/devel/xulrunner/patches/patch-xc b/devel/xulrunner/patches/patch-xc index 6b44be21905..936d046413f 100644 --- a/devel/xulrunner/patches/patch-xc +++ b/devel/xulrunner/patches/patch-xc @@ -1,8 +1,8 @@ -$NetBSD: patch-xc,v 1.2 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xc,v 1.3 2013/01/10 15:01:31 ryoon Exp $ NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2012-08-28 18:54:12.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2013-01-09 15:25:54.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s @@ -0,0 +1,66 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/devel/xulrunner/patches/patch-xd b/devel/xulrunner/patches/patch-xd index 829df1d023f..f832799f1ef 100644 --- a/devel/xulrunner/patches/patch-xd +++ b/devel/xulrunner/patches/patch-xd @@ -1,8 +1,8 @@ -$NetBSD: patch-xd,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xd,v 1.4 2013/01/10 15:01:31 ryoon Exp $ NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig 2012-08-28 18:54:12.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig 2013-01-09 15:25:54.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp @@ -0,0 +1,119 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/devel/xulrunner/patches/patch-xe b/devel/xulrunner/patches/patch-xe index 57080ecd2ed..876c3cfb47a 100644 --- a/devel/xulrunner/patches/patch-xe +++ b/devel/xulrunner/patches/patch-xe @@ -1,6 +1,6 @@ -$NetBSD: patch-xe,v 1.4 2012/11/21 15:26:50 ryoon Exp $ +$NetBSD: patch-xe,v 1.5 2013/01/10 15:01:31 ryoon Exp $ ---- 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.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp @@ -100,6 +100,15 @@ extern "C" { } diff --git a/devel/xulrunner/patches/patch-xf b/devel/xulrunner/patches/patch-xf index d4f97b1a011..9a1563fa6d6 100644 --- a/devel/xulrunner/patches/patch-xf +++ b/devel/xulrunner/patches/patch-xf @@ -1,8 +1,8 @@ -$NetBSD: patch-xf,v 1.4 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xf,v 1.5 2013/01/10 15:01:31 ryoon Exp $ NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ae. ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2012-08-24 22:56:10.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp @@ -91,17 +91,27 @@ extern "C" { } diff --git a/devel/xulrunner/patches/patch-xg b/devel/xulrunner/patches/patch-xg index 74b3b4e0701..d0a63645ee7 100644 --- a/devel/xulrunner/patches/patch-xg +++ b/devel/xulrunner/patches/patch-xg @@ -1,8 +1,8 @@ -$NetBSD: patch-xg,v 1.2 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xg,v 1.3 2013/01/10 15:01:31 ryoon Exp $ NetBSD/arm xptcall support code. From pkgsrc/www/firefox/patch-bm. ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig 2012-08-24 22:56:10.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp @@ -86,18 +86,23 @@ PrepareAndDispatch(nsXPTCStubBase* self, * so they are contiguous with values passed on the stack, and then calls diff --git a/devel/xulrunner/patches/patch-xj b/devel/xulrunner/patches/patch-xj index 8dff184587b..8fce69a72ee 100644 --- a/devel/xulrunner/patches/patch-xj +++ b/devel/xulrunner/patches/patch-xj @@ -1,8 +1,8 @@ -$NetBSD: patch-xj,v 1.3 2012/11/21 15:26:50 ryoon Exp $ +$NetBSD: patch-xj,v 1.4 2013/01/10 15:01:31 ryoon Exp $ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. ---- 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.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp @@ -6,6 +6,7 @@ // Implement shared vtbl methods. diff --git a/devel/xulrunner/patches/patch-xk b/devel/xulrunner/patches/patch-xk index 0749091de13..3b8273072e1 100644 --- a/devel/xulrunner/patches/patch-xk +++ b/devel/xulrunner/patches/patch-xk @@ -1,8 +1,8 @@ -$NetBSD: patch-xk,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xk,v 1.4 2013/01/10 15:01:31 ryoon Exp $ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2012-08-24 22:56:10.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s @@ -25,23 +25,23 @@ .type SharedStub,@function diff --git a/devel/xulrunner/patches/patch-xl b/devel/xulrunner/patches/patch-xl index 60bfbdd962f..c7bad56bcb4 100644 --- a/devel/xulrunner/patches/patch-xl +++ b/devel/xulrunner/patches/patch-xl @@ -1,8 +1,8 @@ -$NetBSD: patch-xl,v 1.4 2012/11/21 15:26:50 ryoon Exp $ +$NetBSD: patch-xl,v 1.5 2013/01/10 15:01:32 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-11-19 17:41:53.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s @@ -20,41 +20,42 @@ diff --git a/devel/xulrunner/patches/patch-xm b/devel/xulrunner/patches/patch-xm index c49dc70fb2e..6955142c439 100644 --- a/devel/xulrunner/patches/patch-xm +++ b/devel/xulrunner/patches/patch-xm @@ -1,8 +1,8 @@ -$NetBSD: patch-xm,v 1.4 2012/11/21 15:26:50 ryoon Exp $ +$NetBSD: patch-xm,v 1.5 2013/01/10 15:01:32 ryoon Exp $ NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla. ---- 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.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp @@ -5,9 +5,9 @@ diff --git a/devel/xulrunner/patches/patch-xn b/devel/xulrunner/patches/patch-xn index 6b45e4a14aa..c6d97d8d91b 100644 --- a/devel/xulrunner/patches/patch-xn +++ b/devel/xulrunner/patches/patch-xn @@ -1,6 +1,6 @@ -$NetBSD: patch-xn,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xn,v 1.4 2013/01/10 15:01:32 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig 2012-08-24 22:56:10.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s @@ -16,6 +16,47 @@ #include <sys/asm.h> diff --git a/devel/xulrunner/patches/patch-xo b/devel/xulrunner/patches/patch-xo index 36e982b7a14..04092c86692 100644 --- a/devel/xulrunner/patches/patch-xo +++ b/devel/xulrunner/patches/patch-xo @@ -1,6 +1,6 @@ -$NetBSD: patch-xo,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xo,v 1.4 2013/01/10 15:01:32 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig 2012-08-24 22:56:10.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s @@ -14,6 +14,47 @@ #include <sys/asm.h> diff --git a/devel/xulrunner/patches/patch-xpcom_Makefile.in b/devel/xulrunner/patches/patch-xpcom_Makefile.in index 6b5d90b6d96..91ec5ec8f7c 100644 --- a/devel/xulrunner/patches/patch-xpcom_Makefile.in +++ b/devel/xulrunner/patches/patch-xpcom_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-xpcom_Makefile.in,v 1.3 2012/08/28 23:27:10 ryoon Exp $ +$NetBSD: patch-xpcom_Makefile.in,v 1.4 2013/01/10 15:01:32 ryoon Exp $ ---- xpcom/Makefile.in.orig 2012-08-24 22:56:10.000000000 +0000 +--- xpcom/Makefile.in.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/Makefile.in @@ -35,6 +35,10 @@ DIRS += windbgdlg endif diff --git a/devel/xulrunner/patches/patch-xpcom_ds_TimeStamp.h b/devel/xulrunner/patches/patch-xpcom_ds_TimeStamp.h index 05b72d1be02..440bb980e09 100644 --- a/devel/xulrunner/patches/patch-xpcom_ds_TimeStamp.h +++ b/devel/xulrunner/patches/patch-xpcom_ds_TimeStamp.h @@ -1,12 +1,12 @@ -$NetBSD: patch-xpcom_ds_TimeStamp.h,v 1.1 2012/12/04 20:28:45 ryoon Exp $ +$NetBSD: patch-xpcom_ds_TimeStamp.h,v 1.2 2013/01/10 15:01:32 ryoon Exp $ http://gnats.netbsd.org/47233 ---- xpcom/ds/TimeStamp.h.orig 2012-11-19 15:43:32.000000000 +0000 +--- xpcom/ds/TimeStamp.h.orig 2013-01-04 23:44:47.000000000 +0000 +++ xpcom/ds/TimeStamp.h @@ -130,11 +130,11 @@ private: // NOTE: this MUST be a >= test, because int64_t(double(INT64_MAX)) - // overflows and gives LL_MININT. + // overflows and gives INT64_MIN. if (aTicks >= double(INT64_MAX)) - return TimeDuration::FromTicks(INT64_MAX); + return TimeDuration::FromTicks(int64_t(INT64_MAX)); diff --git a/devel/xulrunner/patches/patch-xpcom_idl-parser_Makefile.in b/devel/xulrunner/patches/patch-xpcom_idl-parser_Makefile.in deleted file mode 100644 index 8e00608eb5f..00000000000 --- a/devel/xulrunner/patches/patch-xpcom_idl-parser_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xpcom_idl-parser_Makefile.in,v 1.4 2012/08/28 23:27:10 ryoon Exp $ - -https://bugzilla.mozilla.org/show_bug.cgi?id=736961 - ---- xpcom/idl-parser/Makefile.in.orig 2012-08-24 22:56:10.000000000 +0000 -+++ xpcom/idl-parser/Makefile.in -@@ -29,7 +29,7 @@ include $(topsrcdir)/config/rules.mk - export:: $(PARSER_SRCS) $(PLY_PROGS) - $(PYTHON_PATH) \ - $(PLY_INCLUDE) \ -- $(srcdir)/header.py --cachedir=. --regen -+ $(srcdir)/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen - - check:: - $(PYTHON_PATH) \ diff --git a/devel/xulrunner/patches/patch-xpcom_typelib_xpidl_Makefile.in b/devel/xulrunner/patches/patch-xpcom_typelib_xpidl_Makefile.in deleted file mode 100644 index 1c6470fc4d7..00000000000 --- a/devel/xulrunner/patches/patch-xpcom_typelib_xpidl_Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-xpcom_typelib_xpidl_Makefile.in,v 1.2 2012/08/28 23:27:10 ryoon Exp $ - -https://bugzilla.mozilla.org/show_bug.cgi?id=736961 - ---- xpcom/typelib/xpidl/Makefile.in.orig 2012-08-24 22:56:10.000000000 +0000 -+++ xpcom/typelib/xpidl/Makefile.in -@@ -16,8 +16,8 @@ SDK_BINARY = \ - $(topsrcdir)/xpcom/idl-parser/xpidl.py \ - $(topsrcdir)/xpcom/idl-parser/header.py \ - $(topsrcdir)/xpcom/idl-parser/typelib.py \ -- $(DEPTH)/xpcom/idl-parser/xpidllex.py \ -- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \ -+ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \ -+ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \ - $(NULL) - - ifndef MOZ_SYSTEM_PLY |