chromium: fix build on i386, apply forgotten patch

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: chromium: fix build on i386, apply forgotten patch
From: kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sat, 1 Feb 2025 17:13:43 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Sat Feb 1 17:40:38 2025 +0100
Changeset:	a770938cd21ba2f641fb27f723597becc443014f

Modified Files:
	chromium/Makefile
	chromium/distinfo
	chromium/patches/patch-build_config_rust.gni
Added Files:
	chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc

Log Message:
chromium: fix build on i386, apply forgotten patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a770938cd21ba2f641fb27f723597becc443014f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 chromium/Makefile                                  | 19 +++++---
 chromium/distinfo                                  |  3 +-
 chromium/patches/patch-build_config_rust.gni       | 11 ++++-
 ...r_renderer__host_render__process__host__impl.cc | 57 ++++++++++++++++++++++
 4 files changed, 81 insertions(+), 9 deletions(-)

diffs:
diff --git a/chromium/Makefile b/chromium/Makefile
index 783415b8fc..161a6c3744 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=			chromium-${VERSION}
 VERSION=			131.0.6778.204
+PKGREVISION=			1
 CATEGORIES=			www
 MASTER_SITES=			https://commondatastorage.googleapis.com/chromium-browser-official/
 EXTRACT_SUFX_C=			.tar.xz
@@ -54,14 +55,18 @@ DEPENDS+=			xdg-utils-[0-9]*:../../misc/xdg-utils
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
-SUPPORTED_OS=			NetBSD-1[0-9].* FreeBSD-*
-SUPPORTED_OS+=			OpenBSD-* Linux-* Darwin-*
-.for os in ${SUPPORTED_OS}
-ONLY_FOR_PLATFORM+=		${os}-x86_64
-ONLY_FOR_PLATFORM+=		${os}-aarch64
-ONLY_FOR_PLATFORM+=		${os}-i386
+# Supported platforms, synced with rust/platform.mk
+.for c_arch in x86_64 i386 aarch64
+ONLY_FOR_PLATFORM+=		NetBSD-1[0-9].*-${c_arch}
+ONLY_FOR_PLATFORM+=		Linux-*-${c_arch}
 .endfor
 
+.for c_arch in x86_64 aarch64
+ONLY_FOR_PLATFORM+=		Darwin-*-${c_arch}
+.endfor
+
+ONLY_FOR_PLATFORM+=		FreeBSD-*-x86_64
+
 # Workaround for brotli and other commands.
 #BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 
@@ -314,7 +319,6 @@ do-install:
 .include "../../audio/speech-dispatcher/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/dconf/buildlink3.mk"
-.include "../../devel/libatomic/buildlink3.mk"
 .include "../../devel/libepoll-shim/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
@@ -373,4 +377,5 @@ BUILDLINK_TRANSFORM+=	l:pci:pciutils
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chromium/distinfo b/chromium/distinfo
index 83179bc134..725854983d 100644
--- a/chromium/distinfo
+++ b/chromium/distinfo
@@ -146,7 +146,7 @@ SHA1 (patch-build_config_compiler_BUILD.gn) = cb0c731c3287995fc9557f5b2023ca2bec
 SHA1 (patch-build_config_linux_BUILD.gn) = cb87b778e7eaa6d9f3f5b53502c62824e4688d3d
 SHA1 (patch-build_config_linux_pkg-config.py) = d41205c0ccfa08be9b8fe879d7234e82d9752a23
 SHA1 (patch-build_config_ozone.gni) = 5ae4f8c236c2e9b505d2d438e0a69328e73391e0
-SHA1 (patch-build_config_rust.gni) = fa4e96a73586829e160d116b3b19e3fbe3805755
+SHA1 (patch-build_config_rust.gni) = ce41c836ba624903d24a34abe984e95a503f0d78
 SHA1 (patch-build_config_v8__target__cpu.gni) = f5a37fa2170acbb0e857394bfdbdfe713ce3f228
 SHA1 (patch-build_detect__host__arch.py) = 42b3d2f5edf58a3663ca72ff7309352b4af8d7be
 SHA1 (patch-build_gn__run__binary.py) = 752aa7c70696cd05bae26d82929b07a2086b0504
@@ -668,6 +668,7 @@ SHA1 (patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc)
 SHA1 (patch-content_browser_renderer__host_delegated__frame__host.cc) = f82807c5d354852860c90075cb01b45e82e99600
 SHA1 (patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc) = c25b3137528cad4f5a7561412d7a5fdbd35b173f
 SHA1 (patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc) = 4db24342c9c322e120ff060bd9a1c5fec9af2def
+SHA1 (patch-content_browser_renderer__host_render__process__host__impl.cc) = 0f57cdeb5b90412755ff17e22e4bc1fda3d0f686
 SHA1 (patch-content_browser_renderer__host_render__process__host__impl.h) = c49458aa4c77ad19a1a54df586dbc2d969ef9fb1
 SHA1 (patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc) = b7184af29baca7e84b096b1ed73032f5192e57b3
 SHA1 (patch-content_browser_renderer__host_render__view__host__impl.cc) = dad13b383b47eab092f191290b16400db25a275d
diff --git a/chromium/patches/patch-build_config_rust.gni b/chromium/patches/patch-build_config_rust.gni
index 58f3d6c535..936952aaa4 100644
--- a/chromium/patches/patch-build_config_rust.gni
+++ b/chromium/patches/patch-build_config_rust.gni
@@ -4,8 +4,17 @@ $NetBSD$
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/rust.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/config/rust.gni.orig	2024-12-17 18:58:49.000000000 +0100
 +++ build/config/rust.gni
+@@ -201,7 +201,7 @@ if (is_linux || is_chromeos) {
+     rust_abi_target = "aarch64-unknown-linux-gnu"
+     cargo_target_abi = ""
+   } else if (current_cpu == "x86") {
+-    rust_abi_target = "i686-unknown-linux-gnu"
++    rust_abi_target = "i586-unknown-linux-gnu"
+     cargo_target_abi = ""
+   } else if (current_cpu == "x64") {
+     rust_abi_target = "x86_64-unknown-linux-gnu"
 @@ -321,6 +321,10 @@ if (is_linux || is_chromeos) {
    }
  }
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
new file mode 100644
index 0000000000..432142096c
--- /dev/null
+++ b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -0,0 +1,57 @@
+$NetBSD$
+
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-02-01 12:26:17.880666258 +0100
++++ content/browser/renderer_host/render_process_host_impl.cc
+@@ -220,7 +220,7 @@
+ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include <sys/resource.h>
+ 
+ #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
+@@ -1083,7 +1083,7 @@ static constexpr size_t kUnknownPlatform
+ // to indicate failure and std::numeric_limits<size_t>::max() to indicate
+ // unlimited.
+ size_t GetPlatformProcessLimit() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   struct rlimit limit;
+   if (getrlimit(RLIMIT_NPROC, &limit) != 0)
+     return kUnknownPlatformProcessLimit;
+@@ -1260,7 +1260,7 @@ RenderProcessHostImpl::IOThreadHostImpl:
+ 
+ void RenderProcessHostImpl::IOThreadHostImpl::SetPid(
+     base::ProcessId child_pid) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   child_thread_type_switcher_.SetPid(child_pid);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ }
+@@ -3264,7 +3264,7 @@ void RenderProcessHostImpl::AppendRender
+             base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
+   }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
+   // for NV12 GPU memory buffer.
+   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
+@@ -3320,6 +3320,7 @@ void RenderProcessHostImpl::PropagateBro
+       switches::kDisableSpeechAPI,
+       switches::kDisableThreadedCompositing,
+       switches::kDisableTouchDragDrop,
++      switches::kDisableUnveil,
+       switches::kDisableV8IdleTasks,
+       switches::kDisableVideoCaptureUseGpuMemoryBuffer,
+       switches::kDisableWebGLImageChromium,
+@@ -5102,7 +5103,7 @@ uint64_t RenderProcessHostImpl::GetPriva
+   // - Win: https://crbug.com/707022 .
+   uint64_t total_size = 0;
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   total_size = dump->platform_private_footprint->rss_anon_bytes +
+                dump->platform_private_footprint->vm_swap_bytes;
+ #elif BUILDFLAG(IS_APPLE)
Prev by Date: py-homeassistant: Require python 3.13 for 2025.2
Next by Date: py-CT3: add missing tool
Previous by Thread: py-homeassistant: Require python 3.13 for 2025.2
Next by Thread: py-CT3: add missing tool
Indexes:
Home | Main Index | Thread Index | Old Index