summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-browser-app-nsBrowserApp.cpp
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2016-11-02 01:42:30 +0000
committerJan Beich <jbeich@FreeBSD.org>2016-11-02 01:42:30 +0000
commit74e1bc62bd8f8fedafe93ec3efc61be86e27f7ab (patch)
tree171dc9211a3eac82863466179ee9da413dd65f85 /www/firefox/files/patch-browser-app-nsBrowserApp.cpp
parentwww/firefox-esr: update to 45.5esr (diff)
www/firefox: update to 50.0 (rc1)
More candidates are likely to come before the official announcement (aka the rush hour) scheduled on 2016-11-15. This one intended to pick up upstream security fixes earlier while looking for downstream regressions. Changes: https://www.mozilla.org/firefox/50.0/releasenotes/ Security: d1853110-07f4-4645-895b-6fd462ad0589 MFH: 2016Q4 (piling up)
Notes
Notes: svn path=/head/; revision=425099
Diffstat (limited to '')
-rw-r--r--www/firefox/files/patch-browser-app-nsBrowserApp.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/www/firefox/files/patch-browser-app-nsBrowserApp.cpp b/www/firefox/files/patch-browser-app-nsBrowserApp.cpp
index 97b7b8d0cd0b..68cb778b95a7 100644
--- a/www/firefox/files/patch-browser-app-nsBrowserApp.cpp
+++ b/www/firefox/files/patch-browser-app-nsBrowserApp.cpp
@@ -1,11 +1,12 @@
---- browser/app/nsBrowserApp.cpp~
+--- browser/app/nsBrowserApp.cpp.orig 2016-09-19 16:19:28 UTC
+++ browser/app/nsBrowserApp.cpp
-@@ -417,6 +417,8 @@ int main(int argc, char* argv[])
- TriggerQuirks();
- #endif
+@@ -324,6 +324,9 @@ int main(int argc, char* argv[], char* e
+ {
+ mozilla::TimeStamp start = mozilla::TimeStamp::Now();
+ setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
- int gotCounters;
- #if defined(XP_UNIX)
- struct rusage initialRUsage;
++
+ #ifdef HAS_DLL_BLOCKLIST
+ DllBlocklist_Initialize();
+