summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_flag__descriptions.h
diff options
context:
space:
mode:
authorMatthias Wolf <freebsd@rheinwolf.de>2022-02-01 18:38:49 +0100
committerRene Ladan <rene@FreeBSD.org>2022-02-01 18:45:40 +0100
commitaa70a996eae7376396a5dd8a9e5105bebb6bc72c (patch)
treeee91e0564101803a57091d4df8e4f3892eb8d0fc /www/chromium/files/patch-chrome_browser_flag__descriptions.h
parentwww/firefox-esr: update to 91.6.0 (rc1) (diff)
www/chromium: update to 97.0.4692.99
Note that the port is currently broken on i386 as it does not compile there. Security: https://vuxml.freebsd.org/freebsd/51496cbc-7a0e-11ec-a323-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9eeccbf3-6e26-11ec-bb10-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/fb9ba490-5cc4-11ec-aac7-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/18ac074c-579f-11ec-aac7-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/b8c0cbca-472d-11ec-83dc-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/976d7bf9-38ea-11ec-b3b0-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/bdaecfad-3117-11ec-b3b0-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_flag__descriptions.h')
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h32
1 files changed, 14 insertions, 18 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 7870c80884ec..dcd7f258f7f1 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,4 +1,4 @@
---- chrome/browser/flag_descriptions.h.orig 2021-09-24 04:25:58 UTC
+--- chrome/browser/flag_descriptions.h.orig 2022-01-20 10:35:49 UTC
+++ chrome/browser/flag_descriptions.h
@@ -22,9 +22,9 @@
#include "printing/buildflags/buildflags.h"
@@ -12,7 +12,7 @@
// This file declares strings used in chrome://flags. These messages are not
// translated, because instead of end-users they target Chromium developers and
-@@ -2954,7 +2954,7 @@ extern const char kDownloadShelfWebUIDescription[];
+@@ -3045,7 +3045,7 @@ extern const char kDownloadShelfWebUIDescription[];
// Random platform combinations -----------------------------------------------
@@ -20,8 +20,8 @@
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
- extern const char kEnableOopPrintDriversName[];
-@@ -2969,10 +2969,10 @@ extern const char kWebuiFeedbackDescription[];
+ extern const char kWebUIBrandingUpdateName[];
+@@ -3057,10 +3057,10 @@ extern const char kWebuiFeedbackDescription[];
extern const char kSettingsLandingPageRedesignName[];
extern const char kSettingsLandingPageRedesignDescription[];
@@ -34,7 +34,7 @@
extern const char kCommanderName[];
extern const char kCommanderDescription[];
-@@ -2983,7 +2983,7 @@ extern const char kDesktopRestructuredLanguageSettings
+@@ -3071,7 +3071,7 @@ extern const char kDesktopRestructuredLanguageSettings
extern const char kDesktopDetailedLanguageSettingsName[];
extern const char kDesktopDetailedLanguageSettingsDescription[];
@@ -43,20 +43,16 @@
#if defined(OS_CHROMEOS) || defined(OS_LINUX)
#if BUILDFLAG(USE_TCMALLOC)
-@@ -3002,10 +3002,10 @@ extern const char kWebShareName[];
+@@ -3090,7 +3090,7 @@ extern const char kWebShareName[];
extern const char kWebShareDescription[];
- #endif // defined(OS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC)
-
--#if defined(OS_LINUX) && defined(USE_OZONE)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
- extern const char kUseOzonePlatformName[];
- extern const char kUseOzonePlatformDescription[];
--#endif // defined(OS_LINUX) && defined(USE_OZONE)
-+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
-
- // Feature flags --------------------------------------------------------------
-
-@@ -3061,7 +3061,7 @@ extern const char kElasticOverscrollName[];
+ #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC)
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ extern const char kOzonePlatformHintChoiceDefault[];
+ extern const char kOzonePlatformHintChoiceAuto[];
+ extern const char kOzonePlatformHintChoiceX11[];
+@@ -3171,7 +3171,7 @@ extern const char kElasticOverscrollName[];
extern const char kElasticOverscrollDescription[];
#endif // defined(OS_WIN) || defined(OS_ANDROID)