Import of pkgsrc-2016Q3

security/tor-browser/patches/patch-browser_app_nsBrowserApp.cpp

@@ -0,0 +1,36 @@
+$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+
+* Replace XP_MACOSX with XP_DARWIN as the former is not defined when
+  the toolkit is not cocoa.
+
+--- browser/app/nsBrowserApp.cpp.orig	2015-05-04 00:43:18.000000000 +0000
++++ browser/app/nsBrowserApp.cpp
+@@ -18,8 +18,10 @@
+ #include <unistd.h>
+ #endif
+ 
+-#ifdef XP_MACOSX
++#ifdef XP_DARWIN
+ #include <mach/mach_time.h>
++#endif
++#ifdef MOZ_WIDGET_COCOA
+ #include "MacQuirks.h"
+ #endif
+ 
+@@ -459,7 +461,7 @@ TimeStamp_Now()
+   }
+ 
+   return sGetTickCount64() * freq.QuadPart;
+-#elif defined(XP_MACOSX)
++#elif defined(XP_DARWIN)
+   return mach_absolute_time();
+ #elif defined(HAVE_CLOCK_MONOTONIC)
+   struct timespec ts;
+@@ -606,6 +608,7 @@ int main(int argc, char* argv[])
+   TriggerQuirks();
+ #endif
+ 
++  setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
+   int gotCounters;
+ #if defined(XP_UNIX)
+   struct rusage initialRUsage;