pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

firefox-hg: Add patch fixing build on NetBSD.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue May 10 12:20:48 2016 +0200
Changeset:	e2b2742712b5e48d7a43556aa4445c9914d69c59

Modified Files:
	firefox-hg/PLIST
	firefox-hg/distinfo
Added Files:
	firefox-hg/patches/patch-js_src_threading_posix_ConditionVariable.cpp

Log Message:
firefox-hg: Add patch fixing build on NetBSD.

Adapt PLIST for upstream changes while here.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e2b2742712b5e48d7a43556aa4445c9914d69c59

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 firefox-hg/PLIST                                   | 74 ++++++++++++++--------
 firefox-hg/distinfo                                |  1 +
 ...ch-js_src_threading_posix_ConditionVariable.cpp | 24 +++++++
 3 files changed, 71 insertions(+), 28 deletions(-)

diffs:
diff --git a/firefox-hg/PLIST b/firefox-hg/PLIST
index f687c2a..6e2e7a3 100644
--- a/firefox-hg/PLIST
+++ b/firefox-hg/PLIST
@@ -728,17 +728,19 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/acorn/acorn.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/acorn/acorn_loose.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/acorn/walk.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/aboutdebugging.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addon-target.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons-controls.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons-install-error.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons-tab.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/service-worker-target.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tab-header.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tab-menu-entry.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tab-menu.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/controls.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/install-error.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/panel.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/target.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/panel-header.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/panel-menu-entry.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/panel-menu.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/panel.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/target.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/target-list.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/worker-target.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers-tab.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/panel.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/service-worker-target.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/target.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/aboutdebugging/modules/worker.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-details.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-target-node.js
@@ -795,6 +797,8 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/devtools-browser.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/devtools.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/gDevTools.jsm
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/menu-item.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/menu.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/selection.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/sidebar.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/source-location.js
@@ -804,6 +808,8 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/toolbox-hosts.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/toolbox-options.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/framework/toolbox.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/fronts/storage.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/fronts/stylesheets.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/breadcrumbs.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/computed/computed.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js
@@ -1061,6 +1067,9 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/co
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-row.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-view.css
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-view.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/css-angle.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/css-color-db.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/css-color.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/css-parsing-utils.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/css-reload.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/demangle.js
@@ -1125,6 +1134,7 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/wi
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesView.jsm
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesViewController.jsm
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/widgets/ViewHelpers.jsm
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/TooltipToggle.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/sourceeditor/autocomplete.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/sourceeditor/css-autocompleter.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/sourceeditor/debugger.js
@@ -1175,6 +1185,26 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsol
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/events.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/json.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/net.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/messages.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/console-output.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-container.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-icon.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-repeat.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/date-preview.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/default-renderer.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/variables-view-link.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/constants.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/main.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/index.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/messages.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/messages.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/store.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/messages.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/variables-view.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/panel.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/webide/modules/addons.js
@@ -1272,7 +1302,6 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/performan
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/performance/recorder.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/performance/timeline.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/primitive.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/protocol.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/service-worker-child.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/worker.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/DevToolsUtils.js
@@ -1287,8 +1316,7 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/async-uti
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/client/connection-manager.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/client/main.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/content-observer.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/css-angle.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/css-color.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/css-lexer.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/deprecated-sync-thenables.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/discovery/discovery.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/event-emitter.js
@@ -1319,13 +1347,8 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/comm
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/cli.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/clear.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/commands.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/connect.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/context.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/exec.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/global.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/help.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/intro.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/lang.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/mocks.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/pref.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/commands/preflist.js
@@ -1403,6 +1426,7 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/path.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/performance/recording-common.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/performance/recording-utils.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/pretty-fast/pretty-fast.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/protocol.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/qrcode/decoder/index.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/qrcode/encoder/index.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/qrcode/index.js
@@ -1411,6 +1435,8 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/security/
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/security/prompt.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/security/socket.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/sourcemap/source-map.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/specs/storage.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/specs/stylesheets.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/system.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/touch/simulator-content.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/touch/simulator.js
@@ -1491,6 +1517,7 @@ lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/debugger-step-over@2x
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/debugger-toggleBreakpoints.svg
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/debugging-addons.svg
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/debugging-devices.svg
+lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/debugging-tabs.svg
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/debugging-workers.svg
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/diff.svg
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/dock-bottom.svg
@@ -1603,6 +1630,7 @@ lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/security-state-local.
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/security-state-secure.svg
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/security-state-weak.svg
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/sort-arrows.svg
+lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/tabs-icon.svg
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/timeline-filter.svg
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/toggle-tools.png
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/images/toggle-tools%2x.png@localhost
@@ -3397,9 +3425,6 @@ lib/firefox-${VERSION}/components/FormAutofillStartup.js
 lib/firefox-${VERSION}/components/FormHistoryStartup.js
 lib/firefox-${VERSION}/components/FxAccountsPush.js
 lib/firefox-${VERSION}/components/InstallPackagedWebapp.js
-lib/firefox-${VERSION}/components/InterAppCommService.js
-lib/firefox-${VERSION}/components/InterAppConnection.js
-lib/firefox-${VERSION}/components/InterAppMessagePort.js
 lib/firefox-${VERSION}/components/MainProcessSingleton.js
 lib/firefox-${VERSION}/components/MozKeyboard.js
 lib/firefox-${VERSION}/components/NetworkGeolocationProvider.js
@@ -3418,8 +3443,6 @@ lib/firefox-${VERSION}/components/PrivateBrowsingTrackingProtectionWhitelist.js
 lib/firefox-${VERSION}/components/Push.js
 lib/firefox-${VERSION}/components/PushComponents.js
 lib/firefox-${VERSION}/components/RemoteWebNavigation.js
-lib/firefox-${VERSION}/components/RequestSyncManager.js
-lib/firefox-${VERSION}/components/RequestSyncScheduler.js
 lib/firefox-${VERSION}/components/SecurityReporter.js
 lib/firefox-${VERSION}/components/SettingsManager.js
 lib/firefox-${VERSION}/components/SiteSpecificUserAgent.js
@@ -3470,7 +3493,6 @@ lib/firefox-${VERSION}/components/nsLivemarkService.js
 lib/firefox-${VERSION}/components/nsLoginInfo.js
 lib/firefox-${VERSION}/components/nsLoginManager.js
 lib/firefox-${VERSION}/components/nsLoginManagerPrompter.js
-lib/firefox-${VERSION}/components/nsPlacesAutoComplete.js
 lib/firefox-${VERSION}/components/nsPlacesExpiration.js
 lib/firefox-${VERSION}/components/nsPrompter.js
 lib/firefox-${VERSION}/components/nsSearchService.js
@@ -3643,7 +3665,6 @@ lib/firefox-${VERSION}/modules/InlineSpellChecker.jsm
 lib/firefox-${VERSION}/modules/InlineSpellCheckerContent.jsm
 lib/firefox-${VERSION}/modules/InsecurePasswordUtils.jsm
 lib/firefox-${VERSION}/modules/Integration.jsm
-lib/firefox-${VERSION}/modules/InterAppCommService.jsm
 lib/firefox-${VERSION}/modules/Keyboard.jsm
 lib/firefox-${VERSION}/modules/Langpacks.jsm
 lib/firefox-${VERSION}/modules/LightweightThemeConsumer.jsm
@@ -3728,9 +3749,6 @@ lib/firefox-${VERSION}/modules/RemotePageManager.jsm
 lib/firefox-${VERSION}/modules/RemoteSecurityUI.jsm
 lib/firefox-${VERSION}/modules/RemoteWebProgress.jsm
 lib/firefox-${VERSION}/modules/RequestAutocompleteUI.jsm
-lib/firefox-${VERSION}/modules/RequestSyncApp.jsm
-lib/firefox-${VERSION}/modules/RequestSyncService.jsm
-lib/firefox-${VERSION}/modules/RequestSyncTask.jsm
 lib/firefox-${VERSION}/modules/ResetProfile.jsm
 lib/firefox-${VERSION}/modules/ResourceStatsDB.jsm
 lib/firefox-${VERSION}/modules/ResourceStatsService.jsm
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 9327b75..d3171c5 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -11,6 +11,7 @@ SHA1 (patch-build_gyp.mozbuild) = 084e8730d93b2d09901cf85876a39198605ee2a1
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e104bea7922dac0ce441bca4ba7a6f9b2379d17a
 SHA1 (patch-js_src_jit_AtomicOperations.h) = 6baf712644b290173b874910246eab6da438b7de
 SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = c2b7bc27a7e54476b00e142e79b456cbbe9d5d8c
+SHA1 (patch-js_src_threading_posix_ConditionVariable.cpp) = 4e79f7f6d4d5eb97a817691c7f9ed69fd4023b7a
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 0afa1ec917ce9cd6f1bcb39a51be336d6d30e1ce
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 0f2af2631d804a6cb5d2188f3dea712d5ca07ff4
 SHA1 (patch-modules_libpref_init_all.js) = 73dbe0c7001f9bfadb6ff7b50c340f7d135cb42a
diff --git a/firefox-hg/patches/patch-js_src_threading_posix_ConditionVariable.cpp b/firefox-hg/patches/patch-js_src_threading_posix_ConditionVariable.cpp
new file mode 100644
index 0000000..f67a9fd
--- /dev/null
+++ b/firefox-hg/patches/patch-js_src_threading_posix_ConditionVariable.cpp
@@ -0,0 +1,24 @@
+$NetBSD$
+
+NetBSD provides a timespecadd macro in sys/time.h, which conflicts with this one.
+
+--- js/src/threading/posix/ConditionVariable.cpp.orig	2016-05-10 09:55:11.875611541 +0000
++++ js/src/threading/posix/ConditionVariable.cpp
+@@ -37,7 +37,7 @@ static const clockid_t WhichClock = CLOC
+ // timespec structure is largely lacking such conveniences. Thankfully, the
+ // utilities available in MFBT make implementing our own quite easy.
+ static void
+-timespecadd(struct timespec* lhs, struct timespec* rhs, struct timespec* result)
++moz_timespecadd(struct timespec* lhs, struct timespec* rhs, struct timespec* result)
+ {
+   // Add nanoseconds. This may wrap, but not above 2 billion.
+   MOZ_RELEASE_ASSERT(lhs->tv_nsec < NanoSecPerSec);
+@@ -149,7 +149,7 @@ js::ConditionVariable::wait_for(UniqueLo
+   MOZ_RELEASE_ASSERT(!r);
+ 
+   struct timespec abs_ts;
+-  timespecadd(&now_ts, &rel_ts, &abs_ts);
++  moz_timespecadd(&now_ts, &rel_ts, &abs_ts);
+ 
+   r = pthread_cond_timedwait(ptCond, ptMutex, &abs_ts);
+ #else


Home | Main Index | Thread Index | Old Index