ports/www/ungoogled-chromium/patches/patch-chrome_common_chrome_paths_cc

90 lines
3.6 KiB
Text
Raw Normal View History

2023-08-16 22:26:55 +00:00
Index: chrome/common/chrome_paths.cc
--- chrome/common/chrome_paths.cc.orig
+++ chrome/common/chrome_paths.cc
2024-05-20 13:42:05 +00:00
@@ -30,7 +30,7 @@
#include "base/apple/foundation_util.h"
#endif
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
#include "components/policy/core/common/policy_paths.h"
#endif
@@ -52,14 +52,14 @@
2023-08-16 22:26:55 +00:00
namespace {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// The path to the external extension <id>.json files.
// /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
+ FILE_PATH_LITERAL("/usr/local/share/ungoogled-chromium/extensions");
#else
- FILE_PATH_LITERAL("/usr/share/chromium/extensions");
+ FILE_PATH_LITERAL("/usr/local/share/ungoogled-chromium/extensions");
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
2024-05-20 13:42:05 +00:00
@@ -225,7 +225,7 @@ bool PathProvider(int key, base::FilePath* result) {
2023-09-17 04:05:06 +00:00
}
2023-08-16 22:26:55 +00:00
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
2023-09-17 04:05:06 +00:00
if (!GetUserDownloadsDirectorySafe(&cur)) {
2023-08-16 22:26:55 +00:00
return false;
2023-09-17 04:05:06 +00:00
}
2024-05-20 13:42:05 +00:00
@@ -544,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) {
2023-08-16 22:26:55 +00:00
return false;
2023-09-17 04:05:06 +00:00
}
2023-08-16 22:26:55 +00:00
break;
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
case chrome::DIR_POLICY_FILES: {
2024-05-20 13:42:05 +00:00
cur = base::FilePath(policy::kPolicyPath);
2023-08-16 22:26:55 +00:00
break;
2024-05-20 13:42:05 +00:00
@@ -555,7 +555,7 @@ bool PathProvider(int key, base::FilePath* result) {
2023-08-16 22:26:55 +00:00
#if BUILDFLAG(IS_CHROMEOS_ASH) || \
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
BUILDFLAG(CHROMIUM_BRANDING)) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
2023-09-17 04:05:06 +00:00
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
2023-08-16 22:26:55 +00:00
return false;
2024-05-20 13:42:05 +00:00
@@ -564,7 +564,7 @@ bool PathProvider(int key, base::FilePath* result) {
2023-08-16 22:26:55 +00:00
break;
}
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
2024-05-20 13:42:05 +00:00
@@ -612,7 +612,7 @@ bool PathProvider(int key, base::FilePath* result) {
2023-08-16 22:26:55 +00:00
#endif
2024-05-20 13:42:05 +00:00
#if BUILDFLAG(ENABLE_EXTENSIONS) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD))
2023-08-16 22:26:55 +00:00
case chrome::DIR_NATIVE_MESSAGING:
#if BUILDFLAG(IS_MAC)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
2024-05-20 13:42:05 +00:00
@@ -626,9 +626,12 @@ bool PathProvider(int key, base::FilePath* result) {
2023-08-16 22:26:55 +00:00
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
2023-09-17 04:05:06 +00:00
cur = base::FilePath(
FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
2023-08-16 22:26:55 +00:00
+#elif BUILDFLAG(IS_FREEBSD)
+ cur = base::FilePath(FILE_PATH_LITERAL(
+ "/usr/local/etc/ungoogled-chromium/native-messaging-hosts"));
#else
2023-09-17 04:05:06 +00:00
cur = base::FilePath(
- FILE_PATH_LITERAL("/etc/chromium/native-messaging-hosts"));
+ FILE_PATH_LITERAL("/etc/ungoogled-chromium/native-messaging-hosts"));
2023-08-16 22:26:55 +00:00
#endif
#endif // !BUILDFLAG(IS_MAC)
break;