Differential D36179 Diff 109344 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
- This file was added.
--- src/3rdparty/chromium/base/linux_util.cc.orig 2021-11-25 09:20:12 UTC | |||||
+++ src/3rdparty/chromium/base/linux_util.cc | |||||
@@ -15,6 +15,7 @@ | |||||
#include <iomanip> | |||||
#include <memory> | |||||
+#include <sstream> | |||||
#include "base/files/dir_reader_posix.h" | |||||
#include "base/files/file_util.h" | |||||
@@ -79,6 +80,9 @@ class DistroNameGetter { | |||||
public: | |||||
DistroNameGetter() { | |||||
static const char* const kFilesToCheck[] = {"/etc/os-release", | |||||
+#if defined(OS_BSD) | |||||
+ "%%LOCALBASE%%/etc/os-release", | |||||
+#endif | |||||
"/usr/lib/os-release"}; | |||||
for (const char* file : kFilesToCheck) { | |||||
if (ReadDistroFromOSReleaseFile(file)) | |||||
@@ -135,6 +139,9 @@ void SetLinuxDistro(const std::string& distro) { | |||||
} | |||||
bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { | |||||
+#if defined(OS_BSD) | |||||
+ return false; | |||||
+#else | |||||
// 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 | |||||
char buf[25]; | |||||
strings::SafeSPrintf(buf, "/proc/%d/task", pid); | |||||
@@ -154,6 +161,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t | |||||
} | |||||
return true; | |||||
+#endif | |||||
} | |||||
pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data, |