Differential D38165 Diff 118368 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc

Changeset View

Standalone View

	--- src/3rdparty/chromium/base/linux_util.cc.orig 2020-11-07 01:22:36 UTC			--- src/3rdparty/chromium/base/linux_util.cc.orig 2021-12-15 16:12:54 UTC
	+++ src/3rdparty/chromium/base/linux_util.cc			+++ src/3rdparty/chromium/base/linux_util.cc
	@@ -78,6 +78,9 @@ class DistroNameGetter {			@@ -15,6 +15,7 @@

				#include <iomanip>
				#include <memory>
				+#include <sstream>

				#include "base/files/dir_reader_posix.h"
				#include "base/files/file_util.h"
				@@ -78,6 +79,9 @@ class DistroNameGetter {
	public:			public:
	DistroNameGetter() {			DistroNameGetter() {
	static const char* const kFilesToCheck[] = {"/etc/os-release",			static const char* const kFilesToCheck[] = {"/etc/os-release",
	+#if defined(OS_BSD)			+#if defined(OS_BSD)
	+ "%%LOCALBASE%%/etc/os-release",			+ "%%LOCALBASE%%/etc/os-release",
	+#endif			+#endif
	"/usr/lib/os-release"};			"/usr/lib/os-release"};
	for (const char* file : kFilesToCheck) {			for (const char* file : kFilesToCheck) {
	if (ReadDistroFromOSReleaseFile(file))			if (ReadDistroFromOSReleaseFile(file))
				@@ -134,6 +138,9 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
				}

				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);
				@@ -153,6 +160,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
				}

				return true;
				+#endif
				}

				pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data,