summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_common_chrome__paths.cc
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2017-06-20 20:20:44 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2017-06-20 20:20:44 +0000
commit893d9b13f0873ea4181f1998d531ece5149a700e (patch)
treec20b4d7aded464f58574f7dd4d1217a5a7ab5efe /www/chromium/files/patch-chrome_common_chrome__paths.cc
parent- devel/ace+tao-doc: Update from 5.5.0 to 6.4.3 (diff)
www/chromium: update to 59.0.3071.104
- Use https in WWW and MASTER_SITES - Sort ONLY_FOR_ARCHS, USES, USE_GNOME and GN_ARGS - Put in correct place MAKE_ENV+= V=1 variable - Use LLD linker by default for supported archs - Fix DEBUG option - Fix gpu_info_collector.cc warning: control may reach end of non-void function [-Wreturn-type] - Get rid of multiple definition errors Changelog: https://chromium.googlesource.com/chromium/src/+log/58.0.3029.110..59.0.3071.104?pretty=fuller&n=10000 MFH: 2017Q2 Security: https://www.vuxml.org/freebsd/52f4b48b-4ac3-11e7-99aa-e8e0b747a45a.html Security: https://www.vuxml.org/freebsd/f53dd5cc-527f-11e7-a772-e8e0b747a45a.html
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__paths.cc')
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.cc58
1 files changed, 51 insertions, 7 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index a28c7707e790..922b47f40b5a 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,6 +1,23 @@
---- chrome/common/chrome_paths.cc.orig 2017-04-19 19:06:30 UTC
-+++ chrome/common/chrome_paths.cc
-@@ -190,7 +190,7 @@ bool PathProvider(int key, base::FilePat
+--- chrome/common/chrome_paths.cc.orig 2017-06-15 21:03:02.000000000 +0200
++++ chrome/common/chrome_paths.cc 2017-06-18 01:09:20.663411000 +0200
+@@ -51,14 +51,14 @@
+ const base::FilePath::CharType kInternalNaClPluginFileName[] =
+ FILE_PATH_LITERAL("internal-nacl-plugin");
+
+-#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
+@@ -190,7 +190,7 @@
return false;
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -9,7 +26,16 @@
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
-@@ -474,10 +474,12 @@ bool PathProvider(int key, base::FilePat
+@@ -426,7 +426,7 @@
+ break;
+ #endif
+ #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS:
+ if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur))
+ return false;
+@@ -474,10 +474,12 @@
if (!base::PathExists(cur)) // We don't want to create this
return false;
break;
@@ -23,7 +49,25 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
-@@ -528,7 +530,7 @@ bool PathProvider(int key, base::FilePat
+@@ -485,7 +487,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 (!PathService::Get(chrome::DIR_USER_DATA, &cur))
+ return false;
+@@ -493,7 +495,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;
+@@ -528,7 +530,7 @@
#endif
break;
@@ -32,7 +76,7 @@
case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
-@@ -542,6 +544,9 @@ bool PathProvider(int key, base::FilePat
+@@ -542,6 +544,9 @@
#if defined(GOOGLE_CHROME_BUILD)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
@@ -42,7 +86,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
-@@ -554,7 +559,7 @@ bool PathProvider(int key, base::FilePat
+@@ -554,7 +559,7 @@
return false;
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
break;