qt5-qtwebengine: dont use zygote

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sun Mar 21 10:41:16 2021 +1300
Changeset:	992896f9d76f875b40d9d0a13a159c36c0e4b500

Modified Files:
	qt5-qtwebengine/distinfo
	qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc
Added Files:
	qt5-qtwebengine/patches/patch-src_3rdparty_chromium_services_service__manager_zygote_common_zygote__features.gni

Log Message:
qt5-qtwebengine: dont use zygote

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

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

diffstat:
 qt5-qtwebengine/distinfo                           |  3 +-
 ...wser_child__process__launcher__helper__linux.cc | 43 ++++++++++++++++++++--
 ...ice__manager_zygote_common_zygote__features.gni | 12 ++++++
 3 files changed, 54 insertions(+), 4 deletions(-)

diffs:
diff --git a/qt5-qtwebengine/distinfo b/qt5-qtwebengine/distinfo
index b882ffcd71..f2c9db617e 100644
--- a/qt5-qtwebengine/distinfo
+++ b/qt5-qtwebengine/distinfo
@@ -245,7 +245,7 @@ SHA1 (patch-src_3rdparty_chromium_components_webcrypto_algorithms_test__helpers.
 SHA1 (patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc) = 2b1a3e184c5d91d7029c3c5cef881c33991d9861
 SHA1 (patch-src_3rdparty_chromium_content_browser_BUILD.gn) = 8e3e603b52ca84c319dcdd7ebaab18853b60f370
 SHA1 (patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc) = e94a517c2cdb5c89bef131369f9bf14c09aa906f
-SHA1 (patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc) = acda9c4b4312073a8515d71663500db1dfb9dc00
+SHA1 (patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc) = 3949d4077ce8ae682db0acc6fbe5dee26a8050e8
 SHA1 (patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc) = bded50a3060ac935616fcd66f94c0f6f2f5a7cdf
 SHA1 (patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc) = b61ee42ad3b5031e6fd01f6cb1dbcf107d057851
 SHA1 (patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc) = 13dab59045c7a9017bf488e5112e0d906c647ba0
@@ -488,6 +488,7 @@ SHA1 (patch-src_3rdparty_chromium_services_service__manager_sandbox_sandbox.h) =
 SHA1 (patch-src_3rdparty_chromium_services_service__manager_sandbox_switches.cc) = 6678ca7382a74b7cd77133b91e37d061600db548
 SHA1 (patch-src_3rdparty_chromium_services_service__manager_sandbox_switches.h) = 28d10acc7928be607710fff291cb6b646c39a2b6
 SHA1 (patch-src_3rdparty_chromium_services_service__manager_zygote_BUILD.gn) = 81ff54b13a0b40c12481817e3d3835b81e2fc939
+SHA1 (patch-src_3rdparty_chromium_services_service__manager_zygote_common_zygote__features.gni) = 3f1c6705f048eb16b3964ef5b58d7fdeb72eca58
 SHA1 (patch-src_3rdparty_chromium_services_service__manager_zygote_host_zygote__host__impl__linux.cc) = 3d1919c7c2c37a6ac1d43523a9ad65b72c70d3d5
 SHA1 (patch-src_3rdparty_chromium_services_service__manager_zygote_host_zygote__host__impl__linux.h) = 87ce22d008b9c3c47014f712b6231ecdcf2926e8
 SHA1 (patch-src_3rdparty_chromium_services_service__manager_zygote_zygote__host__linux.h) = 1a011d7877e370800ace3d2517de75b50a8f9f82
diff --git a/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc b/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc
index b5baf2231e..a26e7fb8ed 100644
--- a/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc
+++ b/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc
@@ -26,16 +26,53 @@ $NetBSD$
  
    options->environment = delegate_->GetEnvironment();
  
-@@ -82,7 +86,7 @@ ChildProcessLauncherHelper::LaunchProces
+@@ -69,6 +73,7 @@ ChildProcessLauncherHelper::LaunchProces
+     int* launch_result) {
+   *is_synchronous_launch = true;
+ 
++#if !defined(OS_BSD)
+   service_manager::ZygoteHandle zygote_handle =
+       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
+           ? nullptr
+@@ -82,7 +87,6 @@ ChildProcessLauncherHelper::LaunchProces
          GetProcessType());
      *launch_result = LAUNCH_RESULT_SUCCESS;
  
 -#if !defined(OS_OPENBSD)
-+#if !defined(OS_BSD)
      if (handle) {
        // It could be a renderer process or an utility process.
        int oom_score = content::kMiscOomScore;
-@@ -143,13 +147,17 @@ void ChildProcessLauncherHelper::ForceNo
+@@ -92,13 +96,13 @@ ChildProcessLauncherHelper::LaunchProces
+       service_manager::ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(
+           handle, oom_score);
+     }
+-#endif
+ 
+     Process process;
+     process.process = base::Process(handle);
+     process.zygote = zygote_handle;
+     return process;
+   }
++#endif
+ 
+   Process process;
+   process.process = base::LaunchProcess(*command_line(), options);
+@@ -116,10 +120,13 @@ ChildProcessTerminationInfo ChildProcess
+     const ChildProcessLauncherHelper::Process& process,
+     bool known_dead) {
+   ChildProcessTerminationInfo info;
++#if !defined(OS_BSD)
+   if (process.zygote) {
+     info.status = process.zygote->GetTerminationStatus(
+         process.process.Handle(), known_dead, &info.exit_code);
+-  } else if (known_dead) {
++  } else
++#endif
++  if (known_dead) {
+     info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
+                                                       &info.exit_code);
+   } else {
+@@ -143,13 +150,17 @@ void ChildProcessLauncherHelper::ForceNo
    DCHECK(CurrentlyOnProcessLauncherTaskRunner());
    process.process.Terminate(service_manager::RESULT_CODE_NORMAL_EXIT, false);
    // On POSIX, we must additionally reap the child.
diff --git a/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_services_service__manager_zygote_common_zygote__features.gni b/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_services_service__manager_zygote_common_zygote__features.gni
new file mode 100644
index 0000000000..27485fdcd3
--- /dev/null
+++ b/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_services_service__manager_zygote_common_zygote__features.gni
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Don't use zygote process on NetBSD
+
+--- src/3rdparty/chromium/services/service_manager/zygote/common/zygote_features.gni.orig	2020-11-07 01:22:36.000000000 +0000
++++ src/3rdparty/chromium/services/service_manager/zygote/common/zygote_features.gni
+@@ -2,4 +2,4 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-use_zygote_handle = is_posix && !is_android && !is_mac
++use_zygote_handle = is_posix && !is_android && !is_mac && !is_netbsd