Import of pkgsrc-2015Q1

www/seamonkey/patches/patch-mozilla_dom_system_OSFileConstants.cpp

@@ -1,10 +1,10 @@
-$NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.3 2014/03/30 04:13:17 ryoon Exp $
+$NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.6 2015/03/17 19:50:42 ryoon Exp $
 
 * NetBSD 5 does not support posix_spawn(3)
 
---- mozilla/dom/system/OSFileConstants.cpp.orig	2014-03-15 05:19:14.000000000 +0000
+--- mozilla/dom/system/OSFileConstants.cpp.orig	2015-03-09 05:35:03.000000000 +0000
 +++ mozilla/dom/system/OSFileConstants.cpp
-@@ -9,11 +9,15 @@
+@@ -9,6 +9,10 @@
  
  #include "prsystem.h"
  
@@ -15,18 +15,47 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.3 2014/03/30 04:13:17
  #if defined(XP_UNIX)
  #include "unistd.h"
  #include "dirent.h"
- #include "sys/stat.h"
--#if !defined(ANDROID)
-+#if !defined(ANDROID) && (defined(__NetBSD_) && (__NetBSD_Version__ < 600000000))
+@@ -18,7 +22,9 @@
+ #define statvfs statfs
+ #else
+ #include "sys/statvfs.h"
++#if !(defined(__NetBSD__) && (__NetBSD_Version__ < 600000000))
  #include <spawn.h>
- #endif // !defined(ANDROID)
++#endif // !NetBSD 5.*
+ #endif // defined(ANDROID)
  #endif // defined(XP_UNIX)
-@@ -508,7 +512,7 @@ static const dom::ConstantSpec gLibcProp
-   // The size of |time_t|.
-   { "OSFILE_SIZEOF_TIME_T", INT_TO_JSVAL(sizeof (time_t)) },
+ 
+@@ -26,9 +32,9 @@
+ #include <linux/fadvise.h>
+ #endif // defined(XP_LINUX)
+ 
+-#if defined(XP_MACOSX)
++#if defined(XP_DARWIN)
+ #include "copyfile.h"
+-#endif // defined(XP_MACOSX)
++#endif // defined(XP_DARWIN)
+ 
+ #if defined(XP_WIN)
+ #include <windows.h>
+@@ -588,10 +594,10 @@ static const dom::ConstantSpec gLibcProp
+   // The size of |fsblkcnt_t|.
+   { "OSFILE_SIZEOF_FSBLKCNT_T", INT_TO_JSVAL(sizeof (fsblkcnt_t)) },
  
 -#if !defined(ANDROID)
-+#if !defined(ANDROID) && (defined(__NetBSD_) && (__NetBSD_Version__ < 600000000))
++#if !defined(ANDROID) && !(defined(__NetBSD__) && (__NetBSD_Version__ < 600000000))
    // The size of |posix_spawn_file_actions_t|.
    { "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", INT_TO_JSVAL(sizeof (posix_spawn_file_actions_t)) },
- #endif // !defined(ANDROID)
+-#endif // !defined(ANDROID)
++#endif // !defined(ANDROID) && NetBSD 5.*
+ 
+   // Defining |dirent|.
+   // Size
+@@ -660,7 +666,7 @@ static const dom::ConstantSpec gLibcProp
+ 
+   { "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)