diff options
| -rw-r--r-- | devel/xulrunner/Makefile | 3 | ||||
| -rw-r--r-- | devel/xulrunner/PLIST | 111 | ||||
| -rw-r--r-- | devel/xulrunner/buildlink3.mk | 6 | ||||
| -rw-r--r-- | devel/xulrunner/dist.mk | 6 | ||||
| -rw-r--r-- | devel/xulrunner/distinfo | 23 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-as | 30 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-ax | 8 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-ay | 17 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-browser_confvars.sh | 11 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk | 12 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc | 23 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp | 17 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-js_src_jscpucfg.h | 9 |
13 files changed, 148 insertions, 128 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index 4bb234197ee..bede7e69616 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.68 2012/03/11 16:33:48 marino Exp $ +# $NetBSD: Makefile,v 1.69 2012/03/15 08:30:06 ryoon Exp $ .include "dist.mk" PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -PKGREVISION= 1 CATEGORIES= devel www MAINTAINER= tnn@NetBSD.org diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST index ac46e05ec40..944bbd7b8d7 100644 --- a/devel/xulrunner/PLIST +++ b/devel/xulrunner/PLIST @@ -1,16 +1,11 @@ -@comment $NetBSD: PLIST,v 1.38 2012/03/06 12:34:08 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.39 2012/03/15 08:30:06 ryoon Exp $ bin/xulrunner -${PLIST.jit}include/xulrunner/Allocator.h -${PLIST.jit}include/xulrunner/Assembler.h include/xulrunner/AtkSocketAccessible.h include/xulrunner/BasicLayers.h include/xulrunner/CheckedInt.h -${PLIST.jit}include/xulrunner/CodeAlloc.h -${PLIST.jit}include/xulrunner/Containers.h include/xulrunner/CustomQS_Canvas2D.h include/xulrunner/CustomQS_WebGL.h include/xulrunner/EGLUtils.h -${PLIST.jit}include/xulrunner/Fragmento.h include/xulrunner/FrameLayerBuilder.h include/xulrunner/FramePropertyTable.h include/xulrunner/GLContext.h @@ -26,39 +21,30 @@ include/xulrunner/IPC/nsGUIEventIPC.h include/xulrunner/ImageErrors.h include/xulrunner/ImageLayers.h include/xulrunner/ImageLogging.h -${PLIST.jit}include/xulrunner/LIR.h -${PLIST.jit}include/xulrunner/LIRopcode.tbl include/xulrunner/LayerManagerOGL.h include/xulrunner/LayerManagerOGLProgram.h include/xulrunner/Layers.h -include/xulrunner/NSReg.h -${PLIST.jit}include/xulrunner/Native.h -${PLIST.jit}include/xulrunner/NativeCommon.h -${PLIST.jit}include/xulrunner/Native${NANOJIT_ARCH}.h include/xulrunner/PCOMContentPermissionRequestChild.h include/xulrunner/PPrefTuple.h include/xulrunner/PrefTuple.h include/xulrunner/ReadbackLayer.h -${PLIST.jit}include/xulrunner/RegAlloc.h include/xulrunner/TabMessageUtils.h -${PLIST.jit}include/xulrunner/VMPI.h -include/xulrunner/VerReg.h include/xulrunner/VideoUtils.h -${PLIST.jit}include/xulrunner/Writer.h include/xulrunner/a11yGeneric.h include/xulrunner/amIInstallTrigger.h include/xulrunner/amIWebInstallListener.h include/xulrunner/amIWebInstaller.h include/xulrunner/angle/ResourceLimits.h include/xulrunner/angle/ShaderLang.h -${PLIST.jit}include/xulrunner/avmplus.h include/xulrunner/chromium_types.h +include/xulrunner/dmd.h include/xulrunner/domstubs.h include/xulrunner/expat.h include/xulrunner/expat_config.h include/xulrunner/expat_external.h include/xulrunner/extIApplication.h include/xulrunner/ftpCore.h +include/xulrunner/gc/Barrier.h include/xulrunner/gfx2DGlue.h include/xulrunner/gfx3DMatrix.h include/xulrunner/gfxASurface.h @@ -102,6 +88,10 @@ include/xulrunner/gfxUserFontSet.h include/xulrunner/gfxUtils.h include/xulrunner/gfxXlibNativeRenderer.h include/xulrunner/gfxXlibSurface.h +include/xulrunner/graphite2/Font.h +include/xulrunner/graphite2/Segment.h +include/xulrunner/graphite2/Types.h +include/xulrunner/graphite2/XmlLog.h include/xulrunner/gtk2xtbin.h include/xulrunner/harfbuzz/hb-blob.h include/xulrunner/harfbuzz/hb-buffer.h @@ -142,7 +132,6 @@ include/xulrunner/jsalloc.h include/xulrunner/jsapi.h include/xulrunner/jsatom.h include/xulrunner/jsautokw.h -${PLIST.jit}include/xulrunner/jsbuiltins.h include/xulrunner/jscell.h include/xulrunner/jsclass.h include/xulrunner/jsclist.h @@ -160,12 +149,10 @@ include/xulrunner/jsgc.h include/xulrunner/jsgcchunk.h include/xulrunner/jsgcstats.h include/xulrunner/jshash.h -include/xulrunner/jsinttypes.h include/xulrunner/jslock.h include/xulrunner/json.h include/xulrunner/jsopcode.h include/xulrunner/jsopcode.tbl -include/xulrunner/jsotypes.h include/xulrunner/jsperf.h include/xulrunner/jsprf.h include/xulrunner/jspropertycache.h @@ -177,7 +164,6 @@ include/xulrunner/jspubtd.h include/xulrunner/jsreflect.h include/xulrunner/jsstdint.h include/xulrunner/jsstr.h -include/xulrunner/jstracer.h include/xulrunner/jstypedarray.h include/xulrunner/jstypes.h include/xulrunner/jsutil.h @@ -422,13 +408,10 @@ include/xulrunner/mozilla/threads/nsThreadIDs.h include/xulrunner/mozilla/throw_gcc.h include/xulrunner/mozilla/unused.h include/xulrunner/mozpngconf.h -${PLIST.jit}include/xulrunner/nanojit.h include/xulrunner/necko-config.h include/xulrunner/nestegg/nestegg-stdint.h include/xulrunner/nestegg/nestegg.h include/xulrunner/netCore.h -${PLIST.jit}include/xulrunner/njconfig.h -${PLIST.jit}include/xulrunner/njcpudetect.h include/xulrunner/npapi.h include/xulrunner/npfunctions.h include/xulrunner/npruntime.h @@ -694,7 +677,6 @@ include/xulrunner/nsIAccessibleTypes.h include/xulrunner/nsIAccessibleValue.h include/xulrunner/nsIAlertsService.h include/xulrunner/nsIAllocator.h -include/xulrunner/nsIAnimationFrameListener.h include/xulrunner/nsIAnnotationService.h include/xulrunner/nsIAnonymousContentCreator.h include/xulrunner/nsIAppShell.h @@ -785,7 +767,6 @@ include/xulrunner/nsICharsetConverterManager.h include/xulrunner/nsICharsetDetectionAdaptor.h include/xulrunner/nsICharsetDetectionObserver.h include/xulrunner/nsICharsetDetector.h -include/xulrunner/nsICharsetResolver.h include/xulrunner/nsIChildChannel.h include/xulrunner/nsIChromeRegistry.h include/xulrunner/nsIClassInfo.h @@ -1024,7 +1005,6 @@ include/xulrunner/nsIDOMMozCSSKeyframesRule.h include/xulrunner/nsIDOMMozTouchEvent.h include/xulrunner/nsIDOMMutationEvent.h include/xulrunner/nsIDOMNSEditableElement.h -include/xulrunner/nsIDOMNSElement.h include/xulrunner/nsIDOMNSEvent.h include/xulrunner/nsIDOMNSRGBAColor.h include/xulrunner/nsIDOMNSRange.h @@ -1237,7 +1217,6 @@ include/xulrunner/nsIDragService.h include/xulrunner/nsIDragSession.h include/xulrunner/nsIDragSessionGTK.h include/xulrunner/nsIDroppedLinkHandler.h -include/xulrunner/nsIDynamicContainer.h include/xulrunner/nsIEditActionListener.h include/xulrunner/nsIEditingSession.h include/xulrunner/nsIEditor.h @@ -1437,9 +1416,7 @@ include/xulrunner/nsIMemory.h include/xulrunner/nsIMemoryReporter.h include/xulrunner/nsIMenuBoxObject.h include/xulrunner/nsIMenuBuilder.h -include/xulrunner/nsIMenuRollup.h include/xulrunner/nsIModule.h -include/xulrunner/nsIMozWebSocket.h include/xulrunner/nsIMultiPartChannel.h include/xulrunner/nsIMultiplexInputStream.h include/xulrunner/nsIMutable.h @@ -1800,7 +1777,6 @@ include/xulrunner/nsIVariant.h include/xulrunner/nsIVersionComparator.h include/xulrunner/nsIView.h include/xulrunner/nsIViewManager.h -include/xulrunner/nsIViewObserver.h include/xulrunner/nsIViewSourceChannel.h include/xulrunner/nsIWeakReference.h include/xulrunner/nsIWeakReferenceUtils.h @@ -1934,7 +1910,6 @@ include/xulrunner/nsPIPromptService.h include/xulrunner/nsPISocketTransportService.h include/xulrunner/nsPIWindowRoot.h include/xulrunner/nsPIWindowWatcher.h -include/xulrunner/nsPLDOMEvent.h include/xulrunner/nsParserCIID.h include/xulrunner/nsParserConstants.h include/xulrunner/nsPluginDirServiceProvider.h @@ -2034,8 +2009,6 @@ include/xulrunner/nsSubstring.h include/xulrunner/nsSubstringTuple.h include/xulrunner/nsSupportsArray.h include/xulrunner/nsSupportsPrimitives.h -include/xulrunner/nsSystemPrefLog.h -include/xulrunner/nsSystemPrefService.h include/xulrunner/nsTArray-inl.h include/xulrunner/nsTArray.h include/xulrunner/nsTDependentString.h @@ -2177,11 +2150,11 @@ lib/xulrunner-sdk/sdk/bin/ply/__init__.py lib/xulrunner-sdk/sdk/bin/ply/lex.py lib/xulrunner-sdk/sdk/bin/ply/yacc.py lib/xulrunner-sdk/sdk/bin/typelib.py +lib/xulrunner-sdk/sdk/bin/xpidllex.py +lib/xulrunner-sdk/sdk/bin/xpidlyacc.py lib/xulrunner-sdk/sdk/bin/xpidl.py lib/xulrunner-sdk/sdk/bin/xpt.py lib/xulrunner-sdk/sdk/lib/libmozalloc.so -lib/xulrunner-sdk/sdk/lib/libmozreg_s.a -lib/xulrunner-sdk/sdk/lib/libmozreg_s.a.desc lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a.desc lib/xulrunner-sdk/sdk/lib/libxpcom.so @@ -2611,6 +2584,7 @@ lib/xulrunner/chrome/toolkit/res/arrowd.gif lib/xulrunner/chrome/toolkit/res/broken-image.png lib/xulrunner/chrome/toolkit/res/charsetData.properties lib/xulrunner/chrome/toolkit/res/forms.css +lib/xulrunner/chrome/toolkit/res/full-screen-override.css lib/xulrunner/chrome/toolkit/res/hiddenWindow.html lib/xulrunner/chrome/toolkit/res/html.css lib/xulrunner/chrome/toolkit/res/loading-image.png @@ -2659,9 +2633,6 @@ lib/xulrunner/chrome/toolkit/skin/classic/global/checkbox/cbox-check.gif lib/xulrunner/chrome/toolkit/skin/classic/global/colorpicker.css lib/xulrunner/chrome/toolkit/skin/classic/global/commonDialog.css lib/xulrunner/chrome/toolkit/skin/classic/global/config.css -lib/xulrunner/chrome/toolkit/skin/classic/global/console/bullet-error.png -lib/xulrunner/chrome/toolkit/skin/classic/global/console/bullet-question.png -lib/xulrunner/chrome/toolkit/skin/classic/global/console/bullet-warning.png lib/xulrunner/chrome/toolkit/skin/classic/global/console/console-error-caret.gif lib/xulrunner/chrome/toolkit/skin/classic/global/console/console-error-dash.gif lib/xulrunner/chrome/toolkit/skin/classic/global/console/console-toolbar.png @@ -2715,7 +2686,6 @@ lib/xulrunner/chrome/toolkit/skin/classic/global/icons/information-32.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/information-48.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/information-64.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/loading_16.png -lib/xulrunner/chrome/toolkit/skin/classic/global/icons/notfound.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/notloading_16.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/panelarrow-horizontal.svg lib/xulrunner/chrome/toolkit/skin/classic/global/icons/panelarrow-vertical.svg @@ -2731,7 +2701,6 @@ lib/xulrunner/chrome/toolkit/skin/classic/global/icons/warning-16.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/warning-24.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/warning-64.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/warning-large.png -lib/xulrunner/chrome/toolkit/skin/classic/global/icons/webconsole.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/windowControls.png lib/xulrunner/chrome/toolkit/skin/classic/global/icons/wrap.png lib/xulrunner/chrome/toolkit/skin/classic/global/inContentUI.css @@ -2739,6 +2708,7 @@ lib/xulrunner/chrome/toolkit/skin/classic/global/inContentUI/background-texture. 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/error.png +lib/xulrunner/chrome/toolkit/skin/classic/global/media/fullscreenButton.png lib/xulrunner/chrome/toolkit/skin/classic/global/media/muteButton.png lib/xulrunner/chrome/toolkit/skin/classic/global/media/pauseButton.png lib/xulrunner/chrome/toolkit/skin/classic/global/media/playButton.png @@ -2795,8 +2765,6 @@ lib/xulrunner/chrome/toolkit/skin/classic/global/tree/sort-dsc-classic.png lib/xulrunner/chrome/toolkit/skin/classic/global/tree/sort-dsc.png lib/xulrunner/chrome/toolkit/skin/classic/global/tree/twisty-clsd.png lib/xulrunner/chrome/toolkit/skin/classic/global/tree/twisty-open.png -lib/xulrunner/chrome/toolkit/skin/classic/global/webConsole.css -lib/xulrunner/chrome/toolkit/skin/classic/global/webConsole_networkPanel.css lib/xulrunner/chrome/toolkit/skin/classic/global/wizard.css lib/xulrunner/chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons.png lib/xulrunner/chrome/toolkit/skin/classic/mozapps/downloads/downloadIcon.png @@ -2844,7 +2812,6 @@ lib/xulrunner/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-16.png lib/xulrunner/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-64.png lib/xulrunner/chrome/toolkit/skin/classic/mozapps/passwordmgr/key.png lib/xulrunner/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.png -lib/xulrunner/chrome/toolkit/skin/classic/mozapps/places/tagContainerIcon.png lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginBlocked.png lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png lib/xulrunner/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDisabled.png @@ -3036,6 +3003,7 @@ lib/xulrunner/modules/PlacesUtils.jsm lib/xulrunner/modules/PluginProvider.jsm lib/xulrunner/modules/PluralForm.jsm lib/xulrunner/modules/PopupNotifications.jsm +lib/xulrunner/modules/Profiler.jsm lib/xulrunner/modules/Services.jsm lib/xulrunner/modules/WindowDraggingUtils.jsm lib/xulrunner/modules/XPCOMUtils.jsm @@ -3045,11 +3013,12 @@ lib/xulrunner/modules/debug.js lib/xulrunner/modules/jsdebugger.jsm lib/xulrunner/modules/nsFormAutoCompleteResult.jsm lib/xulrunner/modules/reflect.jsm -lib/xulrunner/modules/utils.js lib/xulrunner/mozilla-xremote-client lib/xulrunner/platform.ini lib/xulrunner/plugin-container lib/xulrunner/res/EditorOverride.css +lib/xulrunner/res/TopLevelImageDocument.css +lib/xulrunner/res/TopLevelVideoDocument.css lib/xulrunner/res/contenteditable.css lib/xulrunner/res/designmode.css lib/xulrunner/res/dtd/htmlmathml-f.ent @@ -3179,7 +3148,6 @@ share/idl/xulrunner/nsIAccessibleText.idl share/idl/xulrunner/nsIAccessibleTypes.idl share/idl/xulrunner/nsIAccessibleValue.idl share/idl/xulrunner/nsIAlertsService.idl -share/idl/xulrunner/nsIAnimationFrameListener.idl share/idl/xulrunner/nsIAnnotationService.idl share/idl/xulrunner/nsIAppShell.idl share/idl/xulrunner/nsIAppShellService.idl @@ -3253,7 +3221,6 @@ share/idl/xulrunner/nsIChannel.idl share/idl/xulrunner/nsIChannelEventSink.idl share/idl/xulrunner/nsIChannelPolicy.idl share/idl/xulrunner/nsICharsetConverterManager.idl -share/idl/xulrunner/nsICharsetResolver.idl share/idl/xulrunner/nsIChildChannel.idl share/idl/xulrunner/nsIChromeRegistry.idl share/idl/xulrunner/nsIClassInfo.idl @@ -3483,7 +3450,6 @@ share/idl/xulrunner/nsIDOMMozCSSKeyframesRule.idl share/idl/xulrunner/nsIDOMMozTouchEvent.idl share/idl/xulrunner/nsIDOMMutationEvent.idl share/idl/xulrunner/nsIDOMNSEditableElement.idl -share/idl/xulrunner/nsIDOMNSElement.idl share/idl/xulrunner/nsIDOMNSEvent.idl share/idl/xulrunner/nsIDOMNSRGBAColor.idl share/idl/xulrunner/nsIDOMNSRange.idl @@ -3492,6 +3458,7 @@ share/idl/xulrunner/nsIDOMNamedNodeMap.idl share/idl/xulrunner/nsIDOMNavigator.idl share/idl/xulrunner/nsIDOMNavigatorDesktopNotification.idl share/idl/xulrunner/nsIDOMNavigatorGeolocation.idl +share/idl/xulrunner/nsIDOMNavigatorSms.idl share/idl/xulrunner/nsIDOMNode.idl share/idl/xulrunner/nsIDOMNodeFilter.idl share/idl/xulrunner/nsIDOMNodeIterator.idl @@ -3605,6 +3572,9 @@ share/idl/xulrunner/nsIDOMScrollAreaEvent.idl share/idl/xulrunner/nsIDOMSerializer.idl share/idl/xulrunner/nsIDOMSimpleGestureEvent.idl share/idl/xulrunner/nsIDOMSmartCardEvent.idl +share/idl/xulrunner/nsIDOMSmsEvent.idl +share/idl/xulrunner/nsIDOMSmsManager.idl +share/idl/xulrunner/nsIDOMSmsMessage.idl share/idl/xulrunner/nsIDOMStorage.idl share/idl/xulrunner/nsIDOMStorageEvent.idl share/idl/xulrunner/nsIDOMStorageEventObsolete.idl @@ -3688,7 +3658,6 @@ share/idl/xulrunner/nsIDownloader.idl share/idl/xulrunner/nsIDragService.idl share/idl/xulrunner/nsIDragSession.idl share/idl/xulrunner/nsIDroppedLinkHandler.idl -share/idl/xulrunner/nsIDynamicContainer.idl share/idl/xulrunner/nsIEditActionListener.idl share/idl/xulrunner/nsIEditingSession.idl share/idl/xulrunner/nsIEditor.idl @@ -3753,6 +3722,7 @@ share/idl/xulrunner/nsIFormSubmitObserver.idl share/idl/xulrunner/nsIFormatConverter.idl share/idl/xulrunner/nsIFrameLoader.idl share/idl/xulrunner/nsIFrameMessageManager.idl +share/idl/xulrunner/nsIFrameRequestCallback.idl share/idl/xulrunner/nsIGConfService.idl share/idl/xulrunner/nsIGIOService.idl share/idl/xulrunner/nsIGSettingsService.idl @@ -3860,7 +3830,6 @@ share/idl/xulrunner/nsIMemoryReporter.idl share/idl/xulrunner/nsIMenuBoxObject.idl share/idl/xulrunner/nsIMenuBuilder.idl share/idl/xulrunner/nsIModule.idl -share/idl/xulrunner/nsIMozWebSocket.idl share/idl/xulrunner/nsIMultiPartChannel.idl share/idl/xulrunner/nsIMultiplexInputStream.idl share/idl/xulrunner/nsIMutable.idl @@ -3930,6 +3899,7 @@ share/idl/xulrunner/nsIProfile.idl share/idl/xulrunner/nsIProfileChangeStatus.idl share/idl/xulrunner/nsIProfileMigrator.idl share/idl/xulrunner/nsIProfileUnlocker.idl +share/idl/xulrunner/nsIProfiler.idl share/idl/xulrunner/nsIProgrammingLanguage.idl share/idl/xulrunner/nsIProgressEventSink.idl share/idl/xulrunner/nsIPrompt.idl @@ -4048,6 +4018,7 @@ share/idl/xulrunner/nsISimpleStreamListener.idl share/idl/xulrunner/nsISimpleTest.idl share/idl/xulrunner/nsISimpleUnicharStreamFactory.idl share/idl/xulrunner/nsISliderListener.idl +share/idl/xulrunner/nsISmsService.idl share/idl/xulrunner/nsISocketProvider.idl share/idl/xulrunner/nsISocketProviderService.idl share/idl/xulrunner/nsISocketTransport.idl @@ -4169,6 +4140,7 @@ 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/nsIWindowCreator.idl @@ -4249,6 +4221,7 @@ include/xulrunner/gc/Statistics.h include/xulrunner/gfxLineSegment.h include/xulrunner/gfxQuad.h include/xulrunner/js/HashTable.h +include/xulrunner/js/LegacyIntTypes.h include/xulrunner/js/TemplateLib.h include/xulrunner/js/Utility.h include/xulrunner/js/Vector.h @@ -4280,3 +4253,41 @@ lib/xulrunner/modules/SpellCheckDictionaryBootstrap.js share/idl/xulrunner/nsIDOMBatteryManager.idl share/idl/xulrunner/nsIDOMNavigatorBattery.idl share/idl/xulrunner/nsIIDBOpenDBRequest.idl +include/xulrunner/EventTracer.h +include/xulrunner/GfxInfoCollector.h +include/xulrunner/mozilla/Attributes.h +include/xulrunner/mozilla/AvailableMemoryTracker.h +include/xulrunner/mozilla/ClearOnShutdown.h +include/xulrunner/mozilla/FileLocation.h +include/xulrunner/mozilla/GuardObjects.h +include/xulrunner/mozilla/HangMonitor.h +include/xulrunner/mozilla/MSStdInt.h +include/xulrunner/mozilla/StartupTimeline.h +include/xulrunner/mozilla/StdInt.h +include/xulrunner/mozilla/dom/indexedDB/FileInfo.h +include/xulrunner/mozilla/dom/indexedDB/FileManager.h +include/xulrunner/mozilla/dom/sms/Constants.h +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/SmsServiceFactory.h +include/xulrunner/mozilla/dom/sms/Types.h +include/xulrunner/mozilla/gfx/Blur.h +include/xulrunner/nsAsyncDOMEvent.h +include/xulrunner/nsDOMEventTargetHelper.h +include/xulrunner/nsFrameMessageManager.h +include/xulrunner/nsHtml5ViewSourceUtils.h +include/xulrunner/nsIDOMNavigatorSms.h +include/xulrunner/nsIDOMSmsEvent.h +include/xulrunner/nsIDOMSmsManager.h +include/xulrunner/nsIDOMSmsMessage.h +include/xulrunner/nsIFrameRequestCallback.h +include/xulrunner/nsIProfiler.h +include/xulrunner/nsISmsService.h +include/xulrunner/nsIWebSocket.h +include/xulrunner/nsThread.h +include/xulrunner/snappy/snappy-c.h +include/xulrunner/snappy/snappy-stubs-public.h +include/xulrunner/snappy/snappy.h +include/xulrunner/thread_helper.h + diff --git a/devel/xulrunner/buildlink3.mk b/devel/xulrunner/buildlink3.mk index ec2863eca98..a9310747cc8 100644 --- a/devel/xulrunner/buildlink3.mk +++ b/devel/xulrunner/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.22 2012/03/06 13:37:32 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2012/03/15 08:30:06 ryoon Exp $ BUILDLINK_TREE+= xulrunner .if !defined(XULRUNNER_BUILDLINK3_MK) XULRUNNER_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=10.0.2 -BUILDLINK_ABI_DEPENDS.xulrunner?= xulrunner>=10.0.2 +BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=11.0 +BUILDLINK_ABI_DEPENDS.xulrunner?= xulrunner>=11.0 BUILDLINK_PKGSRCDIR.xulrunner?= ../../devel/xulrunner BUILDLINK_INCDIRS.xulrunner+= lib/xulrunner-sdk/include diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk index 5dbd6f2d744..3a6145d39ce 100644 --- a/devel/xulrunner/dist.mk +++ b/devel/xulrunner/dist.mk @@ -1,4 +1,4 @@ -# $NetBSD: dist.mk,v 1.28 2012/03/06 12:34:08 ryoon Exp $ +# $NetBSD: dist.mk,v 1.29 2012/03/15 08:30:06 ryoon Exp $ # # used by devel/nspr/Makefile # used by devel/nss/Makefile @@ -7,8 +7,8 @@ DISTNAME= firefox-${FIREFOX_VER}.source FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 10.0 -MOZ_BRANCH_MINOR= .2 +MOZ_BRANCH= 11.0 +MOZ_BRANCH_MINOR= MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index 26f68be13f2..31490b48a34 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.62 2012/03/11 16:33:48 marino Exp $ +$NetBSD: distinfo,v 1.63 2012/03/15 08:30:06 ryoon Exp $ -SHA1 (firefox-10.0.2.source.tar.bz2) = d9b459d915d4638a48b3e249fcbaf7cafc27e834 -RMD160 (firefox-10.0.2.source.tar.bz2) = 50c45cf2d561290ecfdfeea3fefae22cbae9ce85 -Size (firefox-10.0.2.source.tar.bz2) = 75540089 bytes +SHA1 (firefox-11.0.source.tar.bz2) = 0b05f91b81803010502cf89f54c3d0187fb63d7e +RMD160 (firefox-11.0.source.tar.bz2) = 13b7c7327063625904d00b58a6d6f15c04918e92 +Size (firefox-11.0.source.tar.bz2) = 78548401 bytes SHA1 (patch-aa) = 93efde3dab747f80a575cd7c10c045967531bb53 SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997 SHA1 (patch-ac) = 6aa120769b63efa5869029655f50af901edb9129 @@ -17,26 +17,25 @@ SHA1 (patch-al) = a8397fe9087a088169c639b42522306824f013b7 SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7 SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3 -SHA1 (patch-as) = 3f51422d828d0ec6e280381a831d8603b88508c7 +SHA1 (patch-as) = 42d3e9ba41a00a9837666ccbe02b6fa75a794c0f SHA1 (patch-at) = d5e820c9ad87feb1827c948a1471127bc21fbd1b SHA1 (patch-au) = e59d5c28c676e03fb8bb38e28c06a4fd4d44ab55 SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771 SHA1 (patch-aw) = 0772c244636f7973171c274c126fa8bfbbcf1acb -SHA1 (patch-ax) = 777ed7921d939e6f7a4a3c23cb92e5489e454601 -SHA1 (patch-ay) = 81c3de4bee86ceab7927a49bcd79d980b06ad6f0 +SHA1 (patch-ax) = eefed6752c991dc700b82181b8bf942aa34ac324 +SHA1 (patch-ay) = 980c20007efef5f1798fb75be7fde0dcf3c61340 SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4 SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d SHA1 (patch-bd) = e09718d6492739a66dc5e21d3ed2cc1a404acd30 SHA1 (patch-bf) = ef6d6ccbbfee2c72aef76c70695b202e346c5038 SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759 SHA1 (patch-bi) = b190a1c338550b70b65c02f29639338708295075 -SHA1 (patch-browser_confvars.sh) = 32dfbd761946779105eda40b748a6a7f77f3f673 SHA1 (patch-build_autoconf_gcc-pr49911.m4) = 252dbdf1c319e17455b5225254281b656dbb397b SHA1 (patch-build_autoconf_nss.m4) = 2cd3f2d824273fe58c1a1f0a4b05605430ed3471 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = b4ce48ef10635feef8ac48017e03737f4a259d95 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = b036f543f2e8502c216164e80aafe7844ae4de54 SHA1 (patch-ipc_chromium_Makefile.in) = 050bfd7911f72b677c12e6f51ba0783a3356a367 -SHA1 (patch-ipc_chromium_chromium-config.mk) = 00810dd00ebaf4a36448b84559035d6990a1514f +SHA1 (patch-ipc_chromium_chromium-config.mk) = cca3892f4f114dea7d2987d52aee862ea9c3fc33 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = de42f64a1484ab6570637643ee79ec2e60d9ea01 SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 4707d1753f5c951efa1d0ecb3e6e17dd200745aa SHA1 (patch-ipc_chromium_src_base_file__util.h) = 9cdf3cad35412a65bc1f8ebbfb7d27ad2e8f6c49 @@ -47,7 +46,7 @@ SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = eb6c8003375c047602 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 2463d67e22ea6debe211511e43547fea351012d1 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ca70558dda0166bf898d3c1ccbb58d06212568ca SHA1 (patch-ipc_chromium_src_base_process__util.h) = c08790eaf22b41e64067ab8d29d0c3a125355622 -SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = c6f9f7fca74cb66bcaab7035d9c85a8b344f4e27 +SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 1adadd3b26e24fcd5c692daae108307c896b0c75 SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 73b6de35552b97957442d69be25ace53faa6aae2 SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = de14044b7e2a0085afa6b603bc76f59b6f24c47f SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = d5cd70bdc680f04120c58ec576227affd403c992 @@ -56,9 +55,9 @@ SHA1 (patch-ipc_chromium_src_build_build__config.h) = 8e43063b693d69bac425705d02 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 27ac2b7dbe1b325ad833ffc2bf17003a5f6a6f88 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = fb31bc5e58615d0297c714e8ba500e51fd2813bc SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = b55156f1cb5a115a3dcec2d22195fc8763c97e00 -SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 18a5d9f0b2e2d1f3d96e69e39de5447c9534eca9 +SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 0e22486a1df8f5a726f675cd6055f8a455d16d9d SHA1 (patch-js_src_build_autoconf_gcc-pr49911.m4) = 28d546bd51cc9fe556a6f92365bdafd335629fb1 -SHA1 (patch-js_src_jscpucfg.h) = d6e54c26608c29697ee310bc4b5fc08e21fdf2b7 +SHA1 (patch-js_src_jscpucfg.h) = 79829d8e9fa2c3dcba07d1d90a6cf1f635791d97 SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = aec956a2cb35ce4dffb87fded52b8436781dab85 SHA1 (patch-js_src_yarr_pcre_pcre.h) = cf86b885ac222854a62c6ab98dad338bd76cd7d1 SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524 diff --git a/devel/xulrunner/patches/patch-as b/devel/xulrunner/patches/patch-as index faed00e4790..f60c02c24f3 100644 --- a/devel/xulrunner/patches/patch-as +++ b/devel/xulrunner/patches/patch-as @@ -1,10 +1,10 @@ -$NetBSD: patch-as,v 1.4 2011/10/03 12:37:24 tnn Exp $ +$NetBSD: patch-as,v 1.5 2012/03/15 08:30:06 ryoon Exp $ Treat DragonFly like FreeBSD. ---- js/src/configure.in.orig 2011-09-22 20:20:26.000000000 +0000 -+++ js/src/configure.in -@@ -784,7 +784,7 @@ EOF +--- js/src/configure.in.orig 2012-03-06 13:17:03.000000000 +0100 ++++ js/src/configure.in 2012-03-07 10:10:42.000000000 +0100 +@@ -856,7 +856,7 @@ AC_LANG_RESTORE ]) @@ -13,7 +13,7 @@ Treat DragonFly like FreeBSD. AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug, ac_cv_have_dllimport_exception_bug, [ -@@ -1999,7 +1999,7 @@ case "$target" in +@@ -2259,7 +2259,7 @@ MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' ;; @@ -22,16 +22,16 @@ Treat DragonFly like FreeBSD. if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then DLL_SUFFIX=".so.1.0" DSO_LDOPTS="-shared" -@@ -2846,7 +2846,7 @@ case "$target" in - *-solaris*) - AC_DEFINE(AVMPLUS_UNIX) - ;; --*-freebsd*|*-kfreebsd*) -+*-freebsd*|*-kfreebsd*|*-netbsd*|*-dragonfly*) - AC_DEFINE(AVMPLUS_UNIX) - ;; - *-openbsd*) -@@ -4846,7 +4846,7 @@ if test "$MOZ_MEMORY"; then +@@ -3368,7 +3368,7 @@ + fi + + case "$target" in +- *-*-freebsd*) ++ *-*-freebsd*|*-dragonfly*) + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) + dnl -pthread links in -lc_r, so don't specify it explicitly. +@@ -4275,7 +4275,7 @@ *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; diff --git a/devel/xulrunner/patches/patch-ax b/devel/xulrunner/patches/patch-ax index 65620778d87..19816702648 100644 --- a/devel/xulrunner/patches/patch-ax +++ b/devel/xulrunner/patches/patch-ax @@ -1,10 +1,10 @@ -$NetBSD: patch-ax,v 1.3 2011/04/26 14:16:36 tnn Exp $ +$NetBSD: patch-ax,v 1.4 2012/03/15 08:30:06 ryoon Exp $ --- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 01:03:41.000000000 +0000 +++ xpcom/base/nsStackWalk.cpp -@@ -1137,7 +1137,7 @@ NS_FormatCodeAddressDetails(void *aPC, c - #define __USE_GNU - #endif +@@ -54,7 +54,7 @@ + }; + static CriticalAddress gCriticalAddress; -#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) +#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__NetBSD__) diff --git a/devel/xulrunner/patches/patch-ay b/devel/xulrunner/patches/patch-ay index 3129de1bfe9..93312e457c3 100644 --- a/devel/xulrunner/patches/patch-ay +++ b/devel/xulrunner/patches/patch-ay @@ -1,12 +1,14 @@ -$NetBSD: patch-ay,v 1.2 2011/10/03 12:37:24 tnn Exp $ +$NetBSD: patch-ay,v 1.3 2012/03/15 08:30:06 ryoon Exp $ --- browser/app/nsBrowserApp.cpp.orig 2011-09-22 20:20:17.000000000 +0000 +++ browser/app/nsBrowserApp.cpp -@@ -49,6 +49,27 @@ +@@ -53,6 +53,30 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> +#include <sys/resource.h> ++ ++#ifdef __NetBSD__ +/* + * On netbsd-4, ulimit -n is 64 by default; too few for us. + */ @@ -27,14 +29,17 @@ $NetBSD: patch-ay,v 1.2 2011/10/03 12:37:24 tnn Exp $ + if (setrlimit(RLIMIT_NOFILE, &rlp) == -1) + fprintf(stderr, "warning: setrlimit failed\n"); +} ++#endif #include "plstr.h" #include "prprf.h" -@@ -203,6 +224,7 @@ static int do_main(const char *exePath, - int main(int argc, char* argv[]) - { - char exePath[MAXPATHLEN]; +@@ -215,6 +239,9 @@ + #ifdef XP_MACOSX + TriggerQuirks(); + #endif ++#ifdef __NetBSD__ + netbsd_fixrlimit(); ++#endif nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); if (NS_FAILED(rv)) { diff --git a/devel/xulrunner/patches/patch-browser_confvars.sh b/devel/xulrunner/patches/patch-browser_confvars.sh deleted file mode 100644 index b8dc1493484..00000000000 --- a/devel/xulrunner/patches/patch-browser_confvars.sh +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-browser_confvars.sh,v 1.1 2012/03/10 03:08:25 ryoon Exp $ - ---- browser/confvars.sh.orig 2012-02-16 06:40:24.000000000 +0000 -+++ browser/confvars.sh -@@ -49,5 +49,5 @@ MOZ_EXTENSIONS_DEFAULT=" gnomevfs" - # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh - # Changing either of these values requires a clobber to ensure correct results, - # because branding dependencies are broken. --MOZ_BRANDING_DIRECTORY=browser/branding/official -+MOZ_BRANDING_DIRECTORY=browser/branding/aurora - MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official diff --git a/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk b/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk index e0231b1d58a..0d9d878e4ac 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk +++ b/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk @@ -1,7 +1,7 @@ -$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.2 2012/03/15 08:30:06 ryoon Exp $ ---- ipc/chromium/chromium-config.mk.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/chromium-config.mk +--- ipc/chromium/chromium-config.mk.orig 2012-02-16 07:40:33.000000000 +0100 ++++ ipc/chromium/chromium-config.mk 2012-03-11 11:05:40.397182000 +0100 @@ -56,17 +56,6 @@ -I$(DEPTH)/ipc/ipdl/_ipdlheaders \ $(NULL) @@ -20,7 +20,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon E ifeq ($(OS_ARCH),WINNT) # { OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp) -@@ -93,13 +82,62 @@ +@@ -93,13 +82,64 @@ endif else # } { @@ -41,6 +41,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon E + +OS_DRAGONFLY = 1 +OS_BSD = 1 ++OS_LIBS += $(call EXPAND_LIBNAME,kvm) +DEFINES += \ + -DOS_DRAGONFLY=1 \ + -DOS_BSD=1 \ @@ -51,6 +52,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon E + +OS_FREEBSD = 1 +OS_BSD = 1 ++OS_LIBS += $(call EXPAND_LIBNAME,kvm) +DEFINES += \ + -DOS_FREEBSD=1 \ + -DOS_BSD=1 \ @@ -86,7 +88,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon E $(NULL) # NB: to stop gcc warnings about exporting template instantiation -@@ -107,4 +145,8 @@ +@@ -107,4 +147,8 @@ endif # } endif # } diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc index e997f9da5e4..39efaf78190 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc @@ -1,8 +1,9 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2012/03/11 16:33:48 marino Exp $ +$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03/15 08:30:06 ryoon Exp $ ---- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-03-11 15:20:05.625294000 +0000 -+++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,297 @@ + +--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-03-08 18:52:15.229788000 +0100 ++++ ipc/chromium/src/base/process_util_bsd.cc 2012-03-11 10:59:50.559480000 +0100 +@@ -0,0 +1,309 @@ +// 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. @@ -15,13 +16,23 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2012/03/11 16:3 +#include <fcntl.h> +#include <unistd.h> +#include <string> ++#if defined(OS_DRAGONFLY) ++/* DragonFly, as of v3.0.1, does not explicitly mark symbols public */ ++#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") ++#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") ++#else ++#define PRE_SYS_INCLUDE ++#define POST_SYS_INCLUDE ++#endif ++PRE_SYS_INCLUDE +#include <kvm.h> ++POST_SYS_INCLUDE +#include <sys/sysctl.h> +#include <sys/types.h> +#include <sys/wait.h> +#if defined(OS_DRAGONFLY) -+#define HAVE_POSIX_SPAWN +#include <sys/user.h> ++#define HAVE_POSIX_SPAWN 1 +#endif + +#include "base/debug_util.h" @@ -39,7 +50,9 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2012/03/11 16:3 +#endif + +#ifdef HAVE_POSIX_SPAWN ++PRE_SYS_INCLUDE +#include <spawn.h> ++POST_SYS_INCLUDE +extern "C" char **environ __dso_public; +#endif + diff --git a/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp index 2386612481c..ee93a1f6af4 100644 --- a/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp +++ b/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 ryoon Exp $ --- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-12-20 23:28:19.000000000 +0000 +++ ipc/glue/GeckoChildProcessHost.cpp -@@ -430,7 +430,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -430,7 +430,7 @@ // and passing wstrings from one config to the other is unsafe. So // we split the logic here. @@ -11,18 +11,18 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/06 12:34:09 ryoo base::environment_map newEnvVars; // XPCOM may not be initialized in some subprocesses. We don't want // to initialize XPCOM just for the directory service, especially -@@ -445,8 +445,8 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -445,8 +445,8 @@ if (NS_SUCCEEDED(rv)) { nsCString path; greDir->GetNativePath(path); -# ifdef OS_LINUX --# ifdef ANDROID +-# ifdef MOZ_WIDGET_ANDROID +# if defined(OS_LINUX) || defined(OS_BSD) -+# if defined(ANDROID) || defined(OS_BSD) ++# if defined(MOZ_WIDGET_ANDROID) || defined(OS_BSD) path += "/lib"; - # endif // ANDROID + # endif // MOZ_WIDGET_ANDROID const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH"); -@@ -557,7 +557,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -557,7 +557,7 @@ childArgv.push_back(pidstring); #if defined(MOZ_CRASHREPORTER) @@ -31,7 +31,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/06 12:34:09 ryoo int childCrashFd, childCrashRemapFd; if (!CrashReporter::CreateNotificationPipeForChild( &childCrashFd, &childCrashRemapFd)) -@@ -594,7 +594,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -594,7 +594,7 @@ #endif base::LaunchApp(childArgv, mFileMap, @@ -40,3 +40,4 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/06 12:34:09 ryoo newEnvVars, #endif false, &process, arch); + diff --git a/devel/xulrunner/patches/patch-js_src_jscpucfg.h b/devel/xulrunner/patches/patch-js_src_jscpucfg.h index 7b58d307ba5..8c7f84b38f3 100644 --- a/devel/xulrunner/patches/patch-js_src_jscpucfg.h +++ b/devel/xulrunner/patches/patch-js_src_jscpucfg.h @@ -1,11 +1,11 @@ -$NetBSD: patch-js_src_jscpucfg.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-js_src_jscpucfg.h,v 1.2 2012/03/15 08:30:06 ryoon Exp $ --- js/src/jscpucfg.h.orig 2012-01-29 11:24:34.000000000 +0100 +++ js/src/jscpucfg.h 2012-02-08 12:35:20.000000000 +0100 @@ -77,6 +77,21 @@ - #define IS_BIG_ENDIAN 1 - #endif + # define IS_BIG_ENDIAN 1 + # endif +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__MirBSD__) || defined(__DragonFly__) +#include <sys/endian.h> @@ -23,5 +23,6 @@ $NetBSD: patch-js_src_jscpucfg.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ +#endif + #elif defined(JS_HAVE_ENDIAN_H) - #include <endian.h> + # include <endian.h> + |