diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2015-08-11 13:22:54 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2015-08-11 13:22:54 +0000 |
commit | ca8a3f7f5989ac489fe9343c9b408e811c31f03c (patch) | |
tree | 975048d2c1b5ae4e089d5d1c66503f476a2fdb05 /www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp | |
parent | - Drop @dirrm* from plist (diff) |
Switch OpenH264 plugin to use environment variable
files/patch-system-openh264 causes patch churn on updates and hits
assertion with DEBUG=on[1]. Rework to use MOZ_GMP_PATH instead.
While here populate Last Updated field to avoid falling back to Epoch start
and disable Automatic Updates in an unlikely case of
- Cisco & Mozilla providing prebuilt version for FreeBSD
- Firefox running with root priveleges i.e., write permission under /usr/local
PR: 202218 [1]
Reported by: kib, pi [1]
Inspired by: Gentoo
MFH: 2015Q3
Notes
Notes:
svn path=/head/; revision=393941
Diffstat (limited to 'www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp')
-rw-r--r-- | www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp b/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp index 6809693a20ce..00dd483a95fb 100644 --- a/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp +++ b/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp @@ -1,11 +1,21 @@ --- suite/app/nsSuiteApp.cpp~ +++ suite/app/nsSuiteApp.cpp -@@ -215,6 +215,8 @@ int main(int argc, char* argv[]) - #ifdef XP_MACOSX +@@ -331,6 +331,9 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif -+ + ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); - - nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); - if (NS_FAILED(rv)) { ++ + int gotCounters; + #if defined(XP_UNIX) + struct rusage initialRUsage; +@@ -339,7 +342,7 @@ int main(int argc, char* argv[]) + IO_COUNTERS ioCounters; + gotCounters = GetProcessIoCounters(GetCurrentProcess(), &ioCounters); + #endif +- ++ + nsIFile *xreDirectory; + + #ifdef HAS_DLL_BLOCKLIST |