diff options
author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-04-05 12:01:25 +0000 |
---|---|---|
committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-04-05 12:01:25 +0000 |
commit | d90bf58cf83c548d4ed98f8c6ee55a6b84af0834 (patch) | |
tree | e364221b071fc7af079027aa7e6ac3d25435767a /www/chromium/files/patch-chrome_common_chrome__paths.cc | |
parent | Update CMake to latest release, 3.14.1 (diff) |
www/chromium: Update to 73.0.3683.86
- 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
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__paths.cc')
-rw-r--r-- | www/chromium/files/patch-chrome_common_chrome__paths.cc | 63 |
1 files changed, 40 insertions, 23 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 922b47f40b5a..84863783b2b8 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,8 +1,8 @@ ---- 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"); +--- 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) @@ -17,7 +17,15 @@ #endif // defined(GOOGLE_CHROME_BUILD) // The path to the hint file that tells the pepper plugin loader -@@ -190,7 +190,7 @@ + // 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: @@ -26,16 +34,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -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 @@ +@@ -459,10 +459,12 @@ if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -49,16 +48,16 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -485,7 +487,7 @@ +@@ -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 (!PathService::Get(chrome::DIR_USER_DATA, &cur)) + if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -493,7 +495,7 @@ +@@ -478,7 +480,7 @@ break; } #endif @@ -67,7 +66,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -528,7 +530,7 @@ +@@ -513,7 +515,7 @@ #endif break; @@ -76,7 +75,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -542,6 +544,9 @@ +@@ -527,6 +529,9 @@ #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); @@ -86,7 +85,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -554,7 +559,7 @@ +@@ -539,7 +544,7 @@ return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; @@ -94,4 +93,22 @@ +#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)) + 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); |