mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 19:50:31 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
114 lines
4.2 KiB
C++
114 lines
4.2 KiB
C++
--- chrome/common/chrome_paths.cc.orig 2019-03-21 01:36:35.000000000 +0100
|
|
+++ chrome/common/chrome_paths.cc 2019-03-24 18:44:09.907854000 +0100
|
|
@@ -52,21 +52,21 @@
|
|
FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
|
|
#endif
|
|
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_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 defined(GOOGLE_CHROME_BUILD)
|
|
FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
|
|
#else
|
|
- FILE_PATH_LITERAL("/usr/share/chromium/extensions");
|
|
+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
|
|
#endif // defined(GOOGLE_CHROME_BUILD)
|
|
|
|
// The path to the hint file that tells the pepper plugin loader
|
|
// where it can find the latest component updated flash.
|
|
const base::FilePath::CharType kComponentUpdatedFlashHint[] =
|
|
FILE_PATH_LITERAL("latest-component-updated-flash");
|
|
-#endif // defined(OS_LINUX)
|
|
+#endif // defined(OS_LINUX) || defined(OS_BSD)
|
|
|
|
#if defined(OS_CHROMEOS)
|
|
const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL(
|
|
@@ -197,7 +197,7 @@
|
|
return false;
|
|
break;
|
|
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
|
|
-#if defined(OS_WIN) || defined(OS_LINUX)
|
|
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
|
|
if (!GetUserDownloadsDirectorySafe(&cur))
|
|
return false;
|
|
break;
|
|
@@ -459,10 +459,12 @@
|
|
if (!base::PathExists(cur)) // We don't want to create this
|
|
return false;
|
|
break;
|
|
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
|
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
|
case chrome::DIR_POLICY_FILES: {
|
|
#if defined(GOOGLE_CHROME_BUILD)
|
|
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
|
|
+#elif defined(OS_BSD)
|
|
+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
|
|
#else
|
|
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
|
|
#endif
|
|
@@ -470,7 +472,7 @@
|
|
}
|
|
#endif
|
|
#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
|
|
- defined(OS_MACOSX)
|
|
+ defined(OS_MACOSX) || defined(OS_BSD)
|
|
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
|
|
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
|
|
return false;
|
|
@@ -478,7 +480,7 @@
|
|
break;
|
|
}
|
|
#endif
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
|
|
cur = base::FilePath(kFilepathSinglePrefExtensions);
|
|
break;
|
|
@@ -513,7 +515,7 @@
|
|
#endif
|
|
break;
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_MACOSX)
|
|
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
|
case chrome::DIR_NATIVE_MESSAGING:
|
|
#if defined(OS_MACOSX)
|
|
#if defined(GOOGLE_CHROME_BUILD)
|
|
@@ -527,6 +529,9 @@
|
|
#if defined(GOOGLE_CHROME_BUILD)
|
|
cur = base::FilePath(FILE_PATH_LITERAL(
|
|
"/etc/opt/chrome/native-messaging-hosts"));
|
|
+#elif defined(OS_BSD)
|
|
+ cur = base::FilePath(FILE_PATH_LITERAL(
|
|
+ "/usr/local/etc/chrome/native-messaging-hosts"));
|
|
#else
|
|
cur = base::FilePath(FILE_PATH_LITERAL(
|
|
"/etc/chromium/native-messaging-hosts"));
|
|
@@ -539,7 +544,7 @@
|
|
return false;
|
|
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
|
|
break;
|
|
-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
|
|
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
|
#if !defined(OS_ANDROID)
|
|
case chrome::DIR_GLOBAL_GCM_STORE:
|
|
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
|
|
@@ -547,7 +552,7 @@
|
|
cur = cur.Append(kGCMStoreDirname);
|
|
break;
|
|
#endif // !defined(OS_ANDROID)
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
case chrome::FILE_COMPONENT_FLASH_HINT:
|
|
if (!base::PathService::Get(
|
|
chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
|
|
@@ -555,7 +560,7 @@
|
|
}
|
|
cur = cur.Append(kComponentUpdatedFlashHint);
|
|
break;
|
|
-#endif // defined(OS_LINUX)
|
|
+#endif // defined(OS_LINUX) || defined(OS_BSD)
|
|
#if defined(OS_CHROMEOS)
|
|
case chrome::FILE_CHROME_OS_COMPONENT_FLASH:
|
|
cur = base::FilePath(kChromeOSComponentFlash);
|