From 91ae25701455d6bb4d536a0a1be22959750690eb Mon Sep 17 00:00:00 2001 From: robert Date: Tue, 10 Jun 2025 11:54:43 +0000 Subject: [PATCH] update to 137.0.7151.68 --- www/ungoogled-chromium/Makefile | 2 +- www/ungoogled-chromium/distinfo | 12 ++++++------ ...mory_instrumentation_queued_request_dispatcher_cc | 10 +++++----- ...blic_cpp_memory_instrumentation_os_metrics_bsd_cc | 3 ++- ...or_public_cpp_memory_instrumentation_os_metrics_h | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 9d0647a32fe..be6fa394e58 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -11,7 +11,7 @@ DPB_PROPERTIES+= lonesome COMMENT= Chromium browser sans integration with Google -V= 137.0.7151.55 +V= 137.0.7151.68 UGV= ${V}-1 DISTNAME= ungoogled-chromium-${V} diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index cbd79c32e9e..b163e3b5023 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,6 +1,6 @@ -SHA256 (chromium-137.0.7151.55-testdata.tar.xz) = 9cLISDzEYI07HrmAzIHXSuOED2QA9M45cnyzCf5TePU= -SHA256 (chromium-137.0.7151.55.tar.xz) = sR52/YJ0XbVgLOFRrpMcxeVsPuK24Iwvv3iL9LPqhMs= -SHA256 (ungoogled-software-ungoogled-chromium-137.0.7151.55-1.tar.gz) = aOxhCMZO5Rbtkl0LDqRMLcPVlz2pLrkfJ4j3B1WW3dY= -SIZE (chromium-137.0.7151.55-testdata.tar.xz) = 656595876 -SIZE (chromium-137.0.7151.55.tar.xz) = 7246424332 -SIZE (ungoogled-software-ungoogled-chromium-137.0.7151.55-1.tar.gz) = 636762 +SHA256 (chromium-137.0.7151.68-testdata.tar.xz) = hVpJY9TGB59J/wiqRivcynrRzUarWWVbLJM+BD+64L8= +SHA256 (chromium-137.0.7151.68.tar.xz) = 2cq7+5AviscnzqQkofpBwNle/kC784W1D3b4hWqmPNM= +SHA256 (ungoogled-software-ungoogled-chromium-137.0.7151.68-1.tar.gz) = ZjGF4Dntlu9QFvMy9NHVBnW8T6DJb4IZWRJxD+lKl5s= +SIZE (chromium-137.0.7151.68-testdata.tar.xz) = 656591304 +SIZE (chromium-137.0.7151.68.tar.xz) = 7245241336 +SIZE (ungoogled-software-ungoogled-chromium-137.0.7151.68-1.tar.gz) = 636743 diff --git a/www/ungoogled-chromium/patches/patch-services_resource_coordinator_memory_instrumentation_queued_request_dispatcher_cc b/www/ungoogled-chromium/patches/patch-services_resource_coordinator_memory_instrumentation_queued_request_dispatcher_cc index 6bbf9d2748e..190f9ee7f13 100644 --- a/www/ungoogled-chromium/patches/patch-services_resource_coordinator_memory_instrumentation_queued_request_dispatcher_cc +++ b/www/ungoogled-chromium/patches/patch-services_resource_coordinator_memory_instrumentation_queued_request_dispatcher_cc @@ -26,8 +26,8 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); - client->RequestOSMemoryDump(request->memory_map_option(), - {base::kNullProcessId}, + client->RequestOSMemoryDump( + request->memory_map_option(), request->memory_dump_flags(), @@ -237,7 +237,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to @@ -37,7 +37,7 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa std::vector pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -283,7 +283,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -284,7 +284,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -46,7 +46,7 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -333,7 +333,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -334,7 +334,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -55,7 +55,7 @@ Index: services/resource_coordinator/memory_instrumentation/queued_request_dispa for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -394,7 +394,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -395,7 +395,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/ungoogled-chromium/patches/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_bsd_cc b/www/ungoogled-chromium/patches/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_bsd_cc index e4d7d9e25ea..16e55ef93f1 100644 --- a/www/ungoogled-chromium/patches/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_bsd_cc +++ b/www/ungoogled-chromium/patches/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_bsd_cc @@ -1,7 +1,7 @@ Index: services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc --- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc -@@ -0,0 +1,58 @@ +@@ -0,0 +1,59 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -27,6 +27,7 @@ Index: services/resource_coordinator/public/cpp/memory_instrumentation/os_metric + +// static +bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, ++ const MemDumpFlagSet& flags, + mojom::RawOSMemDump* dump) { + base::Process process = pid == base::kNullProcessId + ? base::Process::Current() diff --git a/www/ungoogled-chromium/patches/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_h b/www/ungoogled-chromium/patches/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_h index d7a75ef5bf6..9a9daff722d 100644 --- a/www/ungoogled-chromium/patches/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_h +++ b/www/ungoogled-chromium/patches/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_h @@ -1,7 +1,7 @@ Index: services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h --- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h -@@ -57,7 +57,7 @@ class COMPONENT_EXPORT( +@@ -65,7 +65,7 @@ class COMPONENT_EXPORT( static std::vector GetProcessMemoryMaps( base::ProcessHandle); @@ -10,7 +10,7 @@ Index: services/resource_coordinator/public/cpp/memory_instrumentation/os_metric static void SetProcSmapsForTesting(FILE*); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) -@@ -79,7 +79,7 @@ class COMPONENT_EXPORT( +@@ -87,7 +87,7 @@ class COMPONENT_EXPORT( GetMemoryInfo(base::ProcessHandle handle); #endif // !BUILDFLAG(IS_APPLE)