Import of pkgsrc-2014Q1

mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp

@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.4 2012/11/23 07:17:54 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.5 2013/11/12 20:50:51 ryoon Exp $
 
---- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig	2012-11-19 22:42:22.000000000 +0000
+--- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig	2013-10-23 22:09:00.000000000 +0000
 +++ mozilla/ipc/glue/GeckoChildProcessHost.cpp
 @@ -4,7 +4,13 @@
   * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -16,41 +16,39 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.4 2012/11/23 07:17:54 ryoo
  
  #include "base/command_line.h"
  #include "base/path_service.h"
-@@ -437,7 +443,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -490,7 +496,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    // and passing wstrings from one config to the other is unsafe.  So
    // we split the logic here.
  
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS)
    base::environment_map newEnvVars;
-   base::ChildPrivileges privs = kLowRightsSubprocesses ?
-                                 base::UNPRIVILEGED :
-@@ -455,8 +461,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
+   ChildPrivileges privs = mPrivileges;
+   if (privs == base::PRIVILEGES_DEFAULT) {
+@@ -509,7 +515,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
        if (NS_SUCCEEDED(rv)) {
          nsCString path;
          greDir->GetNativePath(path);
--# ifdef OS_LINUX
--#  ifdef MOZ_WIDGET_ANDROID
-+# if defined(OS_LINUX) || defined(OS_BSD)
-+#  if defined(MOZ_WIDGET_ANDROID) || defined(OS_BSD)
+-# if defined(OS_LINUX) || defined(OS_BSD)
++# if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
+ #  if defined(MOZ_WIDGET_ANDROID)
          path += "/lib";
  #  endif  // MOZ_WIDGET_ANDROID
-         const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-@@ -575,7 +581,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -618,7 +624,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    childArgv.push_back(pidstring);
  
  #if defined(MOZ_CRASHREPORTER)
--#  if defined(OS_LINUX)
-+#  if defined(OS_LINUX) || defined(OS_BSD)
+-#  if defined(OS_LINUX) || defined(OS_BSD)
++#  if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
    int childCrashFd, childCrashRemapFd;
    if (!CrashReporter::CreateNotificationPipeForChild(
          &childCrashFd, &childCrashRemapFd))
-@@ -612,7 +618,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
- #endif
+@@ -651,7 +657,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+   childArgv.push_back(childProcessType);
  
    base::LaunchApp(childArgv, mFileMap,
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS)
                    newEnvVars, privs,
  #endif
                    false, &process, arch);