Page MenuHomeFreeBSD
Files F153369051

D25449.diff
No OneTemporary
Actions

D25449.diff
View Options

Index: head/www/chromium/Makefile
===================================================================
--- head/www/chromium/Makefile
+++ head/www/chromium/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 83.0.4103.97
+PORTVERSION= 83.0.4103.106
CATEGORIES?= www java
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/cpm/chromium/:fonts
Index: head/www/chromium/distinfo
===================================================================
--- head/www/chromium/distinfo
+++ head/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1591262286
-SHA256 (chromium-83.0.4103.97.tar.xz) = 12c405f61284cfc78f8c2b6600f3c1ae61a83b639c41087bb4f74fcaab036f83
-SIZE (chromium-83.0.4103.97.tar.xz) = 802603824
-SHA256 (chromium-83.0.4103.97-testdata.tar.xz) = b8787a82efe64d12b0ca7ee0af9eb0e27aa1a85bc75649ab6aef1f5e9ea9f6f4
-SIZE (chromium-83.0.4103.97-testdata.tar.xz) = 257142948
+TIMESTAMP = 1593091518
+SHA256 (chromium-83.0.4103.106.tar.xz) = cfd153a2e10b0bb0fb3b7e6be543aef0915181f5fbdbea893d08465afd097e2f
+SIZE (chromium-83.0.4103.106.tar.xz) = 802630620
+SHA256 (chromium-83.0.4103.106-testdata.tar.xz) = bf0c38e3d59fc346788eb25487956ae40490a88dfd6b1d4c8edacb075873678e
+SIZE (chromium-83.0.4103.106-testdata.tar.xz) = 257157012
SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
SIZE (test_fonts.tar.xz) = 200040
Index: head/www/chromium/files/patch-base_system_sys__info.cc
===================================================================
--- head/www/chromium/files/patch-base_system_sys__info.cc
+++ head/www/chromium/files/patch-base_system_sys__info.cc
@@ -0,0 +1,11 @@
+--- base/system/sys_info.cc.orig 2020-06-25 12:19:57 UTC
++++ base/system/sys_info.cc
+@@ -102,7 +102,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
+ #elif defined(OS_ANDROID) || defined(OS_MACOSX)
+ base::ThreadPool::PostTaskAndReplyWithResult(
+ FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback));
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ base::ThreadPool::PostTaskAndReplyWithResult(
+ FROM_HERE, {base::MayBlock()}, base::BindOnce(&GetHardwareInfoSync),
+ std::move(callback));
Index: head/www/chromium/files/patch-base_system_sys__info__freebsd.cc
===================================================================
--- head/www/chromium/files/patch-base_system_sys__info__freebsd.cc
+++ head/www/chromium/files/patch-base_system_sys__info__freebsd.cc
@@ -1,6 +1,11 @@
---- base/system/sys_info_freebsd.cc.orig 2019-12-16 21:50:40 UTC
+--- base/system/sys_info_freebsd.cc.orig 2020-06-15 18:59:42 UTC
+++ base/system/sys_info_freebsd.cc
-@@ -13,26 +13,59 @@
+@@ -9,30 +9,76 @@
+ #include <sys/sysctl.h>
+
+ #include "base/logging.h"
++#include "base/strings/string_util.h"
+
namespace base {
int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@@ -62,6 +67,17 @@
}
+
return static_cast<uint64_t>(limit);
++}
++
++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;
}
--
+
} // namespace base
Index: head/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc
===================================================================
--- head/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc
+++ head/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc
@@ -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(

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 6:29 PM (12 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31925812
Default Alt Text
D25449.diff (4 KB)

Event Timeline