SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync ports with The Matrix

Browse source
This commit is contained in:
purplerain 2023-09-14 00:49:35 +00:00
parent 9d4d2e721a
commit 79bc6d9d97
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
846 changed files with 10693 additions and 8131 deletions
Download patch file Download diff file Expand all files Collapse all files

32
www/chromium/patches/patch-chrome_common_chrome_paths_cc
View file

@ -1,7 +1,7 @@
Index: chrome/common/chrome_paths.cc
--- chrome/common/chrome_paths.cc.orig
+++ chrome/common/chrome_paths.cc
@@ -48,14 +48,14 @@
@@ -45,14 +45,14 @@
namespace {
@ -19,18 +19,18 @@ Index: chrome/common/chrome_paths.cc
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -176,7 +176,7 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
@@ -207,7 +207,7 @@ bool PathProvider(int key, base::FilePath* result) {
}
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)
if (!GetUserDownloadsDirectorySafe(&cur))
if (!GetUserDownloadsDirectorySafe(&cur)) {
return false;
break;
@@ -419,10 +419,12 @@ bool PathProvider(int key, base::FilePath* result) {
if (!base::PathExists(cur)) // We don't want to create this
}
@@ -500,10 +500,12 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
}
break;
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
@ -42,16 +42,16 @@ Index: chrome/common/chrome_paths.cc
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
@@ -434,7 +436,7 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -515,7 +517,7 @@ bool PathProvider(int key, base::FilePath* result) {
#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: {
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
return false;
@@ -442,7 +444,7 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -524,7 +526,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
}
#endif
@ -60,7 +60,7 @@ Index: chrome/common/chrome_paths.cc
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
@@ -486,7 +488,7 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -571,7 +573,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
#endif
@ -69,13 +69,13 @@ Index: chrome/common/chrome_paths.cc
case chrome::DIR_NATIVE_MESSAGING:
#if BUILDFLAG(IS_MAC)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -500,6 +502,9 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -585,6 +587,9 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
cur = base::FilePath(
FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
+#elif BUILDFLAG(IS_FREEBSD)
+ cur = base::FilePath(FILE_PATH_LITERAL(
+ "/usr/local/etc/chromium/native-messaging-hosts"));
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
cur = base::FilePath(
FILE_PATH_LITERAL("/etc/chromium/native-messaging-hosts"));