Fix build on SmartOS.

I cannot confirm the functionality of this change's result sadly
(no display and no ssh -Y).
The build is completed.

4 files changed, 57 insertions, 5 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 2084e9339bd..805e3d04061 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.113 2013/09/19 12:37:49 ryoon Exp $
+$NetBSD: distinfo,v 1.114 2013/09/21 09:58:49 ryoon Exp $
 
 SHA1 (firefox-24.0esr.source.tar.bz2) = b5859d4baf270e6f7e48baf7807fd8d23a80ca1a
 RMD160 (firefox-24.0esr.source.tar.bz2) = 0984b17713f57509826437bbcaf3bda0c5f5248c
@@ -43,6 +43,7 @@ SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 7bc83577a9678542db4dff7dda19d
 SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 677f0b5ccdcde7a8551f2d07d2a472361a5da03f
 SHA1 (patch-ipc_chromium_src_base_file__util.h) = 2bfc4b8f14cf5290f98902f11c9638cf71575655
 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 4d183855d7932ad6f526649dc3671b72cbfbb195
+SHA1 (patch-ipc_chromium_src_base_file__version__info.h) = d5edba664baab30eaa96aa0e8cb2b354378b05be
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 12f3e063cf3fef23f0e3e0fdba5d5a4c1fc32af3
 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e6d7ac39a8b2a1b232638f7671e8530acfed0b97
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = e386bfd56ae6f77ef1aaadd0fa81af147a09f75d
@@ -62,7 +63,7 @@ SHA1 (patch-js_src_config_system-headers) = a2a68c9eba37fa484af944ffe80969487940
 SHA1 (patch-js_src_ctypes_CTypes.h) = a168d70707b0d09b6ff52141b5ceebf69caa1f90
 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
 SHA1 (patch-js_src_gdb_Makefile.in) = 5719a69750412e63a7772ed8bf9e8c5fa8df03ca
-SHA1 (patch-js_src_jit_AsmJSSignalHandlers.cpp) = 2db5ff71344a8f9fdec01a1d92445f89b6407bbe
+SHA1 (patch-js_src_jit_AsmJSSignalHandlers.cpp) = ff58ca55fe39aef1310a72490472e522aae77956
 SHA1 (patch-js_src_jsapi-tests_Makefile.in) = cc204028b25f9c25f0d421305393ce166fb4cd58
 SHA1 (patch-js_src_jscompartment.h) = 33708bc67f1c05f776dbb9c048ddf91f0eea25ca
 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
@@ -98,6 +99,7 @@ SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spre
 SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc) = 07497983c7c131f3fc148801c6350ab9ccfb19e5
 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9d9036ddd28c7b8ce37860e0120df2997a3a0c59
 SHA1 (patch-mfbt_Atomics.h) = 1a1df4189cf8da1182baa5c2e9909f9add6d2451
+SHA1 (patch-mfbt_Poison.cpp) = 6dfe1528743e54b54120ac8ce87871b08c82da49
 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a
 SHA1 (patch-modules_libpref_src_init_all.js) = 16764075621da048b6c8a359c32b4fc8be6f7d67
 SHA1 (patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c) = 31d49db31b1e130f1b455f883e5b7c606d438771
diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h b/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h
new file mode 100644
index 00000000000..492909c8e12
--- /dev/null
+++ b/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-ipc_chromium_src_base_file__version__info.h,v 1.1 2013/09/21 09:58:49 ryoon Exp $
+
+* Treat Solaris/SunOS like Linux, fix build.
+
+--- ipc/chromium/src/base/file_version_info.h.orig	2013-09-11 03:22:31.000000000 +0000
++++ 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/firefox/patches/patch-js_src_jit_AsmJSSignalHandlers.cpp b/www/firefox/patches/patch-js_src_jit_AsmJSSignalHandlers.cpp
index 5455e754c25..4420ed4b04c 100644
--- a/www/firefox/patches/patch-js_src_jit_AsmJSSignalHandlers.cpp
+++ b/www/firefox/patches/patch-js_src_jit_AsmJSSignalHandlers.cpp
@@ -1,8 +1,23 @@
-$NetBSD: patch-js_src_jit_AsmJSSignalHandlers.cpp,v 1.1 2013/09/19 12:37:50 ryoon Exp $
+$NetBSD: patch-js_src_jit_AsmJSSignalHandlers.cpp,v 1.2 2013/09/21 09:58:49 ryoon Exp $
 
---- js/src/jit/AsmJSSignalHandlers.cpp.orig	2013-09-10 03:43:36.000000000 +0000
+* REG_EIP is not defined on Solaris/SunOS, use REG_PC instead.
+
+--- js/src/jit/AsmJSSignalHandlers.cpp.orig	2013-09-11 03:22:33.000000000 +0000
 +++ js/src/jit/AsmJSSignalHandlers.cpp
-@@ -269,7 +269,7 @@ LookupHeapAccess(const AsmJSModule &modu
+@@ -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
diff --git a/www/firefox/patches/patch-mfbt_Poison.cpp b/www/firefox/patches/patch-mfbt_Poison.cpp
new file mode 100644
index 00000000000..7507e056d9c
--- /dev/null
+++ b/www/firefox/patches/patch-mfbt_Poison.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-mfbt_Poison.cpp,v 1.1 2013/09/21 09:58:49 ryoon Exp $
+
+* Use posix_madvise(3) instead of madvise(3) for Solaris/SunOS.
+  Solaris/SunOS's madvise(3) is not enabled in this context,
+  and its first argument type is different from NetBSD/Linux's one.
+
+--- mfbt/Poison.cpp.orig	2013-09-11 03:22:45.000000000 +0000
++++ mfbt/Poison.cpp
+@@ -125,7 +125,11 @@ ReleaseRegion(void *region, uintptr_t si
+ static bool
+ ProbeRegion(uintptr_t region, uintptr_t size)
+ {
++#if !defined(OS_SOLARIS)
+   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;