diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-08-28 12:42:00 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-08-28 12:42:00 +0000 |
| commit | 56d42de3a531a8b6484bb928ab1bbd19615d231e (patch) | |
| tree | 1b971a894a97846f8e81d075c8ea615e90a2b7f7 | |
| parent | d601ebd9d8778905c405635efcd762174f90a85d (diff) | |
| download | pkgsrc-56d42de3a531a8b6484bb928ab1bbd19615d231e.tar.gz | |
Update to 15.0
* Use patches from https://bugzilla.mozilla.org/show_bug.cgi?id=753046
* Fix firefox.sh
Changelog:
NEW Preliminary native PDF support (Aurora/Beta only)
NEW Support for SPDY networking protocol v3
NEW WebGL enhancements, including compressed textures for better performance
CHANGED Optimized memory usage for add-ons
DEVELOPER JavaScript debugger integrated into developer tools
DEVELOPER New layout view added to Inspector
DEVELOPER The CSS word-break property has been implemented.
DEVELOPER High precision event timer implemented
DEVELOPER New responsive design tool allows web developers to switch between desktop and mobile views of sites
HTML5 Native support for the Opus audio codec added
HTML5 The <source> element now supports the media attribute
HTML5 The <audio> and <video> elements now support the played attribute
121 files changed, 1057 insertions, 1338 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index 9e98a433916..983f4f7697a 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2012/07/18 16:10:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.74 2012/08/28 12:42:00 ryoon Exp $ .include "dist.mk" PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} @@ -36,7 +36,6 @@ LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner -Wl,-rpath,${PREFIX}/lib pre-configure: cd ${WRKSRC} && autoconf cd ${WRKSRC}/js/src && autoconf - cd ${WRKSRC}/nsprpub && autoconf post-install: # XXX fix the pkg-config files instead diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST index 90ec361a81d..ec8e6714f41 100644 --- a/devel/xulrunner/PLIST +++ b/devel/xulrunner/PLIST @@ -1,11 +1,9 @@ -@comment $NetBSD: PLIST,v 1.43 2012/07/18 16:10:06 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.44 2012/08/28 12:42:00 ryoon Exp $ bin/xulrunner -include/xulrunner/ARIAGridAccessibleWrap.h -include/xulrunner/AtkSocketAccessible.h +include/xulrunner/AudioSegment.h include/xulrunner/BasicImplData.h include/xulrunner/BasicLayers.h include/xulrunner/BasicTiledThebesLayer.h -include/xulrunner/CheckedInt.h include/xulrunner/CustomQS_Canvas.h include/xulrunner/CustomQS_Canvas2D.h include/xulrunner/CustomQS_WebGL.h @@ -31,16 +29,28 @@ include/xulrunner/ImageLayers.h include/xulrunner/ImageLogging.h include/xulrunner/LayerManagerOGL.h include/xulrunner/LayerManagerOGLProgram.h +include/xulrunner/LayerManagerOGLShaders.h include/xulrunner/LayerSorter.h include/xulrunner/Layers.h +include/xulrunner/MediaEngine.h +include/xulrunner/MediaEngineDefault.h include/xulrunner/MediaResource.h +include/xulrunner/MediaSegment.h +include/xulrunner/MediaStreamGraph.h include/xulrunner/PCOMContentPermissionRequestChild.h include/xulrunner/PPrefTuple.h include/xulrunner/PrefTuple.h include/xulrunner/ReadbackLayer.h include/xulrunner/SVGAttrValueWrapper.h +include/xulrunner/SharedBuffer.h +include/xulrunner/SharedTextureImage.h +include/xulrunner/StackArena.h +include/xulrunner/StreamBuffer.h include/xulrunner/TabMessageUtils.h +include/xulrunner/TexturePoolOGL.h +include/xulrunner/TimeVarying.h include/xulrunner/VideoFrameContainer.h +include/xulrunner/VideoSegment.h include/xulrunner/VideoUtils.h include/xulrunner/WebGLContext.h include/xulrunner/a11yGeneric.h @@ -62,6 +72,7 @@ include/xulrunner/expat_external.h include/xulrunner/extIApplication.h include/xulrunner/ftpCore.h include/xulrunner/gc/Barrier.h +include/xulrunner/gc/Heap.h include/xulrunner/gc/Root.h include/xulrunner/gc/Statistics.h include/xulrunner/gfx2DGlue.h @@ -79,6 +90,7 @@ include/xulrunner/gfxFT2FontBase.h include/xulrunner/gfxFailure.h include/xulrunner/gfxFont.h include/xulrunner/gfxFontConstants.h +include/xulrunner/gfxFontFeatures.h include/xulrunner/gfxFontTest.h include/xulrunner/gfxFontUtils.h include/xulrunner/gfxGdkNativeRenderer.h @@ -121,6 +133,7 @@ include/xulrunner/harfbuzz/hb-ot-layout.h include/xulrunner/harfbuzz/hb-ot-shape.h include/xulrunner/harfbuzz/hb-ot-tag.h include/xulrunner/harfbuzz/hb-ot.h +include/xulrunner/harfbuzz/hb-set.h include/xulrunner/harfbuzz/hb-shape.h include/xulrunner/harfbuzz/hb-unicode.h include/xulrunner/harfbuzz/hb-version.h @@ -156,7 +169,6 @@ include/xulrunner/jsalloc.h include/xulrunner/jsapi.h include/xulrunner/jsatom.h include/xulrunner/jsatom.tbl -include/xulrunner/jscell.h include/xulrunner/jsclass.h include/xulrunner/jsclist.h include/xulrunner/jscpucfg.h @@ -210,7 +222,8 @@ include/xulrunner/mozIStorageService.h include/xulrunner/mozIStorageServiceQuotaManagement.h include/xulrunner/mozIStorageStatement.h include/xulrunner/mozIStorageStatementCallback.h -include/xulrunner/mozIStorageStatementWrapper.h +include/xulrunner/mozIStorageStatementParams.h +include/xulrunner/mozIStorageStatementRow.h include/xulrunner/mozIStorageVacuumParticipant.h include/xulrunner/mozIStorageValueArray.h include/xulrunner/mozITXTToHTMLConv.h @@ -229,9 +242,11 @@ include/xulrunner/mozilla/BlockingResourceBase.h include/xulrunner/mozilla/BloomFilter.h include/xulrunner/mozilla/CORSMode.h include/xulrunner/mozilla/CharTokenizer.h +include/xulrunner/mozilla/CheckedInt.h include/xulrunner/mozilla/ClearOnShutdown.h include/xulrunner/mozilla/CondVar.h include/xulrunner/mozilla/DeadlockDetector.h +include/xulrunner/mozilla/ErrorResult.h include/xulrunner/mozilla/FileLocation.h include/xulrunner/mozilla/FileUtils.h include/xulrunner/mozilla/FloatingPoint.h @@ -259,6 +274,7 @@ include/xulrunner/mozilla/ModuleLoader.h include/xulrunner/mozilla/ModuleUtils.h include/xulrunner/mozilla/Monitor.h include/xulrunner/mozilla/Mutex.h +include/xulrunner/mozilla/OSFileConstants.h include/xulrunner/mozilla/Observer.h include/xulrunner/mozilla/Omnijar.h include/xulrunner/mozilla/PaintTracker.h @@ -278,12 +294,14 @@ include/xulrunner/mozilla/StartupTimeline.h include/xulrunner/mozilla/StringBuilder.h include/xulrunner/mozilla/Telemetry.h include/xulrunner/mozilla/TelemetryHistograms.h +include/xulrunner/mozilla/ThreadLocal.h include/xulrunner/mozilla/TimeStamp.h include/xulrunner/mozilla/Types.h include/xulrunner/mozilla/Util.h include/xulrunner/mozilla/WidgetTraceEvent.h include/xulrunner/mozilla/X11Util.h include/xulrunner/mozilla/XPCOM.h +include/xulrunner/mozilla/a11y/Accessible.h include/xulrunner/mozilla/a11y/FocusManager.h include/xulrunner/mozilla/a11y/Role.h include/xulrunner/mozilla/a11y/States.h @@ -300,19 +318,28 @@ include/xulrunner/mozilla/docshell/OfflineCacheUpdateChild.h include/xulrunner/mozilla/docshell/OfflineCacheUpdateParent.h include/xulrunner/mozilla/dom/AudioChild.h include/xulrunner/mozilla/dom/AudioParent.h +include/xulrunner/mozilla/dom/BindingUtils.h include/xulrunner/mozilla/dom/ContentChild.h include/xulrunner/mozilla/dom/ContentParent.h include/xulrunner/mozilla/dom/ContentProcess.h include/xulrunner/mozilla/dom/CrashReporterChild.h include/xulrunner/mozilla/dom/CrashReporterParent.h include/xulrunner/mozilla/dom/DOMError.h +include/xulrunner/mozilla/dom/DOMJSClass.h include/xulrunner/mozilla/dom/DOMRequest.h include/xulrunner/mozilla/dom/Element.h +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/FromParser.h +include/xulrunner/mozilla/dom/FunctionBinding.h include/xulrunner/mozilla/dom/ImageData.h include/xulrunner/mozilla/dom/Link.h +include/xulrunner/mozilla/dom/Nullable.h +include/xulrunner/mozilla/dom/PrimitiveConversions.h +include/xulrunner/mozilla/dom/PrototypeList.h +include/xulrunner/mozilla/dom/RegisterBindings.h include/xulrunner/mozilla/dom/ScreenOrientation.h include/xulrunner/mozilla/dom/StorageChild.h include/xulrunner/mozilla/dom/StorageParent.h @@ -320,25 +347,28 @@ include/xulrunner/mozilla/dom/StructuredCloneTags.h include/xulrunner/mozilla/dom/TabChild.h include/xulrunner/mozilla/dom/TabMessageUtils.h include/xulrunner/mozilla/dom/TabParent.h +include/xulrunner/mozilla/dom/TypedArray.h +include/xulrunner/mozilla/dom/WebGLRenderingContextBinding.h +include/xulrunner/mozilla/dom/XMLHttpRequestBinding.h +include/xulrunner/mozilla/dom/XMLHttpRequestEventTargetBinding.h +include/xulrunner/mozilla/dom/XMLHttpRequestUploadBinding.h include/xulrunner/mozilla/dom/battery/Constants.h include/xulrunner/mozilla/dom/battery/Types.h -include/xulrunner/mozilla/dom/bindings/Common.h -include/xulrunner/mozilla/dom/bindings/DOMJSClass.h -include/xulrunner/mozilla/dom/bindings/EventListenerBinding.h -include/xulrunner/mozilla/dom/bindings/EventTargetBinding.h -include/xulrunner/mozilla/dom/bindings/FunctionBinding.h -include/xulrunner/mozilla/dom/bindings/Nullable.h -include/xulrunner/mozilla/dom/bindings/PrototypeList.h -include/xulrunner/mozilla/dom/bindings/Utils.h -include/xulrunner/mozilla/dom/bindings/XMLHttpRequestBinding.h -include/xulrunner/mozilla/dom/bindings/XMLHttpRequestEventTargetBinding.h -include/xulrunner/mozilla/dom/bindings/XMLHttpRequestUploadBinding.h +include/xulrunner/mozilla/dom/file/DOMFileHandle.h +include/xulrunner/mozilla/dom/file/File.h +include/xulrunner/mozilla/dom/file/FileCommon.h +include/xulrunner/mozilla/dom/file/FileHandle.h +include/xulrunner/mozilla/dom/file/FileHelper.h +include/xulrunner/mozilla/dom/file/FileService.h +include/xulrunner/mozilla/dom/file/LockedFile.h +include/xulrunner/mozilla/dom/indexedDB/DatabaseInfo.h include/xulrunner/mozilla/dom/indexedDB/FileInfo.h include/xulrunner/mozilla/dom/indexedDB/FileManager.h include/xulrunner/mozilla/dom/indexedDB/IDBCursor.h include/xulrunner/mozilla/dom/indexedDB/IDBDatabase.h include/xulrunner/mozilla/dom/indexedDB/IDBEvents.h include/xulrunner/mozilla/dom/indexedDB/IDBFactory.h +include/xulrunner/mozilla/dom/indexedDB/IDBFileHandle.h include/xulrunner/mozilla/dom/indexedDB/IDBIndex.h include/xulrunner/mozilla/dom/indexedDB/IDBKeyRange.h include/xulrunner/mozilla/dom/indexedDB/IDBObjectStore.h @@ -348,6 +378,7 @@ include/xulrunner/mozilla/dom/indexedDB/IDBWrapperCache.h include/xulrunner/mozilla/dom/indexedDB/IndexedDatabase.h include/xulrunner/mozilla/dom/indexedDB/IndexedDatabaseManager.h include/xulrunner/mozilla/dom/indexedDB/Key.h +include/xulrunner/mozilla/dom/indexedDB/SerializationHelpers.h include/xulrunner/mozilla/dom/network/Constants.h include/xulrunner/mozilla/dom/network/Types.h include/xulrunner/mozilla/dom/network/Utils.h @@ -369,6 +400,7 @@ include/xulrunner/mozilla/dom/workers/bindings/WorkerFeature.h include/xulrunner/mozilla/dom/workers/bindings/XMLHttpRequest.h include/xulrunner/mozilla/dom/workers/bindings/XMLHttpRequestEventTarget.h include/xulrunner/mozilla/dom/workers/bindings/XMLHttpRequestUpload.h +include/xulrunner/mozilla/fallible.h include/xulrunner/mozilla/gfx/2D.h include/xulrunner/mozilla/gfx/BaseMargin.h include/xulrunner/mozilla/gfx/BasePoint.h @@ -508,8 +540,6 @@ include/xulrunner/nsAccDocManager.h include/xulrunner/nsAccessNode.h include/xulrunner/nsAccessNodeWrap.h include/xulrunner/nsAccessibilityService.h -include/xulrunner/nsAccessible.h -include/xulrunner/nsAccessibleWrap.h include/xulrunner/nsAgg.h include/xulrunner/nsAlgorithm.h include/xulrunner/nsAppDirectoryServiceDefs.h @@ -588,7 +618,6 @@ include/xulrunner/nsColorNames.h include/xulrunner/nsCom.h include/xulrunner/nsCompatibility.h include/xulrunner/nsComponentManagerUtils.h -include/xulrunner/nsCompressedCharMap.h include/xulrunner/nsContentCID.h include/xulrunner/nsContentCreatorFunctions.h include/xulrunner/nsContentDLF.h @@ -615,6 +644,7 @@ include/xulrunner/nsDOMEventTargetHelper.h include/xulrunner/nsDOMFile.h include/xulrunner/nsDOMJSUtils.h include/xulrunner/nsDOMMediaQueryList.h +include/xulrunner/nsDOMMediaStream.h include/xulrunner/nsDOMScriptObjectHolder.h include/xulrunner/nsDOMString.h include/xulrunner/nsDataHashtable.h @@ -628,13 +658,13 @@ include/xulrunner/nsDeque.h include/xulrunner/nsDetectionConfident.h include/xulrunner/nsDeviceContext.h include/xulrunner/nsDeviceSensors.h +include/xulrunner/nsDeviceStorage.h include/xulrunner/nsDirectoryService.h include/xulrunner/nsDirectoryServiceAtomList.h include/xulrunner/nsDirectoryServiceDefs.h include/xulrunner/nsDirectoryServiceUtils.h include/xulrunner/nsDisplayItemTypes.h include/xulrunner/nsDisplayList.h -include/xulrunner/nsDocAccessibleWrap.h include/xulrunner/nsDocLoader.h include/xulrunner/nsDocShellCID.h include/xulrunner/nsDocShellLoadTypes.h @@ -685,12 +715,10 @@ include/xulrunner/nsGridRowLeafLayout.h include/xulrunner/nsHTMLAudioElement.h include/xulrunner/nsHTMLCanvasElement.h include/xulrunner/nsHTMLDNSPrefetch.h -include/xulrunner/nsHTMLImageAccessibleWrap.h include/xulrunner/nsHTMLMediaElement.h include/xulrunner/nsHTMLParts.h include/xulrunner/nsHTMLReflowMetrics.h include/xulrunner/nsHTMLReflowState.h -include/xulrunner/nsHTMLTableAccessibleWrap.h include/xulrunner/nsHTMLTagList.h include/xulrunner/nsHTMLTags.h include/xulrunner/nsHTMLTokens.h @@ -730,8 +758,6 @@ include/xulrunner/nsHttp.h include/xulrunner/nsHttpAtomList.h include/xulrunner/nsHttpHeaderArray.h include/xulrunner/nsHttpResponseHead.h -include/xulrunner/nsHyperTextAccessible.h -include/xulrunner/nsHyperTextAccessibleWrap.h include/xulrunner/nsHyphenationManager.h include/xulrunner/nsHyphenator.h include/xulrunner/nsIASN1Object.h @@ -772,6 +798,7 @@ include/xulrunner/nsIApplicationCache.h include/xulrunner/nsIApplicationCacheChannel.h include/xulrunner/nsIApplicationCacheContainer.h include/xulrunner/nsIApplicationCacheService.h +include/xulrunner/nsIAppsService.h include/xulrunner/nsIArray.h include/xulrunner/nsIAssociatedContentSecurity.h include/xulrunner/nsIAsyncInputStream.h @@ -975,8 +1002,12 @@ include/xulrunner/nsIDOMDOMTokenList.h include/xulrunner/nsIDOMDataContainerEvent.h include/xulrunner/nsIDOMDataTransfer.h include/xulrunner/nsIDOMDesktopNotification.h +include/xulrunner/nsIDOMDeviceLightEvent.h include/xulrunner/nsIDOMDeviceMotionEvent.h include/xulrunner/nsIDOMDeviceOrientationEvent.h +include/xulrunner/nsIDOMDeviceProximityEvent.h +include/xulrunner/nsIDOMDeviceStorage.h +include/xulrunner/nsIDOMDeviceStorageCursor.h include/xulrunner/nsIDOMDocument.h include/xulrunner/nsIDOMDocumentFragment.h include/xulrunner/nsIDOMDocumentType.h @@ -989,8 +1020,10 @@ include/xulrunner/nsIDOMEvent.h include/xulrunner/nsIDOMEventListener.h include/xulrunner/nsIDOMEventTarget.h include/xulrunner/nsIDOMFile.h +include/xulrunner/nsIDOMFileHandle.h include/xulrunner/nsIDOMFileList.h include/xulrunner/nsIDOMFileReader.h +include/xulrunner/nsIDOMFileRequest.h include/xulrunner/nsIDOMFontFace.h include/xulrunner/nsIDOMFontFaceList.h include/xulrunner/nsIDOMFormData.h @@ -1001,6 +1034,7 @@ include/xulrunner/nsIDOMGeoPositionCoords.h include/xulrunner/nsIDOMGeoPositionError.h include/xulrunner/nsIDOMGeoPositionErrorCallback.h include/xulrunner/nsIDOMGetSVGDocument.h +include/xulrunner/nsIDOMGlobalObjectConstructor.h include/xulrunner/nsIDOMGlobalPropertyInitializer.h include/xulrunner/nsIDOMHTMLAnchorElement.h include/xulrunner/nsIDOMHTMLAppletElement.h @@ -1077,9 +1111,11 @@ include/xulrunner/nsIDOMLSProgressEvent.h include/xulrunner/nsIDOMLinkStyle.h include/xulrunner/nsIDOMLoadStatus.h include/xulrunner/nsIDOMLocation.h +include/xulrunner/nsIDOMLockedFile.h include/xulrunner/nsIDOMMediaError.h include/xulrunner/nsIDOMMediaList.h include/xulrunner/nsIDOMMediaQueryList.h +include/xulrunner/nsIDOMMediaStream.h include/xulrunner/nsIDOMMessageEvent.h include/xulrunner/nsIDOMMimeType.h include/xulrunner/nsIDOMMimeTypeArray.h @@ -1101,9 +1137,11 @@ include/xulrunner/nsIDOMNamedNodeMap.h include/xulrunner/nsIDOMNavigator.h include/xulrunner/nsIDOMNavigatorBattery.h include/xulrunner/nsIDOMNavigatorDesktopNotification.h +include/xulrunner/nsIDOMNavigatorDeviceStorage.h include/xulrunner/nsIDOMNavigatorGeolocation.h include/xulrunner/nsIDOMNavigatorNetwork.h include/xulrunner/nsIDOMNavigatorSms.h +include/xulrunner/nsIDOMNavigatorUserMedia.h include/xulrunner/nsIDOMNode.h include/xulrunner/nsIDOMNodeFilter.h include/xulrunner/nsIDOMNodeIterator.h @@ -1211,6 +1249,7 @@ include/xulrunner/nsIDOMSVGTransformable.h include/xulrunner/nsIDOMSVGURIReference.h include/xulrunner/nsIDOMSVGUnitTypes.h include/xulrunner/nsIDOMSVGUseElement.h +include/xulrunner/nsIDOMSVGViewElement.h include/xulrunner/nsIDOMSVGViewSpec.h include/xulrunner/nsIDOMSVGZoomAndPan.h include/xulrunner/nsIDOMSVGZoomEvent.h @@ -1229,7 +1268,6 @@ include/xulrunner/nsIDOMSmsMessage.h include/xulrunner/nsIDOMSmsRequest.h include/xulrunner/nsIDOMStorage.h include/xulrunner/nsIDOMStorageEvent.h -include/xulrunner/nsIDOMStorageEventObsolete.h include/xulrunner/nsIDOMStorageIndexedDB.h include/xulrunner/nsIDOMStorageItem.h include/xulrunner/nsIDOMStorageManager.h @@ -1245,6 +1283,7 @@ include/xulrunner/nsIDOMTransitionEvent.h include/xulrunner/nsIDOMTreeWalker.h include/xulrunner/nsIDOMUIEvent.h include/xulrunner/nsIDOMUserDataHandler.h +include/xulrunner/nsIDOMUserProximityEvent.h include/xulrunner/nsIDOMValidityState.h include/xulrunner/nsIDOMWakeLock.h include/xulrunner/nsIDOMWakeLockListener.h @@ -1315,7 +1354,6 @@ include/xulrunner/nsIDownloadProgressListener.h include/xulrunner/nsIDownloader.h include/xulrunner/nsIDragService.h include/xulrunner/nsIDragSession.h -include/xulrunner/nsIDragSessionGTK.h include/xulrunner/nsIDroppedLinkHandler.h include/xulrunner/nsIEditActionListener.h include/xulrunner/nsIEditingSession.h @@ -1367,6 +1405,7 @@ include/xulrunner/nsIFile.h include/xulrunner/nsIFileChannel.h include/xulrunner/nsIFilePicker.h include/xulrunner/nsIFileProtocolHandler.h +include/xulrunner/nsIFileStorage.h include/xulrunner/nsIFileStreams.h include/xulrunner/nsIFileURL.h include/xulrunner/nsIFileView.h @@ -1398,7 +1437,6 @@ include/xulrunner/nsIGenKeypairInfoDlg.h include/xulrunner/nsIGeolocationProvider.h include/xulrunner/nsIGfxInfo.h include/xulrunner/nsIGfxInfoDebug.h -include/xulrunner/nsIGlobalHistory.h include/xulrunner/nsIGlobalHistory2.h include/xulrunner/nsIGnomeVFSService.h include/xulrunner/nsIGridPart.h @@ -1434,6 +1472,7 @@ include/xulrunner/nsIIDBCursor.h include/xulrunner/nsIIDBCursorWithValue.h include/xulrunner/nsIIDBDatabase.h include/xulrunner/nsIIDBFactory.h +include/xulrunner/nsIIDBFileHandle.h include/xulrunner/nsIIDBIndex.h include/xulrunner/nsIIDBKeyRange.h include/xulrunner/nsIIDBObjectStore.h @@ -1514,6 +1553,7 @@ include/xulrunner/nsIMemory.h include/xulrunner/nsIMemoryReporter.h include/xulrunner/nsIMenuBoxObject.h include/xulrunner/nsIMenuBuilder.h +include/xulrunner/nsIMmsService.h include/xulrunner/nsIMobileConnectionProvider.h include/xulrunner/nsIModule.h include/xulrunner/nsIMozBrowserFrame.h @@ -1578,7 +1618,6 @@ include/xulrunner/nsIPluginHost.h include/xulrunner/nsIPluginInputStream.h include/xulrunner/nsIPluginInstanceOwner.h include/xulrunner/nsIPluginStreamInfo.h -include/xulrunner/nsIPluginStreamListener.h include/xulrunner/nsIPluginTag.h include/xulrunner/nsIPluginTagInfo.h include/xulrunner/nsIPluginWidget.h @@ -1603,6 +1642,8 @@ include/xulrunner/nsIPrintSettingsService.h include/xulrunner/nsIPrintStatusFeedback.h include/xulrunner/nsIPrintingPrompt.h include/xulrunner/nsIPrintingPromptService.h +include/xulrunner/nsIPrivacyTransitionObserver.h +include/xulrunner/nsIPrivateBrowsingConsumer.h include/xulrunner/nsIPrivateBrowsingService.h include/xulrunner/nsIPrivateDOMEvent.h include/xulrunner/nsIPrivateTextEvent.h @@ -1743,6 +1784,7 @@ include/xulrunner/nsISerializable.h include/xulrunner/nsISerializationHelper.h include/xulrunner/nsIServerSocket.h include/xulrunner/nsIServiceManager.h +include/xulrunner/nsISettingsService.h include/xulrunner/nsISidebar.h include/xulrunner/nsISignatureVerifier.h include/xulrunner/nsISimpleEnumerator.h @@ -1759,7 +1801,9 @@ include/xulrunner/nsISocketProviderService.h include/xulrunner/nsISocketTransport.h include/xulrunner/nsISocketTransportService.h include/xulrunner/nsISound.h +include/xulrunner/nsISpeculativeConnect.h include/xulrunner/nsISpellChecker.h +include/xulrunner/nsIStandardFileStream.h include/xulrunner/nsIStandardURL.h include/xulrunner/nsIStartupCache.h include/xulrunner/nsIStatefulFrame.h @@ -1881,6 +1925,7 @@ include/xulrunner/nsIVersionComparator.h include/xulrunner/nsIView.h include/xulrunner/nsIViewManager.h include/xulrunner/nsIViewSourceChannel.h +include/xulrunner/nsIWapPushApplication.h include/xulrunner/nsIWeakReference.h include/xulrunner/nsIWeakReferenceUtils.h include/xulrunner/nsIWebBrowser.h @@ -1925,7 +1970,6 @@ include/xulrunner/nsIX509CertDB2.h include/xulrunner/nsIX509CertList.h include/xulrunner/nsIX509CertValidity.h include/xulrunner/nsIXBLAccessible.h -include/xulrunner/nsIXBLService.h include/xulrunner/nsIXFormsUtilityService.h include/xulrunner/nsIXMLContentBuilder.h include/xulrunner/nsIXMLContentSink.h @@ -1997,6 +2041,7 @@ include/xulrunner/nsNodeUtils.h include/xulrunner/nsOSHelperAppService.h include/xulrunner/nsObjCExceptions.h include/xulrunner/nsObjectFrame.h +include/xulrunner/nsObserverList.h include/xulrunner/nsObserverService.h include/xulrunner/nsOggCodecState.h include/xulrunner/nsOggDecoder.h @@ -2028,6 +2073,7 @@ include/xulrunner/nsPluginsCID.h include/xulrunner/nsPluginsDir.h include/xulrunner/nsPoint.h include/xulrunner/nsPosixLocale.h +include/xulrunner/nsPresArena.h include/xulrunner/nsPresContext.h include/xulrunner/nsPresState.h include/xulrunner/nsPrintfCString.h @@ -2050,7 +2096,6 @@ include/xulrunner/nsReferencedElement.h include/xulrunner/nsRefreshDriver.h include/xulrunner/nsRegion.h include/xulrunner/nsRenderingContext.h -include/xulrunner/nsRootAccessibleWrap.h include/xulrunner/nsRuleData.h include/xulrunner/nsRuleNode.h include/xulrunner/nsRuleProcessorData.h @@ -2079,11 +2124,13 @@ include/xulrunner/nsScriptLoader.h include/xulrunner/nsScriptableInputStream.h include/xulrunner/nsServiceManagerUtils.h include/xulrunner/nsSize.h +include/xulrunner/nsSpecialCasingData.h include/xulrunner/nsStackWalk.h include/xulrunner/nsStaticAtom.h include/xulrunner/nsStaticComponents.h include/xulrunner/nsStaticNameTable.h include/xulrunner/nsStorageStream.h +include/xulrunner/nsStreamListenerWrapper.h include/xulrunner/nsStreamUtils.h include/xulrunner/nsString.h include/xulrunner/nsStringAPI.h @@ -2113,6 +2160,7 @@ include/xulrunner/nsSubstring.h include/xulrunner/nsSubstringTuple.h include/xulrunner/nsSupportsArray.h include/xulrunner/nsSupportsPrimitives.h +include/xulrunner/nsSurfaceTexture.h include/xulrunner/nsTArray-inl.h include/xulrunner/nsTArray.h include/xulrunner/nsTArrayHelpers.h @@ -2126,7 +2174,6 @@ include/xulrunner/nsTString.h include/xulrunner/nsTSubstring.h include/xulrunner/nsTSubstringTuple.h include/xulrunner/nsTWeakRef.h -include/xulrunner/nsTextAccessibleWrap.h include/xulrunner/nsTextFormatter.h include/xulrunner/nsTextFragment.h include/xulrunner/nsTextServicesCID.h @@ -2142,6 +2189,7 @@ include/xulrunner/nsTransform2D.h include/xulrunner/nsTreeColFrame.h include/xulrunner/nsTreeSanitizer.h include/xulrunner/nsTreeUtils.h +include/xulrunner/nsTypedSelection.h include/xulrunner/nsUCVJA2CID.h include/xulrunner/nsUCVJACID.h include/xulrunner/nsUConvCID.h @@ -2160,6 +2208,7 @@ include/xulrunner/nsUnicharUtils.h include/xulrunner/nsUnicodeNormalizer.h include/xulrunner/nsUnicodeProperties.h include/xulrunner/nsUnicodeScriptCodes.h +include/xulrunner/nsVKList.h include/xulrunner/nsVariant.h include/xulrunner/nsVersionComparator.h include/xulrunner/nsViewsCID.h @@ -2186,10 +2235,7 @@ include/xulrunner/nsXPIDLString.h include/xulrunner/nsXPTCUtils.h include/xulrunner/nsXREAppData.h include/xulrunner/nsXULAppAPI.h -include/xulrunner/nsXULListboxAccessibleWrap.h -include/xulrunner/nsXULMenuAccessibleWrap.h include/xulrunner/nsXULPopupManager.h -include/xulrunner/nsXULTreeGridAccessibleWrap.h include/xulrunner/nsZipArchive.h include/xulrunner/nscore.h include/xulrunner/nspluginroot.h @@ -2198,12 +2244,17 @@ include/xulrunner/ogg/config_types.h include/xulrunner/ogg/ogg.h include/xulrunner/ogg/os_types.h include/xulrunner/opentype-sanitiser.h +include/xulrunner/opus/opus.h +include/xulrunner/opus/opus_defines.h +include/xulrunner/opus/opus_multistream.h +include/xulrunner/opus/opus_types.h include/xulrunner/ots-memory-stream.h include/xulrunner/pldhash.h include/xulrunner/png.h include/xulrunner/pngconf.h include/xulrunner/qcms.h include/xulrunner/qcmstypes.h +include/xulrunner/qsObjectHelper.h include/xulrunner/rdf.h include/xulrunner/rdfIDataSource.h include/xulrunner/rdfISerializer.h @@ -2222,7 +2273,6 @@ include/xulrunner/skia/SkBounder.h include/xulrunner/skia/SkBuffer.h include/xulrunner/skia/SkCanvas.h include/xulrunner/skia/SkChunkAlloc.h -include/xulrunner/skia/SkClampRange.h include/xulrunner/skia/SkClipStack.h include/xulrunner/skia/SkColor.h include/xulrunner/skia/SkColorFilter.h @@ -2231,9 +2281,11 @@ include/xulrunner/skia/SkColorShader.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 @@ -2261,7 +2313,10 @@ include/xulrunner/skia/SkMaskFilter.h include/xulrunner/skia/SkMath.h 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 @@ -2300,6 +2355,7 @@ include/xulrunner/skia/SkTRegistry.h include/xulrunner/skia/SkTScopedPtr.h include/xulrunner/skia/SkTSearch.h include/xulrunner/skia/SkTemplates.h +include/xulrunner/skia/SkTextBox.h include/xulrunner/skia/SkThread.h include/xulrunner/skia/SkThread_platform.h include/xulrunner/skia/SkTime.h @@ -2310,11 +2366,13 @@ include/xulrunner/skia/SkUnPreMultiply.h include/xulrunner/skia/SkUnitMapper.h include/xulrunner/skia/SkUserConfig.h include/xulrunner/skia/SkUtils.h +include/xulrunner/skia/SkWeakRefCnt.h include/xulrunner/skia/SkWriter32.h include/xulrunner/skia/SkXfermode.h include/xulrunner/snappy/snappy-c.h include/xulrunner/snappy/snappy-stubs-public.h include/xulrunner/snappy/snappy.h +include/xulrunner/speex/speex_resampler.h include/xulrunner/string-template-def-char.h include/xulrunner/string-template-def-unichar.h include/xulrunner/string-template-undef.h @@ -2334,6 +2392,7 @@ include/xulrunner/vorbis/codec.h include/xulrunner/xpcIJSGetFactory.h include/xulrunner/xpcIJSModuleLoader.h include/xulrunner/xpcIJSWeakReference.h +include/xulrunner/xpcObjectHelper.h include/xulrunner/xpc_map_end.h include/xulrunner/xpccomponents.h include/xulrunner/xpcexception.h @@ -2384,6 +2443,7 @@ lib/xulrunner-sdk/xpcom-config.h lib/xulrunner/LICENSE lib/xulrunner/README.xulrunner 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 @@ -2592,6 +2652,7 @@ lib/xulrunner/chrome/pippki/content/pippki/viewCertDetails.xul lib/xulrunner/chrome/toolkit.manifest lib/xulrunner/chrome/toolkit/content/cookie/cookieAcceptDialog.js lib/xulrunner/chrome/toolkit/content/cookie/cookieAcceptDialog.xul +lib/xulrunner/chrome/toolkit/content/global/BrowserElementChild.js lib/xulrunner/chrome/toolkit/content/global/XPCNativeWrapper.js lib/xulrunner/chrome/toolkit/content/global/about.xhtml lib/xulrunner/chrome/toolkit/content/global/aboutAbout.xhtml @@ -2711,6 +2772,7 @@ lib/xulrunner/chrome/toolkit/content/global/remote-test-ipc.js lib/xulrunner/chrome/toolkit/content/global/resetProfile.css lib/xulrunner/chrome/toolkit/content/global/resetProfile.js lib/xulrunner/chrome/toolkit/content/global/resetProfile.xul +lib/xulrunner/chrome/toolkit/content/global/resetProfileProgress.xul lib/xulrunner/chrome/toolkit/content/global/selectDialog.js lib/xulrunner/chrome/toolkit/content/global/selectDialog.xul lib/xulrunner/chrome/toolkit/content/global/strres.js @@ -2986,7 +3048,6 @@ lib/xulrunner/chrome/toolkit/skin/classic/global/tabbox.css lib/xulrunner/chrome/toolkit/skin/classic/global/tabprompts.css lib/xulrunner/chrome/toolkit/skin/classic/global/textbox.css lib/xulrunner/chrome/toolkit/skin/classic/global/toolbar.css -lib/xulrunner/chrome/toolkit/skin/classic/global/toolbar/Lighten.png lib/xulrunner/chrome/toolkit/skin/classic/global/toolbar/chevron.gif lib/xulrunner/chrome/toolkit/skin/classic/global/toolbar/spring.png lib/xulrunner/chrome/toolkit/skin/classic/global/toolbarbutton.css @@ -3072,8 +3133,10 @@ 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/BrowserElementAPI.js -lib/xulrunner/components/BrowserElementAPI.manifest +lib/xulrunner/components/AppsService.js +lib/xulrunner/components/AppsService.manifest +lib/xulrunner/components/BrowserElementParent.js +lib/xulrunner/components/BrowserElementParent.manifest lib/xulrunner/components/ConsoleAPI.js lib/xulrunner/components/ConsoleAPI.manifest lib/xulrunner/components/ContactManager.js @@ -3087,6 +3150,8 @@ lib/xulrunner/components/NetworkGeolocationProvider.manifest lib/xulrunner/components/PlacesCategoriesStarter.js lib/xulrunner/components/SettingsManager.js lib/xulrunner/components/SettingsManager.manifest +lib/xulrunner/components/SettingsService.js +lib/xulrunner/components/SettingsService.manifest lib/xulrunner/components/TelemetryPing.js lib/xulrunner/components/TelemetryPing.manifest lib/xulrunner/components/Webapps.js @@ -3244,6 +3309,7 @@ lib/xulrunner/modules/DownloadUtils.jsm lib/xulrunner/modules/FileUtils.jsm lib/xulrunner/modules/Geometry.jsm lib/xulrunner/modules/ISO8601DateUtils.jsm +lib/xulrunner/modules/IndexedDBHelper.jsm lib/xulrunner/modules/InlineSpellChecker.jsm lib/xulrunner/modules/LightweightThemeConsumer.jsm lib/xulrunner/modules/LightweightThemeManager.jsm @@ -3258,6 +3324,8 @@ lib/xulrunner/modules/PluralForm.jsm lib/xulrunner/modules/PopupNotifications.jsm lib/xulrunner/modules/PropertyListUtils.jsm lib/xulrunner/modules/Services.jsm +lib/xulrunner/modules/SettingsDB.jsm +lib/xulrunner/modules/SettingsQueue.jsm lib/xulrunner/modules/SpellCheckDictionaryBootstrap.js lib/xulrunner/modules/TelemetryStopwatch.jsm lib/xulrunner/modules/Webapps.jsm @@ -3324,7 +3392,6 @@ lib/xulrunner/res/table-remove-row.gif lib/xulrunner/update.locale lib/xulrunner/updater lib/xulrunner/xulrunner -lib/xulrunner/xulrunner-bin lib/xulrunner/xulrunner-stub share/idl/xulrunner/IJSDebugger.idl share/idl/xulrunner/amIInstallTrigger.idl @@ -3375,7 +3442,8 @@ share/idl/xulrunner/mozIStorageService.idl share/idl/xulrunner/mozIStorageServiceQuotaManagement.idl share/idl/xulrunner/mozIStorageStatement.idl share/idl/xulrunner/mozIStorageStatementCallback.idl -share/idl/xulrunner/mozIStorageStatementWrapper.idl +share/idl/xulrunner/mozIStorageStatementParams.idl +share/idl/xulrunner/mozIStorageStatementRow.idl share/idl/xulrunner/mozIStorageVacuumParticipant.idl share/idl/xulrunner/mozIStorageValueArray.idl share/idl/xulrunner/mozITXTToHTMLConv.idl @@ -3419,6 +3487,7 @@ share/idl/xulrunner/nsIApplicationCache.idl share/idl/xulrunner/nsIApplicationCacheChannel.idl share/idl/xulrunner/nsIApplicationCacheContainer.idl share/idl/xulrunner/nsIApplicationCacheService.idl +share/idl/xulrunner/nsIAppsService.idl share/idl/xulrunner/nsIArray.idl share/idl/xulrunner/nsIAssociatedContentSecurity.idl share/idl/xulrunner/nsIAsyncInputStream.idl @@ -3600,8 +3669,12 @@ share/idl/xulrunner/nsIDOMDOMTokenList.idl share/idl/xulrunner/nsIDOMDataContainerEvent.idl share/idl/xulrunner/nsIDOMDataTransfer.idl share/idl/xulrunner/nsIDOMDesktopNotification.idl +share/idl/xulrunner/nsIDOMDeviceLightEvent.idl share/idl/xulrunner/nsIDOMDeviceMotionEvent.idl share/idl/xulrunner/nsIDOMDeviceOrientationEvent.idl +share/idl/xulrunner/nsIDOMDeviceProximityEvent.idl +share/idl/xulrunner/nsIDOMDeviceStorage.idl +share/idl/xulrunner/nsIDOMDeviceStorageCursor.idl share/idl/xulrunner/nsIDOMDocument.idl share/idl/xulrunner/nsIDOMDocumentFragment.idl share/idl/xulrunner/nsIDOMDocumentType.idl @@ -3614,8 +3687,10 @@ share/idl/xulrunner/nsIDOMEvent.idl share/idl/xulrunner/nsIDOMEventListener.idl share/idl/xulrunner/nsIDOMEventTarget.idl share/idl/xulrunner/nsIDOMFile.idl +share/idl/xulrunner/nsIDOMFileHandle.idl share/idl/xulrunner/nsIDOMFileList.idl share/idl/xulrunner/nsIDOMFileReader.idl +share/idl/xulrunner/nsIDOMFileRequest.idl share/idl/xulrunner/nsIDOMFontFace.idl share/idl/xulrunner/nsIDOMFontFaceList.idl share/idl/xulrunner/nsIDOMFormData.idl @@ -3626,6 +3701,7 @@ share/idl/xulrunner/nsIDOMGeoPositionCoords.idl share/idl/xulrunner/nsIDOMGeoPositionError.idl share/idl/xulrunner/nsIDOMGeoPositionErrorCallback.idl share/idl/xulrunner/nsIDOMGetSVGDocument.idl +share/idl/xulrunner/nsIDOMGlobalObjectConstructor.idl share/idl/xulrunner/nsIDOMGlobalPropertyInitializer.idl share/idl/xulrunner/nsIDOMHTMLAnchorElement.idl share/idl/xulrunner/nsIDOMHTMLAppletElement.idl @@ -3702,9 +3778,11 @@ share/idl/xulrunner/nsIDOMLSProgressEvent.idl share/idl/xulrunner/nsIDOMLinkStyle.idl share/idl/xulrunner/nsIDOMLoadStatus.idl share/idl/xulrunner/nsIDOMLocation.idl +share/idl/xulrunner/nsIDOMLockedFile.idl share/idl/xulrunner/nsIDOMMediaError.idl share/idl/xulrunner/nsIDOMMediaList.idl share/idl/xulrunner/nsIDOMMediaQueryList.idl +share/idl/xulrunner/nsIDOMMediaStream.idl share/idl/xulrunner/nsIDOMMessageEvent.idl share/idl/xulrunner/nsIDOMMimeType.idl share/idl/xulrunner/nsIDOMMimeTypeArray.idl @@ -3726,9 +3804,11 @@ share/idl/xulrunner/nsIDOMNamedNodeMap.idl share/idl/xulrunner/nsIDOMNavigator.idl share/idl/xulrunner/nsIDOMNavigatorBattery.idl share/idl/xulrunner/nsIDOMNavigatorDesktopNotification.idl +share/idl/xulrunner/nsIDOMNavigatorDeviceStorage.idl share/idl/xulrunner/nsIDOMNavigatorGeolocation.idl share/idl/xulrunner/nsIDOMNavigatorNetwork.idl share/idl/xulrunner/nsIDOMNavigatorSms.idl +share/idl/xulrunner/nsIDOMNavigatorUserMedia.idl share/idl/xulrunner/nsIDOMNode.idl share/idl/xulrunner/nsIDOMNodeFilter.idl share/idl/xulrunner/nsIDOMNodeIterator.idl @@ -3836,6 +3916,7 @@ share/idl/xulrunner/nsIDOMSVGTransformable.idl share/idl/xulrunner/nsIDOMSVGURIReference.idl share/idl/xulrunner/nsIDOMSVGUnitTypes.idl share/idl/xulrunner/nsIDOMSVGUseElement.idl +share/idl/xulrunner/nsIDOMSVGViewElement.idl share/idl/xulrunner/nsIDOMSVGViewSpec.idl share/idl/xulrunner/nsIDOMSVGZoomAndPan.idl share/idl/xulrunner/nsIDOMSVGZoomEvent.idl @@ -3853,7 +3934,6 @@ share/idl/xulrunner/nsIDOMSmsMessage.idl share/idl/xulrunner/nsIDOMSmsRequest.idl share/idl/xulrunner/nsIDOMStorage.idl share/idl/xulrunner/nsIDOMStorageEvent.idl -share/idl/xulrunner/nsIDOMStorageEventObsolete.idl share/idl/xulrunner/nsIDOMStorageIndexedDB.idl share/idl/xulrunner/nsIDOMStorageItem.idl share/idl/xulrunner/nsIDOMStorageManager.idl @@ -3869,6 +3949,7 @@ share/idl/xulrunner/nsIDOMTransitionEvent.idl share/idl/xulrunner/nsIDOMTreeWalker.idl share/idl/xulrunner/nsIDOMUIEvent.idl share/idl/xulrunner/nsIDOMUserDataHandler.idl +share/idl/xulrunner/nsIDOMUserProximityEvent.idl share/idl/xulrunner/nsIDOMValidityState.idl share/idl/xulrunner/nsIDOMWakeLock.idl share/idl/xulrunner/nsIDOMWakeLockListener.idl @@ -4006,7 +4087,6 @@ share/idl/xulrunner/nsIGenKeypairInfoDlg.idl share/idl/xulrunner/nsIGeolocationProvider.idl share/idl/xulrunner/nsIGfxInfo.idl share/idl/xulrunner/nsIGfxInfoDebug.idl -share/idl/xulrunner/nsIGlobalHistory.idl share/idl/xulrunner/nsIGlobalHistory2.idl share/idl/xulrunner/nsIGnomeVFSService.idl share/idl/xulrunner/nsIHTMLAbsPosEditor.idl @@ -4037,6 +4117,7 @@ share/idl/xulrunner/nsIIDBCursor.idl share/idl/xulrunner/nsIIDBCursorWithValue.idl share/idl/xulrunner/nsIIDBDatabase.idl share/idl/xulrunner/nsIIDBFactory.idl +share/idl/xulrunner/nsIIDBFileHandle.idl share/idl/xulrunner/nsIIDBIndex.idl share/idl/xulrunner/nsIIDBKeyRange.idl share/idl/xulrunner/nsIIDBObjectStore.idl @@ -4104,6 +4185,7 @@ share/idl/xulrunner/nsIMemory.idl share/idl/xulrunner/nsIMemoryReporter.idl share/idl/xulrunner/nsIMenuBoxObject.idl share/idl/xulrunner/nsIMenuBuilder.idl +share/idl/xulrunner/nsIMmsService.idl share/idl/xulrunner/nsIMobileConnectionProvider.idl share/idl/xulrunner/nsIModule.idl share/idl/xulrunner/nsIMozBrowserFrame.idl @@ -4152,7 +4234,6 @@ share/idl/xulrunner/nsIPluginHost.idl share/idl/xulrunner/nsIPluginInputStream.idl share/idl/xulrunner/nsIPluginInstanceOwner.idl share/idl/xulrunner/nsIPluginStreamInfo.idl -share/idl/xulrunner/nsIPluginStreamListener.idl share/idl/xulrunner/nsIPluginTag.idl share/idl/xulrunner/nsIPluginTagInfo.idl share/idl/xulrunner/nsIPopupBoxObject.idl @@ -4174,6 +4255,8 @@ share/idl/xulrunner/nsIPrintSettingsService.idl share/idl/xulrunner/nsIPrintStatusFeedback.idl share/idl/xulrunner/nsIPrintingPrompt.idl share/idl/xulrunner/nsIPrintingPromptService.idl +share/idl/xulrunner/nsIPrivacyTransitionObserver.idl +share/idl/xulrunner/nsIPrivateBrowsingConsumer.idl share/idl/xulrunner/nsIPrivateBrowsingService.idl share/idl/xulrunner/nsIProcess.idl share/idl/xulrunner/nsIProfile.idl @@ -4289,6 +4372,7 @@ share/idl/xulrunner/nsISerializable.idl share/idl/xulrunner/nsISerializationHelper.idl share/idl/xulrunner/nsIServerSocket.idl share/idl/xulrunner/nsIServiceManager.idl +share/idl/xulrunner/nsISettingsService.idl share/idl/xulrunner/nsISidebar.idl share/idl/xulrunner/nsISignatureVerifier.idl share/idl/xulrunner/nsISimpleEnumerator.idl @@ -4304,6 +4388,8 @@ share/idl/xulrunner/nsISocketProviderService.idl share/idl/xulrunner/nsISocketTransport.idl share/idl/xulrunner/nsISocketTransportService.idl share/idl/xulrunner/nsISound.idl +share/idl/xulrunner/nsISpeculativeConnect.idl +share/idl/xulrunner/nsIStandardFileStream.idl share/idl/xulrunner/nsIStandardURL.idl share/idl/xulrunner/nsIStartupCache.idl share/idl/xulrunner/nsIStorageStream.idl @@ -4401,6 +4487,7 @@ share/idl/xulrunner/nsIUserInfo.idl share/idl/xulrunner/nsIVariant.idl share/idl/xulrunner/nsIVersionComparator.idl share/idl/xulrunner/nsIViewSourceChannel.idl +share/idl/xulrunner/nsIWapPushApplication.idl share/idl/xulrunner/nsIWeakReference.idl share/idl/xulrunner/nsIWebBrowser.idl share/idl/xulrunner/nsIWebBrowserChrome.idl diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk index 41c658d5f17..8a9b1d3c7ee 100644 --- a/devel/xulrunner/dist.mk +++ b/devel/xulrunner/dist.mk @@ -1,11 +1,11 @@ -# $NetBSD: dist.mk,v 1.32 2012/07/18 16:10:06 ryoon Exp $ +# $NetBSD: dist.mk,v 1.33 2012/08/28 12:42:01 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= 14.0.1 +MOZ_BRANCH= 15.0 MOZ_BRANCH_MINOR= MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} \ ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index 402d14bc28d..0c43a00a584 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,114 +1,110 @@ -$NetBSD: distinfo,v 1.73 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: distinfo,v 1.74 2012/08/28 12:42:01 ryoon Exp $ -SHA1 (firefox-14.0.1.source.tar.bz2) = 8c835836f3c415964b07653364c0c26284ba280b -RMD160 (firefox-14.0.1.source.tar.bz2) = 125853b20634195a50e3782b6adc3d18826dbf7c -Size (firefox-14.0.1.source.tar.bz2) = 82478218 bytes -SHA1 (patch-aa) = e4ed60efb771b1d3cae3641dd9db5fc3f22739f1 -SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997 -SHA1 (patch-ac) = 6aa120769b63efa5869029655f50af901edb9129 -SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1 -SHA1 (patch-ae) = 470d64f32fe1e619a101486a4bec45d2a06b6cab -SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df -SHA1 (patch-ag) = a924296e6a569eba4229d661fbe5290eeeb999e0 -SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a -SHA1 (patch-aj) = 78803641532203f878fc99ead9a440b8bf425aeb -SHA1 (patch-ak) = 748dfb52230f384d58a9ed725d786f536a5c1a3f -SHA1 (patch-al) = c37fb66e199e301e08faae529c4b5a644b76e667 -SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 -SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7 -SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3 -SHA1 (patch-as) = 42d3e9ba41a00a9837666ccbe02b6fa75a794c0f -SHA1 (patch-at) = aba9b08cf70199f4f85f8b05d4f23f49715b7e38 -SHA1 (patch-au) = e59d5c28c676e03fb8bb38e28c06a4fd4d44ab55 -SHA1 (patch-av) = b3ad75ef27caec55f9740ccccca8bd7dfc39dd19 -SHA1 (patch-aw) = 0772c244636f7973171c274c126fa8bfbbcf1acb -SHA1 (patch-ax) = eefed6752c991dc700b82181b8bf942aa34ac324 -SHA1 (patch-ay) = 846c03b223a3f1d498f3502d8564dc717e7766c5 -SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4 -SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d -SHA1 (patch-bd) = cd7565ea5e28b4919eb77d51685ec2ef84b53e84 -SHA1 (patch-bf) = e9a80a7a663517977d38911c2246ba4de2e1a59b -SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759 -SHA1 (patch-bi) = d4601e7c284ff9dc31bb9f7065aa35d75c2993af -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-gfx_thebes_gfxPlatform.cpp) = ab986ba116c003a5bd2012478a275425b87be2e5 -SHA1 (patch-ipc_chromium_Makefile.in) = 5c27578cd61b7e87d2f0e25aacad9c8cdbbdb363 -SHA1 (patch-ipc_chromium_chromium-config.mk) = f21e2d079a811bda05243c28027561216fe4607f -SHA1 (patch-ipc_chromium_src_base_base__paths.h) = fda929fab0df0ceec7c15cd7d7e1280090e253de -SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = ca806eade0c07566fdcbb7ac4f5a81bf7fd33c8c -SHA1 (patch-ipc_chromium_src_base_file__util.h) = b127ce3d5677260682da9b504569ecbcb8b1354d -SHA1 (patch-ipc_chromium_src_base_file__util__bsd.cc) = 32dfebad01cce5f63fa5b9093a301222967091ee -SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 2dce45b0edff184775fec49f0a32e5c5ca4fb90f -SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = e13494489a76369638f83b3a06880bb711343560 -SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = f25a4e2d0d97b212e982598a71be6360011c152f -SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 16cee55721718669e87de5a59fab923683febbcd -SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 0b75eb1324c41b8e00d576f2632f852f593a4eec -SHA1 (patch-ipc_chromium_src_base_process__util.h) = 675ad50bf1a09d7928b426fab6e34beeccc541e7 -SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 7c04ac831689f454e5bb5cde27595ac1f21f08ba -SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = e72765ffa99b21efaa3df7863ce253e3fade28d0 -SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 54fd1aa5b4d8f7d4fc1ccb8a3437e15b7732b33d -SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = f9e23e96103b89d29bc3f0129c4e40475162cabd -SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 3ca31bda8f6d107ea7b0cce321958103b9bd4c1a -SHA1 (patch-ipc_chromium_src_build_build__config.h) = 2b2b834a74e0667f462ab5296041b1d6c650555b -SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 36645379e124bdf665d9147c6dd2aaaaacb8b588 -SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = 70da26d63bd49f87668ea201eff9d7d548844bd6 -SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = e61c724196bd2d2c8d73745f4242e17d2cf22b3a -SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 0e22486a1df8f5a726f675cd6055f8a455d16d9d -SHA1 (patch-js_src_config_rules.mk) = 546452cd7b5206002c50efa0398790b1bd66638e -SHA1 (patch-js_src_jscpucfg.h) = 79829d8e9fa2c3dcba07d1d90a6cf1f635791d97 -SHA1 (patch-js_src_jsgc.cpp) = 3ee765a5bdbc50f6d3e73d8c5a4ad202cb1e9453 -SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = aec956a2cb35ce4dffb87fded52b8436781dab85 -SHA1 (patch-js_src_yarr_pcre_pcre.h) = cf86b885ac222854a62c6ab98dad338bd76cd7d1 -SHA1 (patch-js_xpconnect_src_Makefile.in) = 2e72f3c67257d599737e1607d35979d7c1959021 -SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524 -SHA1 (patch-mb) = 82d8243d7f7aadfad77a14df0f57c39bc93ced8a -SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393 -SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2 -SHA1 (patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c) = e257c6873e426e1d037f7eb24ecc3ce4b8e329d0 -SHA1 (patch-media_libvpx_vpx__config.h) = 2be4f01b6a603a8cf8c1d5e31e98b3ee404702b6 -SHA1 (patch-media_libvpx_vpx__config__c.c) = 03be90f07f98b743b61048ad3f7390dcce77e89d -SHA1 (patch-mf) = de2d47132013a1f6fd12a0893d21eb34dd843b3e -SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8 -SHA1 (patch-mh) = 0318566ecddafd00d4abd22a08ccab3eb72eabe3 -SHA1 (patch-mi) = 1a031ea9be110822995094c84f77c3c68f5c2a39 -SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f -SHA1 (patch-mk) = 2dbbc0fd59ff346bbb4c3e2c80f2ed7c1599b75d -SHA1 (patch-ml) = ffec4dcae4a4e3683eebfc3e8aaafe15fa27443e -SHA1 (patch-mm) = 72225841df442ca9f7ce224f17ca0fee4287038d -SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203 -SHA1 (patch-mp) = 18d2490b6bcd4f017cbf2734a920c3830bfe8856 -SHA1 (patch-netwerk_protocol_http_HttpChannelParent.cpp) = 9b9ce05289105839a217657d748a46ce01f8bd72 -SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = 9888fa5070d2201a8912be33a32ae32f1d26f8ce -SHA1 (patch-nsprpub_pr_include_md__pth.h) = 4bfa7e66ac4017169aca87b2643218d1b1bcddcf -SHA1 (patch-nsprpub_pr_include_md_prosdep.h) = ffbe93d98a2d0c6e9587bdf2b9ccfc81a342c34e -SHA1 (patch-nsprpub_pr_src_md_unix_uxrng.c) = df081b19c517b034b0aa37c66fcd5ab8e5bcf67c -SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = f4f6e9b5e24de217665ad3a41ad4f1a24deeb519 -SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 9099113a3f783ef410d8fcce5cfc730b98a93bc7 -SHA1 (patch-pa) = 6cef5b546a877d8fb09d24db16c8d4e7eb7f611e -SHA1 (patch-pb) = db71748a82b7b9796e797d9cd747817e66e96b7a -SHA1 (patch-pc) = c382946203ef4dda28ee1e49d3c6fbf53ee4a9f0 -SHA1 (patch-pd) = 97e4c26d7b72a3ad1cbc6da5cf14431074d178e6 -SHA1 (patch-pg) = 12b5dc13c798b7d4b7fe0bca487d0f43c0dec2a7 -SHA1 (patch-rc) = fb3ae1a38eabf3f7c47e86d8ff62f79496b9bf67 -SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 0f4a691aacd5f58ab59ce7f11e22b4f6714e6938 -SHA1 (patch-storage_src_Makefile.in) = ce61e2edf74a85cafb0fb5dfa009bf929fb84961 -SHA1 (patch-toolkit_toolkit-tiers.mk) = 34481588c0ae03b7c06467fa1676b6a1a4d7c24f +SHA1 (firefox-15.0.source.tar.bz2) = a5e6067cf3fb7741818b630d90778928873a2b04 +RMD160 (firefox-15.0.source.tar.bz2) = e70629dbd92db68e39707e28fbe53df7f0946c36 +Size (firefox-15.0.source.tar.bz2) = 83713360 bytes +SHA1 (patch-aa) = c33f022831bd074bfbf99ca2422506726fb92c78 +SHA1 (patch-ab) = e5bf25fa9c0b52753ad949b34862f9cab39ba190 +SHA1 (patch-ac) = 40c230a9938bc00ad346da742937229bd3c9f2ce +SHA1 (patch-ad) = b6ff278b2bf4ac6fc6e87637d606d5286d28102b +SHA1 (patch-ae) = 0bf39ce63276d258e5679bd0d5435fc0f85102e1 +SHA1 (patch-af) = c919056309cbae98dd872f19983b26b240dfaf1a +SHA1 (patch-ag) = b504b88e00e3988afa00af2b0075b96091efc658 +SHA1 (patch-ai) = 3657df4aaa23518b96193419a048a82037187640 +SHA1 (patch-aj) = 5654a08a5f06ac760134e75edefcfb3f9a887b9f +SHA1 (patch-ak) = 583b39201d1fe7ad339ffecfbfa0b164ceb5a3e1 +SHA1 (patch-al) = 87675579906de604887c164c869431fe418b054d +SHA1 (patch-am) = 711edcae6f3735b346c21d46342f9b0656b808b5 +SHA1 (patch-an) = 8644eee478122eb325c3e6e8870dc7c3acc00ccc +SHA1 (patch-ao) = b676d824f77fb8a2c23fdd0d59d1f8b45778e2b7 +SHA1 (patch-as) = d9077ada58bf84de88ae9d5474aea78cf88707a6 +SHA1 (patch-at) = 6dca9ffc41f1c1e108baa684305104794ca4db4a +SHA1 (patch-au) = 39d44c9941229607edfac4579ece231fc402cf8b +SHA1 (patch-av) = f467d71c42e939024b86d6bf7ffea186f26acab3 +SHA1 (patch-aw) = 99f5892a0ca985a38e262cfabcdf284d742d7d9d +SHA1 (patch-ax) = 1cb872273c6c3a4ac7c5893568586704522dde45 +SHA1 (patch-ay) = cbc483e9535a00c962964caf20fae77767b870fd +SHA1 (patch-az) = 618faa74c664b91fd3f6664c2f9b46b9be55463b +SHA1 (patch-ba) = b503a7c4a9bdf3bcedcaf73495d5bd51b4457682 +SHA1 (patch-bd) = 9bd66cc89cbae0e27641b4795f7a62078857b68c +SHA1 (patch-bf) = 2e0b1f518965119b8564d276648207a070ef4380 +SHA1 (patch-bg) = b9070479b3a5141d71d0350644c23e561ff867ee +SHA1 (patch-bi) = e91291a64249cbf7093ca2345ed85bbba4c24151 +SHA1 (patch-build_autoconf_nss.m4) = ef9287b868cc9a641be8c28dddf85c48722e3335 +SHA1 (patch-config_system-headers) = ce9f70f4fdafaeebdf2b7a4611825431c7242bb3 +SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 4ac99dc00e2d6ee5cb44b104a4db7d39c7e40512 +SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 5454edfc775952b2e84e1d5b662137c22c36ac20 +SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 96ab3f59e5b741733de1059906a02bded5e15398 +SHA1 (patch-ipc_chromium_Makefile.in) = fe20d437767277eec3b1c5ea67a2623a1a8bf4f3 +SHA1 (patch-ipc_chromium_chromium-config.mk) = 4eb4ae3cf03f67bd9d8884581273e3087b3abfda +SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 2667a86942fea5962cf85660554800439b4b90af +SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = f99584656557cd5b068e6bf2785d6c883bff3a43 +SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = e1a68cdbe1c184ee47d81ee06bf0ffcd63ca3e67 +SHA1 (patch-ipc_chromium_src_base_dir__reader__posix.h) = 0e4f3728a95ad9cd195ff5ba3fe7f8551352bc26 +SHA1 (patch-ipc_chromium_src_base_file__util__linux.cc) = 713c1eabb3f27299cd13b8bd7d71815dc71572eb +SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 5199ad1d9c4ef11b49f4636dfcc633f32cc325e1 +SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = 32837fe892fad81df0e31558fc2cd2f0d66d7653 +SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 321e84eb61a5a9390033675f369e6a3b64d9c29c +SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 7c236d0b9453a3e5a8f7b929ac327bef27c2e186 +SHA1 (patch-ipc_chromium_src_base_process__util.h) = e5ae018969b3a64be0833ed329b02be9521cf4e7 +SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 089796b239f67b9c7dd309e561fb98bbf2a49f09 +SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 09d699239a1144c5ff5343649d90c65732053d6b +SHA1 (patch-ipc_chromium_src_base_ref__counted.h) = 23990aa1346610e9a6a07051dc72111c3dca47e5 +SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 4b7ebbc2387bd36ca5367b6bc590e0c1000e0059 +SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 7a9d41a85559d6726b1324fbd06d456ddfc6bb14 +SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 8d49cb468ca54931db1b58d6b60b02cf479fcb0f +SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = ba759e3daaa990f83d38e35924f720ed553a29cf +SHA1 (patch-ipc_chromium_src_build_build__config.h) = e325c4925c3f79c0cbe4caf1dea6636af4b042d1 +SHA1 (patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h) = 511f9fa58afb36893099b1c851d75f73c773f122 +SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d92911b53b20af923ddb13627b9b4453a5d5157d +SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 02ee5f3bacbb035181a91c8f7e9b3081aa292fe9 +SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = 135bfdd567c8e108be30e6152f39ca94f602f096 +SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = aa5a40976a597d06c6824eec4a974845de970954 +SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 3ca73c65890962a0735a977690945327ef4f3717 +SHA1 (patch-ipc_glue_SharedMemorySysV.h) = 5dc78ca7858506e93268e3482c9bbf18793e3bfc +SHA1 (patch-js_src_config_rules.mk) = df5aed45208f27a2f4f4e866bd914f8f48a06724 +SHA1 (patch-js_src_config_system-headers) = 9f9b1b8c76c96674f33ebaf4da4c70d821112665 +SHA1 (patch-js_src_jscpucfg.h) = b987acfb79e448d5dab7f4aafb7766c22202823a +SHA1 (patch-js_src_jsgc.cpp) = 4faf0d867b6e04de6b40b710a7cf4903d76c4390 +SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = 130095f8ed066aca551a2f18f5c20a73bde0c7e5 +SHA1 (patch-ma) = b4eb6e5b8b712154e54daefcacc8dad25cce507b +SHA1 (patch-mb) = ac6bcfb973d55c5397bf1a787011e7dd48139d6f +SHA1 (patch-md) = 3dab162d154d0e8497e6238ed1d3cb1a7897d0bf +SHA1 (patch-me) = 578f43dfc754eaa60143a68d710906f0686033bc +SHA1 (patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c) = fa93dbf08a57eaf7369ccb3e9b2e2a7db9b6b666 +SHA1 (patch-media_libvpx_vpx__config.h) = e507b0f06a0002a7590b256183efe6e21cf40a5e +SHA1 (patch-media_libvpx_vpx__config__c.c) = 8601b218b10f3097bb2fc2d54294c332e479afdd +SHA1 (patch-mf) = 1ef2d2f795aa14cea502b09bf1f7dbdcf422d3fa +SHA1 (patch-mg) = 0b56487b1eb193911031d557bae7a269a9c741d4 +SHA1 (patch-mh) = 9a6ea03cba670841a15bd2be1c86aeefc2dd7399 +SHA1 (patch-mi) = 0a569d066217c2b9eb569d0a2bf065e8be1b9a3a +SHA1 (patch-mj) = ba369593eab15ec15816f4fa7d3968b92b343a41 +SHA1 (patch-mk) = ae4666b03bcd8eb62dcb2171d3b973985f4b3a4d +SHA1 (patch-ml) = 9453cd92f5290f8734d9f253353405dbca2ac8c4 +SHA1 (patch-mm) = f0b48b3e89ad479de097e474adf593b7395a6d1e +SHA1 (patch-mn) = e490f48a9c1b4bc23cbdbb2c74c7048593b55b91 +SHA1 (patch-mp) = 8a13087649f12d1bf05d6db858636a01121e95cd +SHA1 (patch-netwerk_protocol_http_HttpChannelParent.cpp) = ce090b1c26ab356dd4cb68514119e2817d04ddac +SHA1 (patch-pa) = aa78185cfd0145fd8969f22719c2685233633033 +SHA1 (patch-pb) = e386607c49decacea1cc5c63782f65ec50d1ced3 +SHA1 (patch-pc) = 5e46bbdc977fe2dacdea21566b70520bf64698ce +SHA1 (patch-pd) = 420b05fe19ba7d4da3e035232c29e4b86777f55a +SHA1 (patch-pg) = 34d620bdbdbff2681c0b313fc54205aa88a2532e +SHA1 (patch-rc) = 268fb55786108b557fe89bac509b21caa7eff54d +SHA1 (patch-storage_src_Makefile.in) = 980461e57ba533bc9acf33d0995c3a0c9af3996a +SHA1 (patch-toolkit_toolkit-tiers.mk) = bcd354c60bfccde305eaf8476b47dd24dbbaedd3 SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72 SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201 SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965 -SHA1 (patch-xd) = 2ddf436186ccebab28380b9e80f52f061ca3d73e -SHA1 (patch-xe) = 1bcd9def6f9636fa9deb0edb994e5672529b615b -SHA1 (patch-xf) = 5e68024f66e5ba9086ed6ec4a0cc562714e99219 +SHA1 (patch-xd) = a5966d366801772da0a8044e44fc6609ef980a70 +SHA1 (patch-xe) = 96214ee6bde9469b374721d0560836fd37be6994 +SHA1 (patch-xf) = 158110dd5c085dd82b9fbad3733d0082adaaa808 SHA1 (patch-xg) = d8355840ee91dd64ff650a12be87f2c51d8df196 SHA1 (patch-xj) = 7e237668aa4dfa55833d125d2a1464fb97ae3ada -SHA1 (patch-xk) = 16ac8dc3bb5c241452eae6833d40aaf876453761 -SHA1 (patch-xl) = afd74085c01d207907d0b3bfc040bf92fd1ba8b1 -SHA1 (patch-xm) = 072240b71e4738e96d258fcd481698464623735e -SHA1 (patch-xn) = b0d0943b2bc39d8395055550c0fedfa447a5de01 -SHA1 (patch-xo) = 437cbc7e0ed8777ae2313165f8754759d8eee01d -SHA1 (patch-xpcom_Makefile.in) = ad9c0ed4347b0ed4f51a6f0f34ac48c65d2152c8 -SHA1 (patch-xpcom_idl-parser_Makefile.in) = 6f9352553d73c535c711f4f7c9621118aa0809a5 -SHA1 (patch-xpcom_idl-parser_header.py) = 66104636742fea4391a54f88d7927ebf81b2a74c +SHA1 (patch-xk) = 3f35c332af5cdedb04f74321b4a1d6e8b0b325ae +SHA1 (patch-xl) = 65295f4dc57145169c49a9b9b58657b9a8894687 +SHA1 (patch-xn) = 25e59123cd76d2e558533b23bc851653b0f8ea14 +SHA1 (patch-xo) = fe95fa2a0160d2124357fe96f9ec517732b25bc0 +SHA1 (patch-xpcom_Makefile.in) = 99c9cb99ab0b5f5c3dc9391cd219cfb0a7a830c9 +SHA1 (patch-xpcom_idl-parser_Makefile.in) = b6a6068b992160d9e233d602c97f9991a2e99f2d SHA1 (patch-xpcom_typelib_xpidl_Makefile.in) = 1f10216e2b46e5bfa4e24de4a42f8b13af3f2dca diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk index 02550ebb7b3..f924a0e1fe2 100644 --- a/devel/xulrunner/mozilla-common.mk +++ b/devel/xulrunner/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.34 2012/07/18 16:10:06 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.35 2012/08/28 12:42:01 ryoon Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -84,7 +84,7 @@ PREFER.bzip2?= pkgsrc .include "../../audio/alsa-lib/buildlink3.mk" .endif .include "../../archivers/bzip2/buildlink3.mk" -BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.11 +BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.12.1 CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al .include "../../databases/sqlite3/buildlink3.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 diff --git a/devel/xulrunner/patches/patch-aa b/devel/xulrunner/patches/patch-aa index d13263b677c..161199b5725 100644 --- a/devel/xulrunner/patches/patch-aa +++ b/devel/xulrunner/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2012/04/26 13:30:29 ryoon Exp $ +$NetBSD: patch-aa,v 1.11 2012/08/28 12:42:01 ryoon Exp $ ---- configure.in.orig 2012-04-04 04:25:11.000000000 +0000 +--- configure.in.orig 2012-08-08 20:19:43.000000000 +0000 +++ configure.in -@@ -2413,7 +2413,7 @@ case "$target" in +@@ -2299,7 +2299,7 @@ case "$target" in MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' ;; @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2012/04/26 13:30:29 ryoon Exp $ if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then DLL_SUFFIX=".so.1.0" DSO_LDOPTS="-shared" -@@ -2421,6 +2421,9 @@ case "$target" in +@@ -2307,6 +2307,9 @@ case "$target" in if test ! "$GNU_CC"; then DSO_LDOPTS="-Bshareable $DSO_LDOPTS" fi @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.10 2012/04/26 13:30:29 ryoon Exp $ ;; ia64*-hpux*) -@@ -3412,6 +3415,9 @@ dnl ==================================== +@@ -3309,6 +3312,9 @@ dnl ==================================== case $target in *-hpux11.*) ;; @@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.10 2012/04/26 13:30:29 ryoon Exp $ *) AC_CHECK_LIB(c_r, gethostbyname_r) ;; -@@ -4358,6 +4364,14 @@ if test -n "$YASM"; then +@@ -4308,6 +4314,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.10 2012/04/26 13:30:29 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -5732,11 +5746,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV +@@ -5734,11 +5748,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV dnl See if we have assembly on this platform. case "$OS_ARCH:$CPU_ARCH" in @@ -60,7 +60,16 @@ $NetBSD: patch-aa,v 1.10 2012/04/26 13:30:29 ryoon Exp $ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 ;; -@@ -9102,6 +9116,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then +@@ -6140,7 +6154,7 @@ if test -n "$MOZ_CRASHREPORTER"; then + AC_MSG_ERROR([Breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH. Use --disable-crashreporter.]) + fi + +- if test "$OS_ARCH" == "WINNT" -a -z "$HAVE_64BIT_OS"; then ++ if test "$OS_ARCH" = "WINNT" -a -z "$HAVE_64BIT_OS"; then + MOZ_CRASHREPORTER_INJECTOR=1 + AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR) + fi +@@ -9248,6 +9262,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output]) if test "$OS_ARCH" != "WINNT"; then NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs` diff --git a/devel/xulrunner/patches/patch-ab b/devel/xulrunner/patches/patch-ab index 332dbad2fcf..0b555c117a5 100644 --- a/devel/xulrunner/patches/patch-ab +++ b/devel/xulrunner/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2011/04/26 14:16:36 tnn Exp $ +$NetBSD: patch-ab,v 1.4 2012/08/28 12:42:01 ryoon Exp $ ---- nsprpub/pr/include/md/_netbsd.h.orig 2010-05-03 18:21:00.000000000 +0000 +--- nsprpub/pr/include/md/_netbsd.h.orig 2012-08-08 20:20:52.000000000 +0000 +++ nsprpub/pr/include/md/_netbsd.h -@@ -79,7 +79,7 @@ +@@ -47,7 +47,7 @@ #define HAVE_DLL #define USE_DLFCN #define _PR_HAVE_SOCKADDR_LEN @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2011/04/26 14:16:36 tnn Exp $ #define _PR_STAT_HAS_ST_ATIMESPEC #define _PR_POLL_AVAILABLE #define _PR_USE_POLL -@@ -107,6 +107,8 @@ +@@ -75,6 +75,8 @@ #define JB_SP_INDEX 2 #elif defined(__mips__) #define JB_SP_INDEX 4 diff --git a/devel/xulrunner/patches/patch-ac b/devel/xulrunner/patches/patch-ac index d81db7bf530..8883105bc13 100644 --- a/devel/xulrunner/patches/patch-ac +++ b/devel/xulrunner/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2012/01/07 18:47:39 marino Exp $ +$NetBSD: patch-ac,v 1.4 2012/08/28 12:42:01 ryoon Exp $ ---- nsprpub/configure.in.orig 2011-09-02 20:15:44.000000000 +0000 +--- nsprpub/configure.in.orig 2012-08-08 20:20:52.000000000 +0000 +++ nsprpub/configure.in -@@ -71,7 +71,7 @@ OBJDIR_NAME=. +@@ -36,7 +36,7 @@ OBJDIR_NAME=. OBJDIR_SUFFIX=OBJ NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall' NOSUCHFILE=/no-such-file @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2012/01/07 18:47:39 marino Exp $ LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)' CYGWIN_WRAPPER= MACOS_SDK_DIR= -@@ -1311,6 +1311,33 @@ tools are selected during the Xcode/Deve +@@ -1519,6 +1519,33 @@ tools are selected during the Xcode/Deve DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c @@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.3 2012/01/07 18:47:39 marino Exp $ ;; *-hpux*) -@@ -1925,6 +1952,7 @@ mips-nec-sysv*) +@@ -2110,6 +2137,7 @@ mips-nec-sysv*) AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -53,7 +53,7 @@ $NetBSD: patch-ac,v 1.3 2012/01/07 18:47:39 marino Exp $ if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi -@@ -2730,7 +2758,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2918,7 +2946,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.3 2012/01/07 18:47:39 marino Exp $ # Freebsd doesn't use -pthread for compiles, it uses them for linking ;; *) -@@ -2768,7 +2796,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2956,7 +2984,7 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS= fi ;; @@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.3 2012/01/07 18:47:39 marino Exp $ AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -2849,7 +2877,7 @@ case "$target" in +@@ -3037,7 +3065,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 index 589e36db8cd..98ee80bdae9 100644 --- a/devel/xulrunner/patches/patch-ad +++ b/devel/xulrunner/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-ad,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- xpcom/io/nsLocalFileUnix.h.orig 2009-06-29 18:15:32.000000000 +0200 +--- xpcom/io/nsLocalFileUnix.h.orig 2012-08-08 20:21:11.000000000 +0000 +++ xpcom/io/nsLocalFileUnix.h -@@ -75,7 +75,7 @@ +@@ -52,7 +52,7 @@ #endif // so we can statfs on freebsd diff --git a/devel/xulrunner/patches/patch-ae b/devel/xulrunner/patches/patch-ae index 468540016c4..e17254e786e 100644 --- a/devel/xulrunner/patches/patch-ae +++ b/devel/xulrunner/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.4 2011/10/03 12:37:24 tnn Exp $ +$NetBSD: patch-ae,v 1.5 2012/08/28 12:42:01 ryoon Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig 2011-09-22 20:20:37.000000000 +0000 +--- nsprpub/pr/src/misc/prnetdb.c.orig 2012-08-08 20:20:53.000000000 +0000 +++ nsprpub/pr/src/misc/prnetdb.c -@@ -105,7 +105,7 @@ PRLock *_pr_dnsLock = NULL; +@@ -73,7 +73,7 @@ PRLock *_pr_dnsLock = NULL; || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \ || (defined(HPUX10_10) && defined(_REENTRANT)) \ || (defined(HPUX10_20) && defined(_REENTRANT)) \ @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.4 2011/10/03 12:37:24 tnn Exp $ #define _PR_HAVE_GETPROTO_R #define _PR_HAVE_GETPROTO_R_INT #endif -@@ -115,6 +115,11 @@ PRLock *_pr_dnsLock = NULL; +@@ -83,6 +83,11 @@ PRLock *_pr_dnsLock = NULL; #define _PR_HAVE_5_ARG_GETPROTO_R #endif @@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.4 2011/10/03 12:37:24 tnn Exp $ /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) #define _PR_HAVE_GETPROTO_R -@@ -332,7 +337,7 @@ _pr_QueryNetIfs(void) +@@ -300,7 +305,7 @@ _pr_QueryNetIfs(void) } #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \ @@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.4 2011/10/03 12:37:24 tnn Exp $ /* * Use the BSD getifaddrs function. -@@ -2076,6 +2081,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +@@ -2044,6 +2049,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf */ hints.ai_socktype = SOCK_STREAM; @@ -44,7 +44,7 @@ $NetBSD: patch-ae,v 1.4 2011/10/03 12:37:24 tnn Exp $ rv = GETADDRINFO(hostname, NULL, &hints, &res); #ifdef AI_ADDRCONFIG if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) { -@@ -2083,6 +2093,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +@@ -2051,6 +2061,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf rv = GETADDRINFO(hostname, NULL, &hints, &res); } #endif diff --git a/devel/xulrunner/patches/patch-af b/devel/xulrunner/patches/patch-af index c060007761f..1f5dcca4d69 100644 --- a/devel/xulrunner/patches/patch-af +++ b/devel/xulrunner/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-af,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- config/mkdepend/imakemdep.h.orig 2009-06-29 18:14:41.000000000 +0200 +--- config/mkdepend/imakemdep.h.orig 2012-08-08 20:19:43.000000000 +0000 +++ config/mkdepend/imakemdep.h @@ -235,7 +235,7 @@ in this Software without prior written a #ifdef _CRAY diff --git a/devel/xulrunner/patches/patch-ag b/devel/xulrunner/patches/patch-ag index 1d89f709068..abc66518093 100644 --- a/devel/xulrunner/patches/patch-ag +++ b/devel/xulrunner/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.3 2011/04/26 14:16:36 tnn Exp $ +$NetBSD: patch-ag,v 1.4 2012/08/28 12:42:01 ryoon Exp $ ---- nsprpub/pr/include/md/_freebsd.h.orig 2010-03-16 01:02:50.000000000 +0000 +--- nsprpub/pr/include/md/_freebsd.h.orig 2012-08-08 20:20:52.000000000 +0000 +++ nsprpub/pr/include/md/_freebsd.h -@@ -79,7 +79,7 @@ +@@ -47,7 +47,7 @@ #define _PR_HAVE_LARGE_OFF_T #if defined(_PR_PTHREADS) @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.3 2011/04/26 14:16:36 tnn Exp $ /* * libc_r before this version of FreeBSD doesn't have poll(). * Although libc has poll(), it is not thread-safe so we can't -@@ -88,7 +88,7 @@ +@@ -56,7 +56,7 @@ #define _PR_POLL_AVAILABLE #endif #else @@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.3 2011/04/26 14:16:36 tnn Exp $ #define _PR_POLL_AVAILABLE #define _PR_USE_POLL #endif -@@ -97,7 +97,7 @@ +@@ -65,7 +65,7 @@ #define _PR_HAVE_SYSV_SEMAPHORES #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY diff --git a/devel/xulrunner/patches/patch-ai b/devel/xulrunner/patches/patch-ai index 68bbc30bc79..b05be1407cb 100644 --- a/devel/xulrunner/patches/patch-ai +++ b/devel/xulrunner/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-ai,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- dbm/src/mktemp.c.orig 2009-06-29 18:14:43.000000000 +0200 +--- dbm/src/mktemp.c.orig 2012-08-08 20:19:51.000000000 +0000 +++ dbm/src/mktemp.c -@@ -90,7 +90,7 @@ mktemp(char *path) +@@ -92,7 +92,7 @@ mktemp(char *path) static int _gettemp(char *path, register int *doopen, int extraFlags) { diff --git a/devel/xulrunner/patches/patch-aj b/devel/xulrunner/patches/patch-aj index c1ed2dbbeec..0b13c51050a 100644 --- a/devel/xulrunner/patches/patch-aj +++ b/devel/xulrunner/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.3 2011/04/26 14:16:36 tnn Exp $ +$NetBSD: patch-aj,v 1.4 2012/08/28 12:42:01 ryoon Exp $ ---- profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2010-12-15 01:03:34.000000000 +0000 +--- profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2012-08-08 20:20:55.000000000 +0000 +++ profile/dirserviceprovider/src/nsProfileLock.cpp -@@ -405,6 +405,7 @@ nsresult nsProfileLock::LockWithSymlink( +@@ -391,6 +391,7 @@ nsresult nsProfileLock::LockWithSymlink( #endif sigfillset(&act.sa_mask); @@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.3 2011/04/26 14:16:36 tnn Exp $ #define CATCH_SIGNAL(signame) \ PR_BEGIN_MACRO \ if (sigaction(signame, NULL, &oldact) == 0 && \ -@@ -423,6 +424,7 @@ PR_BEGIN_MACRO +@@ -409,6 +410,7 @@ PR_BEGIN_MACRO CATCH_SIGNAL(SIGTERM); #undef CATCH_SIGNAL diff --git a/devel/xulrunner/patches/patch-ak b/devel/xulrunner/patches/patch-ak index 22f75c40537..e28c22d40a6 100644 --- a/devel/xulrunner/patches/patch-ak +++ b/devel/xulrunner/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.5 2011/11/12 12:45:04 tnn Exp $ +$NetBSD: patch-ak,v 1.6 2012/08/28 12:42:01 ryoon Exp $ ---- js/src/ctypes/libffi/configure.orig 2011-11-04 21:34:01.000000000 +0000 +--- js/src/ctypes/libffi/configure.orig 2012-08-08 20:20:10.000000000 +0000 +++ js/src/ctypes/libffi/configure -@@ -11277,7 +11277,7 @@ case "$host" in +@@ -11278,7 +11278,7 @@ case "$host" in powerpc-*-aix* | rs6000-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc ;; diff --git a/devel/xulrunner/patches/patch-al b/devel/xulrunner/patches/patch-al index 8ba99e7aac9..9acf3920d01 100644 --- a/devel/xulrunner/patches/patch-al +++ b/devel/xulrunner/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.5 2012/04/26 13:30:29 ryoon Exp $ +$NetBSD: patch-al,v 1.6 2012/08/28 12:42:01 ryoon Exp $ ---- storage/src/mozStorageConnection.cpp.orig 2012-04-04 04:25:45.000000000 +0000 +--- storage/src/mozStorageConnection.cpp.orig 2012-08-08 20:20:58.000000000 +0000 +++ storage/src/mozStorageConnection.cpp -@@ -718,6 +718,11 @@ Connection::initialize(nsIFile *aDatabas +@@ -680,6 +680,11 @@ Connection::initialize(nsIFile *aDatabas break; } diff --git a/devel/xulrunner/patches/patch-am b/devel/xulrunner/patches/patch-am index 01cbc59bc78..8dfc94ff4e8 100644 --- a/devel/xulrunner/patches/patch-am +++ b/devel/xulrunner/patches/patch-am @@ -1,12 +1,12 @@ -$NetBSD: patch-am,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-am,v 1.2 2012/08/28 12:42:01 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 2009-06-29 18:15:13.000000000 +0200 +--- security/nss/lib/freebl/blapi.h.orig 2012-08-08 20:20:56.000000000 +0000 +++ security/nss/lib/freebl/blapi.h -@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Cont +@@ -1043,6 +1043,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 5e883b781ec..bf76a344850 100644 --- a/devel/xulrunner/patches/patch-an +++ b/devel/xulrunner/patches/patch-an @@ -1,10 +1,10 @@ -$NetBSD: patch-an,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-an,v 1.2 2012/08/28 12:42:01 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 2009-06-29 18:15:14.000000000 +0200 +--- security/nss/lib/freebl/sha-fast-amd64-sun.s.orig 2012-08-08 20:20:56.000000000 +0000 +++ security/nss/lib/freebl/sha-fast-amd64-sun.s @@ -1712,9 +1712,9 @@ shaCompress: .LFE7: diff --git a/devel/xulrunner/patches/patch-ao b/devel/xulrunner/patches/patch-ao index 84454e4ef6f..65a6702393d 100644 --- a/devel/xulrunner/patches/patch-ao +++ b/devel/xulrunner/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.3 2011/04/26 14:16:36 tnn Exp $ +$NetBSD: patch-ao,v 1.4 2012/08/28 12:42:01 ryoon Exp $ ---- toolkit/mozapps/installer/packager.mk.orig 2009-10-29 23:11:21.000000000 +0100 +--- toolkit/mozapps/installer/packager.mk.orig 2012-08-08 20:21:06.000000000 +0000 +++ toolkit/mozapps/installer/packager.mk -@@ -441,8 +441,8 @@ endif +@@ -905,8 +905,8 @@ endif (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ (cd $(DESTDIR)$(installdir) && tar -xf -) $(NSINSTALL) -D $(DESTDIR)$(bindir) diff --git a/devel/xulrunner/patches/patch-as b/devel/xulrunner/patches/patch-as index f60c02c24f3..d9726a7f021 100644 --- a/devel/xulrunner/patches/patch-as +++ b/devel/xulrunner/patches/patch-as @@ -1,10 +1,10 @@ -$NetBSD: patch-as,v 1.5 2012/03/15 08:30:06 ryoon Exp $ +$NetBSD: patch-as,v 1.6 2012/08/28 12:42:01 ryoon Exp $ Treat DragonFly like FreeBSD. ---- 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 @@ +--- js/src/configure.in.orig 2012-08-08 20:20:10.000000000 +0000 ++++ js/src/configure.in +@@ -786,7 +786,7 @@ EOF AC_LANG_RESTORE ]) @@ -13,7 +13,7 @@ Treat DragonFly like FreeBSD. AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug, ac_cv_have_dllimport_exception_bug, [ -@@ -2259,7 +2259,7 @@ +@@ -1996,7 +1996,7 @@ case "$target" in MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' ;; @@ -22,7 +22,7 @@ Treat DragonFly like FreeBSD. if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then DLL_SUFFIX=".so.1.0" DSO_LDOPTS="-shared" -@@ -3368,7 +3368,7 @@ +@@ -3122,7 +3122,7 @@ then fi case "$target" in @@ -31,7 +31,7 @@ Treat DragonFly like FreeBSD. AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -4275,7 +4275,7 @@ +@@ -4015,7 +4015,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 4b10831ddbd..c8a75aa1506 100644 --- a/devel/xulrunner/patches/patch-at +++ b/devel/xulrunner/patches/patch-at @@ -1,6 +1,6 @@ -$NetBSD: patch-at,v 1.6 2012/04/01 15:18:45 ryoon Exp $ +$NetBSD: patch-at,v 1.7 2012/08/28 12:42:01 ryoon Exp $ ---- gfx/qcms/qcmstypes.h.orig 2012-03-13 01:36:50.000000000 +0000 +--- gfx/qcms/qcmstypes.h.orig 2012-08-08 20:20:02.000000000 +0000 +++ gfx/qcms/qcmstypes.h @@ -10,6 +10,8 @@ #if defined (__SVR4) && defined (__sun) diff --git a/devel/xulrunner/patches/patch-au b/devel/xulrunner/patches/patch-au index 511f24f2bb3..84a11b89095 100644 --- a/devel/xulrunner/patches/patch-au +++ b/devel/xulrunner/patches/patch-au @@ -1,12 +1,12 @@ -$NetBSD: patch-au,v 1.4 2011/08/18 18:31:10 tnn Exp $ +$NetBSD: patch-au,v 1.5 2012/08/28 12:42:01 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 2011-08-11 21:41:16.000000000 +0000 +--- media/libsydneyaudio/src/sydney_audio_oss.c.orig 2012-08-08 20:20:43.000000000 +0000 +++ media/libsydneyaudio/src/sydney_audio_oss.c -@@ -55,7 +55,7 @@ +@@ -23,7 +23,7 @@ // support only versions newer than 3.6.1 #define SUPP_OSS_VERSION OSS_VERSION(3,0,1) @@ -15,7 +15,7 @@ $NetBSD: patch-au,v 1.4 2011/08/18 18:31:10 tnn Exp $ #error Unsupported OSS Version #else -@@ -205,7 +205,12 @@ sa_stream_create_pcm( +@@ -173,7 +173,12 @@ sa_stream_create_pcm( return SA_ERROR_SYSTEM; } diff --git a/devel/xulrunner/patches/patch-av b/devel/xulrunner/patches/patch-av index a5590b6f1f3..b8da8ac43c5 100644 --- a/devel/xulrunner/patches/patch-av +++ b/devel/xulrunner/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.2 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: patch-av,v 1.3 2012/08/28 12:42:01 ryoon Exp $ ---- xulrunner/app/nsXULRunnerApp.cpp.orig 2012-07-04 16:04:22.000000000 +0000 +--- xulrunner/app/nsXULRunnerApp.cpp.orig 2012-08-08 20:21:11.000000000 +0000 +++ xulrunner/app/nsXULRunnerApp.cpp -@@ -39,6 +39,27 @@ +@@ -6,6 +6,27 @@ #include "nsXPCOMGlue.h" #include <stdio.h> #include <stdlib.h> @@ -30,7 +30,7 @@ $NetBSD: patch-av,v 1.2 2012/07/18 16:10:06 ryoon Exp $ #ifdef XP_WIN #include <windows.h> #define snprintf _snprintf -@@ -284,6 +305,7 @@ private: +@@ -251,6 +272,7 @@ private: int main(int argc, char* argv[]) { diff --git a/devel/xulrunner/patches/patch-aw b/devel/xulrunner/patches/patch-aw index 883d8f0978c..93ef8e9dd2a 100644 --- a/devel/xulrunner/patches/patch-aw +++ b/devel/xulrunner/patches/patch-aw @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.2 2012/03/06 12:34:08 ryoon Exp $ +$NetBSD: patch-aw,v 1.3 2012/08/28 12:42:01 ryoon Exp $ ---- xulrunner/stub/nsXULStub.cpp.orig 2009-08-24 17:53:30.000000000 +0200 +--- xulrunner/stub/nsXULStub.cpp.orig 2012-08-08 20:21:11.000000000 +0000 +++ xulrunner/stub/nsXULStub.cpp -@@ -44,6 +44,29 @@ +@@ -11,6 +11,29 @@ #include "nsILocalFile.h" #include <stdarg.h> @@ -32,7 +32,7 @@ $NetBSD: patch-aw,v 1.2 2012/03/06 12:34:08 ryoon Exp $ #ifdef XP_WIN #include <windows.h> -@@ -202,7 +225,9 @@ +@@ -169,7 +192,9 @@ main(int argc, char **argv) char greDir[MAXPATHLEN]; bool greFound = false; diff --git a/devel/xulrunner/patches/patch-ax b/devel/xulrunner/patches/patch-ax index 19816702648..c1bd7af38aa 100644 --- a/devel/xulrunner/patches/patch-ax +++ b/devel/xulrunner/patches/patch-ax @@ -1,8 +1,8 @@ -$NetBSD: patch-ax,v 1.4 2012/03/15 08:30:06 ryoon Exp $ +$NetBSD: patch-ax,v 1.5 2012/08/28 12:42:01 ryoon Exp $ ---- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 01:03:41.000000000 +0000 +--- xpcom/base/nsStackWalk.cpp.orig 2012-08-08 20:21:10.000000000 +0000 +++ xpcom/base/nsStackWalk.cpp -@@ -54,7 +54,7 @@ +@@ -23,7 +23,7 @@ struct CriticalAddress { }; static CriticalAddress gCriticalAddress; diff --git a/devel/xulrunner/patches/patch-ay b/devel/xulrunner/patches/patch-ay index d68daa91c16..8a49483c878 100644 --- a/devel/xulrunner/patches/patch-ay +++ b/devel/xulrunner/patches/patch-ay @@ -1,8 +1,8 @@ -$NetBSD: patch-ay,v 1.4 2012/06/05 18:09:21 ryoon Exp $ +$NetBSD: patch-ay,v 1.5 2012/08/28 12:42:01 ryoon Exp $ ---- browser/app/nsBrowserApp.cpp.orig 2012-05-23 18:56:32.000000000 +0000 +--- browser/app/nsBrowserApp.cpp.orig 2012-08-08 20:19:35.000000000 +0000 +++ browser/app/nsBrowserApp.cpp -@@ -47,6 +47,31 @@ +@@ -14,6 +14,31 @@ #include <sys/resource.h> #endif @@ -34,7 +34,7 @@ $NetBSD: patch-ay,v 1.4 2012/06/05 18:09:21 ryoon Exp $ #ifdef XP_MACOSX #include "MacQuirks.h" #endif -@@ -197,6 +222,9 @@ int main(int argc, char* argv[]) +@@ -196,6 +221,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 cf8baa7bd69..88c8de62d65 100644 --- a/devel/xulrunner/patches/patch-az +++ b/devel/xulrunner/patches/patch-az @@ -1,8 +1,8 @@ -$NetBSD: patch-az,v 1.1 2009/11/10 16:06:11 tnn Exp $ +$NetBSD: patch-az,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- nsprpub/pr/src/pthreads/ptthread.c.orig 2009-11-02 22:43:08.000000000 +0100 +--- nsprpub/pr/src/pthreads/ptthread.c.orig 2012-08-08 20:20:53.000000000 +0000 +++ nsprpub/pr/src/pthreads/ptthread.c -@@ -1089,12 +1089,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn +@@ -1038,12 +1038,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn _exit(status); } diff --git a/devel/xulrunner/patches/patch-ba b/devel/xulrunner/patches/patch-ba index dcec46acdf7..fde7de56b74 100644 --- a/devel/xulrunner/patches/patch-ba +++ b/devel/xulrunner/patches/patch-ba @@ -1,10 +1,10 @@ -$NetBSD: patch-ba,v 1.1 2009/11/10 16:06:11 tnn Exp $ +$NetBSD: patch-ba,v 1.2 2012/08/28 12:42:01 ryoon Exp $ pthread_t may be 64-bit, avoid casting it. ---- nsprpub/pr/include/private/pprthred.h.orig 2009-11-02 22:43:08.000000000 +0100 +--- nsprpub/pr/include/private/pprthred.h.orig 2012-08-08 20:20:52.000000000 +0000 +++ nsprpub/pr/include/private/pprthred.h -@@ -51,6 +51,8 @@ +@@ -19,6 +19,8 @@ #include <os2.h> #endif @@ -13,7 +13,7 @@ pthread_t may be 64-bit, avoid casting it. PR_BEGIN_EXTERN_C /*--------------------------------------------------------------------------- -@@ -91,7 +93,7 @@ NSPR_API(void) PR_DetachThread(void); +@@ -59,7 +61,7 @@ NSPR_API(void) PR_DetachThread(void); ** Get the id of the named thread. Each thread is assigned a unique id ** when it is created or attached. */ diff --git a/devel/xulrunner/patches/patch-bd b/devel/xulrunner/patches/patch-bd index 1b32144bfa0..f569ae30dc6 100644 --- a/devel/xulrunner/patches/patch-bd +++ b/devel/xulrunner/patches/patch-bd @@ -1,8 +1,8 @@ -$NetBSD: patch-bd,v 1.2 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: patch-bd,v 1.3 2012/08/28 12:42:01 ryoon Exp $ ---- js/src/ctypes/CTypes.cpp.orig 2012-07-04 16:03:34.000000000 +0000 +--- js/src/ctypes/CTypes.cpp.orig 2012-08-08 20:20:10.000000000 +0000 +++ js/src/ctypes/CTypes.cpp -@@ -38,6 +38,22 @@ +@@ -5,6 +5,23 @@ #include "mozilla/FloatingPoint.h" @@ -20,6 +20,7 @@ $NetBSD: patch-bd,v 1.2 2012/07/18 16:10:06 ryoon Exp $ +#define int64_t int64_t +#define intptr_t intptr_t +#define uintptr_t uintptr_t ++#define off_t off_t +#endif + #include "CTypes.h" diff --git a/devel/xulrunner/patches/patch-bf b/devel/xulrunner/patches/patch-bf index 5e4479f7018..e770a7cee8d 100644 --- a/devel/xulrunner/patches/patch-bf +++ b/devel/xulrunner/patches/patch-bf @@ -1,8 +1,8 @@ -$NetBSD: patch-bf,v 1.6 2012/04/01 15:18:45 ryoon Exp $ +$NetBSD: patch-bf,v 1.7 2012/08/28 12:42:01 ryoon Exp $ ---- js/src/jsnativestack.cpp.orig 2012-03-13 01:36:56.000000000 +0000 +--- js/src/jsnativestack.cpp.orig 2012-08-08 20:20:14.000000000 +0000 +++ js/src/jsnativestack.cpp -@@ -50,10 +50,16 @@ +@@ -19,10 +19,16 @@ #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) # include <pthread.h> @@ -20,7 +20,7 @@ $NetBSD: patch-bf,v 1.6 2012/04/01 15:18:45 ryoon Exp $ #else # error "Unsupported platform" -@@ -145,7 +151,7 @@ GetNativeStackBaseImpl() +@@ -114,7 +120,7 @@ GetNativeStackBaseImpl() pthread_attr_init(&sattr); # if defined(__OpenBSD__) stack_t ss; diff --git a/devel/xulrunner/patches/patch-bg b/devel/xulrunner/patches/patch-bg index c97c072e94c..fc82d266575 100644 --- a/devel/xulrunner/patches/patch-bg +++ b/devel/xulrunner/patches/patch-bg @@ -1,8 +1,8 @@ -$NetBSD: patch-bg,v 1.2 2011/04/26 14:16:37 tnn Exp $ +$NetBSD: patch-bg,v 1.3 2012/08/28 12:42:01 ryoon Exp $ ---- storage/src/SQLiteMutex.h.orig 2010-05-28 13:22:58.000000000 +0000 +--- storage/src/SQLiteMutex.h.orig 2012-08-08 20:20:58.000000000 +0000 +++ storage/src/SQLiteMutex.h -@@ -141,15 +141,19 @@ public: +@@ -108,15 +108,19 @@ public: void assertCurrentThreadOwns() { NS_ASSERTION(mMutex, "No mutex associated with this wrapper!"); diff --git a/devel/xulrunner/patches/patch-bi b/devel/xulrunner/patches/patch-bi index cc0060b4008..e588e491de7 100644 --- a/devel/xulrunner/patches/patch-bi +++ b/devel/xulrunner/patches/patch-bi @@ -1,6 +1,6 @@ -$NetBSD: patch-bi,v 1.3 2012/04/26 13:30:29 ryoon Exp $ +$NetBSD: patch-bi,v 1.4 2012/08/28 12:42:01 ryoon Exp $ ---- gfx/angle/src/compiler/osinclude.h.orig 2012-04-04 04:25:20.000000000 +0000 +--- gfx/angle/src/compiler/osinclude.h.orig 2012-08-08 20:20:00.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 c859551dcbf..ffc729e963b 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.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-build_autoconf_nss.m4,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- build/autoconf/nss.m4.orig 2012-02-16 06:40:24.000000000 +0000 +--- build/autoconf/nss.m4.orig 2012-08-08 20:19:40.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_system-headers b/devel/xulrunner/patches/patch-config_system-headers new file mode 100644 index 00000000000..bc8c2d35558 --- /dev/null +++ b/devel/xulrunner/patches/patch-config_system-headers @@ -0,0 +1,12 @@ +$NetBSD: patch-config_system-headers,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- config/system-headers.orig 2012-08-08 20:19:43.000000000 +0000 ++++ config/system-headers +@@ -1059,3 +1059,7 @@ gst/gst.h + gst/app/gstappsink.h + gst/app/gstappsrc.h + gst/video/video.h ++sys/thr.h ++sys/user.h ++kvm.h ++spawn.h diff --git a/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp b/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp index f6cfdb9a67a..35c631043e3 100644 --- a/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp +++ b/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp @@ -1,8 +1,16 @@ -$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +--- dom/plugins/ipc/PluginModuleChild.cpp.orig 2012-08-08 20:19:54.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp -@@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin +@@ -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" +@@ -192,7 +193,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -11,7 +19,7 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/06 12:34:09 r mShutdownFunc = (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown"); -@@ -1790,7 +1790,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin +@@ -1811,7 +1812,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin PLUGIN_LOG_DEBUG_METHOD; AssertPluginThread(); @@ -20,7 +28,7 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/06 12:34:09 r return true; #elif defined(OS_WIN) || defined(OS_MACOSX) *_retval = mGetEntryPointsFunc(&mFunctions); -@@ -1823,7 +1823,7 @@ PluginModuleChild::AnswerNP_Initialize(N +@@ -1840,7 +1841,7 @@ PluginModuleChild::AnswerNP_Initialize(c SendBackUpXResources(FileDescriptor(xSocketFd, false/*don't close*/)); #endif diff --git a/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.h b/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.h index a08016e07d7..a0e7a5c94fc 100644 --- a/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.h +++ b/devel/xulrunner/patches/patch-dom_plugins_ipc_PluginModuleChild.h @@ -1,8 +1,8 @@ -$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.h,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- dom/plugins/ipc/PluginModuleChild.h.orig 2011-12-20 23:28:14.000000000 +0000 +--- dom/plugins/ipc/PluginModuleChild.h.orig 2012-08-08 20:19:54.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.h -@@ -340,7 +340,7 @@ private: +@@ -330,7 +330,7 @@ private: // we get this from the plugin NP_PLUGINSHUTDOWN mShutdownFunc; diff --git a/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp b/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp index 128527a7293..228f9094a5e 100644 --- a/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp +++ b/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/26 13:30:29 ryoon Exp $ +$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- gfx/thebes/gfxPlatform.cpp.orig 2012-04-04 04:25:21.000000000 +0000 +--- gfx/thebes/gfxPlatform.cpp.orig 2012-08-08 20:20:04.000000000 +0000 +++ gfx/thebes/gfxPlatform.cpp -@@ -436,6 +436,7 @@ void SourceBufferDestroy(void *srcBuffer +@@ -443,6 +443,7 @@ void SourceBufferDestroy(void *srcBuffer static_cast<SourceSurface*>(srcBuffer)->Release(); } @@ -10,7 +10,7 @@ $NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/26 13:30:29 ryoon Exp $ void SourceSnapshotDetached(cairo_surface_t *nullSurf) { gfxImageSurface* origSurf = -@@ -443,6 +444,7 @@ void SourceSnapshotDetached(cairo_surfac +@@ -450,6 +451,7 @@ void SourceSnapshotDetached(cairo_surfac origSurf->SetData(&kSourceSurface, NULL, NULL); } @@ -18,16 +18,16 @@ $NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/26 13:30:29 ryoon Exp $ RefPtr<SourceSurface> gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) -@@ -512,6 +514,7 @@ gfxPlatform::GetSourceSurfaceForSurface( - imgSurface->Stride(), - format); +@@ -544,6 +546,7 @@ gfxPlatform::GetSourceSurfaceForSurface( + + } + #ifdef MOZ_TREE_CAIRO cairo_surface_t *nullSurf = cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); cairo_surface_set_user_data(nullSurf, -@@ -520,6 +523,7 @@ gfxPlatform::GetSourceSurfaceForSurface( - NULL); +@@ -552,6 +555,7 @@ gfxPlatform::GetSourceSurfaceForSurface( + NULL); cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); cairo_surface_destroy(nullSurf); + #endif diff --git a/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in b/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in index 6a255605b09..0e5fcb99e03 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in +++ b/devel/xulrunner/patches/patch-ipc_chromium_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-ipc_chromium_Makefile.in,v 1.2 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_Makefile.in,v 1.3 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/Makefile.in.orig 2012-02-16 06:40:33.000000000 +0000 +--- ipc/chromium/Makefile.in.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/Makefile.in -@@ -278,6 +278,34 @@ endif +@@ -243,6 +243,34 @@ endif endif # } OS_LINUX @@ -12,7 +12,7 @@ $NetBSD: patch-ipc_chromium_Makefile.in,v 1.2 2012/05/08 19:29:36 martin Exp $ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) diff --git a/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk b/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk index e07e30d8f0d..70f76548612 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk +++ b/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk @@ -1,10 +1,10 @@ -$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.3 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.4 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- 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 @@ +--- ipc/chromium/chromium-config.mk.orig 2012-08-08 20:20:07.000000000 +0000 ++++ ipc/chromium/chromium-config.mk +@@ -24,17 +24,6 @@ LOCAL_INCLUDES += \ -I$(DEPTH)/ipc/ipdl/_ipdlheaders \ $(NULL) @@ -22,7 +22,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.3 2012/05/08 19:29:36 martin ifeq ($(OS_ARCH),WINNT) # { OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp) -@@ -93,13 +82,64 @@ +@@ -61,13 +50,65 @@ DEFINES += -DCOMPILER_MSVC endif else # } { @@ -76,6 +76,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.3 2012/05/08 19:29:36 martin + +OS_OPENBSD = 1 +OS_BSD = 1 ++OS_LIBS += $(call EXPAND_LIBNAME,kvm) +DEFINES += \ + -DOS_OPENBSD=1 \ + -DOS_BSD=1 \ @@ -90,7 +91,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.3 2012/05/08 19:29:36 martin $(NULL) # NB: to stop gcc warnings about exporting template instantiation -@@ -107,4 +147,8 @@ +@@ -75,4 +116,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$( 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 index 81564e8562d..ed6ed011692 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_base__paths.h +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_base__paths.h @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_base__paths.h,v 1.2 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_base__paths.h,v 1.3 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/base_paths.h.orig 2011-12-20 23:28:19.000000000 +0000 +--- ipc/chromium/src/base/base_paths.h.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/base/base_paths.h @@ -13,7 +13,7 @@ #include "base/base_paths_win.h" diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc index 7f64d154466..4db286ae9d6 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc @@ -1,34 +1,36 @@ -$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.4 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.5 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/debug_util_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +--- ipc/chromium/src/base/debug_util_posix.cc.orig 2012-08-08 20:20:07.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(__linux__) && !defined(ANDROID)) ++#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID)) #include <errno.h> #include <fcntl.h> -@@ -17,8 +17,13 @@ +@@ -17,9 +17,16 @@ #include <unistd.h> #if MOZ_HAVE_EXECINFO_H #include <execinfo.h> --#include <sys/sysctl.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> -+#elif defined(OS_FREEBSD) -+#include <sys/proc.h> +#endif -+#include <sys/sysctl.h> - ++ #include "base/basictypes.h" #include "base/eintr_wrapper.h" -@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u + #include "base/logging.h" +@@ -32,7 +39,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u return false; } @@ -37,7 +39,7 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.4 2012/05/08 19:2 // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +78,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -45,6 +47,8 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.4 2012/05/08 19:2 + 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; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif 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 new file mode 100644 index 00000000000..f17b3f045df --- /dev/null +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h @@ -0,0 +1,113 @@ +$NetBSD: patch-ipc_chromium_src_base_dir__reader__bsd.h,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- ipc/chromium/src/base/dir_reader_bsd.h.orig 2012-08-13 05:21:05.000000000 +0000 ++++ ipc/chromium/src/base/dir_reader_bsd.h +@@ -0,0 +1,108 @@ ++// 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. ++ ++// derived from dir_reader_linux.h ++ ++#ifndef BASE_DIR_READER_BSD_H_ ++#define BASE_DIR_READER_BSD_H_ ++#pragma once ++ ++#include <dirent.h> ++#include <errno.h> ++#include <fcntl.h> ++#include <stdint.h> ++#include <unistd.h> ++ ++#include "base/logging.h" ++#include "base/eintr_wrapper.h" ++ ++// See the comments in dir_reader_posix.h about this. ++ ++namespace base { ++ ++class DirReaderBSD { ++ public: ++ explicit DirReaderBSD(const char* directory_path) ++#ifdef O_DIRECTORY ++ : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)), ++#else ++ : fd_(open(directory_path, O_RDONLY)), ++#endif ++ offset_(0), ++ size_(0) { ++ memset(buf_, 0, sizeof(buf_)); ++ } ++ ++ ~DirReaderBSD() { ++ if (fd_ >= 0) { ++ if (HANDLE_EINTR(close(fd_))) ++ DLOG(ERROR) << "Failed to close directory handle"; ++ } ++ } ++ ++ bool IsValid() const { ++ return fd_ >= 0; ++ } ++ ++ // Move to the next entry returning false if the iteration is complete. ++ bool Next() { ++ if (size_) { ++ struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]); ++ offset_ += dirent->d_reclen; ++ } ++ ++ if (offset_ != size_) ++ return true; ++ ++#ifdef OS_OPENBSD ++ const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); ++#else ++ const int r = getdents(fd_, buf_, sizeof(buf_)); ++#endif ++ if (r == 0) ++ return false; ++ if (r == -1) { ++#ifdef OS_OPENBSD ++ DLOG(ERROR) << "getdirentries returned an error: " << errno; ++#else ++ DLOG(ERROR) << "getdents returned an error: " << errno; ++#endif ++ return false; ++ } ++ size_ = r; ++ offset_ = 0; ++ return true; ++ } ++ ++ const char* name() const { ++ if (!size_) ++ return NULL; ++ ++ const struct dirent* dirent = ++ reinterpret_cast<const struct dirent*>(&buf_[offset_]); ++ return dirent->d_name; ++ } ++ ++ int fd() const { ++ return fd_; ++ } ++ ++ static bool IsFallback() { ++ return false; ++ } ++ ++ private: ++ const int fd_; ++ char buf_[512]; ++#ifdef OS_OPENBSD ++ off_t *basep_; ++#endif ++ size_t offset_, size_; ++ ++ DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); ++}; ++ ++} // namespace base ++ ++#endif // BASE_DIR_READER_BSD_H_ 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 new file mode 100644 index 00000000000..ebeebcebd7f --- /dev/null +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__posix.h @@ -0,0 +1,27 @@ +$NetBSD: patch-ipc_chromium_src_base_dir__reader__posix.h,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- ipc/chromium/src/base/dir_reader_posix.h.orig 2012-08-08 20:20:07.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.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util.h deleted file mode 100644 index cff6b09732f..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.3 2012/05/08 19:29:36 martin Exp $ - -# Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 - ---- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include <sys/stat.h> - #elif defined(OS_POSIX) - #include <sys/types.h> --#include <fts.h> - #include <sys/stat.h> -+#include <fts.h> - #endif - - #include <stdio.h> diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__bsd.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__bsd.cc deleted file mode 100644 index b9eaa96ca41..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__bsd.cc +++ /dev/null @@ -1,86 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.2 2012/05/08 19:29:36 martin Exp $ - -# Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 - ---- ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,79 @@ -+// Copyright (c) 2006-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. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include <fcntl.h> -+ -+#include <string> -+#include <vector> -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector<char> buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__linux.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__linux.cc new file mode 100644 index 00000000000..bafe9954fb4 --- /dev/null +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__linux.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_chromium_src_base_file__util__linux.cc,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- ipc/chromium/src/base/file_util_linux.cc.orig 2012-08-08 20:20:07.000000000 +0000 ++++ ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } + + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_file__util__posix.cc index fbb4ea1cb0a..8f65346aebb 100644 --- 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 @@ -1,15 +1,15 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.3 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.4 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 +--- ipc/chromium/src/base/file_util_posix.cc.orig 2012-08-08 20:20:07.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 __linux__ ++#ifndef OS_LINUX #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 index 8f59814ce46..afccbe4e61a 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_message__loop.cc +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_message__loop.cc @@ -1,9 +1,9 @@ -$NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.2 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.3 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/message_loop.cc.orig 2012-02-16 07:40:33.000000000 +0100 -+++ ipc/chromium/src/base/message_loop.cc 2012-02-21 21:24:41.000000000 +0100 +--- ipc/chromium/src/base/message_loop.cc.orig 2012-08-08 20:20:07.000000000 +0000 ++++ ipc/chromium/src/base/message_loop.cc @@ -19,7 +19,7 @@ #if defined(OS_POSIX) #include "base/message_pump_libevent.h" @@ -13,7 +13,7 @@ $NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.2 2012/05/08 19:29:36 #ifdef MOZ_WIDGET_GTK2 #include "base/message_pump_glib.h" #endif -@@ -119,7 +119,7 @@ +@@ -119,7 +119,7 @@ MessageLoop::MessageLoop(Type type) if (type_ == TYPE_UI) { #if defined(OS_MACOSX) pump_ = base::MessagePumpMac::Create(); diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__file__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__file__posix.cc deleted file mode 100644 index 566e55a0b3d..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__file__posix.cc +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.2 2012/05/08 19:29:36 martin Exp $ - -# Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 - ---- ipc/chromium/src/base/platform_file_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 -+++ ipc/chromium/src/base/platform_file_posix.cc -@@ -9,6 +9,7 @@ - #ifdef ANDROID - #include <linux/stat.h> - #endif -+#include <sys/stat.h> /* for S_IRUSR */ - - #include "base/logging.h" - #include "base/string_util.h" 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 index 13c35d059c1..4e471a23351 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread.h +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread.h @@ -1,14 +1,18 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.2 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.3 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +--- ipc/chromium/src/base/platform_thread.h.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -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_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include <mach/mach.h> diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc index 3b002b0a92f..645d308fa29 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc @@ -1,44 +1,79 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.5 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.6 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +--- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,16 +9,31 @@ #if defined(OS_MACOSX) #include <mach/mach.h> +#elif defined(OS_NETBSD) +#include <lwp.h> ++#include <nspr/prthread.h> #elif defined(OS_LINUX) #include <sys/syscall.h> - #include <unistd.h> -+#elif defined(OS_DRAGONFLY) -+#include <unistd.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)") -+# include <pthread_np.h> ++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) -@@ -33,6 +42,18 @@ PlatformThreadId PlatformThread::Current + namespace base { + void InitThreading(); +@@ -38,9 +53,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_cc_version > 900000 ++# if __FreeBSD_version > 900030 + return pthread_getthreadid_np(); +# else -+ lwpid_t lwpid; -+ thr_self( &lwpid ); ++ long lwpid; ++ thr_self(&lwpid); + return lwpid; +# endif - #elif defined (__OpenBSD__) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); ++#elif defined(OS_OPENBSD) ++ return (intptr_t) (pthread_self()); + #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif +@@ -83,10 +109,10 @@ 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__) +- pthread_setname_np(pthread_self(), "%s", name); ++#elif defined(OS_NETBSD) ++ PR_SetCurrentThreadName(name); + #else + prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0); + #endif diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h index bd7ed2fb424..0eb05c94749 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util.h @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.3 2012/05/20 02:02:36 sbd Exp $ +$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.4 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/process_util.h.orig 2012-04-20 22:03:52.000000000 +0000 +--- ipc/chromium/src/base/process_util.h.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/base/process_util.h @@ -280,6 +280,7 @@ class NamedProcessIterator { const ProcessEntry* NextProcessEntry(); 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 accda3b76fe..a3216766031 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,10 +1,10 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.6 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- 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.orig 2012-08-13 05:21:05.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,326 @@ +@@ -0,0 +1,320 @@ +// 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. @@ -13,36 +13,20 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/05/08 19:2 + +#include "base/process_util.h" + -+#include <ctype.h> -+#include <fcntl.h> -+#include <unistd.h> -+#include <string> -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do 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/sysctl.h> +#include <sys/wait.h> -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include <sys/user.h> -+POST_SYS_INCLUDE -+#define HAVE_POSIX_SPAWN 1 -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include <sys/user.h> -+POST_SYS_INCLUDE +#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" @@ -50,17 +34,27 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/05/08 19:2 +#include "base/string_tokenizer.h" +#include "base/string_util.h" + -+#ifdef __NetBSD__ ++#ifdef OS_NETBSD +#include <sys/param.h> -+#if __NetBSD_Version__ >= 600000000 ++#if __NetBSD_Version__ >= 599006500 ++#define HAVE_POSIX_SPAWN 1 ++#endif ++#endif ++ ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif ++ ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif +#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_chromium_src_base_process__util__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__posix.cc index 407b1862bbc..3cc71ceec20 100644 --- 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 @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util__posix.cc,v 1.2 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_process__util__posix.cc,v 1.3 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/process_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 +--- ipc/chromium/src/base/process_util_posix.cc.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/base/process_util_posix.cc @@ -116,6 +116,11 @@ void CloseSuperfluousFds(const base::Inj #elif defined(OS_MACOSX) diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_ref__counted.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_ref__counted.h new file mode 100644 index 00000000000..1ebbd264157 --- /dev/null +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_ref__counted.h @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_chromium_src_base_ref__counted.h,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- ipc/chromium/src/base/ref_counted.h.orig 2012-08-08 20:20:07.000000000 +0000 ++++ ipc/chromium/src/base/ref_counted.h +@@ -28,7 +28,7 @@ class RefCountedBase { + bool in_dtor_; + #endif + +- DFAKE_MUTEX(add_release_); ++ DFAKE_MUTEX(add_release_) + + DISALLOW_COPY_AND_ASSIGN(RefCountedBase); + }; 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 index 3ed720c0d34..35bcaa34241 100644 --- 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 @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.3 2012/05/08 19:29:36 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.4 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/sys_info_posix.cc.orig 2011-11-04 21:34:00.000000000 +0000 +--- ipc/chromium/src/base/sys_info_posix.cc.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/base/sys_info_posix.cc @@ -18,6 +18,11 @@ #include <mach/mach_init.h> diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h index 73c2dde1fa8..730df9a8149 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h @@ -1,15 +1,15 @@ -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.3 2012/05/08 19:29:37 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.4 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-12-20 23:28:19.000000000 +0000 +--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h @@ -34,7 +34,7 @@ #include "base/third_party/nspr/prcpucfg_win.h" #elif defined(__APPLE__) #include "base/third_party/nspr/prcpucfg_mac.h" -#elif defined(__linux__) || defined(ANDROID) -+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__DragonFly__) ++#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) #include "base/third_party/nspr/prcpucfg_linux.h" #elif defined(__OpenBSD__) #include "base/third_party/nspr/prcpucfg_openbsd.h" diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prtime.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prtime.cc index a3d4aafce2c..d68fbf876dc 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prtime.cc +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_third__party_nspr_prtime.cc @@ -1,10 +1,10 @@ -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.2 2012/05/08 19:29:37 martin Exp $ +$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.3 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2011-12-20 23:28:19.000000000 +0000 +--- ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/base/third_party/nspr/prtime.cc -@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp +@@ -180,7 +180,7 @@ PR_ImplodeTime(const PRExplodedTime *exp LL_ADD(retVal, retVal, temp); return retVal; @@ -13,7 +13,7 @@ $NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.2 2012/05/0 struct tm exp_tm = {0}; exp_tm.tm_sec = exploded->tm_sec; exp_tm.tm_min = exploded->tm_min; -@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp +@@ -213,6 +213,24 @@ PR_ImplodeTime(const PRExplodedTime *exp result *= kSecondsToMicroseconds; result += exploded->tm_usec; return result; 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 new file mode 100644 index 00000000000..9dc23758645 --- /dev/null +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_time__posix.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_chromium_src_base_time__posix.cc,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- ipc/chromium/src/base/time_posix.cc.orig 2012-08-08 20:20:07.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 index 85a7b319f12..7ef12907592 100644 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h @@ -1,27 +1,33 @@ -$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.5 2012/05/08 19:29:37 martin Exp $ +$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.6 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +--- ipc/chromium/src/build/build_config.h.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -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) 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 new file mode 100644 index 00000000000..a69e9355c09 --- /dev/null +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h.orig 2012-08-08 20:20:07.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 new file mode 100644 index 00000000000..0c36cc5a0de --- /dev/null +++ b/devel/xulrunner/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig 2012-08-08 20:20:07.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 index efab43191d1..7d4b99823cd 100644 --- 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 @@ -1,10 +1,10 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.2 2012/05/08 19:29:37 martin Exp $ +$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.3 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig 2011-06-15 21:57:27.000000000 +0000 +--- ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/chrome/common/ipc_channel_posix.h -@@ -92,7 +92,7 @@ class Channel::ChannelImpl : public Mess +@@ -95,7 +95,7 @@ class Channel::ChannelImpl : public Mess }; // This is a control message buffer large enough to hold kMaxReadFDs 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 index 0e575e30d11..8c5b410bb28 100644 --- 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 @@ -1,24 +1,24 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.2 2012/05/08 19:29:37 martin Exp $ +$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.3 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/chrome/common/ipc_message_utils.h.orig 2011-12-20 23:28:19.000000000 +0000 +--- ipc/chromium/src/chrome/common/ipc_message_utils.h.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/chrome/common/ipc_message_utils.h -@@ -195,7 +195,7 @@ +@@ -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_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || 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 @@ +@@ -248,7 +248,7 @@ struct ParamTraits<uint32> { }; #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || 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 index 441e37ce300..6254a0279de 100644 --- 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 @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.2 2012/05/08 19:29:37 martin Exp $ +$NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.3 2012/08/28 12:42:01 ryoon Exp $ # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046 ---- ipc/chromium/src/chrome/common/transport_dib.h.orig 2011-12-20 23:28:19.000000000 +0000 +--- ipc/chromium/src/chrome/common/transport_dib.h.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/chromium/src/chrome/common/transport_dib.h @@ -7,7 +7,7 @@ @@ -18,7 +18,7 @@ $NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.2 2012/05/08 }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#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; diff --git a/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp index ee93a1f6af4..7d44ecc2e3d 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.2 2012/03/15 08:30:06 ryoon Exp $ +$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2012/08/28 12:42:01 ryoon Exp $ ---- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-12-20 23:28:19.000000000 +0000 +--- ipc/glue/GeckoChildProcessHost.cpp.orig 2012-08-08 20:20:07.000000000 +0000 +++ ipc/glue/GeckoChildProcessHost.cpp -@@ -430,7 +430,7 @@ +@@ -410,7 +410,7 @@ GeckoChildProcessHost::PerformAsyncLaunc // and passing wstrings from one config to the other is unsafe. So // we split the logic here. @@ -11,7 +11,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 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 @@ +@@ -425,8 +425,8 @@ GeckoChildProcessHost::PerformAsyncLaunc if (NS_SUCCEEDED(rv)) { nsCString path; greDir->GetNativePath(path); @@ -22,7 +22,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 ryoo path += "/lib"; # endif // MOZ_WIDGET_ANDROID const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH"); -@@ -557,7 +557,7 @@ +@@ -537,7 +537,7 @@ GeckoChildProcessHost::PerformAsyncLaunc childArgv.push_back(pidstring); #if defined(MOZ_CRASHREPORTER) @@ -31,7 +31,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 ryoo int childCrashFd, childCrashRemapFd; if (!CrashReporter::CreateNotificationPipeForChild( &childCrashFd, &childCrashRemapFd)) -@@ -594,7 +594,7 @@ +@@ -574,7 +574,7 @@ GeckoChildProcessHost::PerformAsyncLaunc #endif base::LaunchApp(childArgv, mFileMap, @@ -40,4 +40,3 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 ryoo newEnvVars, #endif false, &process, arch); - diff --git a/devel/xulrunner/patches/patch-ipc_glue_SharedMemorySysV.h b/devel/xulrunner/patches/patch-ipc_glue_SharedMemorySysV.h new file mode 100644 index 00000000000..282351ce245 --- /dev/null +++ b/devel/xulrunner/patches/patch-ipc_glue_SharedMemorySysV.h @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_glue_SharedMemorySysV.h,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- ipc/glue/SharedMemorySysV.h.orig 2012-08-08 20:20:07.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-js_src_config_rules.mk b/devel/xulrunner/patches/patch-js_src_config_rules.mk index 54d965e0821..4ac11c73766 100644 --- a/devel/xulrunner/patches/patch-js_src_config_rules.mk +++ b/devel/xulrunner/patches/patch-js_src_config_rules.mk @@ -1,24 +1,4 @@ -$NetBSD: patch-js_src_config_rules.mk,v 1.2 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: patch-js_src_config_rules.mk,v 1.3 2012/08/28 12:42:01 ryoon Exp $ https://bugzilla.mozilla.org/show_bug.cgi?id=736961 ---- js/src/config/rules.mk.orig 2012-07-04 16:03:34.000000000 +0000 -+++ js/src/config/rules.mk -@@ -1452,7 +1452,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS - $(PYTHON_PATH) \ - $(PLY_INCLUDE) \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - @if test -n "$(findstring $*.h, $(EXPORTS))"; \ - then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi - -@@ -1465,7 +1465,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE - $(PLY_INCLUDE) \ - -I$(topsrcdir)/xpcom/idl-parser \ - -I$(topsrcdir)/xpcom/typelib/xpt/tools \ -- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - - # no need to link together if XPIDLSRCS contains only XPIDL_MODULE - ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) diff --git a/devel/xulrunner/patches/patch-js_src_config_system-headers b/devel/xulrunner/patches/patch-js_src_config_system-headers new file mode 100644 index 00000000000..3d09d6effee --- /dev/null +++ b/devel/xulrunner/patches/patch-js_src_config_system-headers @@ -0,0 +1,12 @@ +$NetBSD: patch-js_src_config_system-headers,v 1.1 2012/08/28 12:42:01 ryoon Exp $ + +--- js/src/config/system-headers.orig 2012-08-08 20:20:10.000000000 +0000 ++++ js/src/config/system-headers +@@ -1059,3 +1059,7 @@ gst/gst.h + gst/app/gstappsink.h + gst/app/gstappsrc.h + gst/video/video.h ++sys/thr.h ++sys/user.h ++kvm.h ++spawn.h diff --git a/devel/xulrunner/patches/patch-js_src_jscpucfg.h b/devel/xulrunner/patches/patch-js_src_jscpucfg.h index 8c7f84b38f3..3d83a7733dc 100644 --- a/devel/xulrunner/patches/patch-js_src_jscpucfg.h +++ b/devel/xulrunner/patches/patch-js_src_jscpucfg.h @@ -1,9 +1,9 @@ -$NetBSD: patch-js_src_jscpucfg.h,v 1.2 2012/03/15 08:30:06 ryoon Exp $ +$NetBSD: patch-js_src_jscpucfg.h,v 1.3 2012/08/28 12:42:01 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 @@ +--- js/src/jscpucfg.h.orig 2012-08-08 20:20:14.000000000 +0000 ++++ js/src/jscpucfg.h +@@ -44,6 +44,21 @@ # define IS_BIG_ENDIAN 1 # endif @@ -25,4 +25,3 @@ $NetBSD: patch-js_src_jscpucfg.h,v 1.2 2012/03/15 08:30:06 ryoon Exp $ #elif defined(JS_HAVE_ENDIAN_H) # include <endian.h> - diff --git a/devel/xulrunner/patches/patch-js_src_jsgc.cpp b/devel/xulrunner/patches/patch-js_src_jsgc.cpp index 45cbb7447be..5d5753e28c5 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.1 2012/07/14 21:19:48 ryoon Exp $ +$NetBSD: patch-js_src_jsgc.cpp,v 1.2 2012/08/28 12:42:01 ryoon Exp $ http://gnats.netbsd.org/46622 ---- js/src/jsgc.cpp.orig 2012-06-01 12:04:04.000000000 +0000 +--- js/src/jsgc.cpp.orig 2012-08-08 20:20:14.000000000 +0000 +++ js/src/jsgc.cpp -@@ -2636,8 +2636,12 @@ GetCPUCount() +@@ -2635,8 +2635,12 @@ GetCPUCount() GetSystemInfo(&sysinfo); ncpus = unsigned(sysinfo.dwNumberOfProcessors); # else diff --git a/devel/xulrunner/patches/patch-js_src_methodjit_MethodJIT.cpp b/devel/xulrunner/patches/patch-js_src_methodjit_MethodJIT.cpp index 553285b4d7d..c6c5c2e0a5d 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.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-js_src_methodjit_MethodJIT.cpp,v 1.2 2012/08/28 12:42:01 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-01-29 11:24:34.000000000 +0100 -+++ js/src/methodjit/MethodJIT.cpp 2012-02-11 01:13:30.000000000 +0100 -@@ -171,7 +171,7 @@ +--- js/src/methodjit/MethodJIT.cpp.orig 2012-08-08 20:20:15.000000000 +0000 ++++ js/src/methodjit/MethodJIT.cpp +@@ -135,7 +135,7 @@ PopActiveVMFrame(VMFrame &f) JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); diff --git a/devel/xulrunner/patches/patch-js_src_yarr_pcre_pcre.h b/devel/xulrunner/patches/patch-js_src_yarr_pcre_pcre.h deleted file mode 100644 index d7cb0e83696..00000000000 --- a/devel/xulrunner/patches/patch-js_src_yarr_pcre_pcre.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-js_src_yarr_pcre_pcre.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- js/src/yarr/pcre/pcre.h.orig 2012-01-29 11:24:38.000000000 +0100 -+++ js/src/yarr/pcre/pcre.h 2012-02-20 16:50:06.000000000 +0100 -@@ -46,7 +46,9 @@ - #include "assembler/wtf/Platform.h" - #include "jsstr.h" - #include "jsprvtd.h" -+#if ENABLE_ASSEMBLER - #include "jstl.h" -+#endif - - typedef jschar UChar; - typedef JSLinearString UString; diff --git a/devel/xulrunner/patches/patch-js_xpconnect_src_Makefile.in b/devel/xulrunner/patches/patch-js_xpconnect_src_Makefile.in deleted file mode 100644 index a5606b504fe..00000000000 --- a/devel/xulrunner/patches/patch-js_xpconnect_src_Makefile.in +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-js_xpconnect_src_Makefile.in,v 1.1 2012/06/05 18:09:21 ryoon Exp $ - -https://bugzilla.mozilla.org/show_bug.cgi?id=736961 - ---- js/xpconnect/src/Makefile.in.orig 2012-05-23 18:56:49.000000000 +0000 -+++ js/xpconnect/src/Makefile.in -@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quicks - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/qsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output dom_quickstubs.h \ - --stub-output dom_quickstubs.cpp \ - --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \ -@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dombindingsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output dombindings_gen.h \ - $(srcdir)/dombindings.conf - -@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindin - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dombindingsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --stub-output dombindings_gen.cpp \ - --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \ - $(srcdir)/dombindings.conf -@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionar - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dictionary_helper_gen.py \ - -I $(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output DictionaryHelpers.h \ - $(srcdir)/dictionary_helper_gen.conf - -@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/diction - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dictionary_helper_gen.py \ - -I $(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output DictionaryHelpers.h \ - --stub-output DictionaryHelpers.cpp \ - --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \ diff --git a/devel/xulrunner/patches/patch-ma b/devel/xulrunner/patches/patch-ma index 992948cfb86..a98ae7eb097 100644 --- a/devel/xulrunner/patches/patch-ma +++ b/devel/xulrunner/patches/patch-ma @@ -1,8 +1,8 @@ -$NetBSD: patch-ma,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-ma,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- config/autoconf.mk.in.orig 2009-06-29 18:14:41.000000000 +0200 +--- config/autoconf.mk.in.orig 2012-08-08 20:19:43.000000000 +0000 +++ config/autoconf.mk.in -@@ -57,14 +57,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ +@@ -37,14 +37,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ diff --git a/devel/xulrunner/patches/patch-mb b/devel/xulrunner/patches/patch-mb index 5e9bbc295c7..dc02feddaf6 100644 --- a/devel/xulrunner/patches/patch-mb +++ b/devel/xulrunner/patches/patch-mb @@ -1,8 +1,8 @@ -$NetBSD: patch-mb,v 1.7 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-mb,v 1.8 2012/08/28 12:42:01 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-12-20 23:28:44.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2012-08-08 20:21:11.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -84,7 +84,7 @@ endif +@@ -50,7 +50,7 @@ endif endif endif @@ -11,7 +11,7 @@ $NetBSD: patch-mb,v 1.7 2012/03/06 12:34:09 ryoon Exp $ ifeq (86,$(findstring 86,$(OS_TEST))) CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp endif -@@ -93,7 +93,7 @@ endif +@@ -59,7 +59,7 @@ endif # New code for Linux, et. al., with gcc # Migrate other platforms here after testing # @@ -20,7 +20,7 @@ $NetBSD: patch-mb,v 1.7 2012/03/06 12:34:09 ryoon Exp $ # Linux/x86-64 ifeq (x86_64,$(OS_TEST)) CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp -@@ -111,12 +111,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin +@@ -77,12 +77,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin endif endif # @@ -33,7 +33,7 @@ $NetBSD: patch-mb,v 1.7 2012/03/06 12:34:09 ryoon Exp $ # Neutrino/Intel (uses the same unixish_x86 code) # ifeq ($(OS_TARGET),NTO) -@@ -192,7 +186,7 @@ endif +@@ -158,7 +152,7 @@ endif # NetBSD/ARM # ifeq ($(OS_ARCH),NetBSD) @@ -42,7 +42,7 @@ $NetBSD: patch-mb,v 1.7 2012/03/06 12:34:09 ryoon Exp $ CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp endif endif -@@ -249,7 +243,7 @@ endif +@@ -215,7 +209,7 @@ endif # NetBSD/m68k # ifeq ($(OS_ARCH),NetBSD) @@ -51,7 +51,7 @@ $NetBSD: patch-mb,v 1.7 2012/03/06 12:34:09 ryoon Exp $ CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp endif endif -@@ -321,9 +315,10 @@ endif +@@ -287,9 +281,10 @@ endif # # NetBSD/PPC # @@ -63,7 +63,7 @@ $NetBSD: patch-mb,v 1.7 2012/03/06 12:34:09 ryoon Exp $ endif # -@@ -396,6 +391,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c +@@ -355,6 +350,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s endif # diff --git a/devel/xulrunner/patches/patch-md b/devel/xulrunner/patches/patch-md index 6e8661bfead..e67cc37019e 100644 --- a/devel/xulrunner/patches/patch-md +++ b/devel/xulrunner/patches/patch-md @@ -1,10 +1,10 @@ -$NetBSD: patch-md,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-md,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ???. from www/firefox/patch-ax. ---- security/coreconf/SunOS5.mk.orig 2009-06-29 18:15:11.000000000 +0200 +--- security/coreconf/SunOS5.mk.orig 2012-08-08 20:20:55.000000000 +0000 +++ security/coreconf/SunOS5.mk -@@ -156,6 +156,10 @@ endif +@@ -147,6 +147,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 ae212a8605b..7186f85d638 100644 --- a/devel/xulrunner/patches/patch-me +++ b/devel/xulrunner/patches/patch-me @@ -1,10 +1,10 @@ -$NetBSD: patch-me,v 1.5 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-me,v 1.6 2012/08/28 12:42:01 ryoon Exp $ Add DragonFly support. ---- security/nss/lib/freebl/Makefile.orig 2009-06-29 18:15:13.000000000 +0200 +--- security/nss/lib/freebl/Makefile.orig 2012-08-08 20:20:56.000000000 +0000 +++ security/nss/lib/freebl/Makefile -@@ -212,7 +212,7 @@ endif +@@ -279,7 +279,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_libsydneyaudio_src_sydney_audio_pulseaudio.c b/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c index 2a84714a35b..7881a4eb81f 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,8 +1,8 @@ -$NetBSD: patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c,v 1.1 2012/04/26 13:30:30 ryoon Exp $ +$NetBSD: patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig 2012-04-04 04:25:35.000000000 +0000 +--- media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig 2012-08-08 20:20:43.000000000 +0000 +++ media/libsydneyaudio/src/sydney_audio_pulseaudio.c -@@ -29,7 +29,9 @@ +@@ -6,7 +6,9 @@ #include <stdio.h> #include <string.h> #include <pthread.h> diff --git a/devel/xulrunner/patches/patch-media_libvpx_vpx__config.h b/devel/xulrunner/patches/patch-media_libvpx_vpx__config.h index fdd4ccaba1f..e6b816be6a7 100644 --- a/devel/xulrunner/patches/patch-media_libvpx_vpx__config.h +++ b/devel/xulrunner/patches/patch-media_libvpx_vpx__config.h @@ -1,8 +1,8 @@ -$NetBSD: patch-media_libvpx_vpx__config.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-media_libvpx_vpx__config.h,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- media/libvpx/vpx_config.h.orig 2012-01-29 11:24:47.000000000 +0100 -+++ media/libvpx/vpx_config.h 2012-02-09 15:07:24.000000000 +0100 -@@ -12,12 +12,12 @@ +--- media/libvpx/vpx_config.h.orig 2012-08-08 20:20:44.000000000 +0000 ++++ media/libvpx/vpx_config.h +@@ -16,12 +16,12 @@ /* 32 bit MacOS. */ #include "vpx_config_x86-darwin9-gcc.h" diff --git a/devel/xulrunner/patches/patch-media_libvpx_vpx__config__c.c b/devel/xulrunner/patches/patch-media_libvpx_vpx__config__c.c index 558d10b7e65..219a92b087a 100644 --- a/devel/xulrunner/patches/patch-media_libvpx_vpx__config__c.c +++ b/devel/xulrunner/patches/patch-media_libvpx_vpx__config__c.c @@ -1,8 +1,8 @@ -$NetBSD: patch-media_libvpx_vpx__config__c.c,v 1.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-media_libvpx_vpx__config__c.c,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- media/libvpx/vpx_config_c.c.orig 2012-01-29 11:24:47.000000000 +0100 -+++ media/libvpx/vpx_config_c.c 2012-02-09 15:10:30.000000000 +0100 -@@ -12,12 +12,12 @@ +--- media/libvpx/vpx_config_c.c.orig 2012-08-08 20:20:44.000000000 +0000 ++++ media/libvpx/vpx_config_c.c +@@ -15,12 +15,12 @@ /* 32 bit MacOS. */ #include "vpx_config_x86-darwin9-gcc.c" diff --git a/devel/xulrunner/patches/patch-mf b/devel/xulrunner/patches/patch-mf index d91a97ef78c..327af668b55 100644 --- a/devel/xulrunner/patches/patch-mf +++ b/devel/xulrunner/patches/patch-mf @@ -1,9 +1,9 @@ -$NetBSD: patch-mf,v 1.5 2011/11/12 12:45:04 tnn Exp $ +$NetBSD: patch-mf,v 1.6 2012/08/28 12:42:01 ryoon Exp $ Add DragonFly support. Make sure nss libraries have a run path defined. ---- security/coreconf/config.mk.orig 2011-11-04 21:34:14.000000000 +0000 +--- security/coreconf/config.mk.orig 2012-08-08 20:20:55.000000000 +0000 +++ security/coreconf/config.mk @@ -63,7 +63,7 @@ endif ####################################################################### diff --git a/devel/xulrunner/patches/patch-mg b/devel/xulrunner/patches/patch-mg index e75d058fff2..1b4fea5ffb9 100644 --- a/devel/xulrunner/patches/patch-mg +++ b/devel/xulrunner/patches/patch-mg @@ -1,8 +1,8 @@ -$NetBSD: patch-mg,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-mg,v 1.2 2012/08/28 12:42:01 ryoon Exp $ Add DragonFly support. ---- security/coreconf/DragonFly.mk.orig 2009-06-30 22:20:24.000000000 +0200 +--- security/coreconf/DragonFly.mk.orig 2012-08-13 05:26:35.000000000 +0000 +++ security/coreconf/DragonFly.mk @@ -0,0 +1,83 @@ +# diff --git a/devel/xulrunner/patches/patch-mh b/devel/xulrunner/patches/patch-mh index b99c7b4f5c6..1776c3bcd67 100644 --- a/devel/xulrunner/patches/patch-mh +++ b/devel/xulrunner/patches/patch-mh @@ -1,6 +1,6 @@ -$NetBSD: patch-mh,v 1.2 2011/04/26 14:16:37 tnn Exp $ +$NetBSD: patch-mh,v 1.3 2012/08/28 12:42:01 ryoon Exp $ ---- security/nss/lib/Makefile.orig 2011-03-18 23:34:05.000000000 +0000 +--- security/nss/lib/Makefile.orig 2012-08-08 20:20:56.000000000 +0000 +++ security/nss/lib/Makefile @@ -70,7 +70,7 @@ endif diff --git a/devel/xulrunner/patches/patch-mi b/devel/xulrunner/patches/patch-mi index 4043accee7e..8cab9aa6781 100644 --- a/devel/xulrunner/patches/patch-mi +++ b/devel/xulrunner/patches/patch-mi @@ -1,8 +1,8 @@ -$NetBSD: patch-mi,v 1.2 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-mi,v 1.3 2012/08/28 12:42:01 ryoon Exp $ ---- config/config.mk.orig 2011-12-20 23:28:11.000000000 +0000 +--- config/config.mk.orig 2012-08-08 20:19:43.000000000 +0000 +++ config/config.mk -@@ -129,7 +129,7 @@ endif +@@ -97,7 +97,7 @@ endif # but save the version to allow multiple versions of the same base # platform to be built in the same tree. # diff --git a/devel/xulrunner/patches/patch-mj b/devel/xulrunner/patches/patch-mj index a34b5857830..2ca050064ff 100644 --- a/devel/xulrunner/patches/patch-mj +++ b/devel/xulrunner/patches/patch-mj @@ -1,8 +1,8 @@ -$NetBSD: patch-mj,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-mj,v 1.2 2012/08/28 12:42:01 ryoon Exp $ Add DragonFly support. ---- security/coreconf/arch.mk.orig 2009-06-29 18:15:11.000000000 +0200 +--- security/coreconf/arch.mk.orig 2012-08-08 20:20:55.000000000 +0000 +++ security/coreconf/arch.mk @@ -146,7 +146,7 @@ endif # IRIX 6.5-ALPHA-1289139620. diff --git a/devel/xulrunner/patches/patch-mk b/devel/xulrunner/patches/patch-mk index 2d35e6303da..36e495c7c80 100644 --- a/devel/xulrunner/patches/patch-mk +++ b/devel/xulrunner/patches/patch-mk @@ -1,11 +1,11 @@ -$NetBSD: patch-mk,v 1.4 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: patch-mk,v 1.5 2012/08/28 12:42:01 ryoon Exp $ * Conditional for NetBSD and DragonFly * From https://bugzilla.mozilla.org/show_bug.cgi?id=736961 ---- config/rules.mk.orig 2012-07-04 16:03:15.000000000 +0000 +--- config/rules.mk.orig 2012-08-08 20:19:43.000000000 +0000 +++ config/rules.mk -@@ -556,6 +556,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +@@ -454,6 +454,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic endif endif @@ -18,7 +18,7 @@ $NetBSD: patch-mk,v 1.4 2012/07/18 16:10:06 ryoon Exp $ ifeq ($(OS_ARCH),NetBSD) ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST))) ifeq ($(MODULE),layout) -@@ -565,6 +571,10 @@ endif +@@ -463,6 +469,10 @@ endif endif endif diff --git a/devel/xulrunner/patches/patch-ml b/devel/xulrunner/patches/patch-ml index c4b39d2845c..340c073aaf1 100644 --- a/devel/xulrunner/patches/patch-ml +++ b/devel/xulrunner/patches/patch-ml @@ -1,8 +1,8 @@ -$NetBSD: patch-ml,v 1.2 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-ml,v 1.3 2012/08/28 12:42:01 ryoon Exp $ ---- js/src/Makefile.in.orig 2011-12-20 23:28:21.000000000 +0000 +--- js/src/Makefile.in.orig 2012-08-08 20:20:10.000000000 +0000 +++ js/src/Makefile.in -@@ -809,6 +809,9 @@ +@@ -678,6 +678,9 @@ endif # _MSC_VER ifeq ($(OS_ARCH),FreeBSD) EXTRA_LIBS += -pthread endif diff --git a/devel/xulrunner/patches/patch-mm b/devel/xulrunner/patches/patch-mm index 5a7c2dc43fc..d778d251cc1 100644 --- a/devel/xulrunner/patches/patch-mm +++ b/devel/xulrunner/patches/patch-mm @@ -1,29 +1,24 @@ -$NetBSD: patch-mm,v 1.14 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: patch-mm,v 1.15 2012/08/28 12:42:01 ryoon Exp $ ---- toolkit/library/Makefile.in.orig 2012-07-04 16:04:17.000000000 +0000 +--- toolkit/library/Makefile.in.orig 2012-08-08 20:21:05.000000000 +0000 +++ toolkit/library/Makefile.in -@@ -522,6 +522,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle +@@ -535,6 +535,19 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle endif endif -+ifeq ($(OS_ARCH),DragonFly) -+OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3 -+endif -+ -+ifeq ($(OS_ARCH),FreeBSD) -+OS_LIBS += $(call EXPAND_LIBNAME,kvm) ++ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH))) +EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3 +endif + ++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) +ifeq ($(OS_ARCH),NetBSD) -+OS_LIBS += $(call EXPAND_LIBNAME,kvm) +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) + 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 index 4a812e38464..ac4346157a8 100644 --- a/devel/xulrunner/patches/patch-mn +++ b/devel/xulrunner/patches/patch-mn @@ -1,8 +1,8 @@ -$NetBSD: patch-mn,v 1.4 2011/04/26 14:16:37 tnn Exp $ +$NetBSD: patch-mn,v 1.5 2012/08/28 12:42:01 ryoon Exp $ Make sure we link correctly with sqlite3 from pkgsrc. ---- security/nss/lib/softoken/config.mk.orig 2010-07-21 00:52:46.000000000 +0000 +--- security/nss/lib/softoken/config.mk.orig 2012-08-08 20:20:57.000000000 +0000 +++ security/nss/lib/softoken/config.mk @@ -80,7 +80,7 @@ else # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. diff --git a/devel/xulrunner/patches/patch-mp b/devel/xulrunner/patches/patch-mp index 5add507603f..fed327668ab 100644 --- a/devel/xulrunner/patches/patch-mp +++ b/devel/xulrunner/patches/patch-mp @@ -1,8 +1,8 @@ -$NetBSD: patch-mp,v 1.5 2011/04/26 14:16:37 tnn Exp $ +$NetBSD: patch-mp,v 1.6 2012/08/28 12:42:01 ryoon Exp $ ---- media/libsydneyaudio/src/Makefile.in.orig 2010-07-21 00:52:30.000000000 +0000 +--- media/libsydneyaudio/src/Makefile.in.orig 2012-08-08 20:20:43.000000000 +0000 +++ media/libsydneyaudio/src/Makefile.in -@@ -97,6 +97,12 @@ ifeq ($(OS_ARCH),WINNT) +@@ -72,6 +72,12 @@ 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 3dd3839a519..080e55e6ace 100644 --- a/devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp +++ b/devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp @@ -1,14 +1,14 @@ -$NetBSD: patch-netwerk_protocol_http_HttpChannelParent.cpp,v 1.2 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: patch-netwerk_protocol_http_HttpChannelParent.cpp,v 1.3 2012/08/28 12:42:01 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-07-04 16:04:06.000000000 +0000 +--- netwerk/protocol/http/HttpChannelParent.cpp.orig 2012-08-08 20:20:52.000000000 +0000 +++ netwerk/protocol/http/HttpChannelParent.cpp -@@ -340,6 +340,13 @@ HttpChannelParent::RecvUpdateAssociatedC - // Compiling this with GCC <= 4.4 fails with an internal compiler error - #pragma GCC optimize ("O0") - #endif +@@ -299,6 +299,13 @@ HttpChannelParent::RecvUpdateAssociatedC + return true; + } + +// Compiling with a version of GCC <= 4.4 fails with an internal compiler +// error. +#if !defined(__GNUC__) || \ @@ -16,6 +16,6 @@ $NetBSD: patch-netwerk_protocol_http_HttpChannelParent.cpp,v 1.2 2012/07/18 16:1 +#pragma GCC optimize ("O0") +#endif + - bool HttpChannelParent::RecvRedirect2Verify(const nsresult& result, + const RequestHeaderTuples& changedHeaders) diff --git a/devel/xulrunner/patches/patch-nsprpub_pr_include_md__dragonfly.cfg b/devel/xulrunner/patches/patch-nsprpub_pr_include_md__dragonfly.cfg deleted file mode 100644 index 611706b25ad..00000000000 --- a/devel/xulrunner/patches/patch-nsprpub_pr_include_md__dragonfly.cfg +++ /dev/null @@ -1,199 +0,0 @@ -$NetBSD: patch-nsprpub_pr_include_md__dragonfly.cfg,v 1.1 2012/01/07 18:47:39 marino Exp $ - ---- nsprpub/pr/include/md/_dragonfly.cfg.orig 2011-11-21 15:51:33.130151000 +0000 -+++ nsprpub/pr/include/md/_dragonfly.cfg -@@ -0,0 +1,194 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 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 Portable Runtime (NSPR). -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998-2000 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#ifndef nspr_cpucfg___ -+#define nspr_cpucfg___ -+ -+#ifndef XP_UNIX -+#define XP_UNIX -+#endif -+ -+#define PR_AF_INET6 28 /* same as AF_INET6 */ -+ -+#ifndef HAVE_LONG_LONG -+#define HAVE_LONG_LONG -+#endif -+ -+#if defined(__i386__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#undef HAVE_ALIGNED_DOUBLES -+#undef HAVE_ALIGNED_LONGLONGS -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+ -+#elif defined(__amd64__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#else -+ -+#error "Unknown CPU architecture" -+ -+#endif -+ -+#ifndef NO_NSPR_10_SUPPORT -+ -+#define BYTES_PER_BYTE PR_BYTES_PER_BYTE -+#define BYTES_PER_SHORT PR_BYTES_PER_SHORT -+#define BYTES_PER_INT PR_BYTES_PER_INT -+#define BYTES_PER_INT64 PR_BYTES_PER_INT64 -+#define BYTES_PER_LONG PR_BYTES_PER_LONG -+#define BYTES_PER_FLOAT PR_BYTES_PER_FLOAT -+#define BYTES_PER_DOUBLE PR_BYTES_PER_DOUBLE -+#define BYTES_PER_WORD PR_BYTES_PER_WORD -+#define BYTES_PER_DWORD PR_BYTES_PER_DWORD -+ -+#define BITS_PER_BYTE PR_BITS_PER_BYTE -+#define BITS_PER_SHORT PR_BITS_PER_SHORT -+#define BITS_PER_INT PR_BITS_PER_INT -+#define BITS_PER_INT64 PR_BITS_PER_INT64 -+#define BITS_PER_LONG PR_BITS_PER_LONG -+#define BITS_PER_FLOAT PR_BITS_PER_FLOAT -+#define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE -+#define BITS_PER_WORD PR_BITS_PER_WORD -+ -+#define BITS_PER_BYTE_LOG2 PR_BITS_PER_BYTE_LOG2 -+#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2 -+#define BITS_PER_INT_LOG2 PR_BITS_PER_INT_LOG2 -+#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2 -+#define BITS_PER_LONG_LOG2 PR_BITS_PER_LONG_LOG2 -+#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2 -+#define BITS_PER_DOUBLE_LOG2 PR_BITS_PER_DOUBLE_LOG2 -+#define BITS_PER_WORD_LOG2 PR_BITS_PER_WORD_LOG2 -+ -+#define ALIGN_OF_SHORT PR_ALIGN_OF_SHORT -+#define ALIGN_OF_INT PR_ALIGN_OF_INT -+#define ALIGN_OF_LONG PR_ALIGN_OF_LONG -+#define ALIGN_OF_INT64 PR_ALIGN_OF_INT64 -+#define ALIGN_OF_FLOAT PR_ALIGN_OF_FLOAT -+#define ALIGN_OF_DOUBLE PR_ALIGN_OF_DOUBLE -+#define ALIGN_OF_POINTER PR_ALIGN_OF_POINTER -+#define ALIGN_OF_WORD PR_ALIGN_OF_WORD -+ -+#define BYTES_PER_WORD_LOG2 PR_BYTES_PER_WORD_LOG2 -+#define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2 -+#define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2 -+ -+#endif /* NO_NSPR_10_SUPPORT */ -+ -+#endif /* nspr_cpucfg___ */ diff --git a/devel/xulrunner/patches/patch-nsprpub_pr_include_md__pth.h b/devel/xulrunner/patches/patch-nsprpub_pr_include_md__pth.h deleted file mode 100644 index 42013e782a9..00000000000 --- a/devel/xulrunner/patches/patch-nsprpub_pr_include_md__pth.h +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-nsprpub_pr_include_md__pth.h,v 1.1 2012/01/07 18:47:39 marino Exp $ - ---- nsprpub/pr/include/md/_pth.h.orig 2011-09-02 20:15:44.000000000 +0000 -+++ nsprpub/pr/include/md/_pth.h -@@ -146,7 +146,7 @@ - #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) - #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \ - || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ -- || defined(HPUX) || defined(FREEBSD) \ -+ || defined(HPUX) || defined(FREEBSD) || defined(__DragonFly__) \ - || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \ - || defined(NTO) || defined(DARWIN) \ - || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) -@@ -237,7 +237,7 @@ - #endif /* defined(_PR_DCETHREADS) */ - - #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ -- || defined(FREEBSD) || defined(SYMBIAN) -+ || defined(FREEBSD) || defined(SYMBIAN) || defined(__DragonFly__) - #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER) - #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) - #elif defined(NTO) -@@ -296,6 +296,7 @@ extern int (*_PT_aix_yield_fcn)(); - #elif defined(HPUX) || defined(SOLARIS) \ - || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ - || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ -+ || defined(__DragonFly__) \ - || defined(BSDI) || defined(NTO) || defined(DARWIN) \ - || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) - #define _PT_PTHREAD_YIELD() sched_yield() diff --git a/devel/xulrunner/patches/patch-nsprpub_pr_include_md_prosdep.h b/devel/xulrunner/patches/patch-nsprpub_pr_include_md_prosdep.h deleted file mode 100644 index cac420fb3bc..00000000000 --- a/devel/xulrunner/patches/patch-nsprpub_pr_include_md_prosdep.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-nsprpub_pr_include_md_prosdep.h,v 1.1 2012/01/07 18:47:39 marino Exp $ - ---- nsprpub/pr/include/md/prosdep.h.orig 2011-09-02 20:15:44.000000000 +0000 -+++ nsprpub/pr/include/md/prosdep.h -@@ -66,7 +66,7 @@ PR_BEGIN_EXTERN_C - #if defined(AIX) - #include "md/_aix.h" - --#elif defined(FREEBSD) -+#elif defined(FREEBSD) || defined(__DragonFly__) - #include "md/_freebsd.h" - - #elif defined(NETBSD) diff --git a/devel/xulrunner/patches/patch-nsprpub_pr_src_md_unix_uxrng.c b/devel/xulrunner/patches/patch-nsprpub_pr_src_md_unix_uxrng.c deleted file mode 100644 index bc041cdafec..00000000000 --- a/devel/xulrunner/patches/patch-nsprpub_pr_src_md_unix_uxrng.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-nsprpub_pr_src_md_unix_uxrng.c,v 1.1 2012/01/07 18:47:39 marino Exp $ - ---- nsprpub/pr/src/md/unix/uxrng.c.orig 2011-09-02 20:15:44.000000000 +0000 -+++ nsprpub/pr/src/md/unix/uxrng.c -@@ -126,7 +126,7 @@ GetHighResClock(void *buf, size_t maxbyt - - #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \ - || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD) \ -- || defined(SYMBIAN)) -+ || defined(SYMBIAN)) || defined(__DragonFly__) - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> diff --git a/devel/xulrunner/patches/patch-nsprpub_pr_src_pthreads_ptio.c b/devel/xulrunner/patches/patch-nsprpub_pr_src_pthreads_ptio.c deleted file mode 100644 index 9f5d1e4fc33..00000000000 --- a/devel/xulrunner/patches/patch-nsprpub_pr_src_pthreads_ptio.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-nsprpub_pr_src_pthreads_ptio.c,v 1.1 2012/01/07 18:47:39 marino Exp $ - ---- nsprpub/pr/src/pthreads/ptio.c.orig 2011-09-02 20:15:44.000000000 +0000 -+++ nsprpub/pr/src/pthreads/ptio.c -@@ -212,7 +212,8 @@ static PRBool _pr_ipv6_v6only_on_by_defa - || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ - || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ - || defined(BSDI) || defined(NTO) || defined(DARWIN) \ -- || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) -+ || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) \ -+ || defined(__DragonFly__) - #define _PRSelectFdSetArg_t fd_set * - #else - #error "Cannot determine architecture" -@@ -3285,7 +3286,7 @@ static PRIOMethods _pr_socketpollfd_meth - || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \ - || defined(OPENBSD) || defined(BSDI) || defined(NTO) \ - || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) \ -- || defined(SYMBIAN) -+ || defined(SYMBIAN) || defined(__DragonFly__) - #define _PR_FCNTL_FLAGS O_NONBLOCK - #else - #error "Can't determine architecture" diff --git a/devel/xulrunner/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c b/devel/xulrunner/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c deleted file mode 100644 index 72e319d315f..00000000000 --- a/devel/xulrunner/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-nsprpub_pr_src_pthreads_ptsynch.c,v 1.1 2012/01/07 18:47:39 marino Exp $ - ---- nsprpub/pr/src/pthreads/ptsynch.c.orig 2011-09-02 20:15:44.000000000 +0000 -+++ nsprpub/pr/src/pthreads/ptsynch.c -@@ -842,7 +842,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor - */ - #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ - || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \ -- || defined(DARWIN) || defined(SYMBIAN) -+ || defined(DARWIN) || defined(SYMBIAN) || defined(__DragonFly__) - /* union semun is defined by including <sys/sem.h> */ - #else - /* according to X/OPEN we have to define it ourselves */ diff --git a/devel/xulrunner/patches/patch-pa b/devel/xulrunner/patches/patch-pa index e5742d8447c..bd066d03d25 100644 --- a/devel/xulrunner/patches/patch-pa +++ b/devel/xulrunner/patches/patch-pa @@ -1,6 +1,6 @@ -$NetBSD: patch-pa,v 1.4 2012/04/01 15:18:45 ryoon Exp $ +$NetBSD: patch-pa,v 1.5 2012/08/28 12:42:01 ryoon Exp $ ---- xulrunner/installer/mozilla-js.pc.in.orig 2012-03-13 01:37:21.000000000 +0000 +--- xulrunner/installer/mozilla-js.pc.in.orig 2012-08-08 20:21:11.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 ceb1b83ca74..8894e4a3a80 100644 --- a/devel/xulrunner/patches/patch-pb +++ b/devel/xulrunner/patches/patch-pb @@ -1,6 +1,6 @@ -$NetBSD: patch-pb,v 1.5 2012/04/01 15:18:45 ryoon Exp $ +$NetBSD: patch-pb,v 1.6 2012/08/28 12:42:01 ryoon Exp $ ---- xulrunner/installer/libxul.pc.in.orig 2012-03-13 01:37:21.000000000 +0000 +--- xulrunner/installer/libxul.pc.in.orig 2012-08-08 20:21:11.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 672699b8b9b..cc5a98fedb2 100644 --- a/devel/xulrunner/patches/patch-pc +++ b/devel/xulrunner/patches/patch-pc @@ -1,6 +1,6 @@ -$NetBSD: patch-pc,v 1.4 2012/04/01 15:18:45 ryoon Exp $ +$NetBSD: patch-pc,v 1.5 2012/08/28 12:42:01 ryoon Exp $ ---- xulrunner/installer/libxul-embedding.pc.in.orig 2012-03-13 01:37:21.000000000 +0000 +--- xulrunner/installer/libxul-embedding.pc.in.orig 2012-08-08 20:21:11.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 764312f766a..35bb712236b 100644 --- a/devel/xulrunner/patches/patch-pd +++ b/devel/xulrunner/patches/patch-pd @@ -1,6 +1,6 @@ -$NetBSD: patch-pd,v 1.5 2012/04/01 15:18:45 ryoon Exp $ +$NetBSD: patch-pd,v 1.6 2012/08/28 12:42:01 ryoon Exp $ ---- xulrunner/installer/mozilla-nss.pc.in.orig 2012-03-13 01:37:21.000000000 +0000 +--- xulrunner/installer/mozilla-nss.pc.in.orig 2012-08-08 20:21:11.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 63876e693ab..77ebd9832a4 100644 --- a/devel/xulrunner/patches/patch-pg +++ b/devel/xulrunner/patches/patch-pg @@ -1,6 +1,6 @@ -$NetBSD: patch-pg,v 1.4 2012/04/01 15:18:45 ryoon Exp $ +$NetBSD: patch-pg,v 1.5 2012/08/28 12:42:01 ryoon Exp $ ---- xulrunner/installer/mozilla-nspr.pc.in.orig 2012-03-13 01:37:21.000000000 +0000 +--- xulrunner/installer/mozilla-nspr.pc.in.orig 2012-08-08 20:21:11.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 3adce9b02cc..3688d499d48 100644 --- a/devel/xulrunner/patches/patch-rc +++ b/devel/xulrunner/patches/patch-rc @@ -1,8 +1,11 @@ -$NetBSD: patch-rc,v 1.5 2011/07/11 12:46:14 tnn Exp $ +$NetBSD: patch-rc,v 1.6 2012/08/28 12:42:01 ryoon Exp $ ---- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2011-01-22 00:24:21.000000000 +0000 +--- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2012-08-08 20:19:37.000000000 +0000 +++ browser/branding/unofficial/locales/en-US/brand.dtd -@@ -1,4 +1,4 @@ +@@ -2,7 +2,7 @@ + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + -<!ENTITY brandShortName "Mozilla Developer Preview"> -<!ENTITY brandFullName "Mozilla Developer Preview"> +<!ENTITY brandShortName "Browser"> diff --git a/devel/xulrunner/patches/patch-security_nss_cmd_shlibsign_sign.sh b/devel/xulrunner/patches/patch-security_nss_cmd_shlibsign_sign.sh deleted file mode 100644 index 3de09b74326..00000000000 --- a/devel/xulrunner/patches/patch-security_nss_cmd_shlibsign_sign.sh +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-security_nss_cmd_shlibsign_sign.sh,v 1.1 2011/07/12 00:19:45 tnn Exp $ - -This tries to dlopen libsoftokn3.so which is linked against sqlite3, -so we need a directory containing libsqlite3.so in the search path, -beside the directory containing libsoftokn3.so itself. - ---- security/nss/cmd/shlibsign/sign.sh.orig 2011-06-15 21:57:52.000000000 +0000 -+++ security/nss/cmd/shlibsign/sign.sh -@@ -26,7 +26,7 @@ WIN*) - export LIBPATH - SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH - export SHLIB_PATH -- LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH -+ LD_LIBRARY_PATH=${1}/lib:${4}:${PREFIX}/lib:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH - export DYLD_LIBRARY_PATH diff --git a/devel/xulrunner/patches/patch-storage_src_Makefile.in b/devel/xulrunner/patches/patch-storage_src_Makefile.in index 9df5e3147b5..ad2813b893a 100644 --- a/devel/xulrunner/patches/patch-storage_src_Makefile.in +++ b/devel/xulrunner/patches/patch-storage_src_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-storage_src_Makefile.in,v 1.2 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: patch-storage_src_Makefile.in,v 1.3 2012/08/28 12:42:01 ryoon Exp $ * Support jemalloc on *BSD ---- storage/src/Makefile.in.orig 2012-07-04 16:04:12.000000000 +0000 +--- storage/src/Makefile.in.orig 2012-08-08 20:20:58.000000000 +0000 +++ storage/src/Makefile.in -@@ -67,6 +67,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY +@@ -34,6 +34,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY endif endif diff --git a/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk b/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk index 96bd553ebb7..d034d3dd379 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.3 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.4 2012/08/28 12:42:01 ryoon Exp $ ---- toolkit/toolkit-tiers.mk.orig 2012-07-04 16:04:20.000000000 +0000 +--- toolkit/toolkit-tiers.mk.orig 2012-08-08 20:21:07.000000000 +0000 +++ toolkit/toolkit-tiers.mk -@@ -80,7 +80,7 @@ ifdef MOZ_UPDATER +@@ -47,7 +47,7 @@ ifdef MOZ_UPDATER ifndef MOZ_NATIVE_BZ2 tier_platform_dirs += modules/libbz2 endif diff --git a/devel/xulrunner/patches/patch-xd b/devel/xulrunner/patches/patch-xd index c28edb73897..c95badbdd66 100644 --- a/devel/xulrunner/patches/patch-xd +++ b/devel/xulrunner/patches/patch-xd @@ -1,8 +1,8 @@ -$NetBSD: patch-xd,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-xd,v 1.2 2012/08/28 12:42:01 ryoon Exp $ NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig 2009-07-09 10:12:51.000000000 +0200 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig 2012-08-13 05:28:08.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 e50a63245ec..36cfbc81c4c 100644 --- a/devel/xulrunner/patches/patch-xe +++ b/devel/xulrunner/patches/patch-xe @@ -1,10 +1,10 @@ -$NetBSD: patch-xe,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-xe,v 1.2 2012/08/28 12:42:01 ryoon Exp $ NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad. ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2009-06-29 18:15:33.000000000 +0200 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2012-08-08 20:21:11.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp -@@ -132,6 +132,15 @@ extern "C" { +@@ -100,6 +100,15 @@ extern "C" { } } @@ -20,7 +20,7 @@ NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad. XPTC_PUBLIC_API(nsresult) XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, PRUint32 paramCount, nsXPTCVariant* params) -@@ -139,30 +148,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR +@@ -107,30 +116,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR PRUint32 result; __asm__ __volatile__( diff --git a/devel/xulrunner/patches/patch-xf b/devel/xulrunner/patches/patch-xf index 973650058c9..84656110d17 100644 --- a/devel/xulrunner/patches/patch-xf +++ b/devel/xulrunner/patches/patch-xf @@ -1,10 +1,10 @@ -$NetBSD: patch-xf,v 1.2 2009/12/01 22:22:30 tnn Exp $ +$NetBSD: patch-xf,v 1.3 2012/08/28 12:42:01 ryoon Exp $ NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ae. ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2009-06-29 18:15:33.000000000 +0200 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2012-08-08 20:21:11.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp -@@ -123,17 +123,27 @@ extern "C" { +@@ -91,17 +91,27 @@ extern "C" { } } diff --git a/devel/xulrunner/patches/patch-xk b/devel/xulrunner/patches/patch-xk index 920aae396df..c0b3465d3c9 100644 --- a/devel/xulrunner/patches/patch-xk +++ b/devel/xulrunner/patches/patch-xk @@ -1,94 +1,10 @@ -$NetBSD: patch-xk,v 1.1.1.1 2009/08/05 02:59:49 tnn Exp $ +$NetBSD: patch-xk,v 1.2 2012/08/28 12:42:01 ryoon Exp $ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2009-06-29 18:15:33.000000000 +0200 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2012-08-08 20:21:11.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s -@@ -1,43 +1,43 @@ --# -*- Mode: Asm -*- --# --# ***** BEGIN LICENSE BLOCK ***** --# Version: MPL 1.1/GPL 2.0/LGPL 2.1 --# --# The contents of this file are subject to the Mozilla Public License Version --# 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 mozilla.org code. --# --# The Initial Developer of the Original Code is --# Netscape Communications Corporation. --# Portions created by the Initial Developer are Copyright (C) 1999 --# the Initial Developer. All Rights Reserved. --# --# Contributor(s): --# Franz.Sirl-kernel@lauterbach.com (Franz Sirl) --# beard@netscape.com (Patrick Beard) --# waterson@netscape.com (Chris Waterson) --# --# Alternatively, the contents of this file may be used under the terms of --# either the GNU General Public License Version 2 or later (the "GPL"), or --# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), --# in which case the provisions of the GPL or the LGPL are applicable instead --# of those above. If you wish to allow use of your version of this file only --# under the terms of either the GPL or the LGPL, and not to allow others to --# use your version of this file under the terms of the MPL, indicate your --# decision by deleting the provisions above and replace them with the notice --# and other provisions required by the GPL or the LGPL. If you do not delete --# the provisions above, a recipient may use your version of this file under --# the terms of any one of the MPL, the GPL or the LGPL. --# --# ***** END LICENSE BLOCK ***** -+// -*- Mode: Asm -*- -+// -+// ***** BEGIN LICENSE BLOCK ***** -+// Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+// -+// The contents of this file are subject to the Mozilla Public License Version -+// 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 mozilla.org code. -+// -+// The Initial Developer of the Original Code is -+// Netscape Communications Corporation. -+// Portions created by the Initial Developer are Copyright (C) 1999 -+// the Initial Developer. All Rights Reserved. -+// -+// Contributor(s): -+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl) -+// beard@netscape.com (Patrick Beard) -+// waterson@netscape.com (Chris Waterson) -+// -+// Alternatively, the contents of this file may be used under the terms of -+// either the GNU General Public License Version 2 or later (the "GPL"), or -+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+// in which case the provisions of the GPL or the LGPL are applicable instead -+// of those above. If you wish to allow use of your version of this file only -+// under the terms of either the GPL or the LGPL, and not to allow others to -+// use your version of this file under the terms of the MPL, indicate your -+// decision by deleting the provisions above and replace them with the notice -+// and other provisions required by the GPL or the LGPL. If you do not delete -+// the provisions above, a recipient may use your version of this file under -+// the terms of any one of the MPL, the GPL or the LGPL. -+// -+// ***** END LICENSE BLOCK ***** - - .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4 - .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 -@@ -60,23 +60,23 @@ +@@ -25,23 +25,23 @@ .type SharedStub,@function SharedStub: @@ -122,7 +38,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. stfd f2,48(sp) stfd f3,56(sp) stfd f4,64(sp) -@@ -85,21 +85,21 @@ SharedStub: +@@ -50,21 +50,21 @@ SharedStub: stfd f7,88(sp) stfd f8,96(sp) diff --git a/devel/xulrunner/patches/patch-xl b/devel/xulrunner/patches/patch-xl index a05e18905be..c8c6e589220 100644 --- a/devel/xulrunner/patches/patch-xl +++ b/devel/xulrunner/patches/patch-xl @@ -1,94 +1,10 @@ -$NetBSD: patch-xl,v 1.1.1.1 2009/08/05 02:59:49 tnn Exp $ +$NetBSD: patch-xl,v 1.2 2012/08/28 12:42:01 ryoon Exp $ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2009-06-29 18:15:33.000000000 +0200 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2012-08-08 20:21:11.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s -@@ -1,43 +1,43 @@ --# -*- Mode: Asm -*- --# --# ***** BEGIN LICENSE BLOCK ***** --# Version: MPL 1.1/GPL 2.0/LGPL 2.1 --# --# The contents of this file are subject to the Mozilla Public License Version --# 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 mozilla.org code. --# --# The Initial Developer of the Original Code is --# Netscape Communications Corporation. --# Portions created by the Initial Developer are Copyright (C) 1999 --# the Initial Developer. All Rights Reserved. --# --# Contributor(s): --# Franz.Sirl-kernel@lauterbach.com (Franz Sirl) --# beard@netscape.com (Patrick Beard) --# waterson@netscape.com (Chris Waterson) --# --# Alternatively, the contents of this file may be used under the terms of --# either the GNU General Public License Version 2 or later (the "GPL"), or --# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), --# in which case the provisions of the GPL or the LGPL are applicable instead --# of those above. If you wish to allow use of your version of this file only --# under the terms of either the GPL or the LGPL, and not to allow others to --# use your version of this file under the terms of the MPL, indicate your --# decision by deleting the provisions above and replace them with the notice --# and other provisions required by the GPL or the LGPL. If you do not delete --# the provisions above, a recipient may use your version of this file under --# the terms of any one of the MPL, the GPL or the LGPL. --# --# ***** END LICENSE BLOCK ***** -+// -*- Mode: Asm -*- -+// -+// ***** BEGIN LICENSE BLOCK ***** -+// Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+// -+// The contents of this file are subject to the Mozilla Public License Version -+// 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 mozilla.org code. -+// -+// The Initial Developer of the Original Code is -+// Netscape Communications Corporation. -+// Portions created by the Initial Developer are Copyright (C) 1999 -+// the Initial Developer. All Rights Reserved. -+// -+// Contributor(s): -+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl) -+// beard@netscape.com (Patrick Beard) -+// waterson@netscape.com (Chris Waterson) -+// -+// Alternatively, the contents of this file may be used under the terms of -+// either the GNU General Public License Version 2 or later (the "GPL"), or -+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+// in which case the provisions of the GPL or the LGPL are applicable instead -+// of those above. If you wish to allow use of your version of this file only -+// under the terms of either the GPL or the LGPL, and not to allow others to -+// use your version of this file under the terms of the MPL, indicate your -+// decision by deleting the provisions above and replace them with the notice -+// and other provisions required by the GPL or the LGPL. If you do not delete -+// the provisions above, a recipient may use your version of this file under -+// the terms of any one of the MPL, the GPL or the LGPL. -+// -+// ***** END LICENSE BLOCK ***** - .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4 - .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 - .set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14 -@@ -55,41 +55,41 @@ +@@ -20,41 +20,41 @@ .section ".text" .align 2 @@ -155,7 +71,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. lfd f2,40(r30) lfd f3,48(r30) lfd f4,56(r30) -@@ -98,18 +98,13 @@ XPTC_InvokeByIndex: +@@ -63,18 +63,13 @@ XPTC_InvokeByIndex: lfd f7,80(r30) lfd f8,88(r30) @@ -180,7 +96,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. lwz r5,8(r30) lwz r6,12(r30) lwz r7,16(r30) -@@ -117,13 +112,13 @@ XPTC_InvokeByIndex: +@@ -82,13 +77,13 @@ XPTC_InvokeByIndex: lwz r9,24(r30) lwz r10,28(r30) diff --git a/devel/xulrunner/patches/patch-xm b/devel/xulrunner/patches/patch-xm deleted file mode 100644 index 869fcf99b2b..00000000000 --- a/devel/xulrunner/patches/patch-xm +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-xm,v 1.1.1.1 2009/08/05 02:59:49 tnn Exp $ - -NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla. - ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2009-06-29 18:15:33.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp -@@ -40,9 +40,9 @@ - - // Platform specific code to invoke XPCOM methods on native objects - --// The purpose of XPTC_InvokeByIndex() is to map a platform -+// The purpose of NS_InvokeByIndex_P() is to map a platform - // indepenpent call to the platform ABI. To do that, --// XPTC_InvokeByIndex() has to determine the method to call via vtable -+// NS_InvokeByIndex_P() has to determine the method to call via vtable - // access. The parameters for the method are read from the - // nsXPTCVariant* and prepared for the native ABI. For the Linux/PPC - // ABI this means that the first 8 integral and floating point -@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d, - if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack - *((double*) d) = s->val.d; - d += 2; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 2; -+#endif - } - } - else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d, - else { - *((float*) d) = s->val.f; - d += 1; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 1; -+#endif - } - } - else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64 -@@ -142,6 +146,6 @@ invoke_copy_to_stack(PRUint32* d, - } - - extern "C" --XPTC_PUBLIC_API(nsresult) --XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+EXPORT_XPCOM_API(nsresult) -+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex, - PRUint32 paramCount, nsXPTCVariant* params); diff --git a/devel/xulrunner/patches/patch-xn b/devel/xulrunner/patches/patch-xn index b125509b8cc..bbbfba50965 100644 --- a/devel/xulrunner/patches/patch-xn +++ b/devel/xulrunner/patches/patch-xn @@ -1,53 +1,52 @@ -$NetBSD: patch-xn,v 1.1 2010/04/01 08:25:07 jmcneill Exp $ +$NetBSD: patch-xn,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig 2010-03-31 05:56:51.000000000 -0400 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s 2010-03-31 06:28:51.000000000 -0400 -@@ -42,8 +42,46 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig 2012-08-08 20:21:11.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s +@@ -16,6 +16,47 @@ + #include <sys/asm.h> + #endif - /* This code is for MIPS using the O32 ABI. */ - --#include <sys/regdef.h> --#include <sys/asm.h> +#ifdef __NetBSD__ +# include <machine/regdef.h> +# include <machine/asm.h> +# ifndef fp -+# define fp s8 ++# define fp s8 +# endif +# ifndef PTRLOG +# if SZREG == 4 -+# define PTRLOG 2 ++# define PTRLOG 2 +# else -+# define PTRLOG 3 ++# define PTRLOG 3 +# endif +# endif +# ifndef SETUP_GP +# if defined(__mips_o32) -+# define SETUP_GP \ -+ .set push; \ -+ .set noreorder; \ -+ .cpload t9; \ -+ .set pop -+# define SAVE_GP(x) \ -+ .cprestore x ++# define SETUP_GP \ ++ .set push; \ ++ .set noreorder; \ ++ .cpload t9; \ ++ .set pop ++# define SAVE_GP(x) \ ++ .cprestore x +# else -+# define SETUP_GP -+# define SAVE_GP(x) ++# define SETUP_GP ++# define SAVE_GP(x) +# endif +# endif +# ifndef ALSZ +# if defined(__mips_n32) || defined(__mips_n64) -+# define ALSZ 15 -+# define ALMASK ~15 ++# define ALSZ 15 ++# define ALMASK ~15 +# else -+# define ALSZ 7 -+# define ALMASK ~7 ++# define ALSZ 7 ++# define ALMASK ~7 +# endif +# endif +#else +# include <sys/regdef.h> +# include <sys/asm.h> +#endif - ++ # NARGSAVE is the argument space in the callers frame, including extra # 'shadowed' space for the argument registers. The minimum of 4 + # argument slots is sometimes predefined in the header files. diff --git a/devel/xulrunner/patches/patch-xo b/devel/xulrunner/patches/patch-xo index 0b40b798711..0ee5e8ee51c 100644 --- a/devel/xulrunner/patches/patch-xo +++ b/devel/xulrunner/patches/patch-xo @@ -1,53 +1,52 @@ -$NetBSD: patch-xo,v 1.1 2010/04/01 08:25:07 jmcneill Exp $ +$NetBSD: patch-xo,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig 2010-03-31 06:23:31.000000000 -0400 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s 2010-03-31 06:28:23.000000000 -0400 -@@ -26,8 +26,46 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig 2012-08-08 20:21:11.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s +@@ -14,6 +14,47 @@ + #include <sys/asm.h> + #endif - /* This code is for MIPS using the O32 ABI. */ - --#include <sys/regdef.h> --#include <sys/asm.h> +#ifdef __NetBSD__ +# include <machine/regdef.h> +# include <machine/asm.h> +# ifndef fp -+# define fp s8 ++# define fp s8 +# endif +# ifndef PTRLOG +# if SZREG == 4 -+# define PTRLOG 2 ++# define PTRLOG 2 +# else -+# define PTRLOG 3 ++# define PTRLOG 3 +# endif +# endif +# ifndef SETUP_GP +# if defined(__mips_o32) -+# define SETUP_GP \ -+ .set push; \ -+ .set noreorder; \ -+ .cpload t9; \ -+ .set pop -+# define SAVE_GP(x) \ -+ .cprestore x ++# define SETUP_GP \ ++ .set push; \ ++ .set noreorder; \ ++ .cpload t9; \ ++ .set pop ++# define SAVE_GP(x) \ ++ .cprestore x +# else -+# define SETUP_GP -+# define SAVE_GP(x) ++# define SETUP_GP ++# define SAVE_GP(x) +# endif +# endif +# ifndef ALSZ +# if defined(__mips_n32) || defined(__mips_n64) -+# define ALSZ 15 -+# define ALMASK ~15 ++# define ALSZ 15 ++# define ALMASK ~15 +# else -+# define ALSZ 7 -+# define ALMASK ~7 ++# define ALSZ 7 ++# define ALMASK ~7 +# endif +# endif +#else +# include <sys/regdef.h> +# include <sys/asm.h> +#endif - ++ # NARGSAVE is the argument space in the callers frame, including extra # 'shadowed' space for the argument registers. The minimum of 4 + # argument slots is sometimes predefined in the header files. diff --git a/devel/xulrunner/patches/patch-xpcom_Makefile.in b/devel/xulrunner/patches/patch-xpcom_Makefile.in index c01c0bf4763..259ecaa31a5 100644 --- a/devel/xulrunner/patches/patch-xpcom_Makefile.in +++ b/devel/xulrunner/patches/patch-xpcom_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-xpcom_Makefile.in,v 1.1 2012/03/06 12:34:09 ryoon Exp $ +$NetBSD: patch-xpcom_Makefile.in,v 1.2 2012/08/28 12:42:01 ryoon Exp $ ---- xpcom/Makefile.in.orig 2012-02-16 06:40:56.000000000 +0000 +--- xpcom/Makefile.in.orig 2012-08-08 20:21:10.000000000 +0000 +++ xpcom/Makefile.in -@@ -68,6 +68,10 @@ DIRS += windbgdlg +@@ -35,6 +35,10 @@ DIRS += windbgdlg endif endif diff --git a/devel/xulrunner/patches/patch-xpcom_idl-parser_Makefile.in b/devel/xulrunner/patches/patch-xpcom_idl-parser_Makefile.in index ef8dc076cd6..a3da3d3dc9b 100644 --- a/devel/xulrunner/patches/patch-xpcom_idl-parser_Makefile.in +++ b/devel/xulrunner/patches/patch-xpcom_idl-parser_Makefile.in @@ -1,15 +1,15 @@ -$NetBSD: patch-xpcom_idl-parser_Makefile.in,v 1.2 2012/07/18 16:10:06 ryoon Exp $ +$NetBSD: patch-xpcom_idl-parser_Makefile.in,v 1.3 2012/08/28 12:42:01 ryoon Exp $ https://bugzilla.mozilla.org/show_bug.cgi?id=736961 ---- xpcom/idl-parser/Makefile.in.orig 2012-07-04 16:04:22.000000000 +0000 +--- xpcom/idl-parser/Makefile.in.orig 2012-08-08 20:21:11.000000000 +0000 +++ xpcom/idl-parser/Makefile.in -@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS) +@@ -29,7 +29,7 @@ include $(topsrcdir)/config/rules.mk + export:: $(PARSER_SRCS) $(PLY_PROGS) $(PYTHON_PATH) \ $(PLY_INCLUDE) \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen +- $(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_idl-parser_header.py b/devel/xulrunner/patches/patch-xpcom_idl-parser_header.py deleted file mode 100644 index f2dbebed5fd..00000000000 --- a/devel/xulrunner/patches/patch-xpcom_idl-parser_header.py +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-xpcom_idl-parser_header.py,v 1.3 2012/06/05 18:09:21 ryoon Exp $ - -https://bugzilla.mozilla.org/show_bug.cgi?id=754625 - ---- xpcom/idl-parser/header.py.orig 2012-05-23 18:57:10.000000000 +0000 -+++ xpcom/idl-parser/header.py -@@ -505,10 +505,9 @@ if __name__ == '__main__': - print >>sys.stderr, "--regen useless without --cachedir" - # Delete the lex/yacc files. Ply is too stupid to regenerate them - # properly -- deadfiles = os.path.join(options.cachedir, "*.py*") -- for filename in glob.glob(deadfiles): -- print filename -- os.remove(filename) -+ for fileglobs in [os.path.join(options.cachedir, f) for f in ["xpidllex.py*", "xpidlyacc.py*"]]: -+ for filename in glob.glob(fileglobs): -+ os.remove(filename) - - # Instantiate the parser. - p = xpidl.IDLParser(outputdir=options.cachedir) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index e1fac2f8bd8..0d572371336 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.104 2012/07/20 06:45:35 abs Exp $ +# $NetBSD: Makefile,v 1.105 2012/08/28 12:42:02 ryoon Exp $ .include "../../devel/xulrunner/dist.mk" PKGNAME= firefox-${FIREFOX_VER} -PKGREVISION= 1 CATEGORIES= www MAINTAINER= tnn@NetBSD.org diff --git a/www/firefox/PLIST b/www/firefox/PLIST index 6cc1210343e..cc32882538d 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.54 2012/07/20 06:45:35 abs Exp $ +@comment $NetBSD: PLIST,v 1.55 2012/08/28 12:42:02 ryoon Exp $ bin/firefox lib/firefox/application.ini lib/firefox/blocklist.xml lib/firefox/chrome.manifest ${PLIST.nobranding}lib/firefox/chrome/browser/content/branding/about-background.png +lib/firefox/chrome/browser/content/branding/about-background.png lib/firefox/chrome/browser/content/branding/about-logo.png lib/firefox/chrome/browser/content/branding/about-wordmark.png lib/firefox/chrome/browser/content/branding/about.png @@ -52,8 +53,12 @@ lib/firefox/chrome/browser/content/browser/debugger-controller.js lib/firefox/chrome/browser/content/browser/debugger-view.js lib/firefox/chrome/browser/content/browser/debugger.css lib/firefox/chrome/browser/content/browser/debugger.xul +lib/firefox/chrome/browser/content/browser/devtools/HUDService-content.js lib/firefox/chrome/browser/content/browser/devtools/csshtmltree.xul lib/firefox/chrome/browser/content/browser/devtools/cssruleview.xul +lib/firefox/chrome/browser/content/browser/devtools/gcli.css +lib/firefox/chrome/browser/content/browser/devtools/gclioutput.xhtml +lib/firefox/chrome/browser/content/browser/devtools/gclitooltip.xhtml lib/firefox/chrome/browser/content/browser/devtools/layoutview/view.css lib/firefox/chrome/browser/content/browser/devtools/layoutview/view.xhtml lib/firefox/chrome/browser/content/browser/devtools/styleinspector.css @@ -128,6 +133,25 @@ lib/firefox/chrome/browser/content/browser/preferences/fonts.js lib/firefox/chrome/browser/content/browser/preferences/fonts.xul lib/firefox/chrome/browser/content/browser/preferences/handlers.css lib/firefox/chrome/browser/content/browser/preferences/handlers.xml +lib/firefox/chrome/browser/content/browser/preferences/in-content/advanced.js +lib/firefox/chrome/browser/content/browser/preferences/in-content/advanced.xul +lib/firefox/chrome/browser/content/browser/preferences/in-content/applications.js +lib/firefox/chrome/browser/content/browser/preferences/in-content/applications.xul +lib/firefox/chrome/browser/content/browser/preferences/in-content/content.js +lib/firefox/chrome/browser/content/browser/preferences/in-content/content.xul +lib/firefox/chrome/browser/content/browser/preferences/in-content/landing.xul +lib/firefox/chrome/browser/content/browser/preferences/in-content/main.js +lib/firefox/chrome/browser/content/browser/preferences/in-content/main.xul +lib/firefox/chrome/browser/content/browser/preferences/in-content/preferences.js +lib/firefox/chrome/browser/content/browser/preferences/in-content/preferences.xul +lib/firefox/chrome/browser/content/browser/preferences/in-content/privacy.js +lib/firefox/chrome/browser/content/browser/preferences/in-content/privacy.xul +lib/firefox/chrome/browser/content/browser/preferences/in-content/security.js +lib/firefox/chrome/browser/content/browser/preferences/in-content/security.xul +lib/firefox/chrome/browser/content/browser/preferences/in-content/sync.js +lib/firefox/chrome/browser/content/browser/preferences/in-content/sync.xul +lib/firefox/chrome/browser/content/browser/preferences/in-content/tabs.js +lib/firefox/chrome/browser/content/browser/preferences/in-content/tabs.xul lib/firefox/chrome/browser/content/browser/preferences/languages.js lib/firefox/chrome/browser/content/browser/preferences/languages.xul lib/firefox/chrome/browser/content/browser/preferences/main.js @@ -146,6 +170,7 @@ lib/firefox/chrome/browser/content/browser/preferences/sync.js lib/firefox/chrome/browser/content/browser/preferences/sync.xul lib/firefox/chrome/browser/content/browser/preferences/tabs.js lib/firefox/chrome/browser/content/browser/preferences/tabs.xul +lib/firefox/chrome/browser/content/browser/safeMode.css lib/firefox/chrome/browser/content/browser/safeMode.js lib/firefox/chrome/browser/content/browser/safeMode.xul lib/firefox/chrome/browser/content/browser/safebrowsing/blockedSite.xhtml @@ -246,15 +271,22 @@ lib/firefox/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-start.p lib/firefox/chrome/browser/skin/classic/browser/devtools/commandline.png lib/firefox/chrome/browser/skin/classic/browser/devtools/common.css lib/firefox/chrome/browser/skin/classic/browser/devtools/csshtmltree.css +lib/firefox/chrome/browser/skin/classic/browser/devtools/debugger-pause.png +lib/firefox/chrome/browser/skin/classic/browser/devtools/debugger-play.png +lib/firefox/chrome/browser/skin/classic/browser/devtools/debugger-step-in.png +lib/firefox/chrome/browser/skin/classic/browser/devtools/debugger-step-out.png +lib/firefox/chrome/browser/skin/classic/browser/devtools/debugger-step-over.png lib/firefox/chrome/browser/skin/classic/browser/devtools/debugger.css lib/firefox/chrome/browser/skin/classic/browser/devtools/dropmarker.png lib/firefox/chrome/browser/skin/classic/browser/devtools/gcli.css lib/firefox/chrome/browser/skin/classic/browser/devtools/goto-mdn.png lib/firefox/chrome/browser/skin/classic/browser/devtools/htmlpanel.css lib/firefox/chrome/browser/skin/classic/browser/devtools/inspect-button.png +lib/firefox/chrome/browser/skin/classic/browser/devtools/inspector-option-icon.png lib/firefox/chrome/browser/skin/classic/browser/devtools/itemArrow-ltr.png lib/firefox/chrome/browser/skin/classic/browser/devtools/itemArrow-rtl.png lib/firefox/chrome/browser/skin/classic/browser/devtools/itemToggle.png +lib/firefox/chrome/browser/skin/classic/browser/devtools/layout-background-grid.png lib/firefox/chrome/browser/skin/classic/browser/devtools/layout-background.png lib/firefox/chrome/browser/skin/classic/browser/devtools/layout-buttons.png lib/firefox/chrome/browser/skin/classic/browser/devtools/layoutview.css @@ -264,6 +296,9 @@ lib/firefox/chrome/browser/skin/classic/browser/devtools/orion-container.css lib/firefox/chrome/browser/skin/classic/browser/devtools/orion-debug-location.png lib/firefox/chrome/browser/skin/classic/browser/devtools/orion-task.png lib/firefox/chrome/browser/skin/classic/browser/devtools/orion.css +lib/firefox/chrome/browser/skin/classic/browser/devtools/responsive-background.png +lib/firefox/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer.png +lib/firefox/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer.png lib/firefox/chrome/browser/skin/classic/browser/devtools/splitview.css lib/firefox/chrome/browser/skin/classic/browser/devtools/styleeditor.css lib/firefox/chrome/browser/skin/classic/browser/devtools/treepanel-button.png @@ -317,6 +352,7 @@ lib/firefox/chrome/browser/skin/classic/browser/preferences/Options.png lib/firefox/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css lib/firefox/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png lib/firefox/chrome/browser/skin/classic/browser/preferences/applications.css +lib/firefox/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css lib/firefox/chrome/browser/skin/classic/browser/preferences/mail.png lib/firefox/chrome/browser/skin/classic/browser/preferences/preferences.css lib/firefox/chrome/browser/skin/classic/browser/sanitizeDialog.css @@ -371,6 +407,7 @@ lib/firefox/chrome/en-US/locale/browser/devtools/gcli.properties lib/firefox/chrome/en-US/locale/browser/devtools/gclicommands.properties lib/firefox/chrome/en-US/locale/browser/devtools/inspector.properties lib/firefox/chrome/en-US/locale/browser/devtools/layoutview.dtd +lib/firefox/chrome/en-US/locale/browser/devtools/responsiveUI.properties lib/firefox/chrome/en-US/locale/browser/devtools/scratchpad.dtd lib/firefox/chrome/en-US/locale/browser/devtools/scratchpad.properties lib/firefox/chrome/en-US/locale/browser/devtools/sourceeditor.dtd @@ -450,11 +487,45 @@ lib/firefox/chrome/en-US/locale/en-US/services/errors.properties lib/firefox/chrome/en-US/locale/en-US/services/sync.properties lib/firefox/chrome/en-US/locale/feedback/main.dtd lib/firefox/chrome/en-US/locale/feedback/main.properties +lib/firefox/chrome/en-US/locale/pdfviewer/chrome.properties +lib/firefox/chrome/en-US/locale/pdfviewer/viewer.properties lib/firefox/chrome/icons/default/default16.png lib/firefox/chrome/icons/default/default32.png lib/firefox/chrome/icons/default/default48.png lib/firefox/chrome/localized.manifest lib/firefox/chrome/nonlocalized.manifest +lib/firefox/chrome/pdfjs/LICENSE +lib/firefox/chrome/pdfjs/README.mozilla +lib/firefox/chrome/pdfjs/chrome.manifest +lib/firefox/chrome/pdfjs/components/PdfStreamConverter.js +lib/firefox/chrome/pdfjs/content/PdfJs.jsm +lib/firefox/chrome/pdfjs/content/web/debugger.js +lib/firefox/chrome/pdfjs/content/web/images/annotation-check.svg +lib/firefox/chrome/pdfjs/content/web/images/annotation-comment.svg +lib/firefox/chrome/pdfjs/content/web/images/annotation-text.svg +lib/firefox/chrome/pdfjs/content/web/images/loading-icon.gif +lib/firefox/chrome/pdfjs/content/web/images/texture.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-bookmark.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-download.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-menuArrows.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-openFile.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-pageDown-rtl.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-pageDown.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-pageUp-rtl.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-pageUp.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-print.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-sidebarToggle.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewOutline.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-viewThumbnail.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-zoomIn.png +lib/firefox/chrome/pdfjs/content/web/images/toolbarButton-zoomOut.png +lib/firefox/chrome/pdfjs/content/web/l10n.js +lib/firefox/chrome/pdfjs/content/web/viewer.css +lib/firefox/chrome/pdfjs/content/web/viewer.html +lib/firefox/chrome/pdfjs/content/web/viewer.js +lib/firefox/chrome/pdfjs/extension-files +lib/firefox/chrome/pdfjs/install.rdf.in +lib/firefox/components/Aitc.js lib/firefox/components/ChromeProfileMigrator.js lib/firefox/components/DownloadsStartup.js lib/firefox/components/DownloadsUI.js @@ -483,6 +554,7 @@ lib/firefox/defaults/preferences/channel-prefs.js lib/firefox/defaults/preferences/firefox-branding.js lib/firefox/defaults/preferences/firefox-l10n.js lib/firefox/defaults/preferences/firefox.js +lib/firefox/defaults/preferences/services-aitc.js lib/firefox/defaults/preferences/services-sync.js lib/firefox/defaults/profile/bookmarks.html lib/firefox/defaults/profile/chrome/userChrome-example.css @@ -492,17 +564,15 @@ lib/firefox/defaults/profile/mimeTypes.rdf lib/firefox/defaults/profile/prefs.js lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png lib/firefox/firefox lib/firefox/icons/mozicon128.png lib/firefox/modules/AutocompletePopup.jsm lib/firefox/modules/DownloadsCommon.jsm -lib/firefox/modules/GcliCommands.jsm -lib/firefox/modules/GcliTiltCommands.jsm lib/firefox/modules/HUDService.jsm lib/firefox/modules/InsideOutBox.jsm lib/firefox/modules/MigrationUtils.jsm lib/firefox/modules/NetworkHelper.jsm +lib/firefox/modules/NetworkPanel.jsm lib/firefox/modules/NetworkPrioritizer.jsm lib/firefox/modules/NewTabUtils.jsm lib/firefox/modules/PageThumbs.jsm @@ -510,14 +580,21 @@ lib/firefox/modules/PlacesUIUtils.jsm lib/firefox/modules/PropertyPanel.jsm lib/firefox/modules/TelemetryTimestamps.jsm lib/firefox/modules/TreePanel.jsm +lib/firefox/modules/WebConsoleUtils.jsm lib/firefox/modules/WebappsInstaller.jsm +lib/firefox/modules/devtools/Browser.jsm +lib/firefox/modules/devtools/Console.jsm lib/firefox/modules/devtools/CssHtmlTree.jsm lib/firefox/modules/devtools/CssLogic.jsm lib/firefox/modules/devtools/CssRuleView.jsm lib/firefox/modules/devtools/DebuggerUI.jsm +lib/firefox/modules/devtools/DeveloperToolbar.jsm +lib/firefox/modules/devtools/GcliCommands.jsm +lib/firefox/modules/devtools/GcliTiltCommands.jsm lib/firefox/modules/devtools/LayoutHelpers.jsm lib/firefox/modules/devtools/LayoutView.jsm lib/firefox/modules/devtools/Promise.jsm +lib/firefox/modules/devtools/Require.jsm lib/firefox/modules/devtools/SplitView.jsm lib/firefox/modules/devtools/StyleEditor.jsm lib/firefox/modules/devtools/StyleEditorChrome.jsm @@ -532,14 +609,20 @@ lib/firefox/modules/devtools/TiltVisualizer.jsm lib/firefox/modules/devtools/TiltVisualizerStyle.jsm lib/firefox/modules/devtools/TiltWorkerCrafter.js lib/firefox/modules/devtools/TiltWorkerPicker.js +lib/firefox/modules/devtools/gcli.jsm +lib/firefox/modules/devtools/responsivedesign.jsm lib/firefox/modules/devtools/scratchpad-manager.jsm lib/firefox/modules/distribution.js lib/firefox/modules/domplate.jsm -lib/firefox/modules/gcli.jsm lib/firefox/modules/highlighter.jsm lib/firefox/modules/inspector.jsm lib/firefox/modules/offlineAppCache.jsm lib/firefox/modules/openLocationLastURL.jsm +lib/firefox/modules/services-aitc/browserid.js +lib/firefox/modules/services-aitc/client.js +lib/firefox/modules/services-aitc/main.js +lib/firefox/modules/services-aitc/manager.js +lib/firefox/modules/services-aitc/storage.js lib/firefox/modules/services-common/async.js lib/firefox/modules/services-common/log4moz.js lib/firefox/modules/services-common/observers.js @@ -549,6 +632,7 @@ lib/firefox/modules/services-common/stringbundle.js lib/firefox/modules/services-common/tokenserverclient.js lib/firefox/modules/services-common/utils.js lib/firefox/modules/services-crypto/WeaveCrypto.js +lib/firefox/modules/services-crypto/utils.js lib/firefox/modules/services-sync/addonsreconciler.js lib/firefox/modules/services-sync/constants.js lib/firefox/modules/services-sync/engines.js @@ -573,6 +657,9 @@ lib/firefox/modules/services-sync/rest.js lib/firefox/modules/services-sync/service.js lib/firefox/modules/services-sync/status.js lib/firefox/modules/services-sync/util.js +lib/firefox/modules/sessionstore/DocumentUtils.jsm +lib/firefox/modules/sessionstore/SessionStorage.jsm +lib/firefox/modules/sessionstore/SessionStore.jsm lib/firefox/modules/sessionstore/XPathGenerator.jsm lib/firefox/modules/source-editor-orion.jsm lib/firefox/modules/source-editor-ui.jsm diff --git a/www/firefox/files/firefox.sh.in b/www/firefox/files/firefox.sh.in index bc5053e4075..7d302389a85 100644 --- a/www/firefox/files/firefox.sh.in +++ b/www/firefox/files/firefox.sh.in @@ -1,9 +1,9 @@ #! /bin/sh # -# $NetBSD: firefox.sh.in,v 1.1 2009/09/16 19:06:18 tnn Exp $ +# $NetBSD: firefox.sh.in,v 1.2 2012/08/28 12:42:02 ryoon Exp $ # # We currently overwrite the nsXULStub launcher with this wrapper script. # The stub causes problems like HTTPS protocol not working. # XXX to be investigated -exec @PREFIX@/lib/xulrunner/xulrunner-bin @PREFIX@/lib/firefox/application.ini "$@" +exec @PREFIX@/lib/xulrunner/xulrunner @PREFIX@/lib/firefox/application.ini "$@" |