forked from Lainports/freebsd-ports
f92079c61e
- firefox 31.0 - firefox-esr 24.7.0 - libxul 24.7.0 - seamonkey 2.26.1 - thunderbird 31.0 Among changes: - add workaround for crash with openldap on thunderbird and seamonkey [1] - add crashfix for architectures with strict alignmentment - backport crashfix with system sqlite/nss on firefox-esr and thunderbird - restore hooking jemalloc in sqlite on freebsd 10+ - fix thunderbird build with -jN [2] - respect MAKE_JOBS_NUMBER regardless of kern.smp.cpus [2] - define CPE_URI for nspr/nss and firefox/thunderbird/seamonkey - require recent gstreamer1-libav i386 crashfix - add DTRACE option for use with DTraceToolkit (js_flowtime.d, js_who.d, etc) PR: 165263 [1] PR: 184630 [2] Submitted by: Jan Beich
41 lines
2.1 KiB
Text
41 lines
2.1 KiB
Text
diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
|
|
index 4b21361..cb3be32 100644
|
|
--- mozilla/dom/system/OSFileConstants.cpp
|
|
+++ mozilla/dom/system/OSFileConstants.cpp
|
|
@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] =
|
|
|
|
{ "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
|
|
|
|
- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
|
|
+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
|
|
{ "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
|
|
|
|
#endif // defined(XP_UNIX)
|
|
diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
|
|
index b59fca4..0cf220b 100644
|
|
--- mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm
|
|
+++ mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm
|
|
@@ -228,8 +228,8 @@
|
|
let statvfs = new SharedAll.HollowStructure("statvfs",
|
|
Const.OSFILE_SIZEOF_STATVFS);
|
|
|
|
- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
|
|
- "f_bsize", Type.unsigned_long.implementation);
|
|
+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
|
|
+ "f_frsize", Type.unsigned_long.implementation);
|
|
statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
|
|
"f_bavail", Type.fsblkcnt_t.implementation);
|
|
|
|
diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
|
|
index 99e5e9b..de642c5 100644
|
|
--- mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm
|
|
+++ mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm
|
|
@@ -373,7 +373,7 @@
|
|
throw_on_negative("statvfs", UnixFile.statvfs(sourcePath, fileSystemInfoPtr));
|
|
|
|
let bytes = new Type.uint64_t.implementation(
|
|
- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
|
|
+ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
|
|
|
|
return bytes.value;
|
|
};
|