pkgsrc-WIP-changes archive

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

www/firefox-hg: Update to latest aurora, 50.0 and fix segfault on exit



Module Name:	pkgsrc-wip
Committed By:	Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By:	ryoon
Date:		Tue Jun 28 03:15:22 2016 +0900
Changeset:	ecd59e2e0402594766de166b508537b6096be8a6

Modified Files:
	firefox-hg/Makefile
	firefox-hg/distinfo
Added Files:
	firefox-hg/patches/patch-toolkit_components_terminator_nsTerminator.cpp

Log Message:
www/firefox-hg: Update to latest aurora, 50.0 and fix segfault on exit

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

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

diffstat:
 firefox-hg/Makefile                                |  2 +-
 firefox-hg/distinfo                                |  1 +
 ...-toolkit_components_terminator_nsTerminator.cpp | 25 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diffs:
diff --git a/firefox-hg/Makefile b/firefox-hg/Makefile
index 83a0e42..28e1255 100644
--- a/firefox-hg/Makefile
+++ b/firefox-hg/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.9 2015/08/17 07:30:47 thomasklausner Exp $
 
-MOZ_BRANCH=	49.0a1
+MOZ_BRANCH=	50.0a1
 
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 75a0f28..763229e 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -11,6 +11,7 @@ SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info_
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ba581d0edc7cfa4a43e6f0dc8a75a914fef18ea9
 SHA1 (patch-modules_libpref_init_all.js) = 73dbe0c7001f9bfadb6ff7b50c340f7d135cb42a
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform_macros.h) = 4abe361ffcab9f923e9ae7b9bdc0dfdb9ddce820
+SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = a8cbba3cea0987291aed3646196b3a9c72dc0342
 SHA1 (patch-toolkit_library_moz.build) = 3f65d42f4e8a3a11c9411a7b1b7315a410fc051f
 SHA1 (patch-xg) = 2b472858270a109c2b317bb08698c12717174510
 SHA1 (patch-xl) = 337960ba518f1f142b45ae91d3f122ee5e0c9da3
diff --git a/firefox-hg/patches/patch-toolkit_components_terminator_nsTerminator.cpp b/firefox-hg/patches/patch-toolkit_components_terminator_nsTerminator.cpp
new file mode 100644
index 0000000..44d8ec2
--- /dev/null
+++ b/firefox-hg/patches/patch-toolkit_components_terminator_nsTerminator.cpp
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- toolkit/components/terminator/nsTerminator.cpp.orig	2016-06-27 17:15:24.677082132 +0000
++++ toolkit/components/terminator/nsTerminator.cpp
+@@ -36,7 +36,7 @@
+ #if defined(XP_WIN)
+ #include <windows.h>
+ #else
+-#include <unistd.h>
++#include <time.h>
+ #endif
+ 
+ #include "mozilla/ArrayUtils.h"
+@@ -147,7 +147,10 @@ RunWatchdog(void* arg)
+ #if defined(XP_WIN)
+     Sleep(1000 /* ms */);
+ #else
+-    usleep(1000000 /* usec */);
++    struct timespec tickd;
++    tickd.tv_sec = 1;
++    tickd.tv_nsec = 0;
++    nanosleep(&tickd, NULL);
+ #endif
+ 
+     if (gHeartbeat++ < timeToLive) {


Home | Main Index | Thread Index | Old Index