diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-01-07 19:47:18 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-01-07 19:47:18 +0000 |
| commit | ab34cf48c6364f23214d9242e83eefd174f7f820 (patch) | |
| tree | ce7704d873ee687272322780c46fc9ddee28a619 /www/chromium/files/patch-chrome_common_chrome__features.h | |
| parent | - Add CONFLICTS for security/snort3 (diff) | |
www/chromium: Update to 71.0.3578.98
Changelog: https://chromium.googlesource.com/chromium/src/+log/68.0.3440.106..71.0.3578.98?pretty=fuller&n=10000
PR: 233990
Submitted by: Matthias Wolf <freebsd@rheinwolf.de>
Reported by: nikolaibitinit@gmail.com
Reviewed by: rene, cpm
Approved by: rene, cpm
MFH: 2019Q1
Security: http://vuxml.freebsd.org/freebsd/546d4dd4-10ea-11e9-b407-080027ef1a23.html
Security: http://vuxml.freebsd.org/freebsd/720590df-10eb-11e9-b407-080027ef1a23.html
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__features.h')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_chrome__features.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 12669ebbd2ad..64987c1dcac6 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,29 +1,24 @@ ---- chrome/common/chrome_features.h.orig 2018-08-01 00:08:33.000000000 +0200 -+++ chrome/common/chrome_features.h 2018-08-05 16:48:04.662112000 +0200 -@@ -52,7 +52,7 @@ +--- chrome/common/chrome_features.h.orig 2018-12-03 21:16:43.000000000 +0100 ++++ chrome/common/chrome_features.h 2018-12-05 16:20:22.595072000 +0100 +@@ -65,10 +65,10 @@ extern const base::Feature kAutomaticTabDiscarding; #endif // defined(OS_WIN) || defined(OS_MACOSX) -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBackgroundModeAllowRestart; - #endif // defined(OS_WIN) || defined(OS_LINUX) +-#endif // defined(OS_WIN) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) -@@ -76,7 +76,7 @@ + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kBlockPromptsIfDismissedOften; +@@ -90,7 +90,7 @@ extern const base::Feature kTabStripKeyboardFocus; #endif // defined(OS_MACOSX) -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kCertDualVerificationTrialFeature; #endif - -@@ -204,7 +204,7 @@ - extern const base::Feature kAcknowledgeNtpOverrideOnDeactivate; - #endif - --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) - extern const base::Feature kWarnBeforeQuitting; - #endif - |