diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-06-02 20:30:55 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-06-02 20:30:55 +0000 |
| commit | 8f6dc7d1dd8b0ca59427d71524538aab9403ac23 (patch) | |
| tree | c272eeb9d12c3f96a460e7ad3fd1eb4233ad20ce /www/chromium/files/patch-base_linux__util.cc | |
| parent | multimedia/libva-intel-driver: update to 2.4.1 (diff) | |
www/chromium: Update to version 83.0.4103.61
Submitted by: Matthias Wolf <freebsd@rheinwolf.de>
Reviewed by: rene
Approved by: chromium@ (rene)
Obtained from: https://github.com/gliaskos/freebsd-chromium
MFH: 2020Q2
Security: https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html
Differential Revision: https://reviews.freebsd.org/D25102
Notes
Notes:
svn path=/head/; revision=537579
Diffstat (limited to 'www/chromium/files/patch-base_linux__util.cc')
| -rw-r--r-- | www/chromium/files/patch-base_linux__util.cc | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 216208c37181..97ea99e3d97b 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,20 +1,12 @@ ---- base/linux_util.cc.orig 2019-12-16 21:50:40 UTC +--- base/linux_util.cc.orig 2020-05-13 18:39:35 UTC +++ base/linux_util.cc -@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] = - "CrOS"; - #elif defined(OS_ANDROID) - "Android"; -+#elif defined(OS_BSD) -+ "BSD"; - #else // if defined(OS_LINUX) - "Unknown"; - #endif -@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo - } - - std::string GetLinuxDistro() { --#if defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - return g_linux_distro; - #elif defined(OS_LINUX) - LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance(); +@@ -78,6 +78,9 @@ class DistroNameGetter { + public: + DistroNameGetter() { + static const char* const kFilesToCheck[] = {"/etc/os-release", ++#if defined(OS_BSD) ++ "/usr/local/etc/os-release", ++#endif + "/usr/lib/os-release"}; + for (const char* file : kFilesToCheck) { + if (ReadDistroFromOSReleaseFile(file)) |