diff options
| author | Matthias Wolf <matthias@rheinwolf.de> | 2021-04-27 16:25:26 +0200 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-04-27 16:29:47 +0200 |
| commit | be6259aac7b38bb3129be18e4ca60d42078cca3e (patch) | |
| tree | c751b3c98ce06f6217fb44fc88ad582a05327926 /www/chromium/files/patch-chrome_common_chrome__paths.h | |
| parent | benchmarks/dbs: extend BROKENness to FreeBSD 14 (diff) | |
www/chromium: update to 90.0.4430.85
Tested by: Matthias Wolf, rene
MFH: 2021Q2
Security: http://vuxml.freebsd.org/freebsd/cb13a765-a277-11eb-97a0-e09467587c17.html
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__paths.h')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_chrome__paths.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index 4ab66fec7521..cb0abf26c283 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,18 +1,14 @@ ---- chrome/common/chrome_paths.h.orig 2021-03-12 23:57:19 UTC +--- chrome/common/chrome_paths.h.orig 2021-04-14 18:40:56 UTC +++ chrome/common/chrome_paths.h -@@ -53,9 +53,9 @@ enum { - #endif - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(OS_CHROMEOS) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -- BUILDFLAG(CHROMIUM_BRANDING)) || \ -+#if defined(OS_CHROMEOS) || \ -+ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ -+ BUILDFLAG(CHROMIUM_BRANDING)) || \ - defined(OS_MAC) +@@ -56,7 +56,7 @@ enum { + #if BUILDFLAG(IS_CHROMEOS_ASH) || \ + ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ + BUILDFLAG(CHROMIUM_BRANDING)) || \ +- defined(OS_MAC) ++ defined(OS_MAC) || defined(OS_BSD) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. + // On Chrome OS, this path is used for OEM @@ -64,7 +64,7 @@ enum { // create it. #endif @@ -22,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -118,7 +118,7 @@ enum { +@@ -111,7 +111,7 @@ enum { DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers // reside. #endif |