From 4da4f5edbf9de5c4269cf66d70044f4cb3abdc41 Mon Sep 17 00:00:00 2001 From: Hiroki Tagato Date: Wed, 24 Nov 2021 17:28:24 +0900 Subject: devel/electron13: update to 13.6.2 (and rename from devel/electron12) Changelog: https://www.electronjs.org/blog/electron-13-0 --- devel/electron13/files/patch-base_cpu.cc | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 devel/electron13/files/patch-base_cpu.cc (limited to 'devel/electron13/files/patch-base_cpu.cc') diff --git a/devel/electron13/files/patch-base_cpu.cc b/devel/electron13/files/patch-base_cpu.cc new file mode 100644 index 000000000000..4d791960f88a --- /dev/null +++ b/devel/electron13/files/patch-base_cpu.cc @@ -0,0 +1,35 @@ +--- base/cpu.cc.orig 2021-07-15 19:13:29 UTC ++++ base/cpu.cc +@@ -16,7 +16,7 @@ + + #include "base/stl_util.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) + #include "base/containers/flat_set.h" + #include "base/files/file_util.h" +@@ -214,6 +214,14 @@ const ProcCpuInfo& ParseProcCpu() { + + return *info; + } ++#elif defined(OS_BSD) ++std::string* CpuInfoBrand() { ++ static std::string* brand = []() { ++ return new std::string(SysInfo::CPUModelName()); ++ }(); ++ ++ return brand; ++} + #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || + // defined(OS_LINUX) || defined(OS_CHROMEOS)) + +@@ -352,6 +360,8 @@ void CPU::Initialize(bool require_branding) { + has_bti_ = hwcap2 & HWCAP2_BTI; + #endif + ++#elif defined(OS_BSD) ++ cpu_brand_ = *CpuInfoBrand(); + #elif defined(OS_WIN) + // Windows makes high-resolution thread timing information available in + // user-space. -- cgit v1.2.3