Import of pkgsrc-2015Q1

www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp

@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.8 2013/08/11 03:18:46 ryoon Exp $
+$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.9 2015/03/17 19:50:42 ryoon Exp $
 
---- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig	2013-08-04 03:05:22.000000000 +0000
+--- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig	2015-03-09 05:35:00.000000000 +0000
 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp
-@@ -203,7 +203,7 @@ PluginModuleChild::Init(const std::strin
+@@ -307,7 +307,7 @@ PluginModuleChild::InitForChrome(const s
  
      // TODO: use PluginPRLibrary here
  
@@ -11,16 +11,16 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.8 2013/08/11 03
      mShutdownFunc =
          (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
  
-@@ -1834,7 +1834,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
-     PLUGIN_LOG_DEBUG_METHOD;
+@@ -1869,7 +1869,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
      AssertPluginThread();
+     MOZ_ASSERT(mIsChrome);
  
 -#if defined(OS_LINUX) || defined(OS_BSD)
 +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
      return true;
  #elif defined(OS_WIN) || defined(OS_MACOSX)
      *_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1863,7 +1863,7 @@ PluginModuleChild::AnswerNP_Initialize(c
+@@ -1899,7 +1899,7 @@ PluginModuleChild::AnswerNP_Initialize(c
      SendBackUpXResources(FileDescriptor(xSocketFd));
  #endif