diff options
Diffstat (limited to 'www/chromium-uc/patches/patch-chrome_common_chrome_paths_cc')
| -rw-r--r-- | www/chromium-uc/patches/patch-chrome_common_chrome_paths_cc | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/www/chromium-uc/patches/patch-chrome_common_chrome_paths_cc b/www/chromium-uc/patches/patch-chrome_common_chrome_paths_cc deleted file mode 100644 index 1c7e8de..0000000 --- a/www/chromium-uc/patches/patch-chrome_common_chrome_paths_cc +++ /dev/null | |||
| @@ -1,68 +0,0 @@ | |||
| 1 | $OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.66 2021/11/16 11:28:46 robert Exp $ | ||
| 2 | |||
| 3 | Index: chrome/common/chrome_paths.cc | ||
| 4 | --- chrome/common/chrome_paths.cc.orig | ||
| 5 | +++ chrome/common/chrome_paths.cc | ||
| 6 | @@ -44,14 +44,14 @@ | ||
| 7 | |||
| 8 | namespace { | ||
| 9 | |||
| 10 | -#if defined(OS_LINUX) || defined(OS_CHROMEOS) | ||
| 11 | +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||
| 12 | // The path to the external extension <id>.json files. | ||
| 13 | // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ | ||
| 14 | const base::FilePath::CharType kFilepathSinglePrefExtensions[] = | ||
| 15 | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| 16 | - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); | ||
| 17 | + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); | ||
| 18 | #else | ||
| 19 | - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); | ||
| 20 | + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); | ||
| 21 | #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| 22 | |||
| 23 | #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) | ||
| 24 | @@ -183,7 +183,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 25 | return false; | ||
| 26 | break; | ||
| 27 | case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: | ||
| 28 | -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) | ||
| 29 | +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||
| 30 | if (!GetUserDownloadsDirectorySafe(&cur)) | ||
| 31 | return false; | ||
| 32 | break; | ||
| 33 | @@ -426,7 +426,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 34 | if (!base::PathExists(cur)) // We don't want to create this | ||
| 35 | return false; | ||
| 36 | break; | ||
| 37 | -#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_OPENBSD) | ||
| 38 | +#if defined(OS_POSIX) && !defined(OS_MAC) | ||
| 39 | case chrome::DIR_POLICY_FILES: { | ||
| 40 | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| 41 | cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); | ||
| 42 | @@ -439,7 +439,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 43 | // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is | ||
| 44 | // complete. | ||
| 45 | #if BUILDFLAG(IS_CHROMEOS_ASH) || \ | ||
| 46 | - ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ | ||
| 47 | + ((defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ | ||
| 48 | BUILDFLAG(CHROMIUM_BRANDING)) || \ | ||
| 49 | defined(OS_MAC) | ||
| 50 | case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { | ||
| 51 | @@ -449,7 +449,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 52 | break; | ||
| 53 | } | ||
| 54 | #endif | ||
| 55 | -#if defined(OS_LINUX) || defined(OS_CHROMEOS) | ||
| 56 | +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||
| 57 | case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { | ||
| 58 | cur = base::FilePath(kFilepathSinglePrefExtensions); | ||
| 59 | break; | ||
| 60 | @@ -494,7 +494,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 61 | break; | ||
| 62 | #endif | ||
| 63 | |||
| 64 | -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) | ||
| 65 | +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) | ||
| 66 | case chrome::DIR_NATIVE_MESSAGING: | ||
| 67 | #if defined(OS_MAC) | ||
| 68 | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
