From nobody Sun May 12 08:43:01 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vcbjd6nLYz5KZxl; Sun, 12 May 2024 08:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vcbjd6KDsz4j8C; Sun, 12 May 2024 08:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715503381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MdG8W09TI0InvUEp+UrCJ0+CA/nzpBw9YiIccT2cUJU=; b=uNJ0BF7GbELhZ+OmBrE/k/2u9iaymUkp/MtsAb6V4kU6EU3zfCZ7yy2k0zmcV3NDjJSxia tqqtMg4pcLFMmw3bQRHFhyxppQd3+7JhPT3TzV1CDN9IlkJJ824D8K5/gU2x37TgG5Rz3o JBuwT+i3ufbITC/41+bswm+of7dyjzOb96cGVjSno5VWu2oKeQCw4rlbCHZgTNQCFIbicq aTP94HLzr8fMp6NnaCbVYuuCTEzEsotI80B/TRWrwrkEw6pdQFBdgKYZYzhUHQixgM5Lzh 0UHu+CYMVoVnuG3u314xSHdiwf84EzJsEmkmzWrHWQmU0m9nom2zud2N2vHKeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715503381; a=rsa-sha256; cv=none; b=HLFmniBehjWOdkve7RXZp9D+dgkh5t22LNtPSNiXAzRYgyB+sMIBWB7ene+gT164D3VUww t1dKbJsYKDVHx1+yhhnvXoi7+SyaAp21DHb20Mq2/JL4Fg0Ljbhphig3agPaNdCIYmWkh/ x26jAl7/3Z5olKUaHCZpZhr8YWNW/KeA52IyntDmTxL/lzZ2tw0XPZGDi5skltOkTeFWp/ CswfGZ2apP3DbzMeQhWEnS5Y+PCeVWbDUlyjN9XKrI+diJmUuejUrByIuEab4BKwmxUAIE KFOffSKFOSMPWlycdwJhBiFpwuD1NPzPQx2mLsLSQ4vSyuanYXm/22M0mJdm0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715503381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MdG8W09TI0InvUEp+UrCJ0+CA/nzpBw9YiIccT2cUJU=; b=VfKm5kUMJhibz/4UQ7fxnYhS3VYmrwyX9O70wMdMRpl4+rmJZQiaqgrDrTaA2qgCxgpBjl 61bEue0yRxr7QS+HHYhYtJxAlhhl695u0A90CPMhtBgYWv1X2uOpNNThklqCAHPiNAZ652 YNFmJn6S8uOZ54jLbLs9pH++0W28TyVhCNKu9QH13ouhD5gtNQ6QAQWqoo6133+uQsYDsJ Jt9SEkAd2H/iTg+2IEQ5iNxiLBv2gyOppjH2zTGN6yV+/vERZCmya3SjNdt7n8wb9wzOfE EHZMcDMiHfNuZpFknXnVqcAFvJf7ABiZAT8VXeONbWQ0TkwjOyfP1D2grbaqgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vcbjd5wYszxZT; Sun, 12 May 2024 08:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44C8h1G8079721; Sun, 12 May 2024 08:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44C8h17E079718; Sun, 12 May 2024 08:43:01 GMT (envelope-from git) Date: Sun, 12 May 2024 08:43:01 GMT Message-Id: <202405120843.44C8h17E079718@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Nagy Subject: git: 27ddc8da18d7 - 2024Q2 - www/*chromium: update to 124.0.6367.201 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 27ddc8da18d7297672cdd79b6edcdff3ba536cc2 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=27ddc8da18d7297672cdd79b6edcdff3ba536cc2 commit 27ddc8da18d7297672cdd79b6edcdff3ba536cc2 Author: Robert Nagy AuthorDate: 2024-05-12 06:38:25 +0000 Commit: Robert Nagy CommitDate: 2024-05-12 08:42:50 +0000 www/*chromium: update to 124.0.6367.201 Security: https://vuxml.freebsd.org/freebsd/3cf8ea44-1029-11ef-9f97-a8a1599412c6.html PR: 278890 (cherry picked from commit ee156f11d4d69167436ee53bec118d363a563735) --- www/chromium/Makefile | 2 +- www/chromium/distinfo | 14 ++++++------ ...chrome__browser__main__extra__parts__metrics.cc | 6 ++--- .../files/patch-media_base_media__switches.cc | 4 ++-- www/ungoogled-chromium/Makefile | 2 +- www/ungoogled-chromium/distinfo | 14 ++++++------ .../patch-chrome_app_chrome__main__delegate.cc | 26 +++++++++++----------- ...r_chrome__browser__main__extra__parts__linux.cc | 8 +++---- ...chrome__browser__main__extra__parts__metrics.cc | 6 ++--- .../patch-chrome_browser_prefs_browser__prefs.cc | 6 ++--- .../files/patch-media_base_media__switches.cc | 4 ++-- ...derer_platform_runtime__enabled__features.json5 | 14 ++++++------ .../files/patch-ui_base_ui__base__features.cc | 6 ++--- 13 files changed, 56 insertions(+), 56 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 9a2a287d8e19..fca2fa0cd9c2 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 124.0.6367.118 +PORTVERSION= 124.0.6367.201 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 249c42923349..5ac071fe55df 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1714547240 -SHA256 (chromium-124.0.6367.118.tar.xz) = 8aa5a14aad1234b48b568da9ef23d6e0b1b72d7f4ca5c4039462e54e6ad45d96 -SIZE (chromium-124.0.6367.118.tar.xz) = 3444501448 -SHA256 (chrome-linux-124.0.6367.118-llvm17.profdata.tar.xz) = c31572a6cba6268c1938e2c6ea35e567ea8809370f59504fcccb4e67a8dbe24b -SIZE (chrome-linux-124.0.6367.118-llvm17.profdata.tar.xz) = 30065808 -SHA256 (chromium-124.0.6367.118-testdata.tar.xz) = 81bef611eddfa954dc9ef1772eef72a053d8ae07ed0d57883889c00ca342bf34 -SIZE (chromium-124.0.6367.118-testdata.tar.xz) = 279593964 +TIMESTAMP = 1715495805 +SHA256 (chromium-124.0.6367.201.tar.xz) = 11773c4cfce4b39ae1bbe711b2907cb86e9aa299b7c6a71656edb876f0c85992 +SIZE (chromium-124.0.6367.201.tar.xz) = 3447761940 +SHA256 (chrome-linux-124.0.6367.201-llvm17.profdata.tar.xz) = 2e8a5147537dff905e2f40c2da96c7378ac1ecad7dcc664c6b52914bbf56c95e +SIZE (chrome-linux-124.0.6367.201-llvm17.profdata.tar.xz) = 30062840 +SHA256 (chromium-124.0.6367.201-testdata.tar.xz) = ba214fd07aca18b162e1c20d60d049b7f0bd087f3a06b9637fb04ad958baa509 +SIZE (chromium-124.0.6367.201-testdata.tar.xz) = 277739668 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 7a10eb391d30..257aa9ece63e 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-04-19 13:02:56 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-05-11 05:42:43 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -80,8 +80,10 @@ @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -858,7 +860,7 @@ void RecordStartupMetrics() { +@@ -860,7 +862,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1162,11 +1164,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1164,11 +1166,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index 2bd334016a61..818840435859 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2024-04-19 13:02:56 UTC +--- media/base/media_switches.cc.orig 2024-05-11 05:42:43 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -92,7 +92,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1500,7 +1500,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1496,7 +1496,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index de755f18bdc4..73dfc37d5b6e 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 124.0.6367.78 +PORTVERSION= 124.0.6367.201 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index c679ff3e28dd..121116d6b3bb 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1714079979 -SHA256 (chromium-124.0.6367.78.tar.xz) = 697ea9e8591e0a74deea260a50441711b1ea499ca19e91d6012c5b4d200d1acf -SIZE (chromium-124.0.6367.78.tar.xz) = 3438644780 -SHA256 (ungoogled-chromium-124.0.6367.78-1.tar.gz) = 8dabdfa54e0293790d6299aff28aaeb25d61359b0f99321ddd20df9031877c5b -SIZE (ungoogled-chromium-124.0.6367.78-1.tar.gz) = 667153 -SHA256 (chromium-124.0.6367.78-testdata.tar.xz) = 910629247cf98b81ec9b323612068b0ad9f49379605863960e9e3b44f2d5a4cd -SIZE (chromium-124.0.6367.78-testdata.tar.xz) = 280902680 +TIMESTAMP = 1715495859 +SHA256 (chromium-124.0.6367.201.tar.xz) = 11773c4cfce4b39ae1bbe711b2907cb86e9aa299b7c6a71656edb876f0c85992 +SIZE (chromium-124.0.6367.201.tar.xz) = 3447761940 +SHA256 (ungoogled-chromium-124.0.6367.201-1.tar.gz) = 1572690cd4dbe6ae038227575e4d34688bd5911853bce7795bf79db9fdbc9647 +SIZE (ungoogled-chromium-124.0.6367.201-1.tar.gz) = 667468 +SHA256 (chromium-124.0.6367.201-testdata.tar.xz) = ba214fd07aca18b162e1c20d60d049b7f0bd087f3a06b9637fb04ad958baa509 +SIZE (chromium-124.0.6367.201-testdata.tar.xz) = 277739668 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc index 0459ec4b8d77..56986599445b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-04-23 07:42:17 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-05-11 05:39:22 UTC +++ chrome/app/chrome_main_delegate.cc @@ -146,7 +146,7 @@ #include "components/about_ui/credit_utils.h" @@ -34,7 +34,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -346,7 +346,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -349,7 +349,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -43,7 +43,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -431,7 +431,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -434,7 +434,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -52,7 +52,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -477,7 +477,7 @@ void SetCrashpadUploadConsentPostLogin() { +@@ -480,7 +480,7 @@ void SetCrashpadUploadConsentPostLogin() { } #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -61,7 +61,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -559,7 +559,7 @@ std::optional AcquireProcessSingleton( +@@ -562,7 +562,7 @@ std::optional AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -70,7 +70,7 @@ // Read the xdg-activation token and set it in the command line for the // duration of the notification in order to ensure this is propagated to an // already running browser process if it exists. -@@ -643,7 +643,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -646,7 +646,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -79,7 +79,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -770,7 +770,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -773,7 +773,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -88,7 +88,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -1155,7 +1155,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1162,7 +1162,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv chrome::GetChannel() == version_info::Channel::DEV; const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -97,7 +97,7 @@ is_canary_dev; #else false; -@@ -1174,7 +1174,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1181,7 +1181,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv // for more context. base::sequence_manager::internal::ThreadController::InitializeFeatures( /*record_sample_metadata=*/is_canary_dev); @@ -106,7 +106,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1323,7 +1323,7 @@ std::optional ChromeMainDelegate::BasicStartupCom +@@ -1330,7 +1330,7 @@ std::optional ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -115,7 +115,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1353,7 +1353,7 @@ std::optional ChromeMainDelegate::BasicStartupCom +@@ -1360,7 +1360,7 @@ std::optional ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -124,7 +124,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1750,7 +1750,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1757,7 +1757,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -133,7 +133,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1851,7 +1851,7 @@ absl::variant Chrome +@@ -1858,7 +1858,7 @@ absl::variant Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc index 54e29af84e54..7f44501ed5b4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc @@ -1,9 +1,9 @@ ---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-04-23 07:42:17 UTC +--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-05-11 05:39:22 UTC +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc -@@ -169,7 +169,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt - ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default; +@@ -175,7 +175,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar - void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() { + // static + void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On the desktop, we fix the platform name if necessary. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 7219cb6e234c..a115979b7fdb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-04-23 07:42:17 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-05-11 05:39:22 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -80,8 +80,10 @@ @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -858,7 +860,7 @@ void RecordStartupMetrics() { +@@ -860,7 +862,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1162,11 +1164,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1164,11 +1166,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index e5ca4d4ae5e9..ae840bbf1d89 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2024-04-23 07:42:17 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-05-11 05:39:22 UTC +++ chrome/browser/prefs/browser_prefs.cc @@ -485,18 +485,18 @@ #endif @@ -31,7 +31,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1711,7 +1711,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1718,7 +1718,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true); #endif @@ -40,7 +40,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2053,12 +2053,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2060,12 +2060,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc index 3ac5967ad08e..1a7c6ba7ffe0 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2024-04-23 07:42:17 UTC +--- media/base/media_switches.cc.orig 2024-05-11 05:39:22 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -92,7 +92,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1500,7 +1500,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1496,7 +1496,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 716193560c84..72a13e77567d 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-04-23 07:42:17 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-05-11 05:39:22 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -321,7 +321,7 @@ +@@ -313,7 +313,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1978,7 +1978,7 @@ +@@ -1970,7 +1970,7 @@ base_feature_status: "enabled", copied_from_base_feature_if: "overridden", origin_trial_feature_name: "FullscreenPopupWindows", @@ -18,7 +18,7 @@ }, { name: "GamepadButtonAxisEvents", -@@ -2899,7 +2899,7 @@ +@@ -2891,7 +2891,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, @@ -27,7 +27,7 @@ status: "stable", }, { -@@ -3091,7 +3091,7 @@ +@@ -3083,7 +3083,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -36,7 +36,7 @@ status: "stable", public: true, base_feature: "none", -@@ -3959,7 +3959,7 @@ +@@ -3951,7 +3951,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -45,7 +45,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4119,7 +4119,7 @@ +@@ -4111,7 +4111,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc index acda9751c795..59184e5e4f85 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2024-04-23 07:42:17 UTC +--- ui/base/ui_base_features.cc.orig 2024-05-11 05:39:22 UTC +++ ui/base/ui_base_features.cc -@@ -227,7 +227,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -228,7 +228,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -326,7 +326,7 @@ bool IsForcedColorsEnabled() { +@@ -327,7 +327,7 @@ bool IsForcedColorsEnabled() { BASE_FEATURE(kEyeDropper, "EyeDropper", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \