diff options
| author | ryoon <ryoon> | 2013-09-28 14:37:05 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2013-09-28 14:37:05 +0000 |
| commit | ed6ec1dde349ae7c2c2a46a14dd21f4af2783072 (patch) | |
| tree | 297288077d4d70a06eb9541b9e33e8ed465cda9c | |
| parent | eecde9919dd8ec68c1d595d7e8c37329f3bef90e (diff) | |
| download | pkgsrc-ed6ec1dde349ae7c2c2a46a14dd21f4af2783072.tar.gz | |
Update to 2.21
Changelog:
SeaMonkey-specific changes
Implemented an option to thread messages received by date.
Allowed deletion of news posts by default.
Implemented optional taskbar preview-per-tab.
Added support (permission prompt) for desktop notifications.
Added Isn't operator for searching by Priority.
See the changes page for a more complete overview.
Mozilla platform changes
Support for new scrollbar style on Mac OS X 10.7 and newer.
Accessibility related improvements on using pinned tabs (bug 577727).
Major SVG rendering improvements around Image tiling and scaling (bug 600207).
Removed support for sherlock files that are loaded from application or profile directory.
Support for W3C touch events disabled (bug 888304).
Fixed several stability issues.
Fixed in SeaMonkey 2.21
MFSA 2013-92 GC hazard with default compartments and frame chain restoration
MFSA 2013-91 User-defined properties on DOM proxies get the wrong "this" object
MFSA 2013-90 Memory corruption involving scrolling
MFSA 2013-89 Buffer overflow with multi-column, lists, and floats
MFSA 2013-88 compartment mismatch re-attaching XBL-backed nodes
MFSA 2013-85 Uninitialized data in IonMonkey
MFSA 2013-83 Mozilla Updater does not lock MAR file after signature verification
MFSA 2013-82 Calling scope for new Javascript objects can lead to memory corruption
MFSA 2013-81 Use-after-free with select element
MFSA 2013-80 NativeKey continues handling key messages after widget is destroyed
MFSA 2013-79 Use-after-free in Animation Manager during stylesheet cloning
MFSA 2013-78 Integer overflow in ANGLE library
MFSA 2013-77 Improper state in HTML5 Tree Builder with templates
MFSA 2013-76 Miscellaneous memory safety hazards (rv:24.0 / rv:17.0.9)
105 files changed, 1479 insertions, 2247 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index bca53ab591f..3ea0339a4c1 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.103 2013/09/02 19:51:29 adam Exp $ +# $NetBSD: Makefile,v 1.104 2013/09/28 14:37:05 ryoon Exp $ # DISTNAME= # empty PKGNAME= seamonkey-${SM_VER:S/b/beta/} -SM_VER= 2.20 +SM_VER= 2.21 #LIGHTNINGVER= 1.9 -PKGREVISION= 1 CATEGORIES= www #${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=seamonkey/releases/${SM_VER}/source/} @@ -39,11 +38,19 @@ ALL_ENV+= MOZILLA_PKG_NAME=seamonkey #BUILD_DEPENDS+= yasm>=1.1.0:../../devel/yasm #.endif +CHECK_PORTABILITY_SKIP=mozilla/js/src/tests/update-test262.sh + CHECK_INTERPRETER_SKIP+=lib/seamonkey-sdk/sdk/bin/header.py CHECK_INTERPRETER_SKIP+=lib/seamonkey-sdk/sdk/bin/typelib.py CHECK_INTERPRETER_SKIP+=lib/seamonkey-sdk/sdk/bin/xpidl.py CHECK_INTERPRETER_SKIP+=lib/seamonkey-sdk/sdk/bin/xpt.py +SUBST_CLASSES+= sys-dic +SUBST_STAGE.sys-dic= pre-configure +SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries. +SUBST_FILES.sys-dic= mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +SUBST_VARS.sys-dic= PREFIX + #post-extract: # cd ${WRKSRC} && ${RM} -r calendar # ${CP} -r ${EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2}/comm-beta/calendar ${WRKSRC} diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST index 005f80adf38..9193ea9a767 100644 --- a/www/seamonkey/PLIST +++ b/www/seamonkey/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.38 2013/08/11 03:18:46 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.39 2013/09/28 14:37:05 ryoon Exp $ bin/seamonkey include/seamonkey/AbstractMediaDecoder.h include/seamonkey/AccEvent.h @@ -34,6 +34,7 @@ include/seamonkey/Composer2D.h include/seamonkey/CompositableHost.h include/seamonkey/CompositorChild.h include/seamonkey/CompositorParent.h +include/seamonkey/ContainerWriter.h include/seamonkey/CopyableCanvasLayer.h include/seamonkey/Crypto.h include/seamonkey/CryptoTask.h @@ -68,6 +69,7 @@ include/seamonkey/GLScreenBuffer.h include/seamonkey/GLTextureImage.h include/seamonkey/GLXLibrary.h include/seamonkey/GeckoProfiler.h +include/seamonkey/GeneratedEventClasses.h include/seamonkey/GeneratedEvents.h include/seamonkey/GfxInfoCollector.h include/seamonkey/GonkCameraControl.h @@ -100,6 +102,7 @@ include/seamonkey/MediaDecoder.h include/seamonkey/MediaDecoderOwner.h include/seamonkey/MediaDecoderReader.h include/seamonkey/MediaDecoderStateMachine.h +include/seamonkey/MediaEncoder.h include/seamonkey/MediaEngine.h include/seamonkey/MediaEngineDefault.h include/seamonkey/MediaMetadataManager.h @@ -109,6 +112,8 @@ include/seamonkey/MediaStreamGraph.h include/seamonkey/OggCodecState.h include/seamonkey/OggDecoder.h include/seamonkey/OggReader.h +include/seamonkey/OggWriter.h +include/seamonkey/OpusTrackEncoder.h include/seamonkey/PCOMContentPermissionRequestChild.h include/seamonkey/ReadbackLayer.h include/seamonkey/RoundedRect.h @@ -126,7 +131,6 @@ include/seamonkey/SharedSurface.h include/seamonkey/SharedSurfaceEGL.h include/seamonkey/SharedSurfaceGL.h include/seamonkey/SharedTextureImage.h -include/seamonkey/ShmemYCbCrImage.h include/seamonkey/SpecialSystemDirectory.h include/seamonkey/StackArena.h include/seamonkey/StreamBuffer.h @@ -136,6 +140,9 @@ include/seamonkey/SurfaceTypes.h include/seamonkey/TexturePoolOGL.h include/seamonkey/ThreeDPoint.h include/seamonkey/TimeVarying.h +include/seamonkey/TrackEncoder.h +include/seamonkey/TrackUnionStream.h +include/seamonkey/Units.h include/seamonkey/VideoFrameContainer.h include/seamonkey/VideoSegment.h include/seamonkey/VideoUtils.h @@ -147,6 +154,7 @@ include/seamonkey/WebMDecoder.h include/seamonkey/WebMReader.h include/seamonkey/WrapperFactory.h include/seamonkey/XPCJSMemoryReporter.h +include/seamonkey/amIAddonManager.h include/seamonkey/amIInstallTrigger.h include/seamonkey/amIWebInstallListener.h include/seamonkey/amIWebInstaller.h @@ -276,10 +284,8 @@ include/seamonkey/jscpucfg.h include/seamonkey/jsdIDebuggerService.h include/seamonkey/jsdbgapi.h include/seamonkey/jsdebug.h -include/seamonkey/jsdhash.h include/seamonkey/jsfriendapi.h include/seamonkey/jslock.h -include/seamonkey/json.h include/seamonkey/jsperf.h include/seamonkey/jsprf.h include/seamonkey/jsprototypes.h @@ -354,6 +360,7 @@ include/seamonkey/mozilla-config.h include/seamonkey/mozilla/AppData.h include/seamonkey/mozilla/AppProcessChecker.h include/seamonkey/mozilla/Assertions.h +include/seamonkey/mozilla/Atomics.h include/seamonkey/mozilla/Attributes.h include/seamonkey/mozilla/AutoRestore.h include/seamonkey/mozilla/AvailableMemoryTracker.h @@ -370,12 +377,14 @@ include/seamonkey/mozilla/ClearOnShutdown.h include/seamonkey/mozilla/Compiler.h include/seamonkey/mozilla/CondVar.h include/seamonkey/mozilla/Constants.h +include/seamonkey/mozilla/CycleCollectedJSRuntime.h include/seamonkey/mozilla/DeadlockDetector.h include/seamonkey/mozilla/DebugOnly.h include/seamonkey/mozilla/Decimal.h include/seamonkey/mozilla/Endian.h include/seamonkey/mozilla/EnumSet.h include/seamonkey/mozilla/ErrorResult.h +include/seamonkey/mozilla/FFTBlock.h include/seamonkey/mozilla/FileLocation.h include/seamonkey/mozilla/FileUtils.h include/seamonkey/mozilla/FloatingPoint.h @@ -390,6 +399,7 @@ include/seamonkey/mozilla/HalWakeLock.h include/seamonkey/mozilla/HangMonitor.h include/seamonkey/mozilla/HashFunctions.h include/seamonkey/mozilla/IHistory.h +include/seamonkey/mozilla/IOInterposer.h include/seamonkey/mozilla/IntentionalCrash.h include/seamonkey/mozilla/LazyIdleThread.h include/seamonkey/mozilla/Likely.h @@ -425,6 +435,7 @@ include/seamonkey/mozilla/RangedPtr.h include/seamonkey/mozilla/ReentrantMonitor.h include/seamonkey/mozilla/RefPtr.h include/seamonkey/mozilla/SHA1.h +include/seamonkey/mozilla/SQLiteInterposer.h include/seamonkey/mozilla/SSE.h include/seamonkey/mozilla/Scoped.h include/seamonkey/mozilla/Selection.h @@ -434,6 +445,7 @@ include/seamonkey/mozilla/SplayTree.h include/seamonkey/mozilla/StackWalk.h include/seamonkey/mozilla/StandardInteger.h include/seamonkey/mozilla/StartupTimeline.h +include/seamonkey/mozilla/StaticMutex.h include/seamonkey/mozilla/StaticPtr.h include/seamonkey/mozilla/StringBuilder.h include/seamonkey/mozilla/SyncRunnable.h @@ -504,6 +516,8 @@ include/seamonkey/mozilla/dom/AudioProcessingEvent.h include/seamonkey/mozilla/dom/AudioProcessingEventBinding.h include/seamonkey/mozilla/dom/AudioStreamTrack.h include/seamonkey/mozilla/dom/AudioStreamTrackBinding.h +include/seamonkey/mozilla/dom/BarPropBinding.h +include/seamonkey/mozilla/dom/BarProps.h include/seamonkey/mozilla/dom/BatteryManagerBinding.h include/seamonkey/mozilla/dom/BeforeUnloadEventBinding.h include/seamonkey/mozilla/dom/BindingDeclarations.h @@ -511,9 +525,9 @@ include/seamonkey/mozilla/dom/BindingUtils.h include/seamonkey/mozilla/dom/BiquadFilterNode.h include/seamonkey/mozilla/dom/BiquadFilterNodeBinding.h include/seamonkey/mozilla/dom/BlobBinding.h +include/seamonkey/mozilla/dom/BlobEventBinding.h include/seamonkey/mozilla/dom/CDATASection.h include/seamonkey/mozilla/dom/CDATASectionBinding.h -include/seamonkey/mozilla/dom/CFStateChangeEventBinding.h include/seamonkey/mozilla/dom/CSS.h include/seamonkey/mozilla/dom/CSS2PropertiesBinding.h include/seamonkey/mozilla/dom/CSSBinding.h @@ -526,6 +540,7 @@ include/seamonkey/mozilla/dom/CSSValueListBinding.h include/seamonkey/mozilla/dom/CallbackFunction.h include/seamonkey/mozilla/dom/CallbackInterface.h include/seamonkey/mozilla/dom/CallbackObject.h +include/seamonkey/mozilla/dom/CameraManagerBinding.h include/seamonkey/mozilla/dom/CanvasGradient.h include/seamonkey/mozilla/dom/CanvasPattern.h include/seamonkey/mozilla/dom/CanvasRenderingContext2D.h @@ -541,6 +556,7 @@ include/seamonkey/mozilla/dom/ChildNodeBinding.h include/seamonkey/mozilla/dom/ClientRectBinding.h include/seamonkey/mozilla/dom/ClientRectListBinding.h include/seamonkey/mozilla/dom/ClipboardEventBinding.h +include/seamonkey/mozilla/dom/CloseEventBinding.h include/seamonkey/mozilla/dom/CommandEventBinding.h include/seamonkey/mozilla/dom/Comment.h include/seamonkey/mozilla/dom/CommentBinding.h @@ -548,12 +564,16 @@ include/seamonkey/mozilla/dom/CompositionEventBinding.h include/seamonkey/mozilla/dom/ContentChild.h include/seamonkey/mozilla/dom/ContentParent.h include/seamonkey/mozilla/dom/ContentProcess.h +include/seamonkey/mozilla/dom/ConvolverNode.h +include/seamonkey/mozilla/dom/ConvolverNodeBinding.h include/seamonkey/mozilla/dom/CoordinatesBinding.h include/seamonkey/mozilla/dom/CrashReporterChild.h include/seamonkey/mozilla/dom/CrashReporterParent.h +include/seamonkey/mozilla/dom/CustomEventBinding.h include/seamonkey/mozilla/dom/DOMCursor.h include/seamonkey/mozilla/dom/DOMCursorBinding.h include/seamonkey/mozilla/dom/DOMError.h +include/seamonkey/mozilla/dom/DOMErrorBinding.h include/seamonkey/mozilla/dom/DOMImplementation.h include/seamonkey/mozilla/dom/DOMImplementationBinding.h include/seamonkey/mozilla/dom/DOMJSClass.h @@ -566,11 +586,18 @@ include/seamonkey/mozilla/dom/DOMStorageIPC.h include/seamonkey/mozilla/dom/DOMStringMapBinding.h include/seamonkey/mozilla/dom/DOMTokenListBinding.h include/seamonkey/mozilla/dom/DOMTransactionBinding.h +include/seamonkey/mozilla/dom/DOMTransactionEventBinding.h +include/seamonkey/mozilla/dom/DataContainerEventBinding.h include/seamonkey/mozilla/dom/DelayNode.h include/seamonkey/mozilla/dom/DelayNodeBinding.h include/seamonkey/mozilla/dom/DesktopNotification.h include/seamonkey/mozilla/dom/DesktopNotificationBinding.h +include/seamonkey/mozilla/dom/DeviceLightEventBinding.h include/seamonkey/mozilla/dom/DeviceMotionEventBinding.h +include/seamonkey/mozilla/dom/DeviceOrientationEventBinding.h +include/seamonkey/mozilla/dom/DeviceProximityEventBinding.h +include/seamonkey/mozilla/dom/DeviceStorageBinding.h +include/seamonkey/mozilla/dom/DeviceStorageChangeEventBinding.h include/seamonkey/mozilla/dom/DirectionalityUtils.h include/seamonkey/mozilla/dom/DocumentBinding.h include/seamonkey/mozilla/dom/DocumentFragment.h @@ -583,6 +610,7 @@ include/seamonkey/mozilla/dom/DynamicsCompressorNode.h include/seamonkey/mozilla/dom/DynamicsCompressorNodeBinding.h include/seamonkey/mozilla/dom/Element.h include/seamonkey/mozilla/dom/ElementBinding.h +include/seamonkey/mozilla/dom/ElementReplaceEventBinding.h include/seamonkey/mozilla/dom/EnableSpeechSynthesisCheck.h include/seamonkey/mozilla/dom/EnableWebAudioCheck.h include/seamonkey/mozilla/dom/EncodingUtils.h @@ -600,13 +628,18 @@ include/seamonkey/mozilla/dom/FakeSpeechRecognitionService.h include/seamonkey/mozilla/dom/FileBinding.h include/seamonkey/mozilla/dom/FileHandleBinding.h include/seamonkey/mozilla/dom/FileListBinding.h +include/seamonkey/mozilla/dom/FileModeBinding.h include/seamonkey/mozilla/dom/FileReaderBinding.h include/seamonkey/mozilla/dom/FileReaderSyncBinding.h include/seamonkey/mozilla/dom/FileRequestBinding.h +include/seamonkey/mozilla/dom/FocusEventBinding.h include/seamonkey/mozilla/dom/FormDataBinding.h include/seamonkey/mozilla/dom/FragmentOrElement.h include/seamonkey/mozilla/dom/FromParser.h include/seamonkey/mozilla/dom/FunctionBinding.h +include/seamonkey/mozilla/dom/Future.h +include/seamonkey/mozilla/dom/FutureBinding.h +include/seamonkey/mozilla/dom/FutureResolver.h include/seamonkey/mozilla/dom/GainNode.h include/seamonkey/mozilla/dom/GainNodeBinding.h include/seamonkey/mozilla/dom/GeolocationBinding.h @@ -642,6 +675,8 @@ include/seamonkey/mozilla/dom/HTMLFieldSetElement.h include/seamonkey/mozilla/dom/HTMLFieldSetElementBinding.h include/seamonkey/mozilla/dom/HTMLFontElement.h include/seamonkey/mozilla/dom/HTMLFontElementBinding.h +include/seamonkey/mozilla/dom/HTMLFormElement.h +include/seamonkey/mozilla/dom/HTMLFormElementBinding.h include/seamonkey/mozilla/dom/HTMLFrameElement.h include/seamonkey/mozilla/dom/HTMLFrameElementBinding.h include/seamonkey/mozilla/dom/HTMLFrameSetElement.h @@ -733,10 +768,14 @@ include/seamonkey/mozilla/dom/HTMLTimeElement.h include/seamonkey/mozilla/dom/HTMLTimeElementBinding.h include/seamonkey/mozilla/dom/HTMLTitleElement.h include/seamonkey/mozilla/dom/HTMLTitleElementBinding.h +include/seamonkey/mozilla/dom/HTMLTrackElement.h +include/seamonkey/mozilla/dom/HTMLTrackElementBinding.h include/seamonkey/mozilla/dom/HTMLUListElementBinding.h include/seamonkey/mozilla/dom/HTMLUnknownElement.h include/seamonkey/mozilla/dom/HTMLVideoElement.h include/seamonkey/mozilla/dom/HTMLVideoElementBinding.h +include/seamonkey/mozilla/dom/HashChangeEventBinding.h +include/seamonkey/mozilla/dom/IDBDatabaseBinding.h include/seamonkey/mozilla/dom/IDBFactoryBinding.h include/seamonkey/mozilla/dom/IDBVersionChangeEventBinding.h include/seamonkey/mozilla/dom/ImageData.h @@ -744,6 +783,7 @@ include/seamonkey/mozilla/dom/ImageDataBinding.h include/seamonkey/mozilla/dom/ImageDocument.h include/seamonkey/mozilla/dom/ImageDocumentBinding.h include/seamonkey/mozilla/dom/InspectorUtilsBinding.h +include/seamonkey/mozilla/dom/KeyEventBinding.h include/seamonkey/mozilla/dom/KeyboardEventBinding.h include/seamonkey/mozilla/dom/Link.h include/seamonkey/mozilla/dom/LinkStyleBinding.h @@ -751,16 +791,27 @@ include/seamonkey/mozilla/dom/LocalMediaStreamBinding.h include/seamonkey/mozilla/dom/LocationBinding.h include/seamonkey/mozilla/dom/MediaError.h include/seamonkey/mozilla/dom/MediaErrorBinding.h +include/seamonkey/mozilla/dom/MediaStreamAudioDestinationNode.h +include/seamonkey/mozilla/dom/MediaStreamAudioDestinationNodeBinding.h include/seamonkey/mozilla/dom/MediaStreamBinding.h +include/seamonkey/mozilla/dom/MediaStreamEventBinding.h include/seamonkey/mozilla/dom/MediaStreamTrack.h include/seamonkey/mozilla/dom/MediaStreamTrackBinding.h include/seamonkey/mozilla/dom/MessageEventBinding.h include/seamonkey/mozilla/dom/MmsMessage.h include/seamonkey/mozilla/dom/MobileMessageManager.h +include/seamonkey/mozilla/dom/MobileMessageManagerBinding.h include/seamonkey/mozilla/dom/MouseEventBinding.h include/seamonkey/mozilla/dom/MouseScrollEventBinding.h include/seamonkey/mozilla/dom/MozActivityBinding.h +include/seamonkey/mozilla/dom/MozApplicationEventBinding.h +include/seamonkey/mozilla/dom/MozContactChangeEventBinding.h +include/seamonkey/mozilla/dom/MozMmsEventBinding.h +include/seamonkey/mozilla/dom/MozMmsMessageBinding.h include/seamonkey/mozilla/dom/MozNamedAttrMapBinding.h +include/seamonkey/mozilla/dom/MozSettingsEventBinding.h +include/seamonkey/mozilla/dom/MozSmsEventBinding.h +include/seamonkey/mozilla/dom/MozTimeManagerBinding.h include/seamonkey/mozilla/dom/MutationEventBinding.h include/seamonkey/mozilla/dom/MutationObserverBinding.h include/seamonkey/mozilla/dom/NetDashboardBinding.h @@ -775,6 +826,11 @@ include/seamonkey/mozilla/dom/NotificationBinding.h include/seamonkey/mozilla/dom/NotifyAudioAvailableEventBinding.h include/seamonkey/mozilla/dom/NotifyPaintEventBinding.h include/seamonkey/mozilla/dom/Nullable.h +include/seamonkey/mozilla/dom/OfflineAudioCompletionEvent.h +include/seamonkey/mozilla/dom/OfflineAudioCompletionEventBinding.h +include/seamonkey/mozilla/dom/OfflineAudioContextBinding.h +include/seamonkey/mozilla/dom/OfflineResourceListBinding.h +include/seamonkey/mozilla/dom/PageTransitionEventBinding.h include/seamonkey/mozilla/dom/PaintRequestBinding.h include/seamonkey/mozilla/dom/PaintRequestListBinding.h include/seamonkey/mozilla/dom/PannerNode.h @@ -782,15 +838,25 @@ include/seamonkey/mozilla/dom/PannerNodeBinding.h include/seamonkey/mozilla/dom/PerformanceBinding.h include/seamonkey/mozilla/dom/PerformanceNavigationBinding.h include/seamonkey/mozilla/dom/PerformanceTimingBinding.h +include/seamonkey/mozilla/dom/PeriodicWave.h +include/seamonkey/mozilla/dom/PeriodicWaveBinding.h include/seamonkey/mozilla/dom/PermissionMessageUtils.h +include/seamonkey/mozilla/dom/PopStateEventBinding.h +include/seamonkey/mozilla/dom/PopupBlockedEventBinding.h include/seamonkey/mozilla/dom/PositionBinding.h include/seamonkey/mozilla/dom/PositionErrorBinding.h include/seamonkey/mozilla/dom/PrimitiveConversions.h include/seamonkey/mozilla/dom/ProcessingInstruction.h include/seamonkey/mozilla/dom/ProcessingInstructionBinding.h +include/seamonkey/mozilla/dom/ProgressEventBinding.h include/seamonkey/mozilla/dom/PrototypeList.h include/seamonkey/mozilla/dom/RGBColorBinding.h include/seamonkey/mozilla/dom/RTCConfigurationBinding.h +include/seamonkey/mozilla/dom/RTCDataChannelEventBinding.h +include/seamonkey/mozilla/dom/RTCIceCandidateBinding.h +include/seamonkey/mozilla/dom/RTCPeerConnectionBinding.h +include/seamonkey/mozilla/dom/RTCPeerConnectionIceEventBinding.h +include/seamonkey/mozilla/dom/RTCSessionDescriptionBinding.h include/seamonkey/mozilla/dom/RangeBinding.h include/seamonkey/mozilla/dom/RectBinding.h include/seamonkey/mozilla/dom/RegisterBindings.h @@ -819,6 +885,8 @@ include/seamonkey/mozilla/dom/SVGAnimatedPointsBinding.h include/seamonkey/mozilla/dom/SVGAnimatedPreserveAspectRatioBinding.h include/seamonkey/mozilla/dom/SVGAnimatedRect.h include/seamonkey/mozilla/dom/SVGAnimatedRectBinding.h +include/seamonkey/mozilla/dom/SVGAnimatedString.h +include/seamonkey/mozilla/dom/SVGAnimatedStringBinding.h include/seamonkey/mozilla/dom/SVGAnimatedTransformList.h include/seamonkey/mozilla/dom/SVGAnimatedTransformListBinding.h include/seamonkey/mozilla/dom/SVGAnimationElement.h @@ -978,6 +1046,7 @@ include/seamonkey/mozilla/dom/ScriptProcessorNode.h include/seamonkey/mozilla/dom/ScriptProcessorNodeBinding.h include/seamonkey/mozilla/dom/ScrollAreaEventBinding.h include/seamonkey/mozilla/dom/SimpleGestureEventBinding.h +include/seamonkey/mozilla/dom/SmartCardEventBinding.h include/seamonkey/mozilla/dom/SmsFilter.h include/seamonkey/mozilla/dom/SmsManager.h include/seamonkey/mozilla/dom/SmsMessage.h @@ -990,6 +1059,8 @@ include/seamonkey/mozilla/dom/SpeechRecognition.h include/seamonkey/mozilla/dom/SpeechRecognitionAlternative.h include/seamonkey/mozilla/dom/SpeechRecognitionAlternativeBinding.h include/seamonkey/mozilla/dom/SpeechRecognitionBinding.h +include/seamonkey/mozilla/dom/SpeechRecognitionErrorBinding.h +include/seamonkey/mozilla/dom/SpeechRecognitionEventBinding.h include/seamonkey/mozilla/dom/SpeechRecognitionResult.h include/seamonkey/mozilla/dom/SpeechRecognitionResultBinding.h include/seamonkey/mozilla/dom/SpeechRecognitionResultList.h @@ -998,14 +1069,19 @@ include/seamonkey/mozilla/dom/SpeechStreamListener.h include/seamonkey/mozilla/dom/SpeechSynthesis.h include/seamonkey/mozilla/dom/SpeechSynthesisBinding.h include/seamonkey/mozilla/dom/SpeechSynthesisChild.h +include/seamonkey/mozilla/dom/SpeechSynthesisEventBinding.h include/seamonkey/mozilla/dom/SpeechSynthesisParent.h include/seamonkey/mozilla/dom/SpeechSynthesisUtterance.h include/seamonkey/mozilla/dom/SpeechSynthesisUtteranceBinding.h include/seamonkey/mozilla/dom/SpeechSynthesisVoice.h include/seamonkey/mozilla/dom/SpeechSynthesisVoiceBinding.h +include/seamonkey/mozilla/dom/StorageEventBinding.h include/seamonkey/mozilla/dom/StructuredCloneTags.h include/seamonkey/mozilla/dom/StructuredCloneUtils.h +include/seamonkey/mozilla/dom/StyleRuleChangeEventBinding.h +include/seamonkey/mozilla/dom/StyleSheetApplicableStateChangeEventBinding.h include/seamonkey/mozilla/dom/StyleSheetBinding.h +include/seamonkey/mozilla/dom/StyleSheetChangeEventBinding.h include/seamonkey/mozilla/dom/TabChild.h include/seamonkey/mozilla/dom/TabContext.h include/seamonkey/mozilla/dom/TabMessageUtils.h @@ -1019,6 +1095,15 @@ include/seamonkey/mozilla/dom/TextEncoder.h include/seamonkey/mozilla/dom/TextEncoderBase.h include/seamonkey/mozilla/dom/TextEncoderBinding.h include/seamonkey/mozilla/dom/TextMetrics.h +include/seamonkey/mozilla/dom/TextTrack.h +include/seamonkey/mozilla/dom/TextTrackBinding.h +include/seamonkey/mozilla/dom/TextTrackCue.h +include/seamonkey/mozilla/dom/TextTrackCueBinding.h +include/seamonkey/mozilla/dom/TextTrackCueList.h +include/seamonkey/mozilla/dom/TextTrackCueListBinding.h +include/seamonkey/mozilla/dom/TextTrackList.h +include/seamonkey/mozilla/dom/TextTrackListBinding.h +include/seamonkey/mozilla/dom/TimeEventBinding.h include/seamonkey/mozilla/dom/TimeRanges.h include/seamonkey/mozilla/dom/TimeRangesBinding.h include/seamonkey/mozilla/dom/Touch.h @@ -1033,15 +1118,17 @@ include/seamonkey/mozilla/dom/UIEventBinding.h include/seamonkey/mozilla/dom/URL.h include/seamonkey/mozilla/dom/URLBinding.h include/seamonkey/mozilla/dom/URLUtilsBinding.h -include/seamonkey/mozilla/dom/USSDReceivedEventBinding.h include/seamonkey/mozilla/dom/UndoManager.h include/seamonkey/mozilla/dom/UndoManagerBinding.h include/seamonkey/mozilla/dom/UnionConversions.h include/seamonkey/mozilla/dom/UnionTypes.h +include/seamonkey/mozilla/dom/UserProximityEventBinding.h include/seamonkey/mozilla/dom/ValidityState.h include/seamonkey/mozilla/dom/ValidityStateBinding.h include/seamonkey/mozilla/dom/VideoStreamTrack.h include/seamonkey/mozilla/dom/VideoStreamTrackBinding.h +include/seamonkey/mozilla/dom/WaveShaperNode.h +include/seamonkey/mozilla/dom/WaveShaperNodeBinding.h include/seamonkey/mozilla/dom/WebComponentsBinding.h include/seamonkey/mozilla/dom/WebGLRenderingContextBinding.h include/seamonkey/mozilla/dom/WebSocketBinding.h @@ -1133,6 +1220,7 @@ include/seamonkey/mozilla/dom/quota/UsageRunnable.h include/seamonkey/mozilla/dom/quota/Utilities.h include/seamonkey/mozilla/dom/time/DateCacheCleaner.h include/seamonkey/mozilla/dom/time/TimeChangeObserver.h +include/seamonkey/mozilla/dom/time/TimeManager.h include/seamonkey/mozilla/dom/time/TimeService.h include/seamonkey/mozilla/dom/workers/Workers.h include/seamonkey/mozilla/dom/workers/bindings/DOMBindingBase.h @@ -1160,6 +1248,7 @@ include/seamonkey/mozilla/gfx/PathHelpers.h include/seamonkey/mozilla/gfx/Point.h include/seamonkey/mozilla/gfx/Rect.h include/seamonkey/mozilla/gfx/Scale.h +include/seamonkey/mozilla/gfx/ScaleFactor.h include/seamonkey/mozilla/gfx/SharedDIB.h include/seamonkey/mozilla/gfx/Tools.h include/seamonkey/mozilla/gfx/Types.h @@ -1194,11 +1283,6 @@ include/seamonkey/mozilla/ipc/Transport.h include/seamonkey/mozilla/ipc/Transport_posix.h include/seamonkey/mozilla/ipc/URIUtils.h include/seamonkey/mozilla/ipc/XPCShellEnvironment.h -include/seamonkey/mozilla/jsipc/CPOWTypes.h -include/seamonkey/mozilla/jsipc/ContextWrapperChild.h -include/seamonkey/mozilla/jsipc/ContextWrapperParent.h -include/seamonkey/mozilla/jsipc/ObjectWrapperChild.h -include/seamonkey/mozilla/jsipc/ObjectWrapperParent.h include/seamonkey/mozilla/layers/AsyncCompositionManager.h include/seamonkey/mozilla/layers/AsyncPanZoomController.h include/seamonkey/mozilla/layers/Axis.h @@ -1239,7 +1323,6 @@ include/seamonkey/mozilla/layers/ShadowLayers.h include/seamonkey/mozilla/layers/ShadowLayersManager.h include/seamonkey/mozilla/layers/SharedPlanarYCbCrImage.h include/seamonkey/mozilla/layers/SharedRGBImage.h -include/seamonkey/mozilla/layers/ShmemYCbCrImage.h include/seamonkey/mozilla/layers/TaskThrottler.h include/seamonkey/mozilla/layers/TextureClient.h include/seamonkey/mozilla/layers/TextureClientOGL.h @@ -1247,6 +1330,7 @@ include/seamonkey/mozilla/layers/TextureHost.h include/seamonkey/mozilla/layers/TextureHostOGL.h include/seamonkey/mozilla/layers/ThebesLayerComposite.h include/seamonkey/mozilla/layers/TiledContentClient.h +include/seamonkey/mozilla/layers/YCbCrImageDataSerializer.h include/seamonkey/mozilla/layout/FrameChildList.h include/seamonkey/mozilla/layout/RenderFrameChild.h include/seamonkey/mozilla/layout/RenderFrameParent.h @@ -1278,6 +1362,7 @@ include/seamonkey/mozilla/net/NeckoCommon.h include/seamonkey/mozilla/net/NeckoMessageUtils.h include/seamonkey/mozilla/net/NeckoParent.h include/seamonkey/mozilla/net/PHttpChannelParams.h +include/seamonkey/mozilla/net/PSpdyPush3.h include/seamonkey/mozilla/net/RemoteOpenFileChild.h include/seamonkey/mozilla/net/RemoteOpenFileParent.h include/seamonkey/mozilla/net/WebSocketChannel.h @@ -1439,8 +1524,9 @@ include/seamonkey/nsCoord.h include/seamonkey/nsCopySupport.h include/seamonkey/nsCppSharedAllocator.h include/seamonkey/nsCrossSiteListenerProxy.h -include/seamonkey/nsCycleCollectionJSRuntime.h +include/seamonkey/nsCxPusher.h include/seamonkey/nsCycleCollectionNoteChild.h +include/seamonkey/nsCycleCollectionNoteRootCallback.h include/seamonkey/nsCycleCollectionParticipant.h include/seamonkey/nsCycleCollectionTraversalCallback.h include/seamonkey/nsCycleCollector.h @@ -1456,11 +1542,12 @@ include/seamonkey/nsDOMClassInfoID.h include/seamonkey/nsDOMEvent.h include/seamonkey/nsDOMEventTargetHelper.h include/seamonkey/nsDOMFile.h -include/seamonkey/nsDOMGamepad.h include/seamonkey/nsDOMJSUtils.h include/seamonkey/nsDOMKeyNameList.h include/seamonkey/nsDOMMediaQueryList.h +include/seamonkey/nsDOMOfflineResourceList.h include/seamonkey/nsDOMString.h +include/seamonkey/nsDOMTimeEvent.h include/seamonkey/nsDOMTouchEvent.h include/seamonkey/nsDOMUIEvent.h include/seamonkey/nsDataHashtable.h @@ -1614,7 +1701,6 @@ include/seamonkey/nsIAccessibilityService.h include/seamonkey/nsIAccessible.h include/seamonkey/nsIAccessibleApplication.h include/seamonkey/nsIAccessibleCaretMoveEvent.h -include/seamonkey/nsIAccessibleCursorable.h include/seamonkey/nsIAccessibleDocument.h include/seamonkey/nsIAccessibleEditableText.h include/seamonkey/nsIAccessibleEvent.h @@ -1713,8 +1799,6 @@ include/seamonkey/nsICMSMessage.h include/seamonkey/nsICMSMessage2.h include/seamonkey/nsICMSMessageErrors.h include/seamonkey/nsICMSSecureMessage.h -include/seamonkey/nsICRLInfo.h -include/seamonkey/nsICRLManager.h include/seamonkey/nsICSSDeclaration.h include/seamonkey/nsICSSLoaderObserver.h include/seamonkey/nsICSSPseudoComparator.h @@ -1833,7 +1917,6 @@ include/seamonkey/nsIDOMAnimationEvent.h include/seamonkey/nsIDOMApplicationRegistry.h include/seamonkey/nsIDOMApplicationRegistry2.h include/seamonkey/nsIDOMAttr.h -include/seamonkey/nsIDOMBarProp.h include/seamonkey/nsIDOMBeforeUnloadEvent.h include/seamonkey/nsIDOMBlobEvent.h include/seamonkey/nsIDOMCDATASection.h @@ -1841,6 +1924,7 @@ include/seamonkey/nsIDOMCRMFObject.h include/seamonkey/nsIDOMCSSCharsetRule.h include/seamonkey/nsIDOMCSSConditionRule.h include/seamonkey/nsIDOMCSSFontFaceRule.h +include/seamonkey/nsIDOMCSSFontFeatureValuesRule.h include/seamonkey/nsIDOMCSSGroupingRule.h include/seamonkey/nsIDOMCSSImportRule.h include/seamonkey/nsIDOMCSSMediaRule.h @@ -1877,7 +1961,6 @@ include/seamonkey/nsIDOMCryptoDialogs.h include/seamonkey/nsIDOMCryptoLegacy.h include/seamonkey/nsIDOMCustomEvent.h include/seamonkey/nsIDOMDOMCursor.h -include/seamonkey/nsIDOMDOMError.h include/seamonkey/nsIDOMDOMException.h include/seamonkey/nsIDOMDOMImplementation.h include/seamonkey/nsIDOMDOMRequest.h @@ -1909,6 +1992,7 @@ include/seamonkey/nsIDOMFile.h include/seamonkey/nsIDOMFileHandle.h include/seamonkey/nsIDOMFileList.h include/seamonkey/nsIDOMFileReader.h +include/seamonkey/nsIDOMFocusEvent.h include/seamonkey/nsIDOMFontFace.h include/seamonkey/nsIDOMFontFaceList.h include/seamonkey/nsIDOMFormData.h @@ -1922,7 +2006,6 @@ include/seamonkey/nsIDOMGeoPositionCallback.h include/seamonkey/nsIDOMGeoPositionCoords.h include/seamonkey/nsIDOMGeoPositionError.h include/seamonkey/nsIDOMGeoPositionErrorCallback.h -include/seamonkey/nsIDOMGetSVGDocument.h include/seamonkey/nsIDOMGlobalObjectConstructor.h include/seamonkey/nsIDOMGlobalPropertyInitializer.h include/seamonkey/nsIDOMHTMLAnchorElement.h @@ -1936,7 +2019,6 @@ include/seamonkey/nsIDOMHTMLButtonElement.h include/seamonkey/nsIDOMHTMLByteRanges.h include/seamonkey/nsIDOMHTMLCanvasElement.h include/seamonkey/nsIDOMHTMLCollection.h -include/seamonkey/nsIDOMHTMLCommandElement.h include/seamonkey/nsIDOMHTMLDListElement.h include/seamonkey/nsIDOMHTMLDataListElement.h include/seamonkey/nsIDOMHTMLDirectoryElement.h @@ -2062,15 +2144,12 @@ include/seamonkey/nsIDOMPowerManager.h include/seamonkey/nsIDOMProcessingInstruction.h include/seamonkey/nsIDOMProgressEvent.h include/seamonkey/nsIDOMPushManager.h -include/seamonkey/nsIDOMRTCPeerConnection.h include/seamonkey/nsIDOMRange.h include/seamonkey/nsIDOMRect.h include/seamonkey/nsIDOMSVGAnimatedEnum.h include/seamonkey/nsIDOMSVGAnimatedInteger.h include/seamonkey/nsIDOMSVGAnimatedLength.h include/seamonkey/nsIDOMSVGAnimatedNumber.h -include/seamonkey/nsIDOMSVGAnimatedString.h -include/seamonkey/nsIDOMSVGDocument.h include/seamonkey/nsIDOMSVGElement.h include/seamonkey/nsIDOMSVGLength.h include/seamonkey/nsIDOMSVGNumber.h @@ -2091,14 +2170,14 @@ include/seamonkey/nsIDOMStorage.h include/seamonkey/nsIDOMStorageEvent.h include/seamonkey/nsIDOMStorageIndexedDB.h include/seamonkey/nsIDOMStorageManager.h +include/seamonkey/nsIDOMStyleRuleChangeEvent.h include/seamonkey/nsIDOMStyleSheet.h -include/seamonkey/nsIDOMStyleSheetAddedEvent.h +include/seamonkey/nsIDOMStyleSheetApplicableStateChangeEvent.h +include/seamonkey/nsIDOMStyleSheetChangeEvent.h include/seamonkey/nsIDOMStyleSheetList.h -include/seamonkey/nsIDOMStyleSheetRemovedEvent.h include/seamonkey/nsIDOMTCPSocket.h include/seamonkey/nsIDOMText.h include/seamonkey/nsIDOMTimeEvent.h -include/seamonkey/nsIDOMTimeManager.h include/seamonkey/nsIDOMTimeRanges.h include/seamonkey/nsIDOMToString.h include/seamonkey/nsIDOMTouchEvent.h @@ -2160,7 +2239,6 @@ include/seamonkey/nsIDirectoryService.h include/seamonkey/nsIDiskSpaceWatcher.h include/seamonkey/nsIDocCharset.h include/seamonkey/nsIDocShell.h -include/seamonkey/nsIDocShellHistory.h include/seamonkey/nsIDocShellLoadInfo.h include/seamonkey/nsIDocShellTreeItem.h include/seamonkey/nsIDocShellTreeNode.h @@ -2171,7 +2249,6 @@ include/seamonkey/nsIDocumentInlines.h include/seamonkey/nsIDocumentLoader.h include/seamonkey/nsIDocumentLoaderFactory.h include/seamonkey/nsIDocumentObserver.h -include/seamonkey/nsIDocumentRegister.h include/seamonkey/nsIDocumentStateListener.h include/seamonkey/nsIDocumentTransformer.h include/seamonkey/nsIDownload.h @@ -2554,6 +2631,7 @@ include/seamonkey/nsINativeKeyBindings.h include/seamonkey/nsINavBookmarksService.h include/seamonkey/nsINavHistoryService.h include/seamonkey/nsINavigatorBattery.h +include/seamonkey/nsINavigatorGamepads.h include/seamonkey/nsINestedURI.h include/seamonkey/nsINetAddr.h include/seamonkey/nsINetUtil.h @@ -2697,6 +2775,7 @@ include/seamonkey/nsIRecoveryService.h include/seamonkey/nsIRedirectChannelRegistrar.h include/seamonkey/nsIRedirectResultListener.h include/seamonkey/nsIReflowCallback.h +include/seamonkey/nsIReflowObserver.h include/seamonkey/nsIRefreshURI.h include/seamonkey/nsIRelativeFilePref.h include/seamonkey/nsIRemoteOpenFileListener.h @@ -3029,6 +3108,7 @@ include/seamonkey/nsJSNPRuntime.h include/seamonkey/nsJSON.h include/seamonkey/nsJSPrincipals.h include/seamonkey/nsJSProtocolHandler.h +include/seamonkey/nsJSThingHashtable.h include/seamonkey/nsJSUtils.h include/seamonkey/nsLWBrkCIID.h include/seamonkey/nsLayoutCID.h @@ -3651,6 +3731,8 @@ lib/seamonkey/chrome/classic/skin/classic/communicator/icons/lock-insecure-16.pn lib/seamonkey/chrome/classic/skin/classic/communicator/icons/lock-insecure.png lib/seamonkey/chrome/classic/skin/classic/communicator/icons/lock-secure-16.png lib/seamonkey/chrome/classic/skin/classic/communicator/icons/lock-secure.png +lib/seamonkey/chrome/classic/skin/classic/communicator/icons/notification-16.png +lib/seamonkey/chrome/classic/skin/classic/communicator/icons/notification-64.png lib/seamonkey/chrome/classic/skin/classic/communicator/icons/offline.png lib/seamonkey/chrome/classic/skin/classic/communicator/icons/online.png lib/seamonkey/chrome/classic/skin/classic/communicator/icons/plugin.png @@ -3925,6 +4007,7 @@ lib/seamonkey/chrome/classic/skin/classic/navigator/btn1/top.gif lib/seamonkey/chrome/classic/skin/classic/navigator/btn1/up-disabled.gif lib/seamonkey/chrome/classic/skin/classic/navigator/btn1/up-hover.gif lib/seamonkey/chrome/classic/skin/classic/navigator/btn1/up.gif +lib/seamonkey/chrome/classic/skin/classic/navigator/click-to-play-warning-stripes.png lib/seamonkey/chrome/classic/skin/classic/navigator/icons/chevron.gif lib/seamonkey/chrome/classic/skin/classic/navigator/icons/close.gif lib/seamonkey/chrome/classic/skin/classic/navigator/icons/identity.png @@ -4504,7 +4587,6 @@ lib/seamonkey/chrome/en-US/locale/en-US/communicator/help/suite-toc.rdf lib/seamonkey/chrome/en-US/locale/en-US/communicator/help/suitehelp.rdf lib/seamonkey/chrome/en-US/locale/en-US/communicator/help/using_certs_help.xhtml lib/seamonkey/chrome/en-US/locale/en-US/communicator/help/using_priv_help.xhtml -lib/seamonkey/chrome/en-US/locale/en-US/communicator/help/validation_help.xhtml lib/seamonkey/chrome/en-US/locale/en-US/communicator/help/welcome_help.xhtml lib/seamonkey/chrome/en-US/locale/en-US/communicator/history/history.dtd lib/seamonkey/chrome/en-US/locale/en-US/communicator/history/places.properties @@ -4796,6 +4878,7 @@ lib/seamonkey/chrome/en-US/locale/en-US/messenger/eudoraImportMsgs.properties lib/seamonkey/chrome/en-US/locale/en-US/messenger/fieldMapImport.dtd lib/seamonkey/chrome/en-US/locale/en-US/messenger/filter.properties lib/seamonkey/chrome/en-US/locale/en-US/messenger/folderProps.dtd +lib/seamonkey/chrome/en-US/locale/en-US/messenger/folderWidgets.properties lib/seamonkey/chrome/en-US/locale/en-US/messenger/folderpane.dtd lib/seamonkey/chrome/en-US/locale/en-US/messenger/gloda.properties lib/seamonkey/chrome/en-US/locale/en-US/messenger/imapMsgs.properties @@ -4930,7 +5013,6 @@ lib/seamonkey/chrome/en-US/locale/en-US/pippki/pref-certs.dtd lib/seamonkey/chrome/en-US/locale/en-US/pippki/pref-masterpass.dtd lib/seamonkey/chrome/en-US/locale/en-US/pippki/pref-ssl.dtd lib/seamonkey/chrome/en-US/locale/en-US/pippki/pref-validation.dtd -lib/seamonkey/chrome/en-US/locale/en-US/pippki/validation.dtd lib/seamonkey/chrome/en-US/locale/en-US/places/places.properties lib/seamonkey/chrome/en-US/locale/en-US/services/errors.properties lib/seamonkey/chrome/en-US/locale/en-US/services/sync.properties @@ -5219,6 +5301,8 @@ lib/seamonkey/chrome/newsblog/content/messenger-newsblog/am-newsblog.xul lib/seamonkey/chrome/newsblog/content/messenger-newsblog/feed-parser.js lib/seamonkey/chrome/newsblog/content/messenger-newsblog/feed-subscriptions.js lib/seamonkey/chrome/newsblog/content/messenger-newsblog/feed-subscriptions.xul +lib/seamonkey/chrome/newsblog/content/messenger-newsblog/feedAccountWizard.js +lib/seamonkey/chrome/newsblog/content/messenger-newsblog/feedAccountWizard.xul lib/seamonkey/chrome/newsblog/content/messenger-newsblog/newsblogOverlay.js lib/seamonkey/chrome/newsblog/content/messenger-newsblog/utils.js lib/seamonkey/chrome/pippki/content/pippki/CAOverlay.xul @@ -5226,7 +5310,6 @@ lib/seamonkey/chrome/pippki/content/pippki/MineOverlay.xul lib/seamonkey/chrome/pippki/content/pippki/OrphanOverlay.xul lib/seamonkey/chrome/pippki/content/pippki/OthersOverlay.xul lib/seamonkey/chrome/pippki/content/pippki/WebSitesOverlay.xul -lib/seamonkey/chrome/pippki/content/pippki/cacertexists.xul lib/seamonkey/chrome/pippki/content/pippki/certDump.xul lib/seamonkey/chrome/pippki/content/pippki/certManager.js lib/seamonkey/chrome/pippki/content/pippki/certManager.xul @@ -5242,10 +5325,6 @@ lib/seamonkey/chrome/pippki/content/pippki/clientauthask.js lib/seamonkey/chrome/pippki/content/pippki/clientauthask.xul lib/seamonkey/chrome/pippki/content/pippki/createCertInfo.js lib/seamonkey/chrome/pippki/content/pippki/createCertInfo.xul -lib/seamonkey/chrome/pippki/content/pippki/crlImportDialog.js -lib/seamonkey/chrome/pippki/content/pippki/crlImportDialog.xul -lib/seamonkey/chrome/pippki/content/pippki/crlManager.js -lib/seamonkey/chrome/pippki/content/pippki/crlManager.xul lib/seamonkey/chrome/pippki/content/pippki/deletecert.js lib/seamonkey/chrome/pippki/content/pippki/deletecert.xul lib/seamonkey/chrome/pippki/content/pippki/device_manager.js @@ -5269,20 +5348,14 @@ lib/seamonkey/chrome/pippki/content/pippki/password.js lib/seamonkey/chrome/pippki/content/pippki/pippki.js lib/seamonkey/chrome/pippki/content/pippki/pref-certs.js lib/seamonkey/chrome/pippki/content/pippki/pref-certs.xul -lib/seamonkey/chrome/pippki/content/pippki/pref-crlupdate.js -lib/seamonkey/chrome/pippki/content/pippki/pref-crlupdate.xul lib/seamonkey/chrome/pippki/content/pippki/pref-masterpass.js lib/seamonkey/chrome/pippki/content/pippki/pref-masterpass.xul lib/seamonkey/chrome/pippki/content/pippki/pref-ssl.js lib/seamonkey/chrome/pippki/content/pippki/pref-ssl.xul -lib/seamonkey/chrome/pippki/content/pippki/pref-validation.js -lib/seamonkey/chrome/pippki/content/pippki/pref-validation.xul lib/seamonkey/chrome/pippki/content/pippki/protectedAuth.js lib/seamonkey/chrome/pippki/content/pippki/protectedAuth.xul lib/seamonkey/chrome/pippki/content/pippki/resetpassword.js lib/seamonkey/chrome/pippki/content/pippki/resetpassword.xul -lib/seamonkey/chrome/pippki/content/pippki/serverCrlNextupdate.js -lib/seamonkey/chrome/pippki/content/pippki/serverCrlNextupdate.xul lib/seamonkey/chrome/pippki/content/pippki/setp12password.xul lib/seamonkey/chrome/pippki/content/pippki/viewCertDetails.js lib/seamonkey/chrome/pippki/content/pippki/viewCertDetails.xul @@ -5368,22 +5441,12 @@ lib/seamonkey/chrome/toolkit/content/global/console.js lib/seamonkey/chrome/toolkit/content/global/console.xul lib/seamonkey/chrome/toolkit/content/global/consoleBindings.xml lib/seamonkey/chrome/toolkit/content/global/contentAreaUtils.js -lib/seamonkey/chrome/toolkit/content/global/cpow/child.html -lib/seamonkey/chrome/toolkit/content/global/cpow/test.xul lib/seamonkey/chrome/toolkit/content/global/customizeCharset.js lib/seamonkey/chrome/toolkit/content/global/customizeCharset.xul lib/seamonkey/chrome/toolkit/content/global/customizeToolbar.css lib/seamonkey/chrome/toolkit/content/global/customizeToolbar.js lib/seamonkey/chrome/toolkit/content/global/customizeToolbar.xul lib/seamonkey/chrome/toolkit/content/global/devicestorage.properties -lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-browser-actors.js -lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-gcli-actors.js -lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-profiler-actors.js -lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-script-actors.js -lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-server.js -lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-styleeditor-actors.js -lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-transport.js -lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-webconsole-actors.js lib/seamonkey/chrome/toolkit/content/global/dialogOverlay.js lib/seamonkey/chrome/toolkit/content/global/dialogOverlay.xul lib/seamonkey/chrome/toolkit/content/global/directionDetector.html @@ -5780,21 +5843,18 @@ lib/seamonkey/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-16.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-64.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/passwordmgr/key.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.png +lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginActivate.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginBlocked.png -lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClickToPlay.png -lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClickToPlayPlain.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClose.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDisabled.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDownload.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginMissing.png -lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginBlocked.png +lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginStripe.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginCrashed.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginGeneric.png -lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginOutdated.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked-64.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked.png -lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/pluginDisabled.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric-16.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/pluginHelp-16.png @@ -5817,7 +5877,7 @@ lib/seamonkey/components/DownloadLegacy.js lib/seamonkey/components/FeedConverter.js lib/seamonkey/components/FeedProcessor.js lib/seamonkey/components/FeedWriter.js -lib/seamonkey/components/NavigatorPropertyHelper.js +lib/seamonkey/components/FormHistoryStartup.js lib/seamonkey/components/NetworkGeolocationProvider.js lib/seamonkey/components/PermissionSettings.js lib/seamonkey/components/PlacesCategoriesStarter.js @@ -5840,7 +5900,6 @@ lib/seamonkey/components/glautocomp.js lib/seamonkey/components/interfaces.xpt lib/seamonkey/components/jsconsole-clhandler.js lib/seamonkey/components/jsmimeemitter.js -${PLIST.gnome}lib/seamonkey/components/libdbusservice.so lib/seamonkey/components/libmozgnome.so lib/seamonkey/components/libsuite.so lib/seamonkey/components/mdn-service.js @@ -5989,6 +6048,8 @@ lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/com lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/lock-insecure.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/lock-secure-16.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/lock-secure.png +lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/notification-16.png +lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/notification-64.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/offline.gif lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/online.gif lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/plugin.png @@ -6097,6 +6158,7 @@ lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/glo lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/aboutMemory.css lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/aboutSupport.css lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/alerts/alert.css +lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/alerts/notification-48.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/appPicker.css lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/arrow/arrow-dn-dis.gif lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/arrow/arrow-dn.gif @@ -6544,6 +6606,7 @@ lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/nav lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/btn1/up-dis.gif lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/btn1/up-hov.gif lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/btn1/up.gif +lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/click-to-play-warning-stripes.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/icons/browser-small.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/icons/browser.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/icons/identity.png @@ -6627,6 +6690,7 @@ lib/seamonkey/modules/AlarmService.jsm lib/seamonkey/modules/AppDownloadManager.jsm lib/seamonkey/modules/AppsServiceChild.jsm lib/seamonkey/modules/AppsUtils.jsm +lib/seamonkey/modules/AsyncSpellCheckTestHelper.jsm lib/seamonkey/modules/BackgroundPageThumbs.jsm lib/seamonkey/modules/BookmarkHTMLUtils.jsm lib/seamonkey/modules/BookmarkJSONUtils.jsm @@ -6675,6 +6739,7 @@ lib/seamonkey/modules/JXON.js lib/seamonkey/modules/LightweightThemeConsumer.jsm lib/seamonkey/modules/LightweightThemeImageOptimizer.jsm lib/seamonkey/modules/LightweightThemeManager.jsm +lib/seamonkey/modules/LoginManagerContent.jsm lib/seamonkey/modules/MailUtils.js lib/seamonkey/modules/MessagePortBase.jsm lib/seamonkey/modules/MessagePortWorker.js @@ -6704,6 +6769,7 @@ lib/seamonkey/modules/PluralForm.jsm lib/seamonkey/modules/PopupNotifications.jsm lib/seamonkey/modules/Preferences.jsm lib/seamonkey/modules/PrivateBrowsingUtils.jsm +lib/seamonkey/modules/Promise.jsm lib/seamonkey/modules/PropertyListUtils.jsm lib/seamonkey/modules/PushService.jsm lib/seamonkey/modules/RemoteWebProgress.jsm @@ -6721,6 +6787,7 @@ lib/seamonkey/modules/SystemMessagePermissionsChecker.jsm lib/seamonkey/modules/Task.jsm lib/seamonkey/modules/TelemetryStopwatch.jsm lib/seamonkey/modules/TelemetryTimestamps.jsm +lib/seamonkey/modules/ThirdPartyCookieProbe.jsm lib/seamonkey/modules/Timer.jsm lib/seamonkey/modules/Troubleshoot.jsm lib/seamonkey/modules/UpdateChannel.jsm @@ -6729,6 +6796,7 @@ lib/seamonkey/modules/WebappOSUtils.jsm lib/seamonkey/modules/Webapps.jsm lib/seamonkey/modules/WebappsInstaller.jsm lib/seamonkey/modules/WindowDraggingUtils.jsm +lib/seamonkey/modules/WindowsPreviewPerTab.jsm lib/seamonkey/modules/WorkerAPI.jsm lib/seamonkey/modules/XPCOMUtils.jsm lib/seamonkey/modules/XPIProvider.jsm @@ -6736,11 +6804,11 @@ lib/seamonkey/modules/XPIProviderUtils.js lib/seamonkey/modules/accessibility/AccessFu.jsm lib/seamonkey/modules/accessibility/EventManager.jsm lib/seamonkey/modules/accessibility/Makefile.in +lib/seamonkey/modules/accessibility/OutputGenerator.jsm lib/seamonkey/modules/accessibility/Presentation.jsm lib/seamonkey/modules/accessibility/TouchAdapter.jsm lib/seamonkey/modules/accessibility/TraversalRules.jsm lib/seamonkey/modules/accessibility/Utils.jsm -lib/seamonkey/modules/accessibility/UtteranceGenerator.jsm lib/seamonkey/modules/accessibility/jar.mn lib/seamonkey/modules/commonjs/method/History.md lib/seamonkey/modules/commonjs/method/License.md @@ -6758,9 +6826,9 @@ lib/seamonkey/modules/commonjs/sdk/browser/events.js lib/seamonkey/modules/commonjs/sdk/clipboard.js lib/seamonkey/modules/commonjs/sdk/console/plain-text.js lib/seamonkey/modules/commonjs/sdk/console/traceback.js -lib/seamonkey/modules/commonjs/sdk/content/content-proxy.js lib/seamonkey/modules/commonjs/sdk/content/content-worker.js lib/seamonkey/modules/commonjs/sdk/content/content.js +lib/seamonkey/modules/commonjs/sdk/content/events.js lib/seamonkey/modules/commonjs/sdk/content/loader.js lib/seamonkey/modules/commonjs/sdk/content/mod.js lib/seamonkey/modules/commonjs/sdk/content/symbiont.js @@ -6789,6 +6857,7 @@ lib/seamonkey/modules/commonjs/sdk/deprecated/unit-test.js lib/seamonkey/modules/commonjs/sdk/deprecated/window-utils.js lib/seamonkey/modules/commonjs/sdk/dom/events.js lib/seamonkey/modules/commonjs/sdk/dom/events/keys.js +lib/seamonkey/modules/commonjs/sdk/event/chrome.js lib/seamonkey/modules/commonjs/sdk/event/core.js lib/seamonkey/modules/commonjs/sdk/event/dom.js lib/seamonkey/modules/commonjs/sdk/event/target.js @@ -6828,6 +6897,7 @@ lib/seamonkey/modules/commonjs/sdk/panel/utils.js lib/seamonkey/modules/commonjs/sdk/panel/window.js lib/seamonkey/modules/commonjs/sdk/passwords.js lib/seamonkey/modules/commonjs/sdk/passwords/utils.js +lib/seamonkey/modules/commonjs/sdk/places/favicon.js lib/seamonkey/modules/commonjs/sdk/platform/xpcom.js lib/seamonkey/modules/commonjs/sdk/preferences/event-target.js lib/seamonkey/modules/commonjs/sdk/preferences/service.js @@ -6902,6 +6972,9 @@ lib/seamonkey/modules/commonjs/toolkit/loader.js lib/seamonkey/modules/ctypes.jsm lib/seamonkey/modules/debug.js lib/seamonkey/modules/devtools/Console.jsm +lib/seamonkey/modules/devtools/DevToolsUtils.js +lib/seamonkey/modules/devtools/DevToolsUtils.jsm +lib/seamonkey/modules/devtools/Loader.jsm lib/seamonkey/modules/devtools/NetworkHelper.jsm lib/seamonkey/modules/devtools/Require.jsm lib/seamonkey/modules/devtools/SourceMap.jsm @@ -6911,6 +6984,19 @@ lib/seamonkey/modules/devtools/WebConsoleUtils.jsm lib/seamonkey/modules/devtools/dbg-client.jsm lib/seamonkey/modules/devtools/dbg-server.jsm lib/seamonkey/modules/devtools/gcli.jsm +lib/seamonkey/modules/devtools/server/actors/gcli.js +lib/seamonkey/modules/devtools/server/actors/inspector.js +lib/seamonkey/modules/devtools/server/actors/profiler.js +lib/seamonkey/modules/devtools/server/actors/root.js +lib/seamonkey/modules/devtools/server/actors/script.js +lib/seamonkey/modules/devtools/server/actors/string.js +lib/seamonkey/modules/devtools/server/actors/styleeditor.js +lib/seamonkey/modules/devtools/server/actors/webapps.js +lib/seamonkey/modules/devtools/server/actors/webbrowser.js +lib/seamonkey/modules/devtools/server/actors/webconsole.js +lib/seamonkey/modules/devtools/server/main.js +lib/seamonkey/modules/devtools/server/protocol.js +lib/seamonkey/modules/devtools/server/transport.js lib/seamonkey/modules/editorUtilities.jsm lib/seamonkey/modules/errUtils.js lib/seamonkey/modules/folderUtils.jsm @@ -7016,6 +7102,7 @@ lib/seamonkey/modules/services-sync/util.js lib/seamonkey/modules/templateUtils.js lib/seamonkey/modules/traceHelper.js lib/seamonkey/modules/virtualFolderWrapper.js +lib/seamonkey/modules/workers/require.js lib/seamonkey/mozilla-xremote-client lib/seamonkey/platform.ini lib/seamonkey/plugin-container @@ -7077,6 +7164,7 @@ lib/seamonkey/updater lib/seamonkey/updater.ini share/idl/seamonkey/IJSDebugger.idl share/idl/seamonkey/MailNewsTypes2.idl +share/idl/seamonkey/amIAddonManager.idl share/idl/seamonkey/amIInstallTrigger.idl share/idl/seamonkey/amIWebInstallListener.idl share/idl/seamonkey/amIWebInstaller.idl @@ -7174,7 +7262,6 @@ share/idl/seamonkey/nsIAboutModule.idl share/idl/seamonkey/nsIAccessible.idl share/idl/seamonkey/nsIAccessibleApplication.idl share/idl/seamonkey/nsIAccessibleCaretMoveEvent.idl -share/idl/seamonkey/nsIAccessibleCursorable.idl share/idl/seamonkey/nsIAccessibleDocument.idl share/idl/seamonkey/nsIAccessibleEditableText.idl share/idl/seamonkey/nsIAccessibleEvent.idl @@ -7268,8 +7355,6 @@ share/idl/seamonkey/nsICMSMessage.idl share/idl/seamonkey/nsICMSMessage2.idl share/idl/seamonkey/nsICMSMessageErrors.idl share/idl/seamonkey/nsICMSSecureMessage.idl -share/idl/seamonkey/nsICRLInfo.idl -share/idl/seamonkey/nsICRLManager.idl share/idl/seamonkey/nsICache.idl share/idl/seamonkey/nsICacheEntryDescriptor.idl share/idl/seamonkey/nsICacheInfoChannel.idl @@ -7369,7 +7454,6 @@ share/idl/seamonkey/nsIDOMAnimationEvent.idl share/idl/seamonkey/nsIDOMApplicationRegistry.idl share/idl/seamonkey/nsIDOMApplicationRegistry2.idl share/idl/seamonkey/nsIDOMAttr.idl -share/idl/seamonkey/nsIDOMBarProp.idl share/idl/seamonkey/nsIDOMBeforeUnloadEvent.idl share/idl/seamonkey/nsIDOMBlobEvent.idl share/idl/seamonkey/nsIDOMCDATASection.idl @@ -7377,6 +7461,7 @@ share/idl/seamonkey/nsIDOMCRMFObject.idl share/idl/seamonkey/nsIDOMCSSCharsetRule.idl share/idl/seamonkey/nsIDOMCSSConditionRule.idl share/idl/seamonkey/nsIDOMCSSFontFaceRule.idl +share/idl/seamonkey/nsIDOMCSSFontFeatureValuesRule.idl share/idl/seamonkey/nsIDOMCSSGroupingRule.idl share/idl/seamonkey/nsIDOMCSSImportRule.idl share/idl/seamonkey/nsIDOMCSSMediaRule.idl @@ -7412,7 +7497,6 @@ share/idl/seamonkey/nsIDOMCryptoDialogs.idl share/idl/seamonkey/nsIDOMCryptoLegacy.idl share/idl/seamonkey/nsIDOMCustomEvent.idl share/idl/seamonkey/nsIDOMDOMCursor.idl -share/idl/seamonkey/nsIDOMDOMError.idl share/idl/seamonkey/nsIDOMDOMException.idl share/idl/seamonkey/nsIDOMDOMImplementation.idl share/idl/seamonkey/nsIDOMDOMRequest.idl @@ -7444,6 +7528,7 @@ share/idl/seamonkey/nsIDOMFile.idl share/idl/seamonkey/nsIDOMFileHandle.idl share/idl/seamonkey/nsIDOMFileList.idl share/idl/seamonkey/nsIDOMFileReader.idl +share/idl/seamonkey/nsIDOMFocusEvent.idl share/idl/seamonkey/nsIDOMFontFace.idl share/idl/seamonkey/nsIDOMFontFaceList.idl share/idl/seamonkey/nsIDOMFormData.idl @@ -7457,7 +7542,6 @@ share/idl/seamonkey/nsIDOMGeoPositionCallback.idl share/idl/seamonkey/nsIDOMGeoPositionCoords.idl share/idl/seamonkey/nsIDOMGeoPositionError.idl share/idl/seamonkey/nsIDOMGeoPositionErrorCallback.idl -share/idl/seamonkey/nsIDOMGetSVGDocument.idl share/idl/seamonkey/nsIDOMGlobalObjectConstructor.idl share/idl/seamonkey/nsIDOMGlobalPropertyInitializer.idl share/idl/seamonkey/nsIDOMHTMLAnchorElement.idl @@ -7471,7 +7555,6 @@ share/idl/seamonkey/nsIDOMHTMLButtonElement.idl share/idl/seamonkey/nsIDOMHTMLByteRanges.idl share/idl/seamonkey/nsIDOMHTMLCanvasElement.idl share/idl/seamonkey/nsIDOMHTMLCollection.idl -share/idl/seamonkey/nsIDOMHTMLCommandElement.idl share/idl/seamonkey/nsIDOMHTMLDListElement.idl share/idl/seamonkey/nsIDOMHTMLDataListElement.idl share/idl/seamonkey/nsIDOMHTMLDirectoryElement.idl @@ -7597,15 +7680,12 @@ share/idl/seamonkey/nsIDOMPowerManager.idl share/idl/seamonkey/nsIDOMProcessingInstruction.idl share/idl/seamonkey/nsIDOMProgressEvent.idl share/idl/seamonkey/nsIDOMPushManager.idl -share/idl/seamonkey/nsIDOMRTCPeerConnection.idl share/idl/seamonkey/nsIDOMRange.idl share/idl/seamonkey/nsIDOMRect.idl share/idl/seamonkey/nsIDOMSVGAnimatedEnum.idl share/idl/seamonkey/nsIDOMSVGAnimatedInteger.idl share/idl/seamonkey/nsIDOMSVGAnimatedLength.idl share/idl/seamonkey/nsIDOMSVGAnimatedNumber.idl -share/idl/seamonkey/nsIDOMSVGAnimatedString.idl -share/idl/seamonkey/nsIDOMSVGDocument.idl share/idl/seamonkey/nsIDOMSVGElement.idl share/idl/seamonkey/nsIDOMSVGLength.idl share/idl/seamonkey/nsIDOMSVGNumber.idl @@ -7625,14 +7705,14 @@ share/idl/seamonkey/nsIDOMStorage.idl share/idl/seamonkey/nsIDOMStorageEvent.idl share/idl/seamonkey/nsIDOMStorageIndexedDB.idl share/idl/seamonkey/nsIDOMStorageManager.idl +share/idl/seamonkey/nsIDOMStyleRuleChangeEvent.idl share/idl/seamonkey/nsIDOMStyleSheet.idl -share/idl/seamonkey/nsIDOMStyleSheetAddedEvent.idl +share/idl/seamonkey/nsIDOMStyleSheetApplicableStateChangeEvent.idl +share/idl/seamonkey/nsIDOMStyleSheetChangeEvent.idl share/idl/seamonkey/nsIDOMStyleSheetList.idl -share/idl/seamonkey/nsIDOMStyleSheetRemovedEvent.idl share/idl/seamonkey/nsIDOMTCPSocket.idl share/idl/seamonkey/nsIDOMText.idl share/idl/seamonkey/nsIDOMTimeEvent.idl -share/idl/seamonkey/nsIDOMTimeManager.idl share/idl/seamonkey/nsIDOMTimeRanges.idl share/idl/seamonkey/nsIDOMToString.idl share/idl/seamonkey/nsIDOMTouchEvent.idl @@ -7691,7 +7771,6 @@ share/idl/seamonkey/nsIDirectoryService.idl share/idl/seamonkey/nsIDiskSpaceWatcher.idl share/idl/seamonkey/nsIDocCharset.idl share/idl/seamonkey/nsIDocShell.idl -share/idl/seamonkey/nsIDocShellHistory.idl share/idl/seamonkey/nsIDocShellLoadInfo.idl share/idl/seamonkey/nsIDocShellTreeItem.idl share/idl/seamonkey/nsIDocShellTreeNode.idl @@ -7699,7 +7778,6 @@ share/idl/seamonkey/nsIDocShellTreeOwner.idl share/idl/seamonkey/nsIDocumentEncoder.idl share/idl/seamonkey/nsIDocumentLoader.idl share/idl/seamonkey/nsIDocumentLoaderFactory.idl -share/idl/seamonkey/nsIDocumentRegister.idl share/idl/seamonkey/nsIDocumentStateListener.idl share/idl/seamonkey/nsIDownload.idl share/idl/seamonkey/nsIDownloadHistory.idl @@ -8042,6 +8120,7 @@ share/idl/seamonkey/nsINativeAppSupport.idl share/idl/seamonkey/nsINavBookmarksService.idl share/idl/seamonkey/nsINavHistoryService.idl share/idl/seamonkey/nsINavigatorBattery.idl +share/idl/seamonkey/nsINavigatorGamepads.idl share/idl/seamonkey/nsINestedURI.idl share/idl/seamonkey/nsINetAddr.idl share/idl/seamonkey/nsINetUtil.idl @@ -8164,6 +8243,7 @@ share/idl/seamonkey/nsIRecentBadCertsService.idl share/idl/seamonkey/nsIRecoveryService.idl share/idl/seamonkey/nsIRedirectChannelRegistrar.idl share/idl/seamonkey/nsIRedirectResultListener.idl +share/idl/seamonkey/nsIReflowObserver.idl share/idl/seamonkey/nsIRefreshURI.idl share/idl/seamonkey/nsIRelativeFilePref.idl share/idl/seamonkey/nsIRemoteOpenFileListener.idl diff --git a/www/seamonkey/PLIST.lightning b/www/seamonkey/PLIST.lightning index 4917513f1a1..09d85e672ed 100644 --- a/www/seamonkey/PLIST.lightning +++ b/www/seamonkey/PLIST.lightning @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.lightning,v 1.11 2013/08/11 03:18:46 ryoon Exp $ +@comment $NetBSD: PLIST.lightning,v 1.12 2013/09/28 14:37:05 ryoon Exp $ include/seamonkey/calBaseCID.h include/seamonkey/calIAlarm.h include/seamonkey/calIAlarmService.h @@ -377,8 +377,10 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/light lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/wcap.xpt lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/preferences/lightning.js lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf +lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/OAuth2.jsm lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAlarmUtils.jsm lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAuthUtils.jsm +lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calExtract.jsm lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calHashedArray.jsm lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItemUtils.jsm lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calIteratorUtils.jsm diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 9f038180d7e..8c9bcc8c6a6 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,18 +1,17 @@ -$NetBSD: distinfo,v 1.102 2013/08/30 13:00:37 joerg Exp $ +$NetBSD: distinfo,v 1.103 2013/09/28 14:37:05 ryoon Exp $ SHA1 (enigmail-1.5.2.tar.gz) = 6f9d3be09e3858cfa65795389aa4d79ec2d1a4a9 RMD160 (enigmail-1.5.2.tar.gz) = 5d638f889d7e0e51c832b3776372b98316d6bd22 Size (enigmail-1.5.2.tar.gz) = 1211395 bytes -SHA1 (seamonkey-2.20.source.tar.bz2) = 804a86ee3ffcb8eb4d53b0fe16e46d4a5bd14902 -RMD160 (seamonkey-2.20.source.tar.bz2) = 713398932d444f5bb579c889f9a5368c01e01e7c -Size (seamonkey-2.20.source.tar.bz2) = 139969292 bytes -SHA1 (patch-aa) = 9bf59ef7aa3dca59f29f02f9467c20806cfe0e76 +SHA1 (seamonkey-2.21.source.tar.bz2) = 85db647dfb24f8fd5392f8926f5dfc4c6f35312c +RMD160 (seamonkey-2.21.source.tar.bz2) = 7e4853bf5d56a4891d4de9933e634dcc3e533540 +Size (seamonkey-2.21.source.tar.bz2) = 140654724 bytes +SHA1 (patch-aa) = 0a8e5976e8c55166b46cc9d284867b3ef67867ff SHA1 (patch-ak) = a36dd36a037a76a40955316200b1f4603b9ed8e9 SHA1 (patch-al) = 06ddb5f0f55ca02bee0d55ddb5316ddd9099f2d9 SHA1 (patch-ao) = 330d7ed17b5cee49c408c9bc48edc3cedeb04061 -SHA1 (patch-as) = 4f80d55984623c5924ecb36cfee6ee2530d7e630 -SHA1 (patch-bd) = d148a08d6aa03c559d9250cf9a30ca66f1a76859 -SHA1 (patch-bf) = a199d37e83823dee168c1a32f5aeac834b96714f +SHA1 (patch-as) = b4fc3f042db7e5637b7e813c308d2dc239c4d00b +SHA1 (patch-bf) = cf7fef695c6db66a3653d3258a2385c6f1eb709e SHA1 (patch-bg) = 1b4da74724d24693d863392e1963fa674d34b72e SHA1 (patch-bi) = 904ec1a966d6224f873836d8cbee2eb80eb2d2a9 SHA1 (patch-config_baseconfig.mk) = 3fdb27d227ef0d858b56023b9c709117d5cc5e00 @@ -20,36 +19,43 @@ SHA1 (patch-ldap_sdks_c-sdk_build.mk) = 541604f0f63f5c1b3ce5509260517f68f417eb73 SHA1 (patch-ldap_sdks_c-sdk_ldap_include_portable.h) = 4ce9e1a0e8f0d05367243e8d2b5118606a35da94 SHA1 (patch-mail_app_Makefile.in) = d66563480442a43e70715ecabf54ffeda5e5cf79 SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = fda6823079ef3345cc0c4d1724c71e9735184498 -SHA1 (patch-mb) = ee437f869fa3d5cfd3e0056e97625adb8ea526c8 +SHA1 (patch-mb) = f153b28aeb71a0ace4a4c1d55c3e31648d242bd5 +SHA1 (patch-mozilla_browser_app_profile_firefox.js) = 2e8d8470d239b6be2c6c64a8a752f8229d421dc6 SHA1 (patch-mozilla_browser_installer_package-manifest.in) = a61eec2dc12b341bfd84bdda0d70842a627e9c9a +SHA1 (patch-mozilla_browser_locales_en-US_chrome_browser-region_region.properties) = 3783a98ead12f5bab87e944d4cc129261d015007 +SHA1 (patch-mozilla_browser_locales_en-US_searchplugins_duckduckgo.xml) = 828def5acc7c9dc18727a27b0c47e44d87a94eaf +SHA1 (patch-mozilla_browser_locales_en-US_searchplugins_list.txt) = b1e4c051977fa8fc46bba6afcdbe4e3de778be75 SHA1 (patch-mozilla_build_autoconf_nss.m4) = 3b05127e72a76ac2f87c8362cbde13ce76485a19 +SHA1 (patch-mozilla_build_pgo_profileserver.py) = d0cb9879079f0b4847e7a7a5a86671b89a978c48 +SHA1 (patch-mozilla_config_Makefile.in) = 88906ecbe21393239965d9dfcc4975be6e2ed071 SHA1 (patch-mozilla_config_baseconfig.mk) = d6f27cdc853e6d026c151bf40cb898428c37455c SHA1 (patch-mozilla_config_stl__wrappers_ios) = 066a9f3db9203afa8131b2ff91d212033e5950e0 SHA1 (patch-mozilla_config_stl__wrappers_ostream) = 67559c5ab17088680b86dea6b081a48b781f59b5 -SHA1 (patch-mozilla_config_system-headers) = f4ddd48a63041864a9d0c0ad7c573a5c4f49681e +SHA1 (patch-mozilla_config_system-headers) = fd83f4419dd1584332c2e1e675c077ca1ce9fe11 +SHA1 (patch-mozilla_content_media_gstreamer_GStreamerFormatHelper.cpp) = d0922c3bb056e9e27e6b97f4bf7a58c7861abf25 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 400a5af9988d4392d92e493c73bbe61cd1915edb SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = 14038ce0ee2b38db6c7952056a97a65839a2c1a9 SHA1 (patch-mozilla_extensions_auth_nsAuthGSSAPI.cpp) = 527f00c7001e9de95b9ccb4b4eaad62107b49fef -SHA1 (patch-mozilla_gfx_2d_Blur.cpp) = ef1b4f51f4b0da356b931314c3cda78a79519d57 +SHA1 (patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 5f4c28f07469f402035cc607bf82b851bf60a0a4 SHA1 (patch-mozilla_gfx_graphite2_src_Bidi.cpp) = fb97becdfeeea742e8c0bc51e10efc124a2a11f3 -SHA1 (patch-mozilla_gfx_skia_Makefile.in) = 9adc38011a2186d8671360f6635a6c83dc758c9a SHA1 (patch-mozilla_gfx_skia_include_core_SkPreConfig.h) = 0bd308b64ec693076e0a2d349028fa45bddce35c +SHA1 (patch-mozilla_gfx_skia_moz.build) = 180b6d194ea2930002300a9366677eec204c699c SHA1 (patch-mozilla_gfx_skia_src_sfnt_SkOTTable__head.h) = 75a54359e2ebc4a019e4b5ed027df654b612ea34 SHA1 (patch-mozilla_gfx_skia_src_sfnt_SkOTTable__name.h) = f8ef35f6d4ede4d02baee2c2905089b307724b95 SHA1 (patch-mozilla_gfx_skia_src_sfnt_SkSFNTHeader.h) = eab1973eb9cee2440d59147b40fc861ccdae2fb5 -SHA1 (patch-mozilla_gfx_thebes_gfxPlatform.cpp) = e5d5aa6e8919226c9249693334c2c54b843bd627 SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = 316bfe765e20f188c847efa30cfa0ccc9f4fc7e5 SHA1 (patch-mozilla_intl_hyphenation_src_hnjalloc.h) = 8b670bca826d17e373c1c09893e335c1bb3d4546 -SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = e6a190864ca062fd4b0a7dc1bf6eb9a5625acfad +SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = 52124c755fb57e87e50cb8d46f727b65937ab325 SHA1 (patch-mozilla_ipc_chromium_chromium-config.mk) = 7908071f6465cb17fe5fba517b0d628bb437f9e3 SHA1 (patch-mozilla_ipc_chromium_src_base_base__paths.h) = 87e8a5b3e859bba908d985d6952bf1a7ca1f60b2 SHA1 (patch-mozilla_ipc_chromium_src_base_debug__util__posix.cc) = b7fb6d1e607e1b00fe3cdde1376fb18e783fa801 SHA1 (patch-mozilla_ipc_chromium_src_base_file__util.h) = d6ba7a0876840306148c29041f352bee850255cc SHA1 (patch-mozilla_ipc_chromium_src_base_file__util__posix.cc) = 0d43d6a5de73f88c159dd4caf372be7544aa7c6e +SHA1 (patch-mozilla_ipc_chromium_src_base_file__version__info.h) = 463e8d0c433618fe3750627be88d95d8ac4b7def SHA1 (patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc) = 7c18b292b688f4185c9012ba03135ab95e5c473b -SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread.h) = 67e1f444995c57e9e74eb9aa5780b62989ae6c55 -SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc) = 00414321999d7bbb78e8b666324d108a564302f2 -SHA1 (patch-mozilla_ipc_chromium_src_base_process__util.h) = f0c44506921adbd18de26dad09d9b19ecc94aab1 +SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread.h) = 487468d70d9644e6b09c548ab607310ff54add84 +SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc) = 250ae7c2f00bf019fc7f574744d5bfc3830553e5 +SHA1 (patch-mozilla_ipc_chromium_src_base_process__util.h) = 1d570ebf920496f8fd5747d26c620c1a30a28942 SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__posix.cc) = d67e126dfb26e2394a9c21aab5e3b6cc3ab238f1 SHA1 (patch-mozilla_ipc_chromium_src_base_sys__info__posix.cc) = 7897c20672810e796cb09d0df9ab6d4b46302c99 SHA1 (patch-mozilla_ipc_chromium_src_base_time__posix.cc) = 2662bf55bf5276d06c4754cdce125a0bfbac17a0 @@ -58,34 +64,25 @@ SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h) = 53c37deda SHA1 (patch-mozilla_ipc_glue_AsyncChannel.cpp) = 8a93fe19a4badf0bf62bffb62a17d1a118625d50 SHA1 (patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp) = eeff8f44c9b781f006f6e9a90c36c2e43cfdf54b SHA1 (patch-mozilla_ipc_ipdl_ipdl_lower.py) = 2bf473a505692adc68c9cdc75a23d53d61c0fc8b -SHA1 (patch-mozilla_js_public_HeapAPI.h) = 23212f7b77bdada7d23812f79e0d76be06d115c9 -SHA1 (patch-mozilla_js_src_Makefile.in) = c246a9ebace2810814bee3a8540fadbd13429382 -SHA1 (patch-mozilla_js_src_config_system-headers) = 714161aa3069387f32df4bd50753db474649bbc0 -SHA1 (patch-mozilla_js_src_gc_Marking.cpp) = 34081972488015c3644809f1cbe157d426bf9d6f -SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = 88fa2a1b257d18b48b7164aaa877d70ac077756a -SHA1 (patch-mozilla_js_src_gc_Memory.h) = 24e7934d7be8a24a7c7b1b3bd511b00af8cbdf13 -SHA1 (patch-mozilla_js_src_ion_AsmJS.cpp) = 433620f65291cf549db846551f7e06e4a86bfabb -SHA1 (patch-mozilla_js_src_ion_AsmJS.h) = 3568cee264c458e2d1ceee62e44ed15db2e00b8a -SHA1 (patch-mozilla_js_src_ion_AsmJSModule.h) = 5096d511ab32ed8d1c732c250b37fd38351631d0 -SHA1 (patch-mozilla_js_src_ion_AsmJSSignalHandlers.cpp) = 85c1f6dfe5e7073a3551b6c6a7a0094db25e80d1 -SHA1 (patch-mozilla_js_src_jsapi.cpp) = 745c049b49dd63f6e1215446ae6cc5e5ca47b644 -SHA1 (patch-mozilla_js_src_jscntxt.h) = b680508a72968333a6219683cfcf99c8d9cb303a +SHA1 (patch-mozilla_js_src_Makefile.in) = 88bcfa06533baecc6023892e0b55369f44b2a409 +SHA1 (patch-mozilla_js_src_config_Makefile.in) = e85ebe41a6c6e68a7cb5ef3a975cb30082010e7c +SHA1 (patch-mozilla_js_src_config_system-headers) = 2412e1854e967502cb046c7299f975c0f4f00315 +SHA1 (patch-mozilla_js_src_ctypes_CTypes.h) = 3cbc360db82af7f40161d22f4e04c8a720811c3a +SHA1 (patch-mozilla_js_src_frontend_ParseMaps.cpp) = af9c153c78a3d50e926f7820db3c98b7fe1db063 +SHA1 (patch-mozilla_js_src_gdb_Makefile.in) = 324bd666c020295d654d4eb07fa7d4f566fdb1c0 +SHA1 (patch-mozilla_js_src_jit_AsmJSSignalHandlers.cpp) = 42eae6278a1d34607552c81474c0ece7d3c66b50 +SHA1 (patch-mozilla_js_src_jsapi-tests_Makefile.in) = 5a0eb03ee1835ebf7ccdc5cc15bb623d0abf663e SHA1 (patch-mozilla_js_src_jscompartment.h) = dbe4cec8f27f9e694a73232638a834dfad53431f -SHA1 (patch-mozilla_js_src_jsgc.cpp) = d395a4766c7ff6bb67e0ca207a69cb07ee48ede6 -SHA1 (patch-mozilla_js_src_jsmath.cpp) = 4f854a7944524f4e0bf8ba48b600640b8a485471 -SHA1 (patch-mozilla_js_src_jsscript.cpp) = e5fb65c2380662301d69d25c1b757cbb274bac39 -SHA1 (patch-mozilla_js_src_jstypedarray.cpp) = 634d8fbb5802cc52354ed87ee5a4f3dcb3a8a64f -SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = a335669f683b4f0647204723d5201d9172c0300c -SHA1 (patch-mozilla_js_src_vm_ObjectImpl-inl.h) = 0d0ab503aa9dcb82697980058f04858aed05df8c -SHA1 (patch-mozilla_js_src_vm_SPSProfiler.cpp) = f6070497fd4804bd0b65bbbeb247d542a95c0a5d -SHA1 (patch-mozilla_js_src_vm_Stack.cpp) = 750ac4f867e04aa0d400fc804cc46c1d75aca005 -SHA1 (patch-mozilla_js_src_yarr_YarrInterpreter.cpp) = 33903465e6022bbfe1d101952eb64e9554a0d77e +SHA1 (patch-mozilla_js_src_jsmath.cpp) = 25225d4b9f05766314dfb7a809e8f4cf7ffa1f4b +SHA1 (patch-mozilla_js_src_shell_Makefile.in) = baf021d7fe8de763205949b6ffd85abcd8dcdcb8 +SHA1 (patch-mozilla_js_src_vm_ObjectImpl-inl.h) = 6389aa919cb3c414ba380760030cd4ccaf100704 +SHA1 (patch-mozilla_js_src_vm_SPSProfiler.cpp) = 4613c091883160449e7a81ebb1e12954155c36f2 SHA1 (patch-mozilla_media_libpng_pngpriv.h) = 43f554286be3ed7916c065d89fbf59764e5c7bbe SHA1 (patch-mozilla_media_libsoundtouch_src_cpu__detect__x86.cpp) = 83dcc1ffc6ffdd92b5c44f35875b107e46348916 SHA1 (patch-mozilla_media_mtransport_objs.mk) = c14ca9e5f727311495d74107282b0452144a1537 SHA1 (patch-mozilla_media_mtransport_test_Makefile.in) = 2f6341529a79596ffcfcdb96275b243d1a700356 SHA1 (patch-mozilla_media_mtransport_third__party_nICEr_nicer.gyp) = 41eca45bba8612b9c995b5a8e29ccda3ef06735b -SHA1 (patch-mozilla_media_mtransport_third__party_nICEr_src_stun_addrs.c) = 4c250361c6582ddd7832f7cf7caf4e6f7a26bdf8 +SHA1 (patch-mozilla_media_mtransport_third__party_nICEr_src_stun_addrs.c) = 54d79245dcb54e4e5ed1075f67e99aaef8e79a08 SHA1 (patch-mozilla_media_mtransport_third__party_nICEr_src_stun_stun.h) = ddbc02a8529086ddc1dc0b99664cc829f27700c4 SHA1 (patch-mozilla_media_mtransport_third__party_nICEr_src_util_mbslen.c) = 73fc5b93224b5e48853d4412f8c2e0b8ee50238e SHA1 (patch-mozilla_media_mtransport_third__party_nrappkit_nrappkit.gyp) = d7109ef00d55d910d04cba98ff55ad639da28b9a @@ -95,67 +92,56 @@ SHA1 (patch-mozilla_media_mtransport_third__party_nrappkit_src_util_util.c) = 5e SHA1 (patch-mozilla_media_webrtc_signaling_signaling.gyp) = dc04e99b4231e4364f9cb347d83bad663dcfcdfd SHA1 (patch-mozilla_media_webrtc_signaling_src_sipcc_cpr_darwin_cpr__darwin__ipc.c) = 266164bbf2d9c0d64971eb58f7c57dbd71604e44 SHA1 (patch-mozilla_media_webrtc_signaling_test_Makefile.in) = 3f1ebf8e02671eac6a0bd919d304d0065fbe6572 -SHA1 (patch-mozilla_media_webrtc_trunk_third__party_libyuv_libyuv.gyp) = 91c8cb272a357eb890d2823d9cd8935293e24182 +SHA1 (patch-mozilla_media_webrtc_trunk_build_build__config.h) = 851e7c9464e9cecd9599ae104a25622c64f5f41e SHA1 (patch-mozilla_media_webrtc_trunk_tools_gyp_pylib_gyp_generator_mozmake.py) = 77536c92ebe9928302e10fd566cbabcb00bce0f5 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi) = 889c88a4b75069cd6aa0f12aa29fa4a092f42888 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi) = 520a798101cd4b7ee537e8f59c798dce97529323 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__utility.cc) = ce5d6bca9da94ee1c95886bac4e96fd8aeff980c -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc) = 1b25416b992eb6ee12efae393070f33a2282b038 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_rtp__utility.cc) = 562320eb4712a6f6ed1de1f411ca7c2d1ef7aa20 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_udp__transport_source_udp__transport__impl.cc) = 13a528e7a69b9dd47676851ee24745c833fa90d0 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_utility_source_rtp__dump__impl.cc) = 35742cad65dccf3ae97874d2743cb8ff2e708fc7 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_device__info__impl.cc) = 42c2ef3c632782faec8827bd3509d6e129dfd96e -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 3152b35d26da3372b15c1aee439c825c67ef1d1f -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 2063892c7d59824bbe339e48b992dd3805563b02 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 90804cd543dc76768fc69a15e1db9dc791dc3653 +SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi) = 69cebc33717779a39f31082a0385e2badf4df88b +SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__impl.cc) = bb1dbd928570a0a23c0d38fd9dae41dd754b2c94 +SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_test_audio__device__test__api.cc) = ed358299d972e7ace3d63cb1f4ec9c60410f48c4 +SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 5ab199dc0d8d16e7ec97e244a7185053e0b57268 +SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 38153b620a063a9f2e3e04142d20ed952cdee123 +SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 4040cfa0170417d96115b4c87940786099366b13 SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture__factory.cc) = b699a6fd714b542e2087d8409d74f25db889d8e3 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_asm__defines.h) = d7e284b0523373ab42491c26cc21764d6d38d9f0 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_tick__util.h) = e7659c9a5dd6897b11bddb1774df3efe25014b43 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_atomic32__posix.cc) = e46aff2daa809a554c5cdeb07b58a1cfac495a45 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable.cc) = f7e8069a04f01629ba48d405092366848bd42fa3 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable__posix.cc) = 4229a4486a9319263a29905675708aa16a685c94 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu.cc) = 21eee8e6fa516c2a7a51f52d9e59fc742c4fd3e0 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu__info.cc) = a0762a60fc02b709949dfddd0950cf4757076b88 +SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable.cc) = 1fcd9278d8a92807885a5ce171db7550f501ffb1 SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = fd8c2a801427e4354b759b2545a11f8acad4fdf6 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc) = 35ac7b1a720a272dbc7bec730f3a1cb01333def8 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_trace__posix.cc) = 479e43bc5170994ef402cf04e90db0e34f5322f4 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_typedefs.h) = bdafde0ea04820fed1d1619e21fdd4fbc0bd4bdb -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_video__engine_vie__defines.h) = a73f7f9e8a3bcdfd0469146700f2da6e2b187191 -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voe__network__impl.cc) = 79bb0db726ee57bb494e253f5f40a0ddb79c391c -SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voice__engine__defines.h) = 9a74dd7cfeca4a8c5e7278c4c2971109a983b4f2 -SHA1 (patch-mozilla_media_webrtc_webrtc__config.gypi) = 415c6e4c7a0f90facc5ffcba8fe7057532656734 +SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc) = 1e573b63051558df3fc4964c8e2c3b97d4229371 SHA1 (patch-mozilla_memory_mozalloc_mozalloc__abort.cpp) = 6fc6da6ea50b85377a27e2448b2d95570c539479 +SHA1 (patch-mozilla_mfbt_Atomics.h) = 7d4e4a394063eabda1fddd3a3d0228c84ecaf2e8 +SHA1 (patch-mozilla_mfbt_Poison.cpp) = c01b2ef4bbb061585673d434a88036c67aa1a153 SHA1 (patch-mozilla_modules_libjar_nsZipArchive.cpp) = a399e0bd0e83c47938bbee077eaa79fc52386241 -SHA1 (patch-mozilla_netwerk_protocol_websocket_WebSocketChannel.cpp) = bc3cc885ae7853cb37dac105493f3b06381f6e65 -SHA1 (patch-mozilla_netwerk_sctp_src_Makefile.in) = c83496f284a85b66e665a2933b5184baf61772bf +SHA1 (patch-mozilla_modules_libpref_src_init_all.js) = 3580919b10fd558713b08d5fa93c64c15d8c0764 SHA1 (patch-mozilla_netwerk_sctp_src_netinet6_sctp6__usrreq.c) = dd166d48093684ee650a059d83008939cfad23fe SHA1 (patch-mozilla_netwerk_sctp_src_netinet_sctp__os__userspace.h) = 0961bbaa82191669a52ef9464776fbe744dec548 SHA1 (patch-mozilla_netwerk_sctp_src_netinet_sctp__usrreq.c) = 398c6638c71aa499e2b60f8b71f0c4006d832d5c SHA1 (patch-mozilla_netwerk_sctp_src_user__recv__thread.c) = c143363510a179c3c46e106dd8cd46718a7b1ac3 SHA1 (patch-mozilla_netwerk_sctp_src_user__socket.c) = a82b0f6d0d4717bfa593e7f3c53c3a229cfa6942 SHA1 (patch-mozilla_netwerk_sctp_src_user__socketvar.h) = 6d34abb3d8ecc5c8b36bfa594dc11a99facfa13b -SHA1 (patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp) = fb67e2a387031f0849b62aa0e660396b65335bb1 +SHA1 (patch-mozilla_netwerk_wifi_Makefile.in) = 2d55bd8a851cb7f8face61d6d0f8f9adbd584d88 +SHA1 (patch-mozilla_netwerk_wifi_moz.build) = d6358cc75747bb31b6c6358e5ab39b54b2490df1 +SHA1 (patch-mozilla_netwerk_wifi_nsWifiScannerFreeBSD.cpp) = 780dabd37ea0eab07932489181de4cdfe0a5b4a3 +SHA1 (patch-mozilla_ostream) = 2eef3e7761f585ca06a64ea7971220270297d807 +SHA1 (patch-mozilla_security_manager_ssl_src_JARSignatureVerification.cpp) = 9f265784d23be668dbb1fcb4e09185670a298293 +SHA1 (patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp) = 56531146315f3eac703a02ed23ef90f7ac4917b9 +SHA1 (patch-mozilla_toolkit_components_osfile_osfile__unix__allthreads.jsm) = 138cb9e73629a812b501d9b09f66a3f5eae4e134 SHA1 (patch-mozilla_toolkit_library_Makefile.in) = e7915dacee2a0bd3983cafd421ffe55ed54a5874 SHA1 (patch-mozilla_toolkit_mozapps_update_updater_updater.cpp) = 2d4769262671a41950d872f46806374efbbccb37 SHA1 (patch-mozilla_toolkit_toolkit.mozbuild) = d0510df2e3fb3a7c5dd713b36351e72961788345 +SHA1 (patch-mozilla_toolkit_xre_Makefile.in) = b8d51e994008f007b4fc1caec24a6eebe200b55b SHA1 (patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp) = 70030e59b2ed09b9bc9827d35e17b12be7f0cd71 +SHA1 (patch-mozilla_unwind.h) = 79f22c672c6fb0e28fad471d0b5e2619fc91dd1a SHA1 (patch-mozilla_xpcom_base_nsStackWalk.cpp) = 6946cbbd8389e35a13ad457b8cbb4da91e0d8925 SHA1 (patch-mozilla_xpcom_ds_TimeStamp.h) = 3f751a097ec60ad743a3fa2d6ba9c3b36d633176 +SHA1 (patch-mozilla_xpcom_ds_moz.build) = 1f6b3fa6ae17bf483d0c5e418731ab9090a73afd +SHA1 (patch-mozilla_xpcom_reflect_xptcall_src_md_unix_moz.build) = 75baafd5ccb281d54cc38cb1ca6b24d79b655626 SHA1 (patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 2868370f4112bcb8da5ed879e661856949750fb9 SHA1 (patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke__ppc__netbsd.cpp) = e6bdc6adc373dab89bd1ab9546db8fffd41cb38c SHA1 (patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp) = bbdb627a4130b36e1512d7350f92012163067940 -SHA1 (patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcstubs__sparc64__openbsd.cpp) = d63401ac0257ec6486412cffaf0a7484c9b8c166 SHA1 (patch-mozilla_xpcom_string_public_nsAlgorithm.h) = 90d1159982ef11d1ba6bfb01bfb64c0ce3cf8cd3 SHA1 (patch-mozilla_xulrunner_installer_Makefile.in) = 013e4de8500a17deb6c68bd1cd3072bed5785fa0 -SHA1 (patch-pa) = 878a99b3c03bfb262aefb99859f0af06ee5f9a4b SHA1 (patch-pb) = 0ce511845a30024e1abd357c24ecb925d81e1db1 SHA1 (patch-pc) = a1995c9ef5d675b5a8826390cd94abdf0e4b48a7 -SHA1 (patch-pd) = 9c5db7e475b255f5cec93de78d8f46945654d5b7 -SHA1 (patch-pg) = 3f3be408e4503f07262d89632e4f243312633ce2 SHA1 (patch-rc) = e4dbdbb142869c84cc9a79d54b72352db4afdfc0 SHA1 (patch-suite_installer_Makefile.in) = ec8d455118fa3f64762f91c32027d712b58f5ea5 SHA1 (patch-suite_installer_package-manifest.in) = 8e8b999bd7eca81da50e658eec584199522aee66 -SHA1 (patch-xa) = 8f4d16b72140d3687eae12326afd082f43b37c53 SHA1 (patch-xb) = 7573f9f27db06621a591958e44bd78122488365e SHA1 (patch-xc) = 6fb07a53443c6a762ff279cd4712c9f1450eccbd SHA1 (patch-xe) = ab873bf1358b01fdd7975170fef4f4d17f041593 diff --git a/www/seamonkey/patches/patch-aa b/www/seamonkey/patches/patch-aa index f9e97b06e0e..42b120f4708 100644 --- a/www/seamonkey/patches/patch-aa +++ b/www/seamonkey/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-aa,v 1.18 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/configure.in.orig 2013-08-04 03:05:18.000000000 +0000 +--- mozilla/configure.in.orig 2013-09-16 18:26:27.000000000 +0000 +++ mozilla/configure.in -@@ -1411,6 +1411,17 @@ if test "$GNU_CC"; then +@@ -1370,6 +1370,17 @@ if test "$GNU_CC"; then CFLAGS=$_SAVE_CFLAGS AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1) @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ # Turn on GNU-specific warnings: # -Wall - turn on a lot of warnings # -Wpointer-arith - good to have -@@ -2088,6 +2099,9 @@ ia64*-hpux*) +@@ -2047,6 +2058,9 @@ ia64*-hpux*) if test -z "$MC"; then MC=mc.exe fi @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ ;; *-mingw*) DSO_CFLAGS= -@@ -2887,6 +2901,7 @@ EOF +@@ -2843,6 +2857,7 @@ EOF #pragma GCC visibility push(hidden) #pragma GCC visibility push(default) #include <string.h> @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ #pragma GCC visibility pop __attribute__ ((visibility ("default"))) void Func() { -@@ -2895,7 +2910,7 @@ __attribute__ ((visibility ("default"))) +@@ -2851,7 +2866,7 @@ __attribute__ ((visibility ("default"))) } EOF ac_cv_have_visibility_builtin_bug=no @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ ac_cv_have_visibility_builtin_bug=yes else if test `grep -c "@PLT" conftest.S` = 0; then -@@ -3057,6 +3072,9 @@ dnl ==================================== +@@ -3017,6 +3032,9 @@ dnl ==================================== case $target in *-hpux11.*) ;; @@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ *) AC_CHECK_LIB(c_r, gethostbyname_r) ;; -@@ -3358,6 +3376,9 @@ AC_CACHE_CHECK( +@@ -3319,6 +3337,9 @@ AC_CACHE_CHECK( #ifdef linux #define _BSD_SOURCE 1 #endif @@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ #include <resolv.h> ], [int foo = res_ninit(&_res);], -@@ -4012,6 +4033,14 @@ if test -n "$YASM"; then +@@ -3973,6 +3994,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -4039,11 +4068,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then +@@ -4000,11 +4029,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -95,7 +95,30 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -5270,7 +5295,7 @@ dnl --enable-webrtc to override. Can di +@@ -4139,6 +4164,22 @@ if test -n "$MOZ_NATIVE_FFI"; then + fi + + dnl ======================================================== ++dnl system icu support ++dnl ======================================================== ++MOZ_NATIVE_ICU= ++MOZ_ARG_WITH_BOOL(system-icu, ++[ --with-system-icu ++ Use system icu (located with pkgconfig)], ++ MOZ_NATIVE_ICU=1) ++ ++if test -n "$MOZ_NATIVE_ICU"; then ++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) ++ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS" ++fi ++ ++AC_SUBST(MOZ_NATIVE_ICU) ++ ++dnl ======================================================== + dnl Java SDK support + dnl ======================================================== + +@@ -5297,7 +5338,7 @@ dnl --enable-webrtc to override. Can di dnl the master list above. if test -n "$MOZ_WEBRTC"; then case "$target" in @@ -104,7 +127,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ dnl Leave enabled ;; *) -@@ -5323,6 +5348,9 @@ if test -n "$MOZ_WEBRTC"; then +@@ -5353,6 +5394,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VP8_ENCODER=1 MOZ_VP8_ERROR_CONCEALMENT=1 @@ -114,7 +137,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5349,15 +5377,18 @@ AC_SUBST(MOZ_SRTP) +@@ -5379,15 +5423,18 @@ AC_SUBST(MOZ_SRTP) dnl Use integers over floats for audio on B2G and Android, because audio dnl backends for those platforms don't support floats. @@ -136,7 +159,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ dnl ======================================================== dnl = Disable Speech API code -@@ -5707,7 +5738,7 @@ MOZ_ALSA=) +@@ -5737,7 +5784,7 @@ MOZ_ALSA=) if test -n "$MOZ_ALSA"; then AC_DEFINE(MOZ_CUBEB) @@ -145,16 +168,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) fi -@@ -6410,7 +6441,7 @@ MOZ_ARG_ENABLE_BOOL(gtest, - MOZ_ENABLE_GTEST= ) - - if test -n "$MOZ_ENABLE_GTEST"; then -- if test "${OS_TARGET}" = "WINNT" -o "${OS_TARGET}" = "Darwin" -o "${OS_TARGET}" = "Linux" -o "${OS_TARGET}" = "Android"; then -+ if test "${OS_TARGET}" = "WINNT" -o "${OS_TARGET}" = "Darwin" -o "${OS_TARGET}" = "Linux" -o "${OS_TARGET}" = "Android" -o "${OS_TARGET}" = "NetBSD"; then - MOZ_ENABLE_GTEST=1 - GTEST_HAS_RTTI=0 - AC_DEFINE(MOZ_ENABLE_GTEST) -@@ -8330,7 +8361,7 @@ if test "$MOZ_ENABLE_SKIA"; then +@@ -8385,7 +8432,7 @@ if test "$MOZ_ENABLE_SKIA"; then AC_DEFINE(GR_DLL) fi @@ -163,7 +177,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) -@@ -8411,16 +8442,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi, +@@ -8466,16 +8513,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi, NECKO_WIFI=, NECKO_WIFI=1) @@ -200,7 +214,7 @@ $NetBSD: patch-aa,v 1.17 2013/08/11 03:18:46 ryoon Exp $ fi if test "$NECKO_WIFI"; then -@@ -9114,6 +9155,27 @@ if test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE +@@ -9186,6 +9243,27 @@ if test -z "$HAVE_TOOLCHAIN_SUPPORT_SSSE EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1" fi diff --git a/www/seamonkey/patches/patch-as b/www/seamonkey/patches/patch-as index 44c0aa49a8a..f4f292634cf 100644 --- a/www/seamonkey/patches/patch-as +++ b/www/seamonkey/patches/patch-as @@ -1,11 +1,11 @@ -$NetBSD: patch-as,v 1.12 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-as,v 1.13 2013/09/28 14:37:05 ryoon Exp $ * Fix _res is not supported for multi-threaded programs. error. * Treat DragonFly like FreeBSD. ---- mozilla/js/src/configure.in.orig 2013-05-03 03:07:57.000000000 +0000 +--- mozilla/js/src/configure.in.orig 2013-09-16 18:26:39.000000000 +0000 +++ mozilla/js/src/configure.in -@@ -2399,6 +2399,7 @@ EOF +@@ -2424,6 +2424,7 @@ EOF #pragma GCC visibility push(hidden) #pragma GCC visibility push(default) #include <string.h> @@ -13,7 +13,7 @@ $NetBSD: patch-as,v 1.12 2013/05/23 13:25:30 ryoon Exp $ #pragma GCC visibility pop __attribute__ ((visibility ("default"))) void Func() { -@@ -2407,7 +2408,7 @@ __attribute__ ((visibility ("default"))) +@@ -2432,7 +2433,7 @@ __attribute__ ((visibility ("default"))) } EOF ac_cv_have_visibility_builtin_bug=no @@ -22,7 +22,7 @@ $NetBSD: patch-as,v 1.12 2013/05/23 13:25:30 ryoon Exp $ ac_cv_have_visibility_builtin_bug=yes else if test `grep -c "@PLT" conftest.S` = 0; then -@@ -2628,7 +2629,7 @@ then +@@ -2657,7 +2658,7 @@ then fi case "$target" in @@ -31,7 +31,12 @@ $NetBSD: patch-as,v 1.12 2013/05/23 13:25:30 ryoon Exp $ AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lpthread, so don't specify it explicitly. -@@ -2711,6 +2712,9 @@ AC_CACHE_CHECK( +@@ -2736,14 +2737,19 @@ fi + AC_CACHE_CHECK( + [for res_ninit()], + ac_cv_func_res_ninit, +- [AC_TRY_LINK([ ++ [AC_TRY_RUN([ #ifdef linux #define _BSD_SOURCE 1 #endif @@ -39,9 +44,17 @@ $NetBSD: patch-as,v 1.12 2013/05/23 13:25:30 ryoon Exp $ + #error use of global _res variable in threaded programs is not portable + #endif #include <resolv.h> - ], - [int foo = res_ninit(&_res);], -@@ -3486,7 +3490,7 @@ if test "$MOZ_MEMORY"; then +- ], +- [int foo = res_ninit(&_res);], ++ int main(int argc, char **argv){ ++ int foo = res_ninit(&_res); ++ }], + [ac_cv_func_res_ninit=yes], ++ [ac_cv_func_res_ninit=no], + [ac_cv_func_res_ninit=no]) + ]) + +@@ -3517,7 +3523,7 @@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; @@ -50,3 +63,80 @@ $NetBSD: patch-as,v 1.12 2013/05/23 13:25:30 ryoon Exp $ AC_DEFINE(MOZ_MEMORY_BSD) ;; *-android*|*-linuxandroid*) +@@ -4417,6 +4423,16 @@ fi + dnl ======================================================== + dnl ECMAScript Internationalization API Support (uses ICU) + dnl ======================================================== ++ICU_LIB_NAMES= ++MOZ_NATIVE_ICU= ++MOZ_ARG_WITH_BOOL(system-icu, ++[ --with-system-icu ++ Use system icu (located with pkgconfig)], ++ MOZ_NATIVE_ICU=1) ++ ++if test -n "$MOZ_NATIVE_ICU"; then ++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) ++fi + + if test -n "$JS_STANDALONE"; then + ENABLE_INTL_API=1 +@@ -4429,37 +4445,36 @@ MOZ_ARG_ENABLE_BOOL(intl-api, + dnl Settings for the implementation of the ECMAScript Internationalization API + if test -n "$ENABLE_INTL_API"; then + AC_DEFINE(ENABLE_INTL_API) +- # We build ICU as a static library. +- AC_DEFINE(U_STATIC_IMPLEMENTATION) + +- case "$OS_TARGET" in +- WINNT) +- ICU_LIB_NAMES="icuin icuuc icudt" +- ;; +- Darwin|Linux) +- ICU_LIB_NAMES="icui18n icuuc icudata" +- ;; +- *) +- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) +- esac +- +- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' +-else +- ICU_LIB_NAMES= +- ICU_LIBS= ++ if test -z "$MOZ_NATIVE_ICU"; then ++ case "$OS_TARGET" in ++ WINNT) ++ ICU_LIB_NAMES="icuin icuuc icudt" ++ ;; ++ Darwin|Linux) ++ ICU_LIB_NAMES="icui18n icuuc icudata" ++ ;; ++ *) ++ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) ++ esac ++ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' ++ fi + fi + + AC_SUBST(ENABLE_INTL_API) + AC_SUBST(ICU_LIB_NAMES) +-AC_SUBST(ICU_LIBS) ++AC_SUBST(MOZ_ICU_LIBS) ++AC_SUBST(MOZ_NATIVE_ICU) + +-dnl Source files that use ICU should have control over which parts of the ICU +-dnl namespace they want to use. +-AC_DEFINE(U_USING_ICU_NAMESPACE,0) ++dnl Settings for ICU ++if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then ++ dnl We build ICU as a static library. ++ AC_DEFINE(U_STATIC_IMPLEMENTATION) + ++ dnl Source files that use ICU should have control over which parts of the ICU ++ dnl namespace they want to use. ++ AC_DEFINE(U_USING_ICU_NAMESPACE,0) + +-dnl Settings for ICU +-if test -n "$ENABLE_INTL_API" ; then + # Set ICU compile options + ICU_CPPFLAGS="" + # don't use icu namespace automatically in client code diff --git a/www/seamonkey/patches/patch-bf b/www/seamonkey/patches/patch-bf index 5df1667c272..c9238828ff9 100644 --- a/www/seamonkey/patches/patch-bf +++ b/www/seamonkey/patches/patch-bf @@ -1,17 +1,8 @@ -$NetBSD: patch-bf,v 1.12 2013/04/07 20:23:49 ryoon Exp $ +$NetBSD: patch-bf,v 1.13 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/js/src/jsnativestack.cpp.orig 2013-04-01 03:30:59.000000000 +0000 +--- mozilla/js/src/jsnativestack.cpp.orig 2013-09-16 18:26:41.000000000 +0000 +++ mozilla/js/src/jsnativestack.cpp -@@ -19,7 +19,7 @@ - #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) - # include <pthread.h> - --# if defined(__FreeBSD__) || defined(__OpenBSD__) -+# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - # include <pthread_np.h> - # endif - -@@ -112,7 +112,7 @@ js::GetNativeStackBaseImpl() +@@ -114,7 +114,7 @@ js::GetNativeStackBaseImpl() pthread_attr_init(&sattr); # if defined(__OpenBSD__) stack_t ss; diff --git a/www/seamonkey/patches/patch-mb b/www/seamonkey/patches/patch-mb index 426014fe8fc..b20851d32c1 100644 --- a/www/seamonkey/patches/patch-mb +++ b/www/seamonkey/patches/patch-mb @@ -1,53 +1,17 @@ -$NetBSD: patch-mb,v 1.12 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-mb,v 1.13 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2013-08-04 03:05:53.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2013-09-16 18:27:02.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -49,7 +49,7 @@ endif - endif - endif - --ifneq (,$(filter NetBSD OpenBSD GNU,$(OS_ARCH))) -+ifneq (,$(filter GNU,$(OS_ARCH))) - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif -@@ -58,7 +58,7 @@ endif - # New code for Linux, et. al., with gcc - # Migrate other platforms here after testing - # --ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD DragonFly NetBSD OpenBSD GNU_%,$(OS_ARCH))) - # Linux/x86-64 - ifeq (x86_64,$(OS_TEST)) - CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp -@@ -157,7 +157,7 @@ endif - # NetBSD/ARM - # - ifeq ($(OS_ARCH),NetBSD) --ifneq (,$(filter arm% sa110,$(OS_TEST))) -+ifneq (,$(filter arm%,$(TARGET_CPU))) - CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp - endif - endif -@@ -214,7 +214,7 @@ endif - # NetBSD/m68k - # - ifeq ($(OS_ARCH),NetBSD) --ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST))) -+ifneq (,$(filter m68k,$(TARGET_CPU))) - CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp - endif - endif -@@ -286,7 +286,7 @@ endif +@@ -183,7 +183,7 @@ endif # # NetBSD/PPC # -ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST))) +ifeq ($(OS_ARCH)$(OS_TEST),NetBSDpowerpc) - CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s endif -@@ -345,6 +345,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c + +@@ -235,6 +235,13 @@ ifneq (,$(filter OpenBSDsparc64 FreeBSDs ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s endif # diff --git a/www/seamonkey/patches/patch-mozilla_browser_app_profile_firefox.js b/www/seamonkey/patches/patch-mozilla_browser_app_profile_firefox.js new file mode 100644 index 00000000000..8282df2f3d7 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_browser_app_profile_firefox.js @@ -0,0 +1,12 @@ +$NetBSD: patch-mozilla_browser_app_profile_firefox.js,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/browser/app/profile/firefox.js.orig 2013-09-16 18:26:25.000000000 +0000 ++++ mozilla/browser/app/profile/firefox.js +@@ -354,6 +354,7 @@ pref("browser.search.log", false); + pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); + pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); + pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); ++pref("browser.search.order.4", "chrome://browser-region/locale/region.properties"); + + // search bar results always open in a new tab + pref("browser.search.openintab", false); diff --git a/www/seamonkey/patches/patch-mozilla_browser_locales_en-US_chrome_browser-region_region.properties b/www/seamonkey/patches/patch-mozilla_browser_locales_en-US_chrome_browser-region_region.properties new file mode 100644 index 00000000000..6c60dcf0054 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_browser_locales_en-US_chrome_browser-region_region.properties @@ -0,0 +1,12 @@ +$NetBSD: patch-mozilla_browser_locales_en-US_chrome_browser-region_region.properties,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/browser/locales/en-US/chrome/browser-region/region.properties.orig 2013-09-16 18:26:26.000000000 +0000 ++++ mozilla/browser/locales/en-US/chrome/browser-region/region.properties +@@ -9,6 +9,7 @@ browser.search.defaultenginename=Google + browser.search.order.1=Google + browser.search.order.2=Yahoo + browser.search.order.3=Bing ++browser.search.order.4=DuckDuckGo + + # This is the default set of web based feed handlers shown in the reader + # selection UI diff --git a/www/seamonkey/patches/patch-mozilla_browser_locales_en-US_searchplugins_duckduckgo.xml b/www/seamonkey/patches/patch-mozilla_browser_locales_en-US_searchplugins_duckduckgo.xml new file mode 100644 index 00000000000..ea3fe9d777d --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_browser_locales_en-US_searchplugins_duckduckgo.xml @@ -0,0 +1,16 @@ +$NetBSD: patch-mozilla_browser_locales_en-US_searchplugins_duckduckgo.xml,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/browser/locales/en-US/searchplugins/duckduckgo.xml.orig 2013-09-28 01:07:15.000000000 +0000 ++++ mozilla/browser/locales/en-US/searchplugins/duckduckgo.xml +@@ -0,0 +1,11 @@ ++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> ++<ShortName>DuckDuckGo</ShortName> ++<Description>We believe in better search and not tracking.</Description> ++<InputEncoding>UTF-8</InputEncoding> ++<Image height="16" width="16" type="image/x-icon">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</Image> ++<Url type="text/html" method="GET" template="https://duckduckgo.com/"> ++<Param name="q" value="{searchTerms}"/> ++<Param name="t" value="freebsd"/> ++</Url> ++<SearchForm>https://duckduckgo.com/</SearchForm> ++</SearchPlugin> diff --git a/www/seamonkey/patches/patch-mozilla_browser_locales_en-US_searchplugins_list.txt b/www/seamonkey/patches/patch-mozilla_browser_locales_en-US_searchplugins_list.txt new file mode 100644 index 00000000000..f3a5352b4ad --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_browser_locales_en-US_searchplugins_list.txt @@ -0,0 +1,11 @@ +$NetBSD: patch-mozilla_browser_locales_en-US_searchplugins_list.txt,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/browser/locales/en-US/searchplugins/list.txt.orig 2013-09-16 18:26:26.000000000 +0000 ++++ mozilla/browser/locales/en-US/searchplugins/list.txt +@@ -1,5 +1,6 @@ + amazondotcom + bing ++duckduckgo + eBay + google + twitter diff --git a/www/seamonkey/patches/patch-mozilla_build_pgo_profileserver.py b/www/seamonkey/patches/patch-mozilla_build_pgo_profileserver.py new file mode 100644 index 00000000000..08ebd333ee0 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_build_pgo_profileserver.py @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_build_pgo_profileserver.py,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/build/pgo/profileserver.py.orig 2013-09-16 18:26:27.000000000 +0000 ++++ mozilla/build/pgo/profileserver.py +@@ -59,7 +59,7 @@ if __name__ == '__main__': + env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog) + print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"] + +- cmdargs = ["http://localhost:%d/index.html" % PORT] ++ cmdargs = ["http://127.0.0.1:%d/index.html" % PORT] + runner = FirefoxRunner(profile=profile, + binary=build.get_binary_path(where="staged-package"), + cmdargs=cmdargs, diff --git a/www/seamonkey/patches/patch-mozilla_config_Makefile.in b/www/seamonkey/patches/patch-mozilla_config_Makefile.in new file mode 100644 index 00000000000..bbc883bd4b9 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_config_Makefile.in @@ -0,0 +1,12 @@ +$NetBSD: patch-mozilla_config_Makefile.in,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/config/Makefile.in.orig 2013-09-16 18:26:27.000000000 +0000 ++++ mozilla/config/Makefile.in +@@ -102,6 +102,7 @@ export:: $(export-preqs) + -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \ + -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ + -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ ++ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ + $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers + $(INSTALL) system_wrappers $(DIST) + diff --git a/www/seamonkey/patches/patch-mozilla_config_system-headers b/www/seamonkey/patches/patch-mozilla_config_system-headers index 56df3e06bc4..8118940681f 100644 --- a/www/seamonkey/patches/patch-mozilla_config_system-headers +++ b/www/seamonkey/patches/patch-mozilla_config_system-headers @@ -1,10 +1,19 @@ -$NetBSD: patch-mozilla_config_system-headers,v 1.6 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_config_system-headers,v 1.7 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/config/system-headers.orig 2013-05-03 03:07:49.000000000 +0000 +--- mozilla/config/system-headers.orig 2013-09-16 18:26:27.000000000 +0000 +++ mozilla/config/system-headers -@@ -1126,3 +1126,5 @@ sys/thr.h - sys/user.h - kvm.h +@@ -1132,3 +1132,14 @@ kvm.h spawn.h -+err.h -+xlocale.h + err.h + xlocale.h ++#if MOZ_NATIVE_ICU==1 ++unicode/locid.h ++unicode/numsys.h ++unicode/ucal.h ++unicode/ucol.h ++unicode/udat.h ++unicode/udatpg.h ++unicode/uenum.h ++unicode/unum.h ++unicode/ustring.h ++#endif diff --git a/www/seamonkey/patches/patch-mozilla_content_media_gstreamer_GStreamerFormatHelper.cpp b/www/seamonkey/patches/patch-mozilla_content_media_gstreamer_GStreamerFormatHelper.cpp new file mode 100644 index 00000000000..0e28755efb6 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_content_media_gstreamer_GStreamerFormatHelper.cpp @@ -0,0 +1,166 @@ +$NetBSD: patch-mozilla_content_media_gstreamer_GStreamerFormatHelper.cpp,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/content/media/gstreamer/GStreamerFormatHelper.cpp.orig 2013-09-16 18:26:29.000000000 +0000 ++++ mozilla/content/media/gstreamer/GStreamerFormatHelper.cpp +@@ -6,7 +6,7 @@ + + #include "GStreamerFormatHelper.h" + #include "nsCharSeparatedTokenizer.h" +-#include "nsXPCOMStrings.h" ++#include "nsString.h" + #include "GStreamerLoader.h" + + #define ENTRY_FORMAT(entry) entry[0] +@@ -36,7 +36,7 @@ void GStreamerFormatHelper::Shutdown() { + } + } + +-char const *const GStreamerFormatHelper::mContainers[6][2] = { ++static char const *const sContainers[6][2] = { + {"video/mp4", "video/quicktime"}, + {"video/quicktime", "video/quicktime"}, + {"audio/mp4", "audio/x-m4a"}, +@@ -45,7 +45,7 @@ char const *const GStreamerFormatHelper: + {"audio/mp3", "audio/mpeg, mpegversion=(int)1"}, + }; + +-char const *const GStreamerFormatHelper::mCodecs[9][2] = { ++static char const *const sCodecs[9][2] = { + {"avc1.42E01E", "video/x-h264"}, + {"avc1.42001E", "video/x-h264"}, + {"avc1.58A01E", "video/x-h264"}, +@@ -57,6 +57,15 @@ char const *const GStreamerFormatHelper: + {"mp3", "audio/mpeg, mpegversion=(int)1"}, + }; + ++static char const * const sDefaultCodecCaps[][2] = { ++ {"video/mp4", "video/x-h264"}, ++ {"video/quicktime", "video/x-h264"}, ++ {"audio/mp4", "audio/mpeg, mpegversion=(int)4"}, ++ {"audio/x-m4a", "audio/mpeg, mpegversion=(int)4"}, ++ {"audio/mp3", "audio/mpeg, layer=(int)3"}, ++ {"audio/mpeg", "audio/mpeg, layer=(int)3"} ++}; ++ + GStreamerFormatHelper::GStreamerFormatHelper() + : mFactories(nullptr), + mCookie(static_cast<uint32_t>(-1)) +@@ -66,15 +75,15 @@ GStreamerFormatHelper::GStreamerFormatHe + } + + mSupportedContainerCaps = gst_caps_new_empty(); +- for (unsigned int i = 0; i < G_N_ELEMENTS(mContainers); i++) { +- const char* capsString = mContainers[i][1]; ++ for (unsigned int i = 0; i < G_N_ELEMENTS(sContainers); i++) { ++ const char* capsString = sContainers[i][1]; + GstCaps* caps = gst_caps_from_string(capsString); + gst_caps_append(mSupportedContainerCaps, caps); + } + + mSupportedCodecCaps = gst_caps_new_empty(); +- for (unsigned int i = 0; i < G_N_ELEMENTS(mCodecs); i++) { +- const char* capsString = mCodecs[i][1]; ++ for (unsigned int i = 0; i < G_N_ELEMENTS(sCodecs); i++) { ++ const char* capsString = sCodecs[i][1]; + GstCaps* caps = gst_caps_from_string(capsString); + gst_caps_append(mSupportedCodecCaps, caps); + } +@@ -92,6 +101,41 @@ GStreamerFormatHelper::~GStreamerFormatH + g_list_free(mFactories); + } + ++static GstCaps * ++GetContainerCapsFromMIMEType(const char *aType) { ++ /* convert aMIMEType to gst container caps */ ++ const char* capsString = nullptr; ++ for (uint32_t i = 0; i < G_N_ELEMENTS(sContainers); i++) { ++ if (!strcmp(ENTRY_FORMAT(sContainers[i]), aType)) { ++ capsString = ENTRY_CAPS(sContainers[i]); ++ break; ++ } ++ } ++ ++ if (!capsString) { ++ /* we couldn't find any matching caps */ ++ return nullptr; ++ } ++ ++ return gst_caps_from_string(capsString); ++} ++ ++static GstCaps * ++GetDefaultCapsFromMIMEType(const char *aType) { ++ GstCaps *caps = GetContainerCapsFromMIMEType(aType); ++ ++ for (uint32_t i = 0; i < G_N_ELEMENTS(sDefaultCodecCaps); i++) { ++ if (!strcmp(sDefaultCodecCaps[i][0], aType)) { ++ GstCaps *tmp = gst_caps_from_string(sDefaultCodecCaps[i][1]); ++ ++ gst_caps_append(caps, tmp); ++ return caps; ++ } ++ } ++ ++ return nullptr; ++} ++ + bool GStreamerFormatHelper::CanHandleMediaType(const nsACString& aMIMEType, + const nsAString* aCodecs) { + if (!sLoadOK) { +@@ -101,7 +145,15 @@ bool GStreamerFormatHelper::CanHandleMed + const char *type; + NS_CStringGetData(aMIMEType, &type, NULL); + +- GstCaps* caps = ConvertFormatsToCaps(type, aCodecs); ++ GstCaps *caps; ++ if (aCodecs && !aCodecs->IsEmpty()) { ++ caps = ConvertFormatsToCaps(type, aCodecs); ++ } else { ++ // Get a minimal set of codec caps for this MIME type we should support so ++ // that we don't overreport MIME types we are able to play. ++ caps = GetDefaultCapsFromMIMEType(type); ++ } ++ + if (!caps) { + return false; + } +@@ -118,21 +170,11 @@ GstCaps* GStreamerFormatHelper::ConvertF + + unsigned int i; + +- /* convert aMIMEType to gst container caps */ +- const char* capsString = nullptr; +- for (i = 0; i < G_N_ELEMENTS(mContainers); i++) { +- if (!strcmp(ENTRY_FORMAT(mContainers[i]), aMIMEType)) { +- capsString = ENTRY_CAPS(mContainers[i]); +- break; +- } +- } +- +- if (!capsString) { +- /* we couldn't find any matching caps */ ++ GstCaps *caps = GetContainerCapsFromMIMEType(aMIMEType); ++ if (!caps) { + return nullptr; + } + +- GstCaps* caps = gst_caps_from_string(capsString); + /* container only */ + if (!aCodecs) { + return caps; +@@ -141,11 +183,11 @@ GstCaps* GStreamerFormatHelper::ConvertF + nsCharSeparatedTokenizer tokenizer(*aCodecs, ','); + while (tokenizer.hasMoreTokens()) { + const nsSubstring& codec = tokenizer.nextToken(); +- capsString = nullptr; ++ const char *capsString = nullptr; + +- for (i = 0; i < G_N_ELEMENTS(mCodecs); i++) { +- if (codec.EqualsASCII(ENTRY_FORMAT(mCodecs[i]))) { +- capsString = ENTRY_CAPS(mCodecs[i]); ++ for (i = 0; i < G_N_ELEMENTS(sCodecs); i++) { ++ if (codec.EqualsASCII(ENTRY_FORMAT(sCodecs[i]))) { ++ capsString = ENTRY_CAPS(sCodecs[i]); + break; + } + } diff --git a/www/seamonkey/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp b/www/seamonkey/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp new file mode 100644 index 00000000000..34df64cc384 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2013-09-16 18:26:33.000000000 +0000 ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -417,6 +417,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("@PREFIX@/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, diff --git a/www/seamonkey/patches/patch-mozilla_gfx_2d_Blur.cpp b/www/seamonkey/patches/patch-mozilla_gfx_2d_Blur.cpp deleted file mode 100644 index aa5ef001f60..00000000000 --- a/www/seamonkey/patches/patch-mozilla_gfx_2d_Blur.cpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-mozilla_gfx_2d_Blur.cpp,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/gfx/2d/Blur.cpp.orig 2013-06-20 04:35:02.000000000 +0000 -+++ mozilla/gfx/2d/Blur.cpp -@@ -677,10 +677,10 @@ AlphaBoxBlur::BoxBlur_C(uint8_t* aData, - for (int32_t y = 0; y < size.height; y++) { - bool inSkipRectY = y > skipRect.y && y < skipRect.YMost(); - -- uint32_t *topLeftBase = innerIntegral + ((y - aTopLobe) * stride32bit - aLeftLobe); -- uint32_t *topRightBase = innerIntegral + ((y - aTopLobe) * stride32bit + aRightLobe); -- uint32_t *bottomRightBase = innerIntegral + ((y + aBottomLobe) * stride32bit + aRightLobe); -- uint32_t *bottomLeftBase = innerIntegral + ((y + aBottomLobe) * stride32bit - aLeftLobe); -+ uint32_t *topLeftBase = innerIntegral + ((ptrdiff_t)(y - aTopLobe) * stride32bit - aLeftLobe); -+ uint32_t *topRightBase = innerIntegral + ((ptrdiff_t)(y - aTopLobe) * stride32bit + aRightLobe); -+ uint32_t *bottomRightBase = innerIntegral + ((ptrdiff_t)(y + aBottomLobe) * stride32bit + aRightLobe); -+ uint32_t *bottomLeftBase = innerIntegral + ((ptrdiff_t)(y + aBottomLobe) * stride32bit - aLeftLobe); - - for (int32_t x = 0; x < size.width; x++) { - if (inSkipRectY && x > skipRect.x && x < skipRect.XMost()) { diff --git a/www/seamonkey/patches/patch-mozilla_gfx_skia_Makefile.in b/www/seamonkey/patches/patch-mozilla_gfx_skia_Makefile.in deleted file mode 100644 index 411d9c6bef5..00000000000 --- a/www/seamonkey/patches/patch-mozilla_gfx_skia_Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-mozilla_gfx_skia_Makefile.in,v 1.1 2013/01/20 08:33:14 ryoon Exp $ - ---- mozilla/gfx/skia/Makefile.in.orig 2013-01-06 06:26:15.000000000 +0000 -+++ mozilla/gfx/skia/Makefile.in -@@ -355,10 +355,9 @@ CPPSRCS += \ - SkMMapStream.cpp \ - SkOSFile.cpp \ - $(NULL) --ifeq (Linux,$(OS_TARGET)) -+ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET)))) - CPPSRCS += \ - SkFontHost_linux.cpp \ -- SkFontHost_tables.cpp \ - SkTime_Unix.cpp \ - $(NULL) - endif diff --git a/www/seamonkey/patches/patch-mozilla_gfx_skia_moz.build b/www/seamonkey/patches/patch-mozilla_gfx_skia_moz.build new file mode 100644 index 00000000000..84a20f3f8ca --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_gfx_skia_moz.build @@ -0,0 +1,16 @@ +$NetBSD: patch-mozilla_gfx_skia_moz.build,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/gfx/skia/moz.build.orig 2013-09-16 18:26:34.000000000 +0000 ++++ mozilla/gfx/skia/moz.build +@@ -188,10 +188,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt + 'SkMMapStream.cpp', + 'SkOSFile.cpp', + ] +- if CONFIG['OS_TARGET'] == 'Linux': ++ if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux': + CPP_SOURCES += [ + 'SkFontHost_linux.cpp', +- 'SkFontHost_tables.cpp', + 'SkThread_pthread.cpp', + 'SkTime_Unix.cpp', + ] diff --git a/www/seamonkey/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp b/www/seamonkey/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp deleted file mode 100644 index 4afb0e56900..00000000000 --- a/www/seamonkey/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.5 2013/01/20 08:33:14 ryoon Exp $ - ---- mozilla/gfx/thebes/gfxPlatform.cpp.orig 2013-01-06 06:26:16.000000000 +0000 -+++ mozilla/gfx/thebes/gfxPlatform.cpp -@@ -507,11 +507,9 @@ void SourceBufferDestroy(void *srcSurfUD - delete static_cast<SourceSurfaceUserData*>(srcSurfUD); - } - --void SourceSnapshotDetached(cairo_surface_t *nullSurf) -+void SourceSnapshotDetached(void *nullSurf) - { -- gfxImageSurface* origSurf = -- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); -- -+ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf); - origSurf->SetData(&kSourceSurface, NULL, NULL); - } - -@@ -626,14 +624,9 @@ gfxPlatform::GetSourceSurfaceForSurface( - - } - -- cairo_surface_t *nullSurf = -- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); -- cairo_surface_set_user_data(nullSurf, -- &kSourceSurface, -- imgSurface, -- NULL); -- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); -- cairo_surface_destroy(nullSurf); -+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", -+ (const unsigned char *) "data", 4, -+ SourceSnapshotDetached, imgSurface.get()); - } - - SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData; diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in b/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in index ece8e1b38f4..9fedd3d314c 100644 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in +++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in @@ -1,10 +1,21 @@ -$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.8 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.9 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/ipc/chromium/Makefile.in.orig 2013-08-04 03:05:29.000000000 +0000 +--- mozilla/ipc/chromium/Makefile.in.orig 2013-09-16 18:26:38.000000000 +0000 +++ mozilla/ipc/chromium/Makefile.in -@@ -267,6 +267,33 @@ endif +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) + endif # } - endif # } OS_BSD + vpath %.cc \ +@@ -68,6 +66,33 @@ CMMSRCS += \ + + endif # } OS_MACOSX +ifdef OS_SOLARIS # { + diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__version__info.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__version__info.h new file mode 100644 index 00000000000..976c4cebca4 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__version__info.h @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_ipc_chromium_src_base_file__version__info.h,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/ipc/chromium/src/base/file_version_info.h.orig 2013-09-16 18:26:38.000000000 +0000 ++++ mozilla/ipc/chromium/src/base/file_version_info.h +@@ -86,7 +86,7 @@ class FileVersionInfo { + explicit FileVersionInfo(NSBundle *bundle); + + NSBundle *bundle_; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_SOLARIS) + FileVersionInfo(); + #endif + diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h index f6cc62b71f7..abfde25067e 100644 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h +++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h @@ -1,9 +1,9 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.8 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.9 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2013-08-04 03:05:29.000000000 +0000 +--- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2013-09-16 18:26:38.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread.h @@ -25,6 +25,9 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) || defined(OS_OPENBSD) + #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(__GLIBC__) #include <unistd.h> typedef pid_t PlatformThreadId; +#elif defined(OS_SOLARIS) diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc index c014bbe8799..58c6feca5e4 100644 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc +++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc,v 1.2 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc,v 1.3 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2013-08-04 03:05:29.000000000 +0000 +--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2013-09-16 18:26:38.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc @@ -10,7 +10,9 @@ #if defined(OS_MACOSX) @@ -12,12 +12,13 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc,v 1.2 20 #elif defined(OS_LINUX) #include <sys/syscall.h> #include <sys/prctl.h> -@@ -108,7 +110,7 @@ void PlatformThread::SetName(const char* - pthread_set_name_np(pthread_self(), name); - #elif defined(OS_NETBSD) +@@ -110,7 +112,8 @@ void PlatformThread::SetName(const char* pthread_setname_np(pthread_self(), "%s", (void *)name); + #elif defined(OS_BSD) && !defined(__GLIBC__) + pthread_set_name_np(pthread_self(), name); -#else +#elif !defined(OS_SOLARIS) - prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0); ++ prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0); #endif } + #endif // !OS_MACOSX diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h index d03987d6b5a..5a80659a18a 100644 --- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h +++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h @@ -1,13 +1,13 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.9 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.10 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/process_util.h.orig 2013-08-04 03:05:29.000000000 +0000 +--- mozilla/ipc/chromium/src/base/process_util.h.orig 2013-09-16 18:26:38.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util.h @@ -13,7 +13,7 @@ #if defined(OS_WIN) #include <windows.h> #include <tlhelp32.h> --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_SOLARIS) +-#elif defined(OS_LINUX) || defined(__GLIBC__) ++#elif defined(OS_LINUX) || defined(__GLIBC__) || defined(OS_SOLARIS) #include <dirent.h> #include <limits.h> #include <sys/types.h> @@ -25,8 +25,8 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.9 2013/08/11 03 #if defined(OS_WIN) HANDLE snapshot_; bool started_iteration_; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_SOLARIS) +-#elif defined(OS_LINUX) || defined(__GLIBC__) ++#elif defined(OS_LINUX) || defined(__GLIBC__) || defined(OS_SOLARIS) DIR *procfs_dir_; #elif defined(OS_BSD) std::vector<ProcessEntry> content; diff --git a/www/seamonkey/patches/patch-mozilla_js_public_HeapAPI.h b/www/seamonkey/patches/patch-mozilla_js_public_HeapAPI.h deleted file mode 100644 index fdb6d05f94d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_public_HeapAPI.h +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-mozilla_js_public_HeapAPI.h,v 1.2 2013/08/11 03:18:46 ryoon Exp $ - ---- mozilla/js/public/HeapAPI.h.orig 2013-08-04 03:05:30.000000000 +0000 -+++ mozilla/js/public/HeapAPI.h -@@ -13,24 +13,7 @@ - namespace js { - namespace gc { - --/* -- * Page size must be static to support our arena pointer optimizations, so we -- * are forced to support each platform with non-4096 pages as a special case. -- * Note: The freelist supports a maximum arena shift of 15. -- * Note: Do not use JS_CPU_SPARC here, this header is used outside JS. -- */ --#if (defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && \ -- (defined(__sparc) || defined(__sparcv9) || defined(__ia64)) --const size_t PageShift = 13; --const size_t ArenaShift = PageShift; --#elif defined(__powerpc64__) --const size_t PageShift = 16; - const size_t ArenaShift = 12; --#else --const size_t PageShift = 12; --const size_t ArenaShift = PageShift; --#endif --const size_t PageSize = size_t(1) << PageShift; - const size_t ArenaSize = size_t(1) << ArenaShift; - const size_t ArenaMask = ArenaSize - 1; - diff --git a/www/seamonkey/patches/patch-mozilla_js_src_Makefile.in b/www/seamonkey/patches/patch-mozilla_js_src_Makefile.in index 69c25e81f31..dbbb5903a7c 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_Makefile.in +++ b/www/seamonkey/patches/patch-mozilla_js_src_Makefile.in @@ -1,8 +1,52 @@ -$NetBSD: patch-mozilla_js_src_Makefile.in,v 1.1 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_Makefile.in,v 1.2 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/js/src/Makefile.in.orig 2013-05-03 03:07:57.000000000 +0000 +--- mozilla/js/src/Makefile.in.orig 2013-09-16 18:26:39.000000000 +0000 +++ mozilla/js/src/Makefile.in -@@ -791,6 +791,13 @@ EXTRA_LIBS += -lposix4 -ldl -lnsl -lsock +@@ -237,10 +237,14 @@ endif + # ICU headers need to be available whether we build with the complete + # Internationalization API or not - ICU stubs rely on them. + ++ifdef MOZ_NATIVE_ICU ++LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) ++else + LOCAL_INCLUDES += \ + -I$(topsrcdir)/../../intl/icu/source/common \ + -I$(topsrcdir)/../../intl/icu/source/i18n \ + $(NULL) ++endif + + ifdef ENABLE_INTL_API + +@@ -256,6 +260,7 @@ ifeq ($(OS_ARCH),WINNT) + cp -p intl/icu/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/lib/$(libname).lib;) + endif + ++ifndef MOZ_NATIVE_ICU + # - Build ICU as part of the "export" target, so things get built + # in the right order. + # - ICU requires GNU make according to its readme.html. pymake can't be used +@@ -269,6 +274,7 @@ export:: + + distclean clean:: + $(call SUBMAKE,$@,intl/icu) ++endif + + endif + +@@ -408,7 +414,11 @@ ifneq (,$(MOZ_ZLIB_LIBS)$(MOZ_GLUE_LDFLA + DEFINES += -DUSE_ZLIB + endif + +-SHARED_LIBRARY_LIBS += $(ICU_LIBS) ++ifdef MOZ_NATIVE_ICU ++EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) ++else ++SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS) ++endif + + # Prevent floating point errors caused by VC++ optimizations + ifdef _MSC_VER +@@ -467,6 +477,13 @@ EXTRA_LIBS += -lposix4 -ldl -lnsl -lsock endif endif diff --git a/www/seamonkey/patches/patch-mozilla_js_src_config_Makefile.in b/www/seamonkey/patches/patch-mozilla_js_src_config_Makefile.in new file mode 100644 index 00000000000..0fb5563a3a7 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_config_Makefile.in @@ -0,0 +1,12 @@ +$NetBSD: patch-mozilla_js_src_config_Makefile.in,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/js/src/config/Makefile.in.orig 2013-09-16 18:26:39.000000000 +0000 ++++ mozilla/js/src/config/Makefile.in +@@ -59,6 +59,7 @@ export:: \ + $(call mkdir_deps,system_wrappers_js) \ + $(NULL) + $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \ ++ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ + $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js + $(INSTALL) system_wrappers_js $(DIST) + diff --git a/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers b/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers index 99e832e488f..e37c411b59e 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers +++ b/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers @@ -1,10 +1,19 @@ -$NetBSD: patch-mozilla_js_src_config_system-headers,v 1.6 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_config_system-headers,v 1.7 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/js/src/config/system-headers.orig 2013-05-03 03:07:57.000000000 +0000 +--- mozilla/js/src/config/system-headers.orig 2013-09-16 18:26:39.000000000 +0000 +++ mozilla/js/src/config/system-headers -@@ -1126,3 +1126,5 @@ sys/thr.h - sys/user.h - kvm.h +@@ -1132,3 +1132,14 @@ kvm.h spawn.h -+err.h -+xlocale.h + err.h + xlocale.h ++#if MOZ_NATIVE_ICU==1 ++unicode/locid.h ++unicode/numsys.h ++unicode/ucal.h ++unicode/ucol.h ++unicode/udat.h ++unicode/udatpg.h ++unicode/uenum.h ++unicode/unum.h ++unicode/ustring.h ++#endif diff --git a/www/seamonkey/patches/patch-bd b/www/seamonkey/patches/patch-mozilla_js_src_ctypes_CTypes.h index 0de1797ce48..e1a88376818 100644 --- a/www/seamonkey/patches/patch-bd +++ b/www/seamonkey/patches/patch-mozilla_js_src_ctypes_CTypes.h @@ -1,10 +1,10 @@ -$NetBSD: patch-bd,v 1.8 2013/01/07 21:55:30 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_ctypes_CTypes.h,v 1.1 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/js/src/ctypes/CTypes.cpp.orig 2012-11-18 10:19:38.000000000 +0000 -+++ mozilla/js/src/ctypes/CTypes.cpp -@@ -5,6 +5,23 @@ +--- mozilla/js/src/ctypes/CTypes.h.orig 2013-09-16 18:26:39.000000000 +0000 ++++ mozilla/js/src/ctypes/CTypes.h +@@ -13,6 +13,23 @@ - #include "mozilla/FloatingPoint.h" + #include "js/HashTable.h" +#if defined(__NetBSD__) +#include <stdint.h> @@ -23,6 +23,6 @@ $NetBSD: patch-bd,v 1.8 2013/01/07 21:55:30 ryoon Exp $ +#define off_t off_t +#endif + - #include "CTypes.h" - #include "Library.h" - #include "jsnum.h" + namespace js { + namespace ctypes { + diff --git a/www/seamonkey/patches/patch-mozilla_js_src_frontend_ParseMaps.cpp b/www/seamonkey/patches/patch-mozilla_js_src_frontend_ParseMaps.cpp new file mode 100644 index 00000000000..cf4886ff27e --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_frontend_ParseMaps.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-mozilla_js_src_frontend_ParseMaps.cpp,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/js/src/frontend/ParseMaps.cpp.orig 2013-09-16 18:26:39.000000000 +0000 ++++ mozilla/js/src/frontend/ParseMaps.cpp +@@ -132,5 +132,5 @@ frontend::InitAtomMap(JSContext *cx, fro + } + } + +-template class js::frontend::AtomDecls<FullParseHandler>; +-template class js::frontend::AtomDecls<SyntaxParseHandler>; ++template class frontend::AtomDecls<FullParseHandler>; ++template class frontend::AtomDecls<SyntaxParseHandler>; diff --git a/www/seamonkey/patches/patch-mozilla_js_src_gc_Marking.cpp b/www/seamonkey/patches/patch-mozilla_js_src_gc_Marking.cpp deleted file mode 100644 index b917ef5589a..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_gc_Marking.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_js_src_gc_Marking.cpp,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/gc/Marking.cpp.orig 2013-06-20 04:35:07.000000000 +0000 -+++ mozilla/js/src/gc/Marking.cpp -@@ -1143,7 +1143,7 @@ struct SlotArrayLayout - { - union { - HeapSlot *end; -- HeapSlot::Kind kind; -+ uintptr_t kind; - }; - union { - HeapSlot *start; diff --git a/www/seamonkey/patches/patch-mozilla_js_src_gc_Memory.cpp b/www/seamonkey/patches/patch-mozilla_js_src_gc_Memory.cpp deleted file mode 100644 index ae4ed0077f1..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_gc_Memory.cpp +++ /dev/null @@ -1,312 +0,0 @@ -$NetBSD: patch-mozilla_js_src_gc_Memory.cpp,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/gc/Memory.cpp.orig 2013-06-20 04:35:07.000000000 +0000 -+++ mozilla/js/src/gc/Memory.cpp -@@ -8,6 +8,7 @@ - #include "mozilla/Assertions.h" - - #include "jsapi.h" -+#include "jscntxt.h" - - #include "js/HeapAPI.h" - #include "js/Utility.h" -@@ -17,40 +18,35 @@ using namespace js; - using namespace js::gc; - - /* Unused memory decommiting requires the arena size match the page size. */ --static bool --DecommitEnabled() -+bool -+gc::DecommitEnabled(JSRuntime *rt) - { -- return PageSize == ArenaSize; -+ return rt->gcSystemPageSize == ArenaSize; - } - - #if defined(XP_WIN) - #include "jswin.h" - #include <psapi.h> - --static size_t AllocationGranularity = 0; -- - void - gc::InitMemorySubsystem() - { - SYSTEM_INFO sysinfo; - GetSystemInfo(&sysinfo); -- if (sysinfo.dwPageSize != PageSize) { -- fprintf(stderr,"SpiderMonkey compiled with incorrect page size; please update js/public/HeapAPI.h.\n"); -- MOZ_CRASH(); -- } -- AllocationGranularity = sysinfo.dwAllocationGranularity; -+ rt->gcSystemPageSize = sysinfo.dwPageSize; -+ rt->gcSystemAllocGranularity = sysinfo.dwAllocationGranularity; - } - - void * --gc::MapAlignedPages(size_t size, size_t alignment) -+gc::MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment) - { - JS_ASSERT(size >= alignment); - JS_ASSERT(size % alignment == 0); -- JS_ASSERT(size % PageSize == 0); -- JS_ASSERT(alignment % AllocationGranularity == 0); -+ JS_ASSERT(size % rt->gcSystemPageSize == 0); -+ JS_ASSERT(alignment % rt->gcSystemAllocGranularity == 0); - - /* Special case: If we want allocation alignment, no further work is needed. */ -- if (alignment == AllocationGranularity) { -+ if (alignment == rt->gcSystemAllocGranularity) { - return VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); - } - -@@ -74,7 +70,7 @@ gc::MapAlignedPages(size_t size, size_t - if (!p) - return NULL; - void *chunkStart = (void *)(uintptr_t(p) + (alignment - (uintptr_t(p) % alignment))); -- UnmapPages(p, size * 2); -+ UnmapPages(rt, p, size * 2); - p = VirtualAlloc(chunkStart, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); - - /* Failure here indicates a race with another thread, so try again. */ -@@ -85,26 +81,26 @@ gc::MapAlignedPages(size_t size, size_t - } - - void --gc::UnmapPages(void *p, size_t size) -+gc::UnmapPages(JSRuntime *rt, void *p, size_t size) - { - JS_ALWAYS_TRUE(VirtualFree(p, 0, MEM_RELEASE)); - } - - bool --gc::MarkPagesUnused(void *p, size_t size) -+gc::MarkPagesUnused(JSRuntime *rt, void *p, size_t size) - { -- if (!DecommitEnabled()) -- return false; -+ if (!DecommitEnabled(rt)) -+ return true; - -- JS_ASSERT(uintptr_t(p) % PageSize == 0); -+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0); - LPVOID p2 = VirtualAlloc(p, size, MEM_RESET, PAGE_READWRITE); - return p2 == p; - } - - bool --gc::MarkPagesInUse(void *p, size_t size) -+gc::MarkPagesInUse(JSRuntime *rt, void *p, size_t size) - { -- JS_ASSERT(uintptr_t(p) % PageSize == 0); -+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0); - return true; - } - -@@ -126,12 +122,13 @@ gc::GetPageFaultCount() - #define OS2_MAX_RECURSIONS 16 - - void --gc::InitMemorySubsystem() -+gc::InitMemorySubsystem(JSRuntime *rt) - { -+ rt->gcSystemPageSize = rt->gcSystemAllocGranularity = ArenaSize; - } - - void --gc::UnmapPages(void *addr, size_t size) -+gc::UnmapPages(JSRuntime *rt, void *addr, size_t size) - { - if (!DosFreeMem(addr)) - return; -@@ -152,7 +149,7 @@ gc::UnmapPages(void *addr, size_t size) - } - - static void * --gc::MapAlignedPagesRecursively(size_t size, size_t alignment, int& recursions) -+gc::MapAlignedPagesRecursively(JSRuntime *rt, size_t size, size_t alignment, int& recursions) - { - if (++recursions >= OS2_MAX_RECURSIONS) - return NULL; -@@ -178,7 +175,7 @@ gc::MapAlignedPagesRecursively(size_t si - unsigned long rc = DosQueryMem(&(static_cast<char*>(tmp))[size], - &cb, &flags); - if (!rc && (flags & PAG_FREE) && cb >= filler) { -- UnmapPages(tmp, 0); -+ UnmapPages(rt, tmp, 0); - if (DosAllocMem(&tmp, filler, - OBJ_ANY | PAG_COMMIT | PAG_READ | PAG_WRITE)) { - JS_ALWAYS_TRUE(DosAllocMem(&tmp, filler, -@@ -186,19 +183,19 @@ gc::MapAlignedPagesRecursively(size_t si - } - } - -- void *p = MapAlignedPagesRecursively(size, alignment, recursions); -- UnmapPages(tmp, 0); -+ void *p = MapAlignedPagesRecursively(rt, size, alignment, recursions); -+ UnmapPages(rt, tmp, 0); - - return p; - } - - void * --gc::MapAlignedPages(size_t size, size_t alignment) -+gc::MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment) - { - JS_ASSERT(size >= alignment); - JS_ASSERT(size % alignment == 0); -- JS_ASSERT(size % PageSize == 0); -- JS_ASSERT(alignment % PageSize == 0); -+ JS_ASSERT(size % rt->gcSystemPageSize == 0); -+ JS_ASSERT(alignment % rt->gcSystemAllocGranularity == 0); - - int recursions = -1; - -@@ -207,7 +204,7 @@ gc::MapAlignedPages(size_t size, size_t - * of the right size by recursively allocating blocks of unaligned - * free memory until only an aligned allocation is possible. - */ -- void *p = MapAlignedPagesRecursively(size, alignment, recursions); -+ void *p = MapAlignedPagesRecursively(rt, size, alignment, recursions); - if (p) - return p; - -@@ -229,16 +226,16 @@ gc::MapAlignedPages(size_t size, size_t - } - - bool --gc::MarkPagesUnused(void *p, size_t size) -+gc::MarkPagesUnused(JSRuntime *rt, void *p, size_t size) - { -- JS_ASSERT(uintptr_t(p) % PageSize == 0); -+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0); - return true; - } - - bool --gc::MarkPagesInUse(void *p, size_t size) -+gc::MarkPagesInUse(JSRuntime *rt, void *p, size_t size) - { -- JS_ASSERT(uintptr_t(p) % PageSize == 0); -+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0); - return true; - } - -@@ -258,17 +255,18 @@ gc::GetPageFaultCount() - #endif - - void --gc::InitMemorySubsystem() -+gc::InitMemorySubsystem(JSRuntime *rt) - { -+ rt->gcSystemPageSize = rt->gcSystemAllocGranularity = size_t(sysconf(_SC_PAGESIZE)); - } - - void * --gc::MapAlignedPages(size_t size, size_t alignment) -+gc::MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment) - { - JS_ASSERT(size >= alignment); - JS_ASSERT(size % alignment == 0); -- JS_ASSERT(size % PageSize == 0); -- JS_ASSERT(alignment % PageSize == 0); -+ JS_ASSERT(size % rt->gcSystemPageSize == 0); -+ JS_ASSERT(alignment % rt->gcSystemAllocGranularity == 0); - - int prot = PROT_READ | PROT_WRITE; - int flags = MAP_PRIVATE | MAP_ANON | MAP_ALIGN | MAP_NOSYNC; -@@ -280,22 +278,22 @@ gc::MapAlignedPages(size_t size, size_t - } - - void --gc::UnmapPages(void *p, size_t size) -+gc::UnmapPages(JSRuntime *rt, void *p, size_t size) - { - JS_ALWAYS_TRUE(0 == munmap((caddr_t)p, size)); - } - - bool --gc::MarkPagesUnused(void *p, size_t size) -+gc::MarkPagesUnused(JSRuntime *rt, void *p, size_t size) - { -- JS_ASSERT(uintptr_t(p) % PageSize == 0); -+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0); - return true; - } - - bool --gc::MarkPagesInUse(void *p, size_t size) -+gc::MarkPagesInUse(JSRuntime *rt, void *p, size_t size) - { -- JS_ASSERT(uintptr_t(p) % PageSize == 0); -+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0); - return true; - } - -@@ -313,27 +311,24 @@ gc::GetPageFaultCount() - #include <unistd.h> - - void --gc::InitMemorySubsystem() -+gc::InitMemorySubsystem(JSRuntime *rt) - { -- if (size_t(sysconf(_SC_PAGESIZE)) != PageSize) { -- fprintf(stderr,"SpiderMonkey compiled with incorrect page size; please update js/public/HeapAPI.h.\n"); -- MOZ_CRASH(); -- } -+ rt->gcSystemPageSize = rt->gcSystemAllocGranularity = size_t(sysconf(_SC_PAGESIZE)); - } - - void * --gc::MapAlignedPages(size_t size, size_t alignment) -+gc::MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment) - { - JS_ASSERT(size >= alignment); - JS_ASSERT(size % alignment == 0); -- JS_ASSERT(size % PageSize == 0); -- JS_ASSERT(alignment % PageSize == 0); -+ JS_ASSERT(size % rt->gcSystemPageSize == 0); -+ JS_ASSERT(alignment % rt->gcSystemAllocGranularity == 0); - - int prot = PROT_READ | PROT_WRITE; - int flags = MAP_PRIVATE | MAP_ANON; - - /* Special case: If we want page alignment, no further work is needed. */ -- if (alignment == PageSize) { -+ if (alignment == rt->gcSystemAllocGranularity) { - return mmap(NULL, size, prot, flags, -1, 0); - } - -@@ -359,26 +354,26 @@ gc::MapAlignedPages(size_t size, size_t - } - - void --gc::UnmapPages(void *p, size_t size) -+gc::UnmapPages(JSRuntime *rt, void *p, size_t size) - { - JS_ALWAYS_TRUE(0 == munmap(p, size)); - } - - bool --gc::MarkPagesUnused(void *p, size_t size) -+gc::MarkPagesUnused(JSRuntime *rt, void *p, size_t size) - { -- if (!DecommitEnabled()) -+ if (!DecommitEnabled(rt)) - return false; - -- JS_ASSERT(uintptr_t(p) % PageSize == 0); -+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0); - int result = madvise(p, size, MADV_DONTNEED); - return result != -1; - } - - bool --gc::MarkPagesInUse(void *p, size_t size) -+gc::MarkPagesInUse(JSRuntime *rt, void *p, size_t size) - { -- JS_ASSERT(uintptr_t(p) % PageSize == 0); -+ JS_ASSERT(uintptr_t(p) % rt->gcSystemPageSize == 0); - return true; - } - diff --git a/www/seamonkey/patches/patch-mozilla_js_src_gc_Memory.h b/www/seamonkey/patches/patch-mozilla_js_src_gc_Memory.h deleted file mode 100644 index 4ed28c13e7e..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_gc_Memory.h +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-mozilla_js_src_gc_Memory.h,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/gc/Memory.h.orig 2013-06-20 04:35:07.000000000 +0000 -+++ mozilla/js/src/gc/Memory.h -@@ -16,23 +16,34 @@ namespace gc { - - // Sanity check that our compiled configuration matches the currently running - // instance and initialize any runtime data needed for allocation. --void InitMemorySubsystem(); -+void -+InitMemorySubsystem(JSRuntime *rt); -+ -+// Decommiting unused memory requires the arena size match the page size. -+bool -+DecommitEnabled(JSRuntime *rt); - - // Allocate or deallocate pages from the system with the given alignment. --void *MapAlignedPages(size_t size, size_t alignment); --void UnmapPages(void *p, size_t size); -+void * -+MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment); -+ -+void -+UnmapPages(JSRuntime *rt, void *p, size_t size); - - // Tell the OS that the given pages are not in use, so they should not - // be written to a paging file. This may be a no-op on some platforms. --bool MarkPagesUnused(void *p, size_t size); -+bool -+MarkPagesUnused(JSRuntime *rt, void *p, size_t size); - - // Undo |MarkPagesUnused|: tell the OS that the given pages are of interest - // and should be paged in and out normally. This may be a no-op on some - // platforms. --bool MarkPagesInUse(void *p, size_t size); -+bool -+MarkPagesInUse(JSRuntime *rt, void *p, size_t size); - - // Returns #(hard faults) + #(soft faults) --size_t GetPageFaultCount(); -+size_t -+GetPageFaultCount(); - - } // namespace gc - } // namespace js diff --git a/www/seamonkey/patches/patch-mozilla_js_src_gdb_Makefile.in b/www/seamonkey/patches/patch-mozilla_js_src_gdb_Makefile.in new file mode 100644 index 00000000000..e0cf08e0ae9 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_gdb_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-mozilla_js_src_gdb_Makefile.in,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/js/src/gdb/Makefile.in.orig 2013-09-16 18:26:39.000000000 +0000 ++++ mozilla/js/src/gdb/Makefile.in +@@ -19,6 +19,10 @@ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$ + + LOCAL_INCLUDES += -I$(topsrcdir) -I.. + ++ifdef MOZ_NATIVE_ICU ++EXTRA_LIBS += $(MOZ_ICU_LIBS) ++endif ++ + EXTRA_LIBS += $(MOZ_FFI_LIBS) + + # Place a GDB Python auto-load file next to the gdb-tests executable, both diff --git a/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJS.cpp b/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJS.cpp deleted file mode 100644 index 35ac08e608e..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJS.cpp +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-mozilla_js_src_ion_AsmJS.cpp,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/ion/AsmJS.cpp.orig 2013-06-20 04:35:07.000000000 +0000 -+++ mozilla/js/src/ion/AsmJS.cpp -@@ -1324,7 +1324,7 @@ class ModuleCompiler - - void setSecondPassComplete() { - JS_ASSERT(currentPass_ == 2); -- masm_.align(gc::PageSize); -+ masm_.align(AsmJSPageSize); - module_->setFunctionBytes(masm_.size()); - currentPass_ = 3; - } -@@ -1357,7 +1357,7 @@ class ModuleCompiler - - // The code must be page aligned, so include extra space so that we can - // AlignBytes the allocation result below. -- size_t allocedBytes = totalBytes + gc::PageSize; -+ size_t allocedBytes = totalBytes + AsmJSPageSize; - - // Allocate the slab of memory. - JSC::ExecutableAllocator *execAlloc = cx_->compartment->ionCompartment()->execAlloc(); -@@ -1365,7 +1365,7 @@ class ModuleCompiler - uint8_t *unalignedBytes = (uint8_t*)execAlloc->alloc(allocedBytes, &pool, JSC::ASMJS_CODE); - if (!unalignedBytes) - return false; -- uint8_t *code = (uint8_t*)AlignBytes((uintptr_t)unalignedBytes, gc::PageSize); -+ uint8_t *code = (uint8_t*)AlignBytes((uintptr_t)unalignedBytes, AsmJSPageSize); - - // The ExecutablePool owns the memory and must be released by the AsmJSModule. - module_->takeOwnership(pool, code, codeBytes, totalBytes); diff --git a/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJS.h b/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJS.h deleted file mode 100644 index 4487e5090a6..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJS.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mozilla_js_src_ion_AsmJS.h,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/ion/AsmJS.h.orig 2013-06-20 04:35:07.000000000 +0000 -+++ mozilla/js/src/ion/AsmJS.h -@@ -97,6 +97,9 @@ class AsmJSActivation - void setResumePC(void *pc) { resumePC_ = pc; } - }; - -+// The assumed page size; dynamically checked in CompileAsmJS. -+const size_t AsmJSPageSize = 4096; -+ - // The asm.js spec requires that the ArrayBuffer's byteLength be a multiple of 4096. - static const size_t AsmJSAllocationGranularity = 4096; - diff --git a/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJSModule.h b/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJSModule.h deleted file mode 100644 index 5665e3c8bc1..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJSModule.h +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-mozilla_js_src_ion_AsmJSModule.h,v 1.1 2013/08/11 03:18:46 ryoon Exp $ - ---- mozilla/js/src/ion/AsmJSModule.h.orig 2013-08-04 03:05:31.000000000 +0000 -+++ mozilla/js/src/ion/AsmJSModule.h -@@ -582,12 +582,12 @@ class AsmJSModule - } - - void setFunctionBytes(size_t functionBytes) { -- JS_ASSERT(functionBytes % gc::PageSize == 0); -+ JS_ASSERT(functionBytes % AsmJSPageSize == 0); - functionBytes_ = functionBytes; - } - size_t functionBytes() const { - JS_ASSERT(functionBytes_); -- JS_ASSERT(functionBytes_ % gc::PageSize == 0); -+ JS_ASSERT(functionBytes_ % AsmJSPageSize == 0); - return functionBytes_; - } - bool containsPC(void *pc) const { -@@ -648,7 +648,7 @@ class AsmJSModule - - - void takeOwnership(JSC::ExecutablePool *pool, uint8_t *code, size_t codeBytes, size_t totalBytes) { -- JS_ASSERT(uintptr_t(code) % gc::PageSize == 0); -+ JS_ASSERT(uintptr_t(code) % AsmJSPageSize == 0); - codePool_ = pool; - code_ = code; - codeBytes_ = codeBytes; -@@ -656,7 +656,7 @@ class AsmJSModule - } - uint8_t *functionCode() const { - JS_ASSERT(code_); -- JS_ASSERT(uintptr_t(code_) % gc::PageSize == 0); -+ JS_ASSERT(uintptr_t(code_) % AsmJSPageSize == 0); - return code_; - } - diff --git a/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJSSignalHandlers.cpp b/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJSSignalHandlers.cpp deleted file mode 100644 index 6905872c6af..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_ion_AsmJSSignalHandlers.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_js_src_ion_AsmJSSignalHandlers.cpp,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/ion/AsmJSSignalHandlers.cpp.orig 2013-06-20 04:35:07.000000000 +0000 -+++ mozilla/js/src/ion/AsmJSSignalHandlers.cpp -@@ -271,7 +271,7 @@ LookupHeapAccess(const AsmJSModule &modu - # if defined(JS_CPU_X64) - # if defined(__DragonFly__) - # include <machine/npx.h> // for union savefpu --# elif defined(__FreeBSD__) || defined(__OpenBSD__) -+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) - # include <machine/fpu.h> // for struct savefpu/fxsave64 - # endif - # endif diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jit_AsmJSSignalHandlers.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jit_AsmJSSignalHandlers.cpp new file mode 100644 index 00000000000..bc70a0c2bcb --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_jit_AsmJSSignalHandlers.cpp @@ -0,0 +1,26 @@ +$NetBSD: patch-mozilla_js_src_jit_AsmJSSignalHandlers.cpp,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/js/src/jit/AsmJSSignalHandlers.cpp.orig 2013-09-16 18:26:40.000000000 +0000 ++++ mozilla/js/src/jit/AsmJSSignalHandlers.cpp +@@ -59,10 +59,11 @@ using namespace mozilla; + #elif defined(__linux__) || defined(SOLARIS) + # if defined(__linux__) + # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) ++# define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) + # else + # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i]) ++# define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC]) + # endif +-# define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) + # define RIP_sig(p) ((p)->uc_mcontext.gregs[REG_RIP]) + # define PC_sig(p) ((p)->uc_mcontext.arm_pc) + # define RAX_sig(p) ((p)->uc_mcontext.gregs[REG_RAX]) +@@ -269,7 +270,7 @@ LookupHeapAccess(const AsmJSModule &modu + # if defined(JS_CPU_X64) + # if defined(__DragonFly__) + # include <machine/npx.h> // for union savefpu +-# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) ++# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + # include <machine/fpu.h> // for struct savefpu/fxsave64 + # endif + # endif diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jsapi-tests_Makefile.in b/www/seamonkey/patches/patch-mozilla_js_src_jsapi-tests_Makefile.in new file mode 100644 index 00000000000..1162a7240a7 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_jsapi-tests_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-mozilla_js_src_jsapi-tests_Makefile.in,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/js/src/jsapi-tests/Makefile.in.orig 2013-09-16 18:26:40.000000000 +0000 ++++ mozilla/js/src/jsapi-tests/Makefile.in +@@ -20,6 +20,10 @@ LIBS = $(DEPTH)/$(LIB_PREFIX)js_sta + + LOCAL_INCLUDES += -I$(topsrcdir) -I.. + ++ifdef MOZ_NATIVE_ICU ++EXTRA_LIBS += $(MOZ_ICU_LIBS) ++endif ++ + EXTRA_LIBS += $(MOZ_FFI_LIBS) + + ifdef QEMU_EXE diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jsapi.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jsapi.cpp deleted file mode 100644 index 698b4e0c5aa..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_jsapi.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_js_src_jsapi.cpp,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/jsapi.cpp.orig 2013-06-20 04:35:08.000000000 +0000 -+++ mozilla/js/src/jsapi.cpp -@@ -1131,8 +1131,6 @@ JS_NewRuntime(uint32_t maxbytes, JSUseHe - #undef MSG_DEF - #endif /* DEBUG */ - -- InitMemorySubsystem(); -- - if (!js::TlsPerThreadData.init()) - return NULL; - diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jscntxt.h b/www/seamonkey/patches/patch-mozilla_js_src_jscntxt.h deleted file mode 100644 index 60520aa549b..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_jscntxt.h +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-mozilla_js_src_jscntxt.h,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/jscntxt.h.orig 2013-06-20 04:35:08.000000000 +0000 -+++ mozilla/js/src/jscntxt.h -@@ -1101,6 +1101,15 @@ struct JSRuntime : js::RuntimeFriendFiel - /* Stack of thread-stack-allocated GC roots. */ - js::AutoGCRooter *autoGCRooters; - -+ /* -+ * The GC can only safely decommit memory when the page size of the -+ * running process matches the compiled arena size. -+ */ -+ size_t gcSystemPageSize; -+ -+ /* The OS allocation granularity may not match the page size. */ -+ size_t gcSystemAllocGranularity; -+ - /* Strong references on scripts held for PCCount profiling API. */ - js::ScriptAndCountsVector *scriptAndCountsVector; - diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jsgc.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jsgc.cpp deleted file mode 100644 index 1af2513aac5..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_jsgc.cpp +++ /dev/null @@ -1,127 +0,0 @@ -$NetBSD: patch-mozilla_js_src_jsgc.cpp,v 1.5 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/jsgc.cpp.orig 2013-06-20 04:35:08.000000000 +0000 -+++ mozilla/js/src/jsgc.cpp -@@ -478,13 +478,15 @@ FinalizeArenas(FreeOp *fop, - } - - static inline Chunk * --AllocChunk() { -- return static_cast<Chunk *>(MapAlignedPages(ChunkSize, ChunkSize)); -+AllocChunk(JSRuntime *rt) -+{ -+ return static_cast<Chunk *>(MapAlignedPages(rt, ChunkSize, ChunkSize)); - } - - static inline void --FreeChunk(Chunk *p) { -- UnmapPages(static_cast<void *>(p), ChunkSize); -+FreeChunk(JSRuntime *rt, Chunk *p) -+{ -+ UnmapPages(rt, static_cast<void *>(p), ChunkSize); - } - - inline bool -@@ -574,25 +576,25 @@ ChunkPool::expire(JSRuntime *rt, bool re - } - - static void --FreeChunkList(Chunk *chunkListHead) -+FreeChunkList(JSRuntime *rt, Chunk *chunkListHead) - { - while (Chunk *chunk = chunkListHead) { - JS_ASSERT(!chunk->info.numArenasFreeCommitted); - chunkListHead = chunk->info.next; -- FreeChunk(chunk); -+ FreeChunk(rt, chunk); - } - } - - void - ChunkPool::expireAndFree(JSRuntime *rt, bool releaseAll) - { -- FreeChunkList(expire(rt, releaseAll)); -+ FreeChunkList(rt, expire(rt, releaseAll)); - } - - /* static */ Chunk * - Chunk::allocate(JSRuntime *rt) - { -- Chunk *chunk = static_cast<Chunk *>(AllocChunk()); -+ Chunk *chunk = AllocChunk(rt); - - #ifdef JSGC_ROOT_ANALYSIS - // Our poison pointers are not guaranteed to be invalid on 64-bit -@@ -605,7 +607,7 @@ Chunk::allocate(JSRuntime *rt) - // were marked as uncommitted, but it's a little complicated to avoid - // clobbering pre-existing unrelated mappings. - while (IsPoisonedPtr(chunk)) -- chunk = static_cast<Chunk *>(AllocChunk()); -+ chunk = AllocChunk(rt); - #endif - - if (!chunk) -@@ -621,7 +623,7 @@ Chunk::release(JSRuntime *rt, Chunk *chu - { - JS_ASSERT(chunk); - chunk->prepareToBeFreed(rt); -- FreeChunk(chunk); -+ FreeChunk(rt, chunk); - } - - inline void -@@ -749,7 +751,7 @@ Chunk::fetchNextDecommittedArena() - decommittedArenas.unset(offset); - - Arena *arena = &arenas[offset]; -- MarkPagesInUse(arena, ArenaSize); -+ MarkPagesInUse(info.runtime, arena, ArenaSize); - arena->aheader.setAsNotAllocated(); - - return &arena->aheader; -@@ -948,6 +950,8 @@ static const int64_t JIT_SCRIPT_RELEASE_ - JSBool - js_InitGC(JSRuntime *rt, uint32_t maxbytes) - { -+ InitMemorySubsystem(rt); -+ - if (!rt->gcChunkSet.init(INITIAL_CHUNK_CAPACITY)) - return false; - -@@ -2024,6 +2028,9 @@ js::MaybeGC(JSContext *cx) - static void - DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp) - { -+ if (!DecommitEnabled(rt)) -+ return; -+ - Chunk *chunk = *availableListHeadp; - if (!chunk) - return; -@@ -2075,7 +2082,7 @@ DecommitArenasFromAvailableList(JSRuntim - Maybe<AutoUnlockGC> maybeUnlock; - if (!rt->isHeapBusy()) - maybeUnlock.construct(rt); -- ok = MarkPagesUnused(aheader->getArena(), ArenaSize); -+ ok = MarkPagesUnused(rt, aheader->getArena(), ArenaSize); - } - - if (ok) { -@@ -2105,7 +2112,7 @@ DecommitArenasFromAvailableList(JSRuntim - JS_ASSERT(chunk->info.prevp); - } - -- if (rt->gcChunkAllocationSinceLastGC) { -+ if (rt->gcChunkAllocationSinceLastGC || !ok) { - /* - * The allocator thread has started to get new chunks. We should stop - * to avoid decommitting arenas in just allocated chunks. -@@ -2143,7 +2150,7 @@ ExpireChunksAndArenas(JSRuntime *rt, boo - { - if (Chunk *toFree = rt->gcChunkPool.expire(rt, shouldShrink)) { - AutoUnlockGC unlock(rt); -- FreeChunkList(toFree); -+ FreeChunkList(rt, toFree); - } - - if (shouldShrink) diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jsmath.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jsmath.cpp index fdad75e057b..8bedf809748 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_jsmath.cpp +++ b/www/seamonkey/patches/patch-mozilla_js_src_jsmath.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-mozilla_js_src_jsmath.cpp,v 1.1 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jsmath.cpp,v 1.2 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/js/src/jsmath.cpp.orig 2013-08-04 03:05:33.000000000 +0000 +--- mozilla/js/src/jsmath.cpp.orig 2013-09-16 18:26:41.000000000 +0000 +++ mozilla/js/src/jsmath.cpp -@@ -219,7 +219,7 @@ js::ecmaAtan2(double x, double y) +@@ -244,7 +244,7 @@ js::ecmaAtan2(double y, double x) } #endif -#if defined(SOLARIS) && defined(__GNUC__) +#if defined(notSOLARIS) && defined(__GNUC__) - if (x == 0) { - if (MOZ_DOUBLE_IS_NEGZERO(y)) - return js_copysign(M_PI, x); + if (y == 0) { + if (IsNegativeZero(x)) + return js_copysign(M_PI, y); diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jsscript.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jsscript.cpp deleted file mode 100644 index 23e3c052810..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_jsscript.cpp +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-mozilla_js_src_jsscript.cpp,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/jsscript.cpp.orig 2013-06-20 04:35:08.000000000 +0000 -+++ mozilla/js/src/jsscript.cpp -@@ -1629,7 +1629,11 @@ ScriptDataSize(uint32_t nbindings, uint3 - if (ntrynotes != 0) - size += sizeof(TryNoteArray) + ntrynotes * sizeof(JSTryNote); - -- size += nbindings * sizeof(Binding); -+ if (nbindings != 0) { -+ // account for padding pre bindings -+ size = JS_ROUNDUP(size, JS_ALIGNMENT_OF(Binding)) + nbindings * sizeof(Binding); -+ } -+ - return size; - } - -@@ -1757,6 +1761,11 @@ JSScript::partiallyInit(JSContext *cx, H - cursor += vectorSize; - } - -+ if (script->bindings.count() != 0) { -+ // Make sure bindings are sufficiently aligned. -+ cursor = reinterpret_cast<uint8_t*> -+ (JS_ROUNDUP(reinterpret_cast<uintptr_t>(cursor), JS_ALIGNMENT_OF(Binding))); -+ } - cursor = script->bindings.switchToScriptStorage(reinterpret_cast<Binding *>(cursor)); - - JS_ASSERT(cursor == script->data + size); diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jstypedarray.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jstypedarray.cpp deleted file mode 100644 index 3910b42b871..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_jstypedarray.cpp +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-mozilla_js_src_jstypedarray.cpp,v 1.2 2013/08/11 03:18:46 ryoon Exp $ - ---- mozilla/js/src/jstypedarray.cpp.orig 2013-08-04 03:05:33.000000000 +0000 -+++ mozilla/js/src/jstypedarray.cpp -@@ -338,9 +338,9 @@ ArrayBufferObject::uninlineData(JSContex - // | \ / - // obj->elements required to be page boundaries - // --JS_STATIC_ASSERT(sizeof(ObjectElements) < PageSize); --JS_STATIC_ASSERT(AsmJSAllocationGranularity == PageSize); --static const size_t AsmJSMappedSize = PageSize + AsmJSBufferProtectedSize; -+JS_STATIC_ASSERT(sizeof(ObjectElements) < AsmJSPageSize); -+JS_STATIC_ASSERT(AsmJSAllocationGranularity == AsmJSPageSize); -+static const size_t AsmJSMappedSize = AsmJSPageSize + AsmJSBufferProtectedSize; - - bool - ArrayBufferObject::prepareForAsmJS(JSContext *cx, Handle<ArrayBufferObject*> buffer) -@@ -363,19 +363,19 @@ ArrayBufferObject::prepareForAsmJS(JSCon - // Enable access to the valid region. - JS_ASSERT(buffer->byteLength() % AsmJSAllocationGranularity == 0); - # ifdef XP_WIN -- if (!VirtualAlloc(p, PageSize + buffer->byteLength(), MEM_COMMIT, PAGE_READWRITE)) { -+ if (!VirtualAlloc(p, AsmJSPageSize + buffer->byteLength(), MEM_COMMIT, PAGE_READWRITE)) { - VirtualFree(p, 0, MEM_RELEASE); - return false; - } - # else -- if (mprotect(p, PageSize + buffer->byteLength(), PROT_READ | PROT_WRITE)) { -+ if (mprotect(p, AsmJSPageSize + buffer->byteLength(), PROT_READ | PROT_WRITE)) { - munmap(p, AsmJSMappedSize); - return false; - } - # endif - - // Copy over the current contents of the typed array. -- uint8_t *data = reinterpret_cast<uint8_t*>(p) + PageSize; -+ uint8_t *data = reinterpret_cast<uint8_t*>(p) + AsmJSPageSize; - memcpy(data, buffer->dataPointer(), buffer->byteLength()); - - // Swap the new elements into the ArrayBufferObject. -@@ -397,8 +397,8 @@ ArrayBufferObject::releaseAsmJSArrayBuff - ArrayBufferObject &buffer = obj->asArrayBuffer(); - JS_ASSERT(buffer.isAsmJSArrayBuffer()); - -- uint8_t *p = buffer.dataPointer() - PageSize ; -- JS_ASSERT(uintptr_t(p) % PageSize == 0); -+ uint8_t *p = buffer.dataPointer() - AsmJSPageSize ; -+ JS_ASSERT(uintptr_t(p) % AsmJSPageSize == 0); - # ifdef XP_WIN - VirtualFree(p, 0, MEM_RELEASE); - # else diff --git a/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp b/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp deleted file mode 100644 index 32cc6e52eba..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-mozilla_js_src_methodjit_MethodJIT.cpp,v 1.7 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/js/src/methodjit/MethodJIT.cpp.orig 2013-05-03 03:07:59.000000000 +0000 -+++ mozilla/js/src/methodjit/MethodJIT.cpp -@@ -138,7 +138,7 @@ PopActiveVMFrame(VMFrame &f) - - JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); - --#if defined(__linux__) && defined(JS_CPU_X64) -+#if defined(__ELF__) && defined(JS_CPU_X64) - # define SYMBOL_STRING_RELOC(name) #name "@plt" - #else - # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) -@@ -152,7 +152,7 @@ JS_STATIC_ASSERT(offsetof(FrameRegs, sp) - - #if defined(XP_MACOSX) - # define HIDE_SYMBOL(name) ".private_extern _" #name --#elif defined(__linux__) -+#elif defined(__ELF__) - # define HIDE_SYMBOL(name) ".hidden" #name - #else - # define HIDE_SYMBOL(name) diff --git a/www/seamonkey/patches/patch-mozilla_js_src_shell_Makefile.in b/www/seamonkey/patches/patch-mozilla_js_src_shell_Makefile.in new file mode 100644 index 00000000000..eb3dab63d1f --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_shell_Makefile.in @@ -0,0 +1,14 @@ +$NetBSD: patch-mozilla_js_src_shell_Makefile.in,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/js/src/shell/Makefile.in.orig 2013-09-16 18:26:41.000000000 +0000 ++++ mozilla/js/src/shell/Makefile.in +@@ -27,6 +27,9 @@ LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS + ifdef MOZ_NATIVE_FFI + EXTRA_LIBS += $(MOZ_FFI_LIBS) + endif ++ifdef MOZ_NATIVE_ICU ++EXTRA_LIBS += $(MOZ_ICU_LIBS) ++endif + + LOCAL_INCLUDES += -I$(topsrcdir) -I.. + diff --git a/www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h b/www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h index a23be05188a..e02397548c4 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h +++ b/www/seamonkey/patches/patch-mozilla_js_src_vm_ObjectImpl-inl.h @@ -1,29 +1,17 @@ -$NetBSD: patch-mozilla_js_src_vm_ObjectImpl-inl.h,v 1.3 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_vm_ObjectImpl-inl.h,v 1.4 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/js/src/vm/ObjectImpl-inl.h.orig 2013-08-04 03:05:34.000000000 +0000 +--- mozilla/js/src/vm/ObjectImpl-inl.h.orig 2013-09-16 18:26:43.000000000 +0000 +++ mozilla/js/src/vm/ObjectImpl-inl.h -@@ -217,9 +217,9 @@ js::ObjectImpl::initializeSlotRange(uint - JSRuntime *rt = runtime(); - uint32_t offset = start; - for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++) -- sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, UndefinedValue()); -+ sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, js::UndefinedValue()); - for (HeapSlot *sp = slotsStart; sp < slotsEnd; sp++) -- sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, UndefinedValue()); -+ sp->init(rt, this->asObjectPtr(), HeapSlot::Slot, offset++, js::UndefinedValue()); - } - - inline bool -@@ -389,7 +389,7 @@ ZoneOfValue(const JS::Value &value) +@@ -364,7 +364,7 @@ js::ObjectImpl::zone() const js::ObjectImpl::readBarrier(ObjectImpl *obj) { #ifdef JSGC_INCREMENTAL - Zone *zone = obj->zone(); + JS::Zone *zone = obj->zone(); if (zone->needsBarrier()) { - MOZ_ASSERT(!zone->rt->isHeapBusy()); + MOZ_ASSERT(!zone->rt->isHeapMajorCollecting()); JSObject *tmp = obj->asObjectPtr(); -@@ -403,7 +403,7 @@ inline void +@@ -378,7 +378,7 @@ inline void js::ObjectImpl::privateWriteBarrierPre(void **old) { #ifdef JSGC_INCREMENTAL @@ -32,12 +20,12 @@ $NetBSD: patch-mozilla_js_src_vm_ObjectImpl-inl.h,v 1.3 2013/08/11 03:18:46 ryoo if (zone->needsBarrier()) { if (*old && getClass()->trace) getClass()->trace(zone->barrierTracer(), this->asObjectPtr()); -@@ -430,7 +430,7 @@ js::ObjectImpl::writeBarrierPre(ObjectIm +@@ -405,7 +405,7 @@ js::ObjectImpl::writeBarrierPre(ObjectIm if (IsNullTaggedPointer(obj) || !obj->runtime()->needsBarrier()) return; - Zone *zone = obj->zone(); + JS::Zone *zone = obj->zone(); if (zone->needsBarrier()) { - MOZ_ASSERT(!zone->rt->isHeapBusy()); + MOZ_ASSERT(!zone->rt->isHeapMajorCollecting()); JSObject *tmp = obj->asObjectPtr(); diff --git a/www/seamonkey/patches/patch-mozilla_js_src_vm_SPSProfiler.cpp b/www/seamonkey/patches/patch-mozilla_js_src_vm_SPSProfiler.cpp index 6d2b5b51c76..2a99e607fe7 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_vm_SPSProfiler.cpp +++ b/www/seamonkey/patches/patch-mozilla_js_src_vm_SPSProfiler.cpp @@ -1,12 +1,12 @@ -$NetBSD: patch-mozilla_js_src_vm_SPSProfiler.cpp,v 1.1 2013/07/12 12:24:10 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_vm_SPSProfiler.cpp,v 1.2 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/js/src/vm/SPSProfiler.cpp.orig 2013-06-20 04:35:09.000000000 +0000 +--- mozilla/js/src/vm/SPSProfiler.cpp.orig 2013-09-16 18:26:43.000000000 +0000 +++ mozilla/js/src/vm/SPSProfiler.cpp -@@ -9,6 +9,7 @@ +@@ -8,6 +8,7 @@ #include "jsnum.h" #include "jsscript.h" +#include "jscntxtinlines.h" - #include "methodjit/MethodJIT.h" - #include "methodjit/Compiler.h" + #include "vm/SPSProfiler.h" + #include "vm/StringBuffer.h" diff --git a/www/seamonkey/patches/patch-mozilla_js_src_vm_Stack.cpp b/www/seamonkey/patches/patch-mozilla_js_src_vm_Stack.cpp deleted file mode 100644 index 4e80e011d1a..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_vm_Stack.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-mozilla_js_src_vm_Stack.cpp,v 1.1 2013/08/11 03:18:46 ryoon Exp $ - ---- mozilla/js/src/vm/Stack.cpp.orig 2013-08-04 03:05:34.000000000 +0000 -+++ mozilla/js/src/vm/Stack.cpp -@@ -803,7 +803,11 @@ StackSpace::sizeOf() - #endif - - MincoreArgType *vec = (MincoreArgType *) js_malloc(numPages); -+#ifdef __sun -+ int result = mincore((caddr_t)base_, numBytes, vec); -+#else - int result = mincore(base_, numBytes, vec); -+#endif - if (result) { - js_free(vec); - /* diff --git a/www/seamonkey/patches/patch-mozilla_js_src_yarr_YarrInterpreter.cpp b/www/seamonkey/patches/patch-mozilla_js_src_yarr_YarrInterpreter.cpp deleted file mode 100644 index 47e25ce8ccd..00000000000 --- a/www/seamonkey/patches/patch-mozilla_js_src_yarr_YarrInterpreter.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-mozilla_js_src_yarr_YarrInterpreter.cpp,v 1.1 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/js/src/yarr/YarrInterpreter.cpp.orig 2013-06-20 04:35:09.000000000 +0000 -+++ mozilla/js/src/yarr/YarrInterpreter.cpp -@@ -156,6 +156,7 @@ public: - ParenthesesDisjunctionContext* allocParenthesesDisjunctionContext(ByteDisjunction* disjunction, unsigned* output, ByteTerm& term) - { - size_t size = sizeof(ParenthesesDisjunctionContext) - sizeof(unsigned) + (term.atom.parenthesesDisjunction->m_numSubpatterns << 1) * sizeof(unsigned) + sizeof(DisjunctionContext) - sizeof(uintptr_t) + disjunction->m_frameSize * sizeof(uintptr_t); -+ size = JS_ROUNDUP(size, JS_ALIGNMENT_OF(ParenthesesDisjunctionContext)); - allocatorPool = allocatorPool->ensureCapacity(size); - if (!allocatorPool) - CRASH(); diff --git a/www/seamonkey/patches/patch-mozilla_media_mtransport_third__party_nICEr_src_stun_addrs.c b/www/seamonkey/patches/patch-mozilla_media_mtransport_third__party_nICEr_src_stun_addrs.c index 774dc5b71eb..cb2a0af3f93 100644 --- a/www/seamonkey/patches/patch-mozilla_media_mtransport_third__party_nICEr_src_stun_addrs.c +++ b/www/seamonkey/patches/patch-mozilla_media_mtransport_third__party_nICEr_src_stun_addrs.c @@ -1,21 +1,36 @@ -$NetBSD: patch-mozilla_media_mtransport_third__party_nICEr_src_stun_addrs.c,v 1.2 2013/07/12 12:24:10 ryoon Exp $ +$NetBSD: patch-mozilla_media_mtransport_third__party_nICEr_src_stun_addrs.c,v 1.3 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c.orig 2013-06-20 04:35:15.000000000 +0000 +--- mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c.orig 2013-09-16 18:26:49.000000000 +0000 +++ mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c -@@ -54,11 +54,15 @@ static char *RCSSTRING __UNUSED__="$Id: - #include <linux/sysctl.h> +@@ -55,7 +55,13 @@ static char *RCSSTRING __UNUSED__="$Id: #endif #include <net/if.h> --#ifndef LINUX -+#if defined(__FreeBSD__) + #ifndef LINUX ++#if !defined(__OpenBSD__) && !defined(__NetBSD__) #include <net/if_var.h> - #include <net/if_dl.h> - #include <net/if_types.h> - #include <sys/sockio.h> -+#elif defined(__NetBSD__) ++#endif +#include <net/if_dl.h> +#include <net/if_types.h> +#include <sys/sockio.h> - #else - #include <linux/if.h> - #endif ++#elif defined(__NetBSD__) + #include <net/if_dl.h> + #include <net/if_types.h> + #include <sys/sockio.h> +@@ -80,7 +86,7 @@ static char *RCSSTRING __UNUSED__="$Id: + + + +-#ifdef DARWIN ++#if defined(BSD) || defined(DARWIN) + /* + * Copyright (c) 1983, 1993 + * The Regents of the University of California. All rights reserved. +@@ -695,7 +701,7 @@ nr_stun_get_addrs(nr_transport_addr addr + int _status=0; + int i; + +-#ifdef DARWIN ++#if defined(BSD) || defined(DARWIN) + _status = stun_get_mib_addrs(addrs, maxaddrs, count); + #elif defined(WIN32) + _status = stun_get_win32_addrs(addrs, maxaddrs, count); diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_build_build__config.h b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_build_build__config.h new file mode 100644 index 00000000000..05b0d205590 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_build_build__config.h @@ -0,0 +1,41 @@ +$NetBSD: patch-mozilla_media_webrtc_trunk_build_build__config.h,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/media/webrtc/trunk/build/build_config.h.orig 2013-09-16 18:26:50.000000000 +0000 ++++ mozilla/media/webrtc/trunk/build/build_config.h +@@ -37,9 +37,15 @@ + #elif defined(_WIN32) + #define OS_WIN 1 + #define TOOLKIT_VIEWS 1 +-#elif defined(__FreeBSD__) ++#elif defined(__DragonFly__) ++#define OS_DRAGONFLY 1 ++#define TOOLKIT_GTK ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #define OS_FREEBSD 1 + #define TOOLKIT_GTK ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 ++#define TOOLKIT_GTK + #elif defined(__OpenBSD__) + #define OS_OPENBSD 1 + #define TOOLKIT_GTK +@@ -56,15 +62,15 @@ + + // For access to standard BSD features, use OS_BSD instead of a + // more specific macro. +-#if defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) + #define OS_BSD 1 + #endif + + // For access to standard POSIXish features, use OS_POSIX instead of a + // more specific macro. +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ +- defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ +- defined(OS_NACL) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ ++ defined(OS_SOLARIS) || defined(OS_ANDROID) || defined(OS_NACL) + #define OS_POSIX 1 + #endif + diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_third__party_libyuv_libyuv.gyp b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_third__party_libyuv_libyuv.gyp deleted file mode 100644 index eba127b4c76..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_third__party_libyuv_libyuv.gyp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_third__party_libyuv_libyuv.gyp,v 1.2 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/third_party/libyuv/libyuv.gyp.orig 2013-06-20 04:35:15.000000000 +0000 -+++ mozilla/media/webrtc/trunk/third_party/libyuv/libyuv.gyp -@@ -58,6 +58,11 @@ - }], - ], - 'conditions': [ -+ ['yuv_disable_asm==1', { -+ 'defines': [ -+ 'YUV_DISABLE_ASM', -+ ], -+ }], - ['build_with_mozilla==1', { - 'include_dirs': [ - '$(DEPTH)/dist/include', diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi index c3010f818a0..a55b45bcfac 100644 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi,v 1.2 2013/07/12 12:24:10 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi,v 1.3 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/build/common.gypi.orig 2013-06-20 04:35:16.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/build/common.gypi.orig 2013-09-16 18:26:50.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/build/common.gypi @@ -71,9 +71,9 @@ 'enable_data_logging%': 0, @@ -14,34 +14,12 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi,v 1.2 2013/07 # Enable to use the Mozilla internal settings. 'build_with_mozilla%': 0, -@@ -124,6 +124,11 @@ - # and Java Implementation - 'enable_android_opensl%': 0, +@@ -238,7 +238,7 @@ }], -+ ['OS=="linux" or OS=="solaris" or os_bsd==1', { -+ 'include_v4l2_video_capture%': 1, -+ }, { -+ 'include_v4l2_video_capture%': 0, -+ }], - ['OS=="ios"', { - 'enable_video%': 0, - 'enable_protobuf%': 0, -@@ -215,6 +220,18 @@ - }], + ['OS=="dragonfly" or OS=="netbsd"', { + 'defines': [ +- # doesn't support pthread_condattr_setclock ++ # doesn't support pthread_condattr_setclock, NetBSD 6 supports it. + 'WEBRTC_CLOCK_TYPE_REALTIME', ], }], -+ ['os_bsd==1', { -+ 'defines': [ -+ 'WEBRTC_BSD', -+ 'WEBRTC_THREAD_RR', -+ ], -+ }], -+ ['OS=="dragonfly" or OS=="netbsd"', { -+ 'defines': [ -+ # doesn't support pthread_condattr_setclock -+ 'WEBRTC_CLOCK_TYPE_REALTIME', -+ ], -+ }], - ['OS=="ios"', { - 'defines': [ - 'WEBRTC_MAC', diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi deleted file mode 100644 index 250a0f67c88..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi +++ /dev/null @@ -1,91 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi,v 1.2 2013/08/11 03:18:46 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi.orig 2013-08-04 03:05:43.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi -@@ -45,11 +45,15 @@ - 'dummy/audio_device_utility_dummy.h', - ], - 'conditions': [ -- ['OS=="linux"', { -+ ['include_alsa_audio==1 or include_pulse_audio==1', { - 'include_dirs': [ - 'linux', - ], -- }], # OS==linux -+ 'defines': [ -+ # avoid pointless rename -+ 'WEBRTC_LINUX', -+ ], -+ }], # include_alsa_audio==1 or include_pulse_audio==1 - ['OS=="ios"', { - 'include_dirs': [ - 'ios', -@@ -78,14 +82,8 @@ - }], - ['include_internal_audio_device==1', { - 'sources': [ -- 'linux/alsasymboltable_linux.cc', -- 'linux/alsasymboltable_linux.h', -- 'linux/audio_device_alsa_linux.cc', -- 'linux/audio_device_alsa_linux.h', - 'linux/audio_device_utility_linux.cc', - 'linux/audio_device_utility_linux.h', -- 'linux/audio_mixer_manager_alsa_linux.cc', -- 'linux/audio_mixer_manager_alsa_linux.h', - 'linux/latebindingsymboltable_linux.cc', - 'linux/latebindingsymboltable_linux.h', - 'ios/audio_device_ios.cc', -@@ -126,28 +124,36 @@ - }, - }], - ['OS=="linux"', { -- 'defines': [ -- 'LINUX_ALSA', -- ], - 'link_settings': { - 'libraries': [ - '-ldl', - ], - }, -- 'conditions': [ -- ['include_pulse_audio==1', { -- 'defines': [ -- 'LINUX_PULSE', -- ], -- 'sources': [ -- 'linux/audio_device_pulse_linux.cc', -- 'linux/audio_device_pulse_linux.h', -- 'linux/audio_mixer_manager_pulse_linux.cc', -- 'linux/audio_mixer_manager_pulse_linux.h', -- 'linux/pulseaudiosymboltable_linux.cc', -- 'linux/pulseaudiosymboltable_linux.h', -- ], -- }], -+ }], -+ ['include_alsa_audio==1', { -+ 'defines': [ -+ 'LINUX_ALSA', -+ ], -+ 'sources': [ -+ 'linux/alsasymboltable_linux.cc', -+ 'linux/alsasymboltable_linux.h', -+ 'linux/audio_device_alsa_linux.cc', -+ 'linux/audio_device_alsa_linux.h', -+ 'linux/audio_mixer_manager_alsa_linux.cc', -+ 'linux/audio_mixer_manager_alsa_linux.h', -+ ], -+ }], -+ ['include_pulse_audio==1', { -+ 'defines': [ -+ 'LINUX_PULSE', -+ ], -+ 'sources': [ -+ 'linux/audio_device_pulse_linux.cc', -+ 'linux/audio_device_pulse_linux.h', -+ 'linux/audio_mixer_manager_pulse_linux.cc', -+ 'linux/audio_mixer_manager_pulse_linux.h', -+ 'linux/pulseaudiosymboltable_linux.cc', -+ 'linux/pulseaudiosymboltable_linux.h', - ], - }], - ['OS=="mac" or OS=="ios"', { diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__impl.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__impl.cc new file mode 100644 index 00000000000..7f80b9aad3f --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__impl.cc @@ -0,0 +1,71 @@ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__impl.cc,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc.orig 2013-09-16 18:26:51.000000000 +0000 ++++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc +@@ -16,7 +16,9 @@ + #include <assert.h> + #include <string.h> + +-#if defined(_WIN32) ++#if defined(WEBRTC_DUMMY_AUDIO_BUILD) ++// do not include platform specific headers ++#elif defined(_WIN32) + #include "audio_device_utility_win.h" + #include "audio_device_wave_win.h" + #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) +@@ -32,14 +34,8 @@ + #include <stdlib.h> + #include "audio_device_utility_android.h" + #include "audio_device_jni_android.h" +-#elif defined(WEBRTC_LINUX) ++#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + #include "audio_device_utility_linux.h" +- #if defined(LINUX_ALSA) +- #include "audio_device_alsa_linux.h" +- #endif +- #if defined(LINUX_PULSE) +- #include "audio_device_pulse_linux.h" +- #endif + #elif defined(WEBRTC_IOS) + #include "audio_device_utility_ios.h" + #include "audio_device_ios.h" +@@ -47,6 +43,12 @@ + #include "audio_device_utility_mac.h" + #include "audio_device_mac.h" + #endif ++#if defined(LINUX_ALSA) ++ #include "audio_device_alsa_linux.h" ++#endif ++#if defined(LINUX_PULSE) ++ #include "audio_device_pulse_linux.h" ++#endif + #include "audio_device_dummy.h" + #include "audio_device_utility_dummy.h" + #include "critical_section_wrapper.h" +@@ -161,7 +163,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Che + #elif defined(WEBRTC_ANDROID) + platform = kPlatformAndroid; + WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is ANDROID"); +-#elif defined(WEBRTC_LINUX) ++#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + platform = kPlatformLinux; + WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is LINUX"); + #elif defined(WEBRTC_IOS) +@@ -301,7 +303,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Cre + + // Create the *Linux* implementation of the Audio Device + // +-#elif defined(WEBRTC_LINUX) ++#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + if ((audioLayer == kLinuxPulseAudio) || (audioLayer == kPlatformDefaultAudio)) + { + #if defined(LINUX_PULSE) +@@ -347,7 +349,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Cre + // + ptrAudioDeviceUtility = new AudioDeviceUtilityLinux(Id()); + } +-#endif // #if defined(WEBRTC_LINUX) ++#endif // #if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + + // Create the *iPhone* implementation of the Audio Device + // diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__utility.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__utility.cc deleted file mode 100644 index 18fc8487a9d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__utility.cc +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_audio__device__utility.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_utility.cc -@@ -46,7 +46,7 @@ bool AudioDeviceUtility::StringCompare( - - } // namespace webrtc - --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - // ============================================================================ - // Linux & Mac -@@ -109,6 +109,6 @@ bool AudioDeviceUtility::StringCompare( - - } // namespace webrtc - --#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_test_audio__device__test__api.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_test_audio__device__test__api.cc new file mode 100644 index 00000000000..6058cae6972 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_test_audio__device__test__api.cc @@ -0,0 +1,31 @@ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__device_test_audio__device__test__api.cc,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc.orig 2013-09-16 18:26:51.000000000 +0000 ++++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc +@@ -196,7 +196,7 @@ class AudioDeviceAPITest: public testing + // Create default implementation instance + EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( + kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); +-#elif defined(WEBRTC_LINUX) ++#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( + kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL); + EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( +@@ -1689,7 +1689,7 @@ TEST_F(AudioDeviceAPITest, CPULoad) { + + // TODO(kjellander): Fix flakiness causing failures on Windows. + // TODO(phoglund): Fix flakiness causing failures on Linux. +-#if !defined(_WIN32) && !defined(WEBRTC_LINUX) ++#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + TEST_F(AudioDeviceAPITest, StartAndStopRawOutputFileRecording) { + // NOTE: this API is better tested in a functional test + CheckInitialPlayoutStates(); +@@ -1758,7 +1758,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopR + // - size of raw_input_not_recording.pcm shall be 0 + // - size of raw_input_not_recording.pcm shall be > 0 + } +-#endif // !WIN32 && !WEBRTC_LINUX ++#endif // !WIN32 && !WEBRTC_LINUX && !defined(WEBRTC_BSD) + + TEST_F(AudioDeviceAPITest, RecordingSampleRate) { + WebRtc_UWord32 sampleRate(0); diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc deleted file mode 100644 index b3957cb47e8..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc -@@ -12,6 +12,7 @@ - - #include <algorithm> - #include <cassert> -+#include <cstdlib> // for abs() - #include <cstring> - #include <iterator> - diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_rtp__utility.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_rtp__utility.cc deleted file mode 100644 index c84e69f17db..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_rtp__utility.cc +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_rtp__utility.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_utility.cc -@@ -18,7 +18,7 @@ - #include <Windows.h> // FILETIME - #include <WinSock.h> // timeval - #include <MMSystem.h> // timeGetTime --#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - #include <sys/time.h> // gettimeofday - #include <time.h> - #endif -@@ -156,7 +156,7 @@ void get_time(WindowsHelpTimer* help_tim - WindowsHelpTimer* _helpTimer; - }; - --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - // A clock reading times from the POSIX API. - class UnixSystemClock : public RtpRtcpClock { -@@ -214,7 +214,7 @@ void WindowsSystemClock::CurrentNTP(WebR - frac = (WebRtc_UWord32)dtemp; - } - --#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - - WebRtc_Word64 UnixSystemClock::GetTimeInMS() { - return TickTime::MillisecondTimestamp(); -@@ -253,7 +253,7 @@ static WindowsHelpTimer global_help_time - RtpRtcpClock* GetSystemClock() { - #if defined(_WIN32) - return new WindowsSystemClock(&global_help_timer); --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return new UnixSystemClock(); - #else - return NULL; -@@ -330,7 +330,7 @@ bool StringCompare(const char* str1, con - const WebRtc_UWord32 length) { - return (_strnicmp(str1, str2, length) == 0) ? true : false; - } --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - bool StringCompare(const char* str1, const char* str2, - const WebRtc_UWord32 length) { - return (strncasecmp(str1, str2, length) == 0) ? true : false; diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_udp__transport_source_udp__transport__impl.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_udp__transport_source_udp__transport__impl.cc deleted file mode 100644 index 9d50afb646e..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_udp__transport_source_udp__transport__impl.cc +++ /dev/null @@ -1,90 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_udp__transport_source_udp__transport__impl.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport_impl.cc -@@ -18,16 +18,16 @@ - #if defined(_WIN32) - #include <winsock2.h> - #include <ws2tcpip.h> --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - #include <arpa/inet.h> - #include <ctype.h> - #include <fcntl.h> - #include <netdb.h> -+#include <sys/socket.h> - #include <net/if.h> - #include <netinet/in.h> - #include <stdlib.h> - #include <sys/ioctl.h> --#include <sys/socket.h> - #include <sys/time.h> - #include <unistd.h> - #ifndef WEBRTC_IOS -@@ -36,9 +36,11 @@ - #endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) - - #if defined(WEBRTC_MAC) --#include <ifaddrs.h> - #include <machine/types.h> - #endif -+#if defined(WEBRTC_BSD) || defined(WEBRTC_MAC) -+#include <ifaddrs.h> -+#endif - #if defined(WEBRTC_LINUX) - #include <linux/netlink.h> - #include <linux/rtnetlink.h> -@@ -51,7 +53,7 @@ - #include "typedefs.h" - #include "udp_socket_manager_wrapper.h" - --#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - #define GetLastError() errno - - #define IFRSIZE ((int)(size * sizeof (struct ifreq))) -@@ -61,7 +63,7 @@ - (int)(nlh)->nlmsg_len >= (int)sizeof(struct nlmsghdr) && \ - (int)(nlh)->nlmsg_len <= (len)) - --#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - namespace webrtc { - -@@ -2371,7 +2373,7 @@ WebRtc_Word32 UdpTransport::InetPresenta - const char* src, - void* dst) - { --#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - const WebRtc_Word32 result = inet_pton(af, src, dst); - return result > 0 ? 0 : -1; - -@@ -2493,7 +2495,7 @@ WebRtc_Word32 UdpTransport::LocalHostAdd - "getaddrinfo failed to find address"); - return -1; - --#elif defined(WEBRTC_MAC) -+#elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - struct ifaddrs* ptrIfAddrs = NULL; - struct ifaddrs* ptrIfAddrsStart = NULL; - -@@ -2685,7 +2687,7 @@ WebRtc_Word32 UdpTransport::LocalHostAdd - "gethostbyname failed, error:%d", error); - return -1; - } --#elif (defined(WEBRTC_MAC)) -+#elif (defined(WEBRTC_BSD) || defined(WEBRTC_MAC)) - char localname[255]; - if (gethostname(localname, 255) != -1) - { -@@ -2824,7 +2826,7 @@ WebRtc_Word32 UdpTransport::IPAddress(co - sourcePort = htons(source_port); - return 0; - -- #elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+ #elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - WebRtc_Word32 ipFamily = address._sockaddr_storage.sin_family; - const void* ptrNumericIP = NULL; - diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_utility_source_rtp__dump__impl.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_utility_source_rtp__dump__impl.cc deleted file mode 100644 index 039e3b13177..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_utility_source_rtp__dump__impl.cc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_utility_source_rtp__dump__impl.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/modules/utility/source/rtp_dump_impl.cc -@@ -19,7 +19,7 @@ - #if defined(_WIN32) - #include <Windows.h> - #include <mmsystem.h> --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - #include <string.h> - #include <sys/time.h> - #include <time.h> -@@ -238,7 +238,7 @@ inline WebRtc_UWord32 RtpDumpImpl::GetTi - { - #if defined(_WIN32) - return timeGetTime(); --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - struct timeval tv; - struct timezone tz; - unsigned long val; diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_device__info__impl.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_device__info__impl.cc deleted file mode 100644 index a12d57a28c6..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_device__info__impl.cc +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_device__info__impl.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.cc -@@ -54,7 +54,7 @@ WebRtc_Word32 DeviceInfoImpl::NumberOfCa - if (_lastUsedDeviceNameLength == strlen((char*) deviceUniqueIdUTF8)) - { - // Is it the same device that is asked for again. --#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) -+#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - if(strncasecmp((char*)_lastUsedDeviceName, - (char*) deviceUniqueIdUTF8, - _lastUsedDeviceNameLength)==0) -@@ -91,7 +91,7 @@ WebRtc_Word32 DeviceInfoImpl::GetCapabil - ReadLockScoped cs(_apiLock); - - if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8)) --#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) -+#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - || (strncasecmp((char*)_lastUsedDeviceName, - (char*) deviceUniqueIdUTF8, - _lastUsedDeviceNameLength)!=0)) -@@ -155,7 +155,7 @@ WebRtc_Word32 DeviceInfoImpl::GetBestMat - - ReadLockScoped cs(_apiLock); - if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8)) --#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) -+#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - || (strncasecmp((char*)_lastUsedDeviceName, - (char*) deviceUniqueIdUTF8, - _lastUsedDeviceNameLength)!=0)) diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc index aa35571e4a0..3ec2cc0a037 100644 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc @@ -1,18 +1,11 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.2 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2013-05-03 03:08:07.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2013-09-16 18:26:51.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc -@@ -19,12 +19,30 @@ - #include <stdlib.h> - - //v4l includes -+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include <sys/videoio.h> -+#elif defined(__sun) -+#include <sys/videodev2.h> -+#else +@@ -26,10 +26,30 @@ + #else #include <linux/videodev2.h> -+#endif + #endif +#ifdef HAVE_LIBV4L2 +#include <libv4l2.h> +#endif @@ -20,7 +13,15 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_de #include "ref_count.h" #include "trace.h" - ++#ifdef HAVE_LIBV4L2 ++#define open v4l2_open ++#define close v4l2_close ++#define dup v4l2_dup ++#define ioctl v4l2_ioctl ++#define mmap v4l2_mmap ++#define munmap v4l2_munmap ++#endif ++ +#ifdef HAVE_LIBV4L2 +#define open v4l2_open +#define close v4l2_close @@ -29,11 +30,10 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_de +#define mmap v4l2_mmap +#define munmap v4l2_munmap +#endif -+ + namespace webrtc { - namespace videocapturemodule -@@ -130,6 +148,11 @@ WebRtc_Word32 DeviceInfoLinux::GetDevice +@@ -137,6 +157,11 @@ WebRtc_Word32 DeviceInfoLinux::GetDevice memset(deviceNameUTF8, 0, deviceNameLength); memcpy(cameraName, cap.card, sizeof(cap.card)); diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc index 43a48afecee..3b3ed1dad3a 100644 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc @@ -1,33 +1,18 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.2 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2013-05-03 03:08:07.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2013-09-16 18:26:51.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc -@@ -12,12 +12,23 @@ - #include <unistd.h> - #include <sys/stat.h> - #include <fcntl.h> --#include <linux/videodev2.h> - #include <errno.h> - #include <stdio.h> - #include <sys/mman.h> - #include <string.h> - -+//v4l includes -+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include <sys/videoio.h> -+#elif defined(__sun) -+#include <sys/videodev2.h> -+#else -+#include <linux/videodev2.h> -+#endif +@@ -25,6 +25,9 @@ + #else + #include <linux/videodev2.h> + #endif +#ifdef HAVE_LIBV4L2 +#include <libv4l2.h> +#endif -+ + #include <new> - #include "ref_count.h" -@@ -26,6 +37,15 @@ +@@ -34,6 +37,15 @@ #include "critical_section_wrapper.h" #include "video_capture_linux.h" diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi index d3d151811d5..5b0fb09b050 100644 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.1 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.2 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2013-05-03 03:08:07.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2013-09-16 18:26:51.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi @@ -7,6 +7,9 @@ # be found in the AUTHORS file in the root of the source tree. @@ -12,12 +12,10 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__c 'targets': [ { 'target_name': 'video_capture_module', -@@ -48,7 +51,17 @@ - ], +@@ -49,6 +52,16 @@ }, { # include_internal_video_capture == 1 'conditions': [ -- ['OS=="linux"', { -+ ['include_v4l2_video_capture==1', { + ['include_v4l2_video_capture==1', { + 'conditions': [ + ['use_libv4l2==1', { + 'defines': [ @@ -31,32 +29,3 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__c 'include_dirs': [ 'linux', ], -@@ -157,7 +170,7 @@ - 'test/video_capture_main_mac.mm', - ], - 'conditions': [ -- ['OS=="mac" or OS=="linux"', { -+ ['OS!="win" and OS!="android"', { - 'cflags': [ - '-Wno-write-strings', - ], -@@ -165,13 +178,17 @@ - '-lpthread -lm', - ], - }], -- ['OS=="linux"', { -+ ['include_v4l2_video_capture==1', { - 'libraries': [ -- '-lrt', - '-lXext', - '-lX11', - ], - }], -+ ['OS=="linux"', { -+ 'libraries': [ -+ '-lrt', -+ ], -+ }], - ['OS=="mac"', { - 'dependencies': [ - # Link with a special main for mac so we can use the webcam. diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_asm__defines.h b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_asm__defines.h deleted file mode 100644 index 8c766a0875f..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_asm__defines.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_asm__defines.h,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/asm_defines.h -@@ -11,7 +11,7 @@ - #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_ - #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ASM_DEFINES_H_ - --#if defined(__linux__) && defined(__ELF__) -+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__) - .section .note.GNU-stack,"",%progbits - #endif - diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_tick__util.h b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_tick__util.h deleted file mode 100644 index 34b192d7dd5..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_tick__util.h +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_interface_tick__util.h,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h -@@ -194,7 +194,7 @@ inline WebRtc_Word64 TickTime::QueryOsFo - } - result.ticks_ = now + (num_wrap_time_get_time << 32); - #endif --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - struct timespec ts; - // TODO(wu): Remove CLOCK_REALTIME implementation. - #ifdef WEBRTC_CLOCK_TYPE_REALTIME -@@ -241,7 +241,7 @@ inline WebRtc_Word64 TickTime::Milliseco - #else - return ticks; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ticks / 1000000LL; - #else - return ticks / 1000LL; -@@ -258,7 +258,7 @@ inline WebRtc_Word64 TickTime::Microseco - #else - return ticks * 1000LL; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ticks / 1000LL; - #else - return ticks; -@@ -278,7 +278,7 @@ inline WebRtc_Word64 TickTime::Milliseco - #else - return ms; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ms * 1000000LL; - #else - return ms * 1000LL; -@@ -294,7 +294,7 @@ inline WebRtc_Word64 TickTime::TicksToMi - #else - return ticks; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ticks / 1000000LL; - #else - return ticks / 1000LL; -@@ -323,7 +323,7 @@ inline WebRtc_Word64 TickInterval::Milli - // interval_ is in ms - return interval_; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - // interval_ is in ns - return interval_ / 1000000; - #else -@@ -342,7 +342,7 @@ inline WebRtc_Word64 TickInterval::Micro - // interval_ is in ms - return interval_ * 1000LL; - #endif --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - // interval_ is in ns - return interval_ / 1000; - #else diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_atomic32__posix.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_atomic32__posix.cc deleted file mode 100644 index cb8358a9060..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_atomic32__posix.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_atomic32__posix.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_posix.cc -@@ -12,7 +12,6 @@ - - #include <assert.h> - #include <inttypes.h> --#include <malloc.h> - - #include "common_types.h" - diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable.cc index af32036fcc6..fd6042c0323 100644 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable.cc +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable.cc @@ -1,33 +1,13 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable.cc,v 1.2 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable.cc.orig 2013-05-03 03:08:07.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable.cc.orig 2013-09-16 18:26:51.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable.cc -@@ -8,14 +8,16 @@ - * be found in the AUTHORS file in the root of the source tree. - */ - -+#include "condition_variable_wrapper.h" -+ - #if defined(_WIN32) - #include <windows.h> - #include "condition_variable_win.h" --#include "condition_variable_wrapper.h" --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) +@@ -16,6 +16,8 @@ + #elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) #include <pthread.h> #include "condition_variable_posix.h" --#include "condition_variable_wrapper.h" +#else +#include <stddef.h> // for NULL #endif namespace webrtc { -@@ -23,7 +25,7 @@ namespace webrtc { - ConditionVariableWrapper* ConditionVariableWrapper::CreateConditionVariable() { - #if defined(_WIN32) - return new ConditionVariableWindows; --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - return ConditionVariablePosix::Create(); - #else - return NULL; diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable__posix.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable__posix.cc deleted file mode 100644 index b09fad7dc0d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable__posix.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_condition__variable__posix.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc -@@ -79,7 +79,7 @@ bool ConditionVariablePosix::SleepCS(Cri - unsigned long max_time_inMS) { - const unsigned long INFINITE = 0xFFFFFFFF; - const int MILLISECONDS_PER_SECOND = 1000; --#ifndef WEBRTC_LINUX -+#if !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - const int MICROSECONDS_PER_MILLISECOND = 1000; - #endif - const int NANOSECONDS_PER_SECOND = 1000000000; diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu.cc deleted file mode 100644 index c41883f8ac8..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu.cc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu.cc -@@ -14,7 +14,7 @@ - #include "cpu_win.h" - #elif defined(WEBRTC_MAC) - #include "cpu_mac.h" --#elif defined(WEBRTC_ANDROID) -+#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - // Not implemented yet, might be possible to use Linux implementation - #else // defined(WEBRTC_LINUX) - #include "cpu_linux.h" -@@ -26,7 +26,7 @@ CpuWrapper* CpuWrapper::CreateCpu() { - return new CpuWindows(); - #elif defined(WEBRTC_MAC) - return new CpuWrapperMac(); --#elif defined(WEBRTC_ANDROID) -+#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - return 0; - #else - return new CpuLinux(); diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu__info.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu__info.cc deleted file mode 100644 index 1a312b5d3d0..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu__info.cc +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_cpu__info.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc -@@ -12,13 +12,15 @@ - - #if defined(_WIN32) - #include <Windows.h> --#elif defined(WEBRTC_MAC) --#include <sys/sysctl.h> -+#elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - #include <sys/types.h> -+#include <sys/sysctl.h> - #elif defined(WEBRTC_ANDROID) - // Not implemented yet, might be possible to use Linux implementation --#else // defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) - #include <sys/sysinfo.h> -+#else // defined(_SC_NPROCESSORS_ONLN) -+#include <unistd.h> - #endif - - #include "trace.h" -@@ -41,8 +43,15 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Available number of cores:%d", number_of_cores_); - --#elif defined(WEBRTC_MAC) -- int name[] = {CTL_HW, HW_AVAILCPU}; -+#elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC) -+ int name[] = { -+ CTL_HW, -+#ifdef HW_AVAILCPU -+ HW_AVAILCPU, -+#else -+ HW_NCPU, -+#endif -+ }; - int ncpu; - size_t size = sizeof(ncpu); - if (0 == sysctl(name, 2, &ncpu, &size, NULL, 0)) { -@@ -54,6 +63,8 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo - "Failed to get number of cores"); - number_of_cores_ = 1; - } -+#elif defined(_SC_NPROCESSORS_ONLN) -+ _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN); - #else - WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1, - "No function to get number of cores"); diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc index 35822432517..b97e35c756f 100644 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc @@ -1,75 +1,25 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc,v 1.2 2013/07/12 12:24:10 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc,v 1.3 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc.orig 2013-06-20 04:35:16.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc.orig 2013-09-16 18:26:51.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc -@@ -59,6 +59,19 @@ - #include <sys/prctl.h> - #endif - -+#if defined(__NetBSD__) -+#include <lwp.h> -+#include <pthread.h> -+#include <sched.h> -+#elif defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/thr.h> -+#endif -+ -+#if defined(WEBRTC_BSD) && !defined(__NetBSD__) -+#include <pthread_np.h> -+#endif -+ - #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" - #include "webrtc/system_wrappers/interface/event_wrapper.h" - #include "webrtc/system_wrappers/interface/trace.h" -@@ -141,6 +154,20 @@ uint32_t ThreadWrapper::GetThreadId() { - return static_cast<uint32_t>(syscall(__NR_gettid)); - #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - return pthread_mach_thread_np(pthread_self()); -+#elif defined(__NetBSD__) -+ return _lwp_self(); -+#elif defined(__DragonFly__) -+ return lwp_gettid(); -+#elif defined(__OpenBSD__) -+ return reinterpret_cast<uintptr_t> (pthread_self()); -+#elif defined(__FreeBSD__) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif - #else - return reinterpret_cast<uint32_t>(pthread_self()); - #endif -@@ -172,7 +199,7 @@ ThreadPosix::~ThreadPosix() { - delete crit_state_; - } - --#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) -+#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) - - bool ThreadPosix::Start(unsigned int& thread_id) - { -@@ -237,21 +264,43 @@ bool ThreadPosix::Start(unsigned int& th +@@ -272,7 +272,7 @@ bool ThreadPosix::Start(unsigned int& th // CPU_ZERO and CPU_SET are not available in NDK r7, so disable // SetAffinity on Android for now. --#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK))) +-#if defined(__FreeBSD__) || (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK))) +#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK))) bool ThreadPosix::SetAffinity(const int* processor_numbers, const unsigned int amount_of_processors) { if (!processor_numbers || (amount_of_processors == 0)) { - return false; +@@ -280,20 +280,34 @@ bool ThreadPosix::SetAffinity(const int* } -+#if defined(__FreeBSD__) -+ cpuset_t mask; + #if defined(__FreeBSD__) + cpuset_t mask; +#elif defined(__NetBSD__) + cpuset_t *mask; -+#else + #else cpu_set_t mask; -+#endif + #endif +#if defined(__NetBSD__) + cpuset_zero(mask); +#else @@ -85,27 +35,14 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_thread_ CPU_SET(processor_numbers[processor], &mask); +#endif } --#if defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK) -+#if defined(__FreeBSD__) -+ const int result = pthread_setaffinity_np(thread_, -+ sizeof(mask), -+ &mask); + #if defined(__FreeBSD__) + const int result = pthread_setaffinity_np(thread_, + sizeof(mask), + &mask); +#elif defined(__NetBSD__) + const int result = pthread_setaffinity_np(thread_, + sizeof(mask), + mask); -+#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK) + #elif defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK) // Android. const int result = syscall(__NR_sched_setaffinity, - pid_, -@@ -325,6 +374,10 @@ void ThreadPosix::Run() { - if (set_thread_name_) { - #ifdef WEBRTC_LINUX - prctl(PR_SET_NAME, (unsigned long)name_, 0, 0, 0); -+#elif defined(__NetBSD__) -+ pthread_setname_np(pthread_self(), "%s", (void *)name_); -+#elif defined(WEBRTC_BSD) -+ pthread_set_name_np(pthread_self(), name_); - #endif - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Thread with name:%s started ", name_); diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_trace__posix.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_trace__posix.cc deleted file mode 100644 index 66b61ca67b2..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_trace__posix.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_trace__posix.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc -@@ -54,7 +54,7 @@ WebRtc_Word32 TracePosix::AddTime(char* - } - struct tm buffer; - const struct tm* system_time = -- localtime_r(&system_time_high_res.tv_sec, &buffer); -+ localtime_r((const time_t *)(&system_time_high_res.tv_sec), &buffer); - - const WebRtc_UWord32 ms_time = system_time_high_res.tv_usec / 1000; - WebRtc_UWord32 prev_tickCount = 0; diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_typedefs.h b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_typedefs.h deleted file mode 100644 index e6793a1bfac..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_typedefs.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_typedefs.h,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/typedefs.h.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/typedefs.h -@@ -21,7 +21,7 @@ - // For access to standard POSIXish features, use WEBRTC_POSIX instead of a - // more specific macro. - #if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) || \ -- defined(WEBRTC_ANDROID) -+ defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - #define WEBRTC_POSIX - #endif - diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_video__engine_vie__defines.h b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_video__engine_vie__defines.h deleted file mode 100644 index 8a642bf2999..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_video__engine_vie__defines.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_video__engine_vie__defines.h,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/video_engine/vie_defines.h.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/video_engine/vie_defines.h -@@ -173,7 +173,7 @@ inline int ChannelId(const int moduleId) - - // Linux specific. - #ifndef WEBRTC_ANDROID --#ifdef WEBRTC_LINUX -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - // Build information macros. - #if defined(_DEBUG) - #define BUILDMODE "d" diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voe__network__impl.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voe__network__impl.cc deleted file mode 100644 index 24b6166c571..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voe__network__impl.cc +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voe__network__impl.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/voice_engine/voe_network_impl.cc.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/voice_engine/voe_network_impl.cc -@@ -472,7 +472,7 @@ int VoENetworkImpl::SetSendTOS(int chann - "SetSendTOS(channel=%d, DSCP=%d, useSetSockopt=%d)", - channel, DSCP, useSetSockopt); - --#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_MAC) -+#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) && !defined(WEBRTC_MAC) - _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceWarning, - "SetSendTOS() is not supported on this platform"); - return -1; -@@ -528,7 +528,7 @@ int VoENetworkImpl::SetSendTOS(int chann - "SetSendTOS() external transport is enabled"); - return -1; - } --#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - useSetSockopt = true; - WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_shared->instance_id(), -1), - " force useSetSockopt=true since there is no alternative" -@@ -551,7 +551,7 @@ int VoENetworkImpl::GetSendTOS(int chann - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), - "GetSendTOS(channel=%d)", channel); - --#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_MAC) -+#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) && !defined(WEBRTC_MAC) - _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceWarning, - "GetSendTOS() is not supported on this platform"); - return -1; diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voice__engine__defines.h b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voice__engine__defines.h deleted file mode 100644 index 9d0f6ae48ba..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voice__engine__defines.h +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_voice__engine_voice__engine__defines.h,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h.orig 2013-05-03 03:08:07.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/voice_engine/voice_engine_defines.h -@@ -414,7 +414,7 @@ namespace webrtc - // *** WEBRTC_MAC *** - // including iPhone - --#ifdef WEBRTC_MAC -+#if defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - #include <pthread.h> - #include <sys/types.h> -@@ -431,6 +431,7 @@ namespace webrtc - #include <sched.h> - #include <sys/time.h> - #include <time.h> -+#if !defined(WEBRTC_BSD) - #include <AudioUnit/AudioUnit.h> - #if !defined(WEBRTC_IOS) - #include <CoreServices/CoreServices.h> -@@ -439,6 +440,7 @@ namespace webrtc - #include <AudioToolbox/AudioConverter.h> - #include <CoreAudio/HostTime.h> - #endif -+#endif - - #define DWORD unsigned long int - #define WINAPI -@@ -531,7 +533,7 @@ namespace webrtc - - #else - #define IPHONE_NOT_SUPPORTED(stat) --#endif // #ifdef WEBRTC_MAC -+#endif // #if defined(WEBRTC_BSD) || defined(WEBRTC_MAC) - - - diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_webrtc__config.gypi b/www/seamonkey/patches/patch-mozilla_media_webrtc_webrtc__config.gypi deleted file mode 100644 index ff5c1e720fb..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_webrtc__config.gypi +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_webrtc__config.gypi,v 1.2 2013/07/12 12:24:10 ryoon Exp $ - ---- mozilla/media/webrtc/webrtc_config.gypi.orig 2013-06-20 04:35:16.000000000 +0000 -+++ mozilla/media/webrtc/webrtc_config.gypi -@@ -14,7 +14,6 @@ - 'include_internal_video_render': 0, - 'clang_use_chrome_plugins': 0, - 'enable_protobuf': 0, -- 'include_pulse_audio': 0, - 'include_tests': 0, - 'enable_android_opensl': 1, - # use_system_lib* still seems to be in use in trunk/build diff --git a/www/seamonkey/patches/patch-mozilla_mfbt_Atomics.h b/www/seamonkey/patches/patch-mozilla_mfbt_Atomics.h new file mode 100644 index 00000000000..9e1b88ffb55 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_mfbt_Atomics.h @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_mfbt_Atomics.h,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/mfbt/Atomics.h.orig 2013-09-16 18:26:51.000000000 +0000 ++++ mozilla/mfbt/Atomics.h +@@ -37,7 +37,7 @@ + */ + # if !defined(__linux__) && !defined(__OpenBSD__) && \ + (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \ +- __has_include(<atomic>) ++ __has_include_next(<atomic>) + # define MOZ_HAVE_CXX11_ATOMICS + # endif + /* diff --git a/www/seamonkey/patches/patch-mozilla_mfbt_Poison.cpp b/www/seamonkey/patches/patch-mozilla_mfbt_Poison.cpp new file mode 100644 index 00000000000..62d9009ad89 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_mfbt_Poison.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-mozilla_mfbt_Poison.cpp,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/mfbt/Poison.cpp.orig 2013-09-16 18:26:51.000000000 +0000 ++++ mozilla/mfbt/Poison.cpp +@@ -125,7 +125,11 @@ ReleaseRegion(void *region, uintptr_t si + static bool + ProbeRegion(uintptr_t region, uintptr_t size) + { ++#if !defined(__sun__) + if (madvise(reinterpret_cast<void*>(region), size, MADV_NORMAL)) { ++#else ++ if (posix_madvise(reinterpret_cast<void*>(region), size, MADV_NORMAL)) { ++#endif + return true; + } else { + return false; diff --git a/www/seamonkey/patches/patch-mozilla_modules_libpref_src_init_all.js b/www/seamonkey/patches/patch-mozilla_modules_libpref_src_init_all.js new file mode 100644 index 00000000000..306981343be --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_modules_libpref_src_init_all.js @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_modules_libpref_src_init_all.js,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/modules/libpref/src/init/all.js.orig 2013-09-16 18:26:53.000000000 +0000 ++++ mozilla/modules/libpref/src/init/all.js +@@ -188,7 +188,7 @@ pref("media.webm.enabled", true); + pref("media.dash.enabled", false); + #endif + #ifdef MOZ_GSTREAMER +-pref("media.gstreamer.enabled", false); ++pref("media.gstreamer.enabled", true); + #endif + #ifdef MOZ_WEBRTC + pref("media.navigator.enabled", true); diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_protocol_websocket_WebSocketChannel.cpp b/www/seamonkey/patches/patch-mozilla_netwerk_protocol_websocket_WebSocketChannel.cpp deleted file mode 100644 index bccb078a56a..00000000000 --- a/www/seamonkey/patches/patch-mozilla_netwerk_protocol_websocket_WebSocketChannel.cpp +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-mozilla_netwerk_protocol_websocket_WebSocketChannel.cpp,v 1.1 2013/07/12 12:24:11 ryoon Exp $ - ---- mozilla/netwerk/protocol/websocket/WebSocketChannel.cpp.orig 2013-06-20 04:35:18.000000000 +0000 -+++ mozilla/netwerk/protocol/websocket/WebSocketChannel.cpp -@@ -1632,7 +1632,8 @@ WebSocketChannel::PrimeNewOutgoingMessag - // and there isn't an internal error, use that. - if (NS_SUCCEEDED(mStopOnClose)) { - if (mScriptCloseCode) { -- *((uint16_t *)payload) = PR_htons(mScriptCloseCode); -+ uint16_t temp = PR_htons(mScriptCloseCode); -+ memcpy(payload, &temp, 2); - mOutHeader[1] += 2; - mHdrOutToSend = 8; - if (!mScriptCloseReason.IsEmpty()) { -@@ -1651,7 +1652,8 @@ WebSocketChannel::PrimeNewOutgoingMessag - mHdrOutToSend = 6; - } - } else { -- *((uint16_t *)payload) = PR_htons(ResultToCloseCode(mStopOnClose)); -+ uint16_t temp = PR_htons(ResultToCloseCode(mStopOnClose)); -+ memcpy(payload, &temp, 2); - mOutHeader[1] += 2; - mHdrOutToSend = 8; - } -@@ -1739,7 +1741,8 @@ WebSocketChannel::PrimeNewOutgoingMessag - mask = * reinterpret_cast<uint32_t *>(buffer); - NS_Free(buffer); - } while (!mask); -- *(((uint32_t *)payload) - 1) = PR_htonl(mask); -+ uint32_t temp = PR_htonl(mask); -+ memcpy(payload - 4, &temp, 4); - - LOG(("WebSocketChannel::PrimeNewOutgoingMessage() using mask %08x\n", mask)); - diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_sctp_src_Makefile.in b/www/seamonkey/patches/patch-mozilla_netwerk_sctp_src_Makefile.in deleted file mode 100644 index 0dda2a22cb1..00000000000 --- a/www/seamonkey/patches/patch-mozilla_netwerk_sctp_src_Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-mozilla_netwerk_sctp_src_Makefile.in,v 1.1 2013/05/23 13:25:30 ryoon Exp $ - ---- mozilla/netwerk/sctp/src/Makefile.in.orig 2013-05-03 03:08:09.000000000 +0000 -+++ mozilla/netwerk/sctp/src/Makefile.in -@@ -114,11 +114,18 @@ DEFINES += \ - -U__FreeBSD__ \ - $(NULL) - else -+ifeq ($(OS_TARGET),NetBSD) -+DEFINES += \ -+ -D__Userspace_os_NetBSD=1 \ -+ -U__NetBSD__ \ -+ $(NULL) -+else - #error Unsupported platform! - endif - endif - endif - endif -+endif - - include $(topsrcdir)/config/config.mk - include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_wifi_Makefile.in b/www/seamonkey/patches/patch-mozilla_netwerk_wifi_Makefile.in new file mode 100644 index 00000000000..4a2c6f532fe --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_netwerk_wifi_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_netwerk_wifi_Makefile.in,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/netwerk/wifi/Makefile.in.orig 2013-09-16 18:26:54.000000000 +0000 ++++ mozilla/netwerk/wifi/Makefile.in +@@ -26,7 +26,7 @@ ifeq ($(OS_ARCH),SunOS) + OS_INCLUDES += $(GLIB_CFLAGS) + endif + +-ifdef MOZ_ENABLE_DBUS ++ifdef NECKO_WIFI_DBUS + OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS) + endif + diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_wifi_moz.build b/www/seamonkey/patches/patch-mozilla_netwerk_wifi_moz.build new file mode 100644 index 00000000000..a356724b611 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_netwerk_wifi_moz.build @@ -0,0 +1,24 @@ +$NetBSD: patch-mozilla_netwerk_wifi_moz.build,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/netwerk/wifi/moz.build.orig 2013-09-16 18:26:54.000000000 +0000 ++++ mozilla/netwerk/wifi/moz.build +@@ -31,6 +31,10 @@ if CONFIG['OS_ARCH'] == 'Darwin': + CPP_SOURCES += [ + 'nsWifiScannerMac.cpp', + ] ++elif CONFIG['OS_ARCH'] == 'FreeBSD': ++ CPP_SOURCES += [ ++ 'nsWifiScannerFreeBSD.cpp', ++ ] + elif CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsWifiScannerWin.cpp', +@@ -40,7 +44,7 @@ elif CONFIG['OS_ARCH'] == 'SunOS': + 'nsWifiScannerSolaris.cpp', + ] + +-if CONFIG['MOZ_ENABLE_DBUS']: ++if CONFIG['NECKO_WIFI_DBUS']: + CPP_SOURCES += [ + 'nsWifiScannerDBus.cpp', + ] diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_wifi_nsWifiScannerFreeBSD.cpp b/www/seamonkey/patches/patch-mozilla_netwerk_wifi_nsWifiScannerFreeBSD.cpp new file mode 100644 index 00000000000..88979dae9e8 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_netwerk_wifi_nsWifiScannerFreeBSD.cpp @@ -0,0 +1,177 @@ +$NetBSD: patch-mozilla_netwerk_wifi_nsWifiScannerFreeBSD.cpp,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp.orig 2013-09-28 01:07:16.000000000 +0000 ++++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp +@@ -0,0 +1,172 @@ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * 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/. */ ++ ++// Developed by J.R. Oldroyd <fbsd@opal.com>, December 2012. ++ ++// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces ++// and then check for those with an 802.11 media type and able to return ++// a list of stations. This is similar to ifconfig(8). ++ ++#include <sys/types.h> ++#include <sys/ioctl.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <net/if_media.h> ++#include <net80211/ieee80211_ioctl.h> ++ ++#include <ifaddrs.h> ++#include <string.h> ++#include <unistd.h> ++ ++#include "nsWifiAccessPoint.h" ++ ++using namespace mozilla; ++ ++static nsresult ++FreeBSDGetAccessPointData(nsCOMArray<nsWifiAccessPoint> &accessPoints) ++{ ++ bool res = false; ++ char *dupn = NULL; ++ struct ifaddrs *ifal, *ifa; ++ unsigned len; ++ ++ // get list of interfaces ++ if (getifaddrs(&ifal) < 0) ++ return NS_ERROR_FAILURE; ++ ++ accessPoints.Clear(); ++ ++ // loop through the interfaces ++ for (ifa = ifal; ifa; ifa = ifa->ifa_next) { ++ int s; ++ struct ifreq ifr; ++ struct ifmediareq ifmr; ++ struct ieee80211req i802r; ++ char iscanbuf[32*1024], *vsr; ++ ++ memset(&ifr, 0, sizeof(ifr)); ++ ++ // list can contain duplicates, so ignore those ++ if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0) ++ continue; ++ dupn = ifa->ifa_name; ++ ++ // store interface name in socket structure ++ strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name)); ++ ifr.ifr_addr.sa_family = AF_LOCAL; ++ ++ // open socket to interface ++ if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0) ++ continue; ++ ++ // clear interface media structure ++ (void) memset(&ifmr, 0, sizeof(ifmr)); ++ (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name)); ++ ++ // get interface media information ++ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { ++ close(s); ++ continue; ++ } ++ ++ // check interface is a WiFi interface ++ if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) { ++ close(s); ++ continue; ++ } ++ ++ // perform WiFi scan ++ (void) memset(&i802r, 0, sizeof(i802r)); ++ (void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name)); ++ i802r.i_type = IEEE80211_IOC_SCAN_RESULTS; ++ i802r.i_data = iscanbuf; ++ i802r.i_len = sizeof(iscanbuf); ++ if (ioctl(s, SIOCG80211, &i802r) < 0) { ++ close(s); ++ continue; ++ } ++ ++ // close socket ++ close(s); ++ ++ // loop through WiFi networks and build geoloc-lookup structure ++ vsr = (char *) i802r.i_data; ++ len = i802r.i_len; ++ while (len >= sizeof(struct ieee80211req_scan_result)) { ++ struct ieee80211req_scan_result *isr; ++ char *id; ++ int idlen; ++ char ssid[IEEE80211_NWID_LEN+1]; ++ nsWifiAccessPoint *ap; ++ ++ isr = (struct ieee80211req_scan_result *) vsr; ++ ++ // determine size of this entry ++ if (isr->isr_meshid_len) { ++ id = vsr + isr->isr_ie_off + isr->isr_ssid_len; ++ idlen = isr->isr_meshid_len; ++ } ++ else { ++ id = vsr + isr->isr_ie_off; ++ idlen = isr->isr_ssid_len; ++ } ++ ++ // copy network data ++ strncpy(ssid, id, idlen); ++ ssid[idlen] = '\0'; ++ ap = new nsWifiAccessPoint(); ++ ap->setSSID(ssid, strlen(ssid)); ++ ap->setMac(isr->isr_bssid); ++ ap->setSignal(isr->isr_rssi); ++ accessPoints.AppendObject(ap); ++ res = true; ++ ++ // log the data ++ LOG(( "FreeBSD access point: " ++ "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, " ++ "Strength: %d, Channel: %dMHz\n", ++ ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2], ++ isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5], ++ isr->isr_rssi, isr->isr_freq)); ++ ++ // increment pointers ++ len -= isr->isr_len; ++ vsr += isr->isr_len; ++ } ++ } ++ ++ freeifaddrs(ifal); ++ ++ return res ? NS_OK : NS_ERROR_FAILURE; ++} ++ ++nsresult ++nsWifiMonitor::DoScan() ++{ ++ // Regularly get the access point data. ++ ++ nsCOMArray<nsWifiAccessPoint> lastAccessPoints; ++ nsCOMArray<nsWifiAccessPoint> accessPoints; ++ ++ do { ++ nsresult rv = FreeBSDGetAccessPointData(accessPoints); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ bool accessPointsChanged = !AccessPointsEqual(accessPoints, lastAccessPoints); ++ ReplaceArray(lastAccessPoints, accessPoints); ++ ++ rv = CallWifiListeners(lastAccessPoints, accessPointsChanged); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ // wait for some reasonable amount of time. pref? ++ LOG(("waiting on monitor\n")); ++ ++ ReentrantMonitorAutoEnter mon(mReentrantMonitor); ++ mon.Wait(PR_SecondsToInterval(60)); ++ } ++ while (mKeepGoing); ++ ++ return NS_OK; ++} diff --git a/www/seamonkey/patches/patch-mozilla_ostream b/www/seamonkey/patches/patch-mozilla_ostream new file mode 100644 index 00000000000..2fd946f0c36 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_ostream @@ -0,0 +1,8 @@ +$NetBSD: patch-mozilla_ostream,v 1.3 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/ostream.orig 2013-09-28 01:07:15.000000000 +0000 ++++ mozilla/ostream +@@ -0,0 +1,3 @@ ++#pragma GCC visibility push(default) ++#include_next <ostream> ++#pragma GCC visibility pop diff --git a/www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_JARSignatureVerification.cpp b/www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_JARSignatureVerification.cpp new file mode 100644 index 00000000000..ae28dbddd09 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_JARSignatureVerification.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-mozilla_security_manager_ssl_src_JARSignatureVerification.cpp,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/security/manager/ssl/src/JARSignatureVerification.cpp.orig 2013-09-16 18:26:55.000000000 +0000 ++++ mozilla/security/manager/ssl/src/JARSignatureVerification.cpp +@@ -596,9 +596,9 @@ OpenSignedJARFile(nsIFile * aJarFile, + } + + // Verify that the signature file is a valid signature of the SF file +- if (!SEC_PKCS7VerifyDetachedSignatureAtTime(p7_info, certUsageObjectSigner, +- &sfCalculatedDigest.get(), +- HASH_AlgSHA1, false, PR_Now())) { ++ if (!SEC_PKCS7VerifyDetachedSignature(p7_info, certUsageObjectSigner, ++ &sfCalculatedDigest.get(), HASH_AlgSHA1, ++ false)) { + PRErrorCode error = PR_GetError(); + const char * errorName = PR_ErrorToName(error); + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to verify detached signature: %s", diff --git a/www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp b/www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp index bbadf8a2e65..48e481ee922 100644 --- a/www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp +++ b/www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp @@ -1,12 +1,12 @@ -$NetBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp,v 1.1 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp,v 1.2 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig 2013-05-03 03:08:10.000000000 +0000 +--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig 2013-09-16 18:26:55.000000000 +0000 +++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp -@@ -72,6 +72,7 @@ +@@ -49,6 +49,7 @@ + #include "nss.h" - #include "pk11func.h" #include "ssl.h" +#define NSS_ENABLE_ECC 1 #include "sslproto.h" #include "secmod.h" - #include "sechash.h" + #include "secmime.h" diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_components_osfile_osfile__unix__allthreads.jsm b/www/seamonkey/patches/patch-mozilla_toolkit_components_osfile_osfile__unix__allthreads.jsm new file mode 100644 index 00000000000..d0bacbcbde3 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_toolkit_components_osfile_osfile__unix__allthreads.jsm @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_toolkit_components_osfile_osfile__unix__allthreads.jsm,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/toolkit/components/osfile/osfile_unix_allthreads.jsm.orig 2013-09-16 18:26:58.000000000 +0000 ++++ mozilla/toolkit/components/osfile/osfile_unix_allthreads.jsm +@@ -40,7 +40,7 @@ if (typeof Components != "undefined") { + // Open libc + let libc; + let libc_candidates = [ "libSystem.B.dylib", +- "libc.so.6", ++ "libc.so.7", + "libc.so" ]; + for (let i = 0; i < libc_candidates.length; ++i) { + try { diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_xre_Makefile.in b/www/seamonkey/patches/patch-mozilla_toolkit_xre_Makefile.in new file mode 100644 index 00000000000..6a5bb68637d --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_toolkit_xre_Makefile.in @@ -0,0 +1,10 @@ +$NetBSD: patch-mozilla_toolkit_xre_Makefile.in,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/toolkit/xre/Makefile.in.orig 2013-09-16 18:27:01.000000000 +0000 ++++ mozilla/toolkit/xre/Makefile.in +@@ -216,5 +216,3 @@ GARBAGE += platform.ini + libs:: platform.ini + $(INSTALL) $^ $(DIST)/bin + +-install:: +- $(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir) diff --git a/www/seamonkey/patches/patch-mozilla_unwind.h b/www/seamonkey/patches/patch-mozilla_unwind.h new file mode 100644 index 00000000000..29fd1bcbd9c --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_unwind.h @@ -0,0 +1,9 @@ +$NetBSD: patch-mozilla_unwind.h,v 1.3 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/unwind.h.orig 2013-09-28 01:07:15.000000000 +0000 ++++ mozilla/unwind.h +@@ -0,0 +1,4 @@ ++#pragma GCC system_header ++#pragma GCC visibility push(default) ++#include_next <unwind.h> ++#pragma GCC visibility pop diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_ds_moz.build b/www/seamonkey/patches/patch-mozilla_xpcom_ds_moz.build new file mode 100644 index 00000000000..431a05953c9 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_xpcom_ds_moz.build @@ -0,0 +1,22 @@ +$NetBSD: patch-mozilla_xpcom_ds_moz.build,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/xpcom/ds/moz.build.orig 2013-09-16 18:27:02.000000000 +0000 ++++ mozilla/xpcom/ds/moz.build +@@ -95,7 +95,6 @@ CPP_SOURCES += [ + 'nsSupportsPrimitives.cpp', + 'nsUnicharBuffer.cpp', + 'nsVariant.cpp', +- 'TimeStamp.cpp', + ] + + if CONFIG['HAVE_CLOCK_MONOTONIC']: +@@ -113,5 +112,9 @@ elif CONFIG['OS_ARCH'] == 'WINNT': + else: + error('No TimeStamp implementation on this platform. Build will not succeed') + ++CPP_SOURCES += [ ++ 'TimeStamp.cpp', ++] ++ + LIBRARY_NAME = 'xpcomds_s' + diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_moz.build b/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_moz.build new file mode 100644 index 00000000000..77ec591f05e --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_moz.build @@ -0,0 +1,21 @@ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_moz.build,v 1.1 2013/09/28 14:37:05 ryoon Exp $ + +--- mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build.orig 2013-09-16 18:27:02.000000000 +0000 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build +@@ -19,14 +19,14 @@ if CONFIG['OS_ARCH'] == 'Darwin': + 'xptcstubs_gcc_x86_unix.cpp', + ] + +-if CONFIG['OS_ARCH'] in ('NetBSD', 'OpenBSD', 'GNU'): ++if CONFIG['OS_ARCH'] in ('OpenBSD', 'GNU'): + if CONFIG['CPU_ARCH'] == 'x86': + CPP_SOURCES += [ + 'xptcinvoke_gcc_x86_unix.cpp', + 'xptcstubs_gcc_x86_unix.cpp' + ] + +-if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD') or \ ++if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'DragonFly') or \ + CONFIG['OS_ARCH'].startswith('GNU_'): + if CONFIG['OS_TEST'] == 'x86_64': + CPP_SOURCES += [ diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcstubs__sparc64__openbsd.cpp b/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcstubs__sparc64__openbsd.cpp deleted file mode 100644 index a306e802932..00000000000 --- a/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcstubs__sparc64__openbsd.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcstubs__sparc64__openbsd.cpp,v 1.1 2013/07/12 12:24:11 ryoon Exp $ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp.orig 2013-06-20 04:35:24.000000000 +0000 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp -@@ -83,7 +83,7 @@ PrepareAndDispatch(nsXPTCStubBase* self, - return result; - } - --extern "C" int SharedStub(int, int*); -+extern "C" nsresult SharedStub(int, int*); - - #define STUB_ENTRY(n) \ - nsresult nsXPTCStubBase::Stub##n() \ diff --git a/www/seamonkey/patches/patch-pa b/www/seamonkey/patches/patch-pa deleted file mode 100644 index 75875405d0f..00000000000 --- a/www/seamonkey/patches/patch-pa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-pa,v 1.9 2013/08/11 03:18:46 ryoon Exp $ - ---- mozilla/xulrunner/installer/mozilla-js.pc.in.orig 2013-08-04 03:05:53.000000000 +0000 -+++ mozilla/xulrunner/installer/mozilla-js.pc.in -@@ -6,5 +6,5 @@ Name: JavaScript - Description: The Mozilla JavaScript Library - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib %MOZ_JS_LINK% -+Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_JS_LINK% - Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE diff --git a/www/seamonkey/patches/patch-pd b/www/seamonkey/patches/patch-pd deleted file mode 100644 index 91aeb361cbb..00000000000 --- a/www/seamonkey/patches/patch-pd +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-pd,v 1.10 2013/08/11 03:18:46 ryoon Exp $ - ---- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig 2013-08-04 03:05:53.000000000 +0000 -+++ mozilla/xulrunner/installer/mozilla-nss.pc.in -@@ -6,5 +6,5 @@ Name: NSS - Description: Mozilla Network Security Services - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3 -+Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3 - Cflags: -I${includedir} diff --git a/www/seamonkey/patches/patch-pg b/www/seamonkey/patches/patch-pg deleted file mode 100644 index 4c361d94bc4..00000000000 --- a/www/seamonkey/patches/patch-pg +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-pg,v 1.9 2013/08/11 03:18:46 ryoon Exp $ - ---- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig 2013-08-04 03:05:53.000000000 +0000 -+++ mozilla/xulrunner/installer/mozilla-nspr.pc.in -@@ -5,7 +5,5 @@ includedir=%includedir% - Name: NSPR - Description: The Netscape Portable Runtime - Version: %NSPR_VERSION% --Libs: %FULL_NSPR_LIBS% --Cflags: %FULL_NSPR_CFLAGS% -- -- -+Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lplds4 -lplc4 -lnspr4 -pthread -+Cflags: -I${includedir} diff --git a/www/seamonkey/patches/patch-xa b/www/seamonkey/patches/patch-xa deleted file mode 100644 index 72431cb754a..00000000000 --- a/www/seamonkey/patches/patch-xa +++ /dev/null @@ -1,119 +0,0 @@ -$NetBSD: patch-xa,v 1.7 2013/01/07 21:55:30 ryoon Exp $ - -NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ - ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig 2012-11-23 07:42:33.000000000 +0000 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s -@@ -0,0 +1,112 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+ * -+ * The contents of this file are subject to the Netscape 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/NPL/ -+ * -+ * 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 Netscape are -+ * Copyright (C) 1998 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ .global NS_InvokeByIndex_P -+ .type NS_InvokeByIndex_P, #function -+/* -+ NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+/* -+ * Note: To simplify stack handling we allocate an extra stack -+ * frame here. In principle invoke_copy_to_stack() could -+ * save the parameters our caller's frame and we could -+ * reclaim the stackframe and do a tail call to the -+ * function. However, this gets complicated.... -+ * -+ * The vtable consist of be: -+ * -+ * struct { -+ * short __delta; -+ * short __index; -+ * union { -+ * P __pfn; -+ * short __delta2; -+ * } __pfn_or_delta2; -+ * }; -+ * -+ * See gcc/cp/cp-tree.h -+ */ -+ -+NS_InvokeByIndex_P: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %f2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+ ldx [%i0],%l1 ! *this --> address of vtable -+ ldx [%l0 + %l1],%l0 ! this->vtable[index] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size NS_InvokeByIndex_P, .-NS_InvokeByIndex_P |