summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome__common__chrome_paths.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2013-05-14 21:10:15 +0000
committerRene Ladan <rene@FreeBSD.org>2013-05-14 21:10:15 +0000
commit217593e8de3b3015393d2afaade0aa1ccea49b7a (patch)
treeab81e2a78d66721e46b691bea9c0bea13db968b4 /www/chromium/files/patch-chrome__common__chrome_paths.cc
parent- Convert to optionsNG (diff)
Update to 27.0.1453.81
Note that this is still a beta version, and that the sysctl kern.ipc.shm_allow_removed must be set to 1 for correct operation. Port changes: - add dependency on accessibility/speech-dispatcher for libspeechd - use internal libvpx - update disk space requirements - add pkg-message for the above sysctl Submitted by: George Liaskos Security: http://vuxml.org/freebsd/bdd48858-9656-11e2-a9a8-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.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.cc b/www/chromium/files/patch-chrome__common__chrome_paths.cc
index 45f63649d9c1..6ca29057bc5a 100644
--- a/www/chromium/files/patch-chrome__common__chrome_paths.cc
+++ b/www/chromium/files/patch-chrome__common__chrome_paths.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.cc.orig 2012-05-23 04:50:48.000000000 +0300
-+++ chrome/common/chrome_paths.cc 2012-05-26 00:47:40.880289194 +0300
-@@ -334,10 +334,12 @@
+--- chrome/common/chrome_paths.cc.orig 2013-02-28 10:15:52.000000000 +0200
++++ chrome/common/chrome_paths.cc 2013-03-06 21:25:36.000000000 +0200
+@@ -441,10 +441,12 @@
if (!file_util::PathExists(cur)) // We don't want to create this
return false;
break;
@@ -8,9 +8,9 @@
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
case chrome::DIR_POLICY_FILES: {
#if defined(GOOGLE_CHROME_BUILD)
- cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
+ cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
+#elif defined(OS_BSD)
-+ cur = FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
++ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
#else
- cur = FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
+ cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif