Import of pkgsrc-2015Q2

www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp

@@ -1,8 +1,8 @@
-$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.6 2015/02/28 04:30:55 ryoon Exp $
+$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.7 2015/04/05 12:54:11 ryoon Exp $
 
---- dom/plugins/ipc/PluginModuleChild.cpp.orig	2015-02-17 21:40:45.000000000 +0000
+--- dom/plugins/ipc/PluginModuleChild.cpp.orig	2015-03-27 02:20:27.000000000 +0000
 +++ dom/plugins/ipc/PluginModuleChild.cpp
-@@ -307,7 +307,7 @@ PluginModuleChild::InitForChrome(const s
+@@ -320,7 +320,7 @@ PluginModuleChild::InitForChrome(const s
  
      // TODO: use PluginPRLibrary here
  
@@ -11,7 +11,7 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.6 2015/02/28 04:30:55 r
      mShutdownFunc =
          (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
  
-@@ -1869,7 +1869,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
+@@ -1882,7 +1882,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
      AssertPluginThread();
      MOZ_ASSERT(mIsChrome);
  
@@ -20,12 +20,12 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.6 2015/02/28 04:30:55 r
      return true;
  #elif defined(OS_WIN) || defined(OS_MACOSX)
      *_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1899,7 +1899,7 @@ PluginModuleChild::AnswerNP_Initialize(c
-     SendBackUpXResources(FileDescriptor(xSocketFd));
+@@ -1927,7 +1927,7 @@ PluginModuleChild::DoNP_Initialize(const
  #endif
  
+     NPError result;
 -#if defined(OS_LINUX) || defined(OS_BSD)
 +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
-     *_retval = mInitializeFunc(&sBrowserFuncs, &mFunctions);
-     return true;
+     result = mInitializeFunc(&sBrowserFuncs, &mFunctions);
  #elif defined(OS_WIN) || defined(OS_MACOSX)
+     result = mInitializeFunc(&sBrowserFuncs);