diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2022-02-20 12:35:15 +0100 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-02-20 12:42:02 +0100 |
| commit | a23dfd214ae04e8b4d116ca6411570b684eb5ed6 (patch) | |
| tree | a42703b6563673398eee97ae6ad4d01eafd77738 /www/chromium/files/patch-chrome_common_chrome__features.h | |
| parent | graphics/libglvnd: reduce dependency on gcc for everyone on powerpc64* by usi... (diff) | |
www/chromium: update to 98.0.4758.102
- The port now uses the combined patch set for OpenBSD and FreeBSD
maintained by Robert Nagy.
- Fix build on i386 again.
Obtained from: Robert Nagy <robert@openbsd.org>
Security: https://vuxml.freebsd.org/freebsd/e12432af-8e73-11ec-8bc4-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/e852f43c-846e-11ec-b043-3065ec8fd3ec.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 | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 7246dedfb8ae..86290c7e4766 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,15 +1,15 @@ ---- chrome/common/chrome_features.h.orig 2021-12-31 00:57:25 UTC +--- chrome/common/chrome_features.h.orig 2022-02-07 13:39:41 UTC +++ chrome/common/chrome_features.h -@@ -84,7 +84,7 @@ extern const base::Feature kAppShimNewCloseBehavior; - +@@ -92,7 +92,7 @@ extern const base::Feature kArcPiGhostWindow; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) || defined(OS_FUCHSIA) + #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillAddressSurvey; -@@ -94,10 +94,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) + COMPONENT_EXPORT(CHROME_FEATURES) +@@ -101,7 +101,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillPasswordSurvey; #endif @@ -17,12 +17,8 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBackgroundModeAllowRestart; --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - #if BUILDFLAG(IS_CHROMEOS_ASH) - COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis; -@@ -111,7 +111,7 @@ extern const base::Feature kBrowserAppInstanceTracking + #endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +@@ -118,7 +118,7 @@ extern const base::Feature kBrowserAppInstanceTracking COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kChangePictureVideoMode; @@ -31,21 +27,30 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kChromeAppsDeprecation; #endif -@@ -175,7 +175,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kDefaultPinnedAppsUpdate2021Q2; +@@ -183,7 +183,7 @@ extern const base::Feature kPreinstalledWebAppInstalla #endif --#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || \ +- defined(OS_FUCHSIA) ++ defined(OS_FUCHSIA) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kDesktopPWAsAppIconShortcutsMenuUI; #endif -@@ -410,7 +410,7 @@ extern const base::Feature kIncognitoBrandConsistencyF - COMPONENT_EXPORT(CHROME_FEATURES) +@@ -418,7 +418,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kIncognitoNtpRevamp; --#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -+#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) || defined(OS_FUCHSIA) + #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kIncognitoBrandConsistencyForDesktop; + +@@ -445,7 +445,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kKernelnextVMs; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kLinuxLowMemoryMonitor; + COMPONENT_EXPORT(CHROME_FEATURES) |