$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.5 2014/05/30 10:22:05 pho Exp $ * Replace XP_MACOSX with XP_DARWIN as the former is not defined when the toolkit is not cocoa. --- browser/app/nsBrowserApp.cpp.orig 2014-05-06 22:55:09.000000000 +0000 +++ browser/app/nsBrowserApp.cpp @@ -18,8 +18,10 @@ #include #endif -#ifdef XP_MACOSX +#ifdef XP_DARWIN #include +#endif +#ifdef MOZ_WIDGET_COCOA #include "MacQuirks.h" #endif @@ -447,7 +449,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; @@ -586,6 +588,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;