Attachment 215923 Details for Bug 246387 – Adapted Patch from OpenBSD

[patch] Adapted Patch from OpenBSD

sync.patch (text/plain), 2.04 KB, created by Jonathan Chen on 2020-06-25 03:00:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Chen

Created: 2020-06-25 03:00:12 UTC

Size: 2.04 KB

patch

obsolete

>diff -ruN /usr/ports/www/chromium/files/patch-base_system_sys__info__freebsd.cc ./files/patch-base_system_sys__info__freebsd.cc
>--- /usr/ports/www/chromium/files/patch-base_system_sys__info__freebsd.cc	2020-06-24 19:44:00.861606000 +1200
>+++ ./files/patch-base_system_sys__info__freebsd.cc	2020-06-24 19:45:20.128294000 +1200
>@@ -1,6 +1,6 @@
>---- base/system/sys_info_freebsd.cc.orig	2019-12-16 21:50:40 UTC
>+--- base/system/sys_info_freebsd.cc.orig	2020-06-24 07:44:41 UTC
> +++ base/system/sys_info_freebsd.cc
>-@@ -13,26 +13,59 @@
>+@@ -13,26 +13,70 @@
>  namespace base {
>  
>  int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
>@@ -49,6 +49,17 @@
> +  if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0)
> +    return name;
> +  return std::string();
>++}
>++
>++SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
>++  HardwareInfo info;
>++  // Set the manufacturer to "FreeBSD" and the model to
>++  // an empty string.
>++  info.manufacturer = "FreeBSD";
>++  info.model = HardwareModelName();
>++  DCHECK(IsStringUTF8(info.manufacturer));
>++  DCHECK(IsStringUTF8(info.model));
>++  return info;
> +}
> +
> +// static
>diff -ruN /usr/ports/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc ./files/patch-components_sync__device__info_device__info__sync__bridge.cc
>--- /usr/ports/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc	2020-06-24 19:44:00.876671000 +1200
>+++ ./files/patch-components_sync__device__info_device__info__sync__bridge.cc	1970-01-01 12:00:00.000000000 +1200
>@@ -1,16 +0,0 @@
>---- components/sync_device_info/device_info_sync_bridge.cc.orig	2020-03-16 18:40:31 UTC
>-+++ components/sync_device_info/device_info_sync_bridge.cc
>-@@ -456,11 +456,13 @@ void DeviceInfoSyncBridge::OnStoreCreated(
>-     return;
>-   }
>- 
>-+#if !defined(OS_BSD)
>-   store_ = std::move(store);
>- 
>-   base::SysInfo::GetHardwareInfo(
>-       base::BindOnce(&DeviceInfoSyncBridge::OnHardwareInfoRetrieved,
>-                      weak_ptr_factory_.GetWeakPtr()));
>-+#endif
>- }
>- 
>- void DeviceInfoSyncBridge::OnHardwareInfoRetrieved(

Actions: View | Diff

Attachments on bug 246387: 215923