Date: Fri, 26 Jun 2020 08:44:32 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r540450 - in branches/2020Q2/www/chromium: . files Message-ID: <202006260844.05Q8iWYC066454@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Fri Jun 26 08:44:32 2020 New Revision: 540450 URL: https://svnweb.freebsd.org/changeset/ports/540450 Log: MFH: r540411 www/chromium: Update to 83.0.4103.106 and fix synchronization PR: 244185, 246387 Reported by: bourne.identity@hotmail.com Approved by: ports-secteam (implicit), chromium@ (rene), cem Obtained from: Robert Nagy via OpenBSD port Security: https://www.vuxml.org/freebsd/6a5d15b6-b661-11ea-8015-e09467587c17.html Differential Revision: https://reviews.freebsd.org/D25449 Added: branches/2020Q2/www/chromium/files/patch-base_system_sys__info.cc - copied unchanged from r540411, head/www/chromium/files/patch-base_system_sys__info.cc Deleted: branches/2020Q2/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc Modified: branches/2020Q2/www/chromium/Makefile branches/2020Q2/www/chromium/distinfo branches/2020Q2/www/chromium/files/patch-base_system_sys__info__freebsd.cc Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/chromium/Makefile ============================================================================== --- branches/2020Q2/www/chromium/Makefile Fri Jun 26 08:44:29 2020 (r540449) +++ branches/2020Q2/www/chromium/Makefile Fri Jun 26 08:44:32 2020 (r540450) @@ -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 Modified: branches/2020Q2/www/chromium/distinfo ============================================================================== --- branches/2020Q2/www/chromium/distinfo Fri Jun 26 08:44:29 2020 (r540449) +++ branches/2020Q2/www/chromium/distinfo Fri Jun 26 08:44:32 2020 (r540450) @@ -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 Copied: branches/2020Q2/www/chromium/files/patch-base_system_sys__info.cc (from r540411, head/www/chromium/files/patch-base_system_sys__info.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/chromium/files/patch-base_system_sys__info.cc Fri Jun 26 08:44:32 2020 (r540450, copy of r540411, 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)); Modified: branches/2020Q2/www/chromium/files/patch-base_system_sys__info__freebsd.cc ============================================================================== --- branches/2020Q2/www/chromium/files/patch-base_system_sys__info__freebsd.cc Fri Jun 26 08:44:29 2020 (r540449) +++ branches/2020Q2/www/chromium/files/patch-base_system_sys__info__freebsd.cc Fri Jun 26 08:44:32 2020 (r540450) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006260844.05Q8iWYC066454>