diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-07-23 16:31:18 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-07-23 16:31:18 +0000 |
| commit | 651302b592fe54c5197641402df87ff216c27903 (patch) | |
| tree | 784a10fc6050d3be8786fd6f4f954d7802bd9204 /www/iridium/files/patch-extensions_common_feature__switch.cc | |
| parent | Add compiler:c++14-lang to USES to atttempt to fix on GCC-based systems: (diff) | |
www/iridium: update to 2020.04.81
PR: 245959
Submitted by: Matthias Wolf
MFH: 2020Q3
Security: any Chromium vulnerability between 73 and 81
Diffstat (limited to 'www/iridium/files/patch-extensions_common_feature__switch.cc')
| -rw-r--r-- | www/iridium/files/patch-extensions_common_feature__switch.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/www/iridium/files/patch-extensions_common_feature__switch.cc b/www/iridium/files/patch-extensions_common_feature__switch.cc index c59bf0a971d5..9cac45bedcb2 100644 --- a/www/iridium/files/patch-extensions_common_feature__switch.cc +++ b/www/iridium/files/patch-extensions_common_feature__switch.cc @@ -1,14 +1,16 @@ ---- extensions/common/feature_switch.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/feature_switch.cc.orig 2019-10-21 19:06:34 UTC +++ extensions/common/feature_switch.cc -@@ -44,11 +44,7 @@ class CommonSwitches { +@@ -42,11 +42,11 @@ class CommonSwitches { FeatureSwitch::DEFAULT_ENABLED), load_media_router_component_extension( kLoadMediaRouterComponentExtensionFlag, --#if defined(GOOGLE_CHROME_BUILD) +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OS_BSD) FeatureSwitch::DEFAULT_ENABLED) --#else -- FeatureSwitch::DEFAULT_DISABLED) --#endif // defined(GOOGLE_CHROME_BUILD) + #else + FeatureSwitch::DEFAULT_DISABLED) +-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OS_BSD) { } |