diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-06-07 20:28:41 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-06-07 20:28:41 +0000 |
| commit | 45d3cc73dc908af3262c6a714cb755edd03f071a (patch) | |
| tree | 564e40b2ccfe669385077be2c94de93ac0c15fe3 /www/chromium/files/patch-chrome_common_chrome__paths.cc | |
| parent | Update to 6.0p1. Notable fixes: (diff) | |
www/chromium: update to 51.0.2704.84
A lot of patch files are renamed in this update.
Submitted by: Timothy Vaccarelli
Obtained from: https://github.com/LeFroid/
MFH: 2016Q2
Security: http://vuxml.freebsd.org/freebsd/c039a761-2c29-11e6-8912-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/1a6bbb95-24b8-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/4dfafa16-24ba-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/7da1da96-24bb-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/6d8505f0-0614-11e6-b39c-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__paths.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_chrome__paths.cc | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc new file mode 100644 index 000000000000..8ef25950c031 --- /dev/null +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -0,0 +1,53 @@ +--- chrome/common/chrome_paths.cc.orig 2016-05-11 19:02:17 UTC ++++ chrome/common/chrome_paths.cc +@@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePat + 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; +@@ -470,10 +470,12 @@ bool PathProvider(int key, base::FilePat + 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 +@@ -540,7 +542,7 @@ bool PathProvider(int key, base::FilePat + #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) +@@ -554,6 +556,9 @@ bool PathProvider(int key, base::FilePat + #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")); +@@ -566,7 +571,7 @@ bool PathProvider(int key, base::FilePat + 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 (!PathService::Get(chrome::DIR_USER_DATA, &cur)) |