From 534c234048e768fb9fd73b1915938082ce9db07c Mon Sep 17 00:00:00 2001
From: robert <robert@openbsd.org>
Date: Tue, 22 Oct 2019 18:35:43 +0000
Subject: [PATCH] update to 77.0.3865.120 and make sure to use HW_NCPUONLINE
 instead of HW_NCPU

---
 www/chromium/Makefile                              |  7 ++-----
 www/chromium/distinfo                              |  4 ++--
 .../patches/patch-base_system_sys_info_openbsd_cc  | 10 +++++++---
 www/chromium/patches/patch-v8_src_base_sys-info_cc | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 www/chromium/patches/patch-v8_src_base_sys-info_cc

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 10fda54b52b..479e838db52 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.469 2019/10/08 18:41:26 kurt Exp $
+# $OpenBSD: Makefile,v 1.470 2019/10/22 18:35:43 robert Exp $
 
 .include <bsd.port.arch.mk>
 
@@ -12,14 +12,12 @@ DPB_PROPERTIES=		lonesome
 
 COMMENT=		Chromium browser
 
-V=			77.0.3865.90
+V=			77.0.3865.120
 ECV=			76.0.3809.132
 ELECTRON_V=		6.0.3
 
 DISTNAME=		chromium-${V}
 
-REVISION=		4
-
 DISTFILES+=		chromium-${V}${EXTRACT_SUFX} \
 			chromium-${ECV}${EXTRACT_SUFX} \
 			electron-${ELECTRON_V}_${ECV}${EXTRACT_SUFX}:0 \
@@ -73,7 +71,6 @@ WANTLIB += drm epoxy fontconfig freetype fribidi gmodule-2.0 graphite2
 WANTLIB += gthread-2.0 intl pangoft2-1.0 pcre pixman-1
 WANTLIB += plc4 plds4 util xcb-dri2 xcb-glx xcb-render xcb-shm
 WANTLIB += xml2 z
-WANTLIB += uuid
 WANTLIB += harfbuzz 
 WANTLIB += ffi png
 
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 1198517d745..ed3695fd39f 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,8 +1,8 @@
 SHA256 (chromium-76.0.3809.132.tar.xz) = 1U5GQLXjmdFw3/vFvP9lFX6xspMUuUtdgI9yfZzkUkE=
-SHA256 (chromium-77.0.3865.90.tar.xz) = AEz9sd90hHvqhlm8r44DnVH+EQHUK2zxxsw0YHP978M=
+SHA256 (chromium-77.0.3865.120.tar.xz) = 15L5sJsdz9ZOaPR6YRxUDdE4Pdmr14yh4Gsqfi/wavg=
 SHA256 (chromium-patches-76.0.3809.132.tar.gz) = /LXYkpWTqad/bWbAuVElfv0uP4b8F0++dLKmpDIwKUM=
 SHA256 (electron-6.0.3_76.0.3809.132.tar.xz) = ULe9K5cbFXgCbZr+XTonmq1aji9hAtWmhhgFInA6vn0=
 SIZE (chromium-76.0.3809.132.tar.xz) = 728899912
-SIZE (chromium-77.0.3865.90.tar.xz) = 729551228
+SIZE (chromium-77.0.3865.120.tar.xz) = 729636120
 SIZE (chromium-patches-76.0.3809.132.tar.gz) = 251433
 SIZE (electron-6.0.3_76.0.3809.132.tar.xz) = 59166632
diff --git a/www/chromium/patches/patch-base_system_sys_info_openbsd_cc b/www/chromium/patches/patch-base_system_sys_info_openbsd_cc
index b1834da19c6..45d18ea6b82 100644
--- a/www/chromium/patches/patch-base_system_sys_info_openbsd_cc
+++ b/www/chromium/patches/patch-base_system_sys_info_openbsd_cc
@@ -1,9 +1,9 @@
-$OpenBSD: patch-base_system_sys_info_openbsd_cc,v 1.2 2019/03/24 12:24:44 robert Exp $
+$OpenBSD: patch-base_system_sys_info_openbsd_cc,v 1.3 2019/10/22 18:35:43 robert Exp $
 
 Index: base/system/sys_info_openbsd.cc
 --- base/system/sys_info_openbsd.cc.orig
 +++ base/system/sys_info_openbsd.cc
-@@ -29,6 +29,10 @@ int64_t AmountOfMemory(int pages_name) {
+@@ -29,9 +29,13 @@ int64_t AmountOfMemory(int pages_name) {
  
  namespace base {
  
@@ -13,7 +13,11 @@ Index: base/system/sys_info_openbsd.cc
 +
  // static
  int SysInfo::NumberOfProcessors() {
-   int mib[] = {CTL_HW, HW_NCPU};
+-  int mib[] = {CTL_HW, HW_NCPU};
++  int mib[] = {CTL_HW, HW_NCPUONLINE};
+   int ncpu;
+   size_t size = sizeof(ncpu);
+   if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) {
 @@ -43,26 +47,20 @@ int SysInfo::NumberOfProcessors() {
  
  // static
diff --git a/www/chromium/patches/patch-v8_src_base_sys-info_cc b/www/chromium/patches/patch-v8_src_base_sys-info_cc
new file mode 100644
index 00000000000..40922f64f2b
--- /dev/null
+++ b/www/chromium/patches/patch-v8_src_base_sys-info_cc
@@ -0,0 +1,14 @@
+$OpenBSD: patch-v8_src_base_sys-info_cc,v 1.1 2019/10/22 18:35:43 robert Exp $
+
+Index: v8/src/base/sys-info.cc
+--- v8/src/base/sys-info.cc.orig
++++ v8/src/base/sys-info.cc
+@@ -32,7 +32,7 @@ namespace base {
+ // static
+ int SysInfo::NumberOfProcessors() {
+ #if V8_OS_OPENBSD
+-  int mib[2] = {CTL_HW, HW_NCPU};
++  int mib[2] = {CTL_HW, HW_NCPUONLINE};
+   int ncpu = 0;
+   size_t len = sizeof(ncpu);
+   if (sysctl(mib, arraysize(mib), &ncpu, &len, nullptr, 0) != 0) {