git: b26544a25f53 - 2024Q1 - www/chromium: update to 123.0.6312.86
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 27 Mar 2024 18:04:29 UTC
The branch 2024Q1 has been updated by rnagy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b26544a25f53470359c5f6dfc32364ae8b41b87e
commit b26544a25f53470359c5f6dfc32364ae8b41b87e
Author: Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2024-03-27 17:57:27 +0000
Commit: Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2024-03-27 18:04:21 +0000
www/chromium: update to 123.0.6312.86
Security: https://vuxml.freebsd.org/freebsd/814af1be-ec63-11ee-8e76-a8a1599412c6.html
(cherry picked from commit 526e284ae0947beb40421b6096b21876ab5477e1)
---
www/chromium/Makefile | 2 +-
www/chromium/distinfo | 14 +++++-----
.../files/patch-chrome_browser_about__flags.cc | 24 ++++++++---------
..._updater_widevine__cdm__component__installer.cc | 21 +++++----------
.../patch-chrome_browser_flag__descriptions.cc | 22 +++++++--------
.../patch-chrome_browser_flag__descriptions.h | 20 +++++++-------
.../patch-chrome_common_media_cdm__registration.cc | 31 ++++++++--------------
.../patch-chrome_common_media_cdm__registration.h | 11 --------
...a_component__widevine__cdm__hint__file__linux.h | 4 +--
..._platform_headless_ozone__platform__headless.cc | 4 +--
10 files changed, 62 insertions(+), 91 deletions(-)
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 018aedf9f9e5..af8f3debef74 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 123.0.6312.58
+PORTVERSION= 123.0.6312.86
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 f759bfecff1b..94063dd4d8b7 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1711095187
-SHA256 (chromium-123.0.6312.58.tar.xz) = f8dae4a2ff7b00bb44fa136c2101638fea4f232e4819be3f73381ddc0d3bf718
-SIZE (chromium-123.0.6312.58.tar.xz) = 3465099244
-SHA256 (chrome-linux-123.0.6312.58-llvm17.profdata.tar.xz) = fc9b772967baa84f44c0387f054433c22d4ccc2e0deb69b2ac7826f0de447655
-SIZE (chrome-linux-123.0.6312.58-llvm17.profdata.tar.xz) = 29783740
-SHA256 (chromium-123.0.6312.58-testdata.tar.xz) = a5dbcc3dd4a7469db1a85e31739508c8919fb37ca6050a617f059329e0d45940
-SIZE (chromium-123.0.6312.58-testdata.tar.xz) = 275371844
+TIMESTAMP = 1711546354
+SHA256 (chromium-123.0.6312.86.tar.xz) = f4a78c1955dac4354d57ab45e93051fcda50fc5fccd681457f8116630746dffe
+SIZE (chromium-123.0.6312.86.tar.xz) = 3472393888
+SHA256 (chrome-linux-123.0.6312.86-llvm17.profdata.tar.xz) = da2ed7c8ad49133d811df0306253fc834875e132d546528a3c342acd5007739f
+SIZE (chrome-linux-123.0.6312.86-llvm17.profdata.tar.xz) = 29847172
+SHA256 (chromium-123.0.6312.86-testdata.tar.xz) = d6b7cc20884f3f0e26b2320e4346134cfcc83549ac804ac526586f973680e831
+SIZE (chromium-123.0.6312.86-testdata.tar.xz) = 280595032
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 96f04be1859c..4f64db6ba0f7 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,4 +1,4 @@
---- chrome/browser/about_flags.cc.orig 2024-03-22 08:19:40 UTC
+--- chrome/browser/about_flags.cc.orig 2024-03-27 13:31:02 UTC
+++ chrome/browser/about_flags.cc
@@ -234,7 +234,7 @@
#include "ui/ui_features.h"
@@ -117,7 +117,7 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(net::features::kAsyncDns)},
-@@ -7778,7 +7778,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7785,7 +7785,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -126,7 +126,7 @@
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -7811,7 +7811,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7818,7 +7818,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)},
@@ -135,7 +135,7 @@
{"enable-family-link-extensions-permissions",
flag_descriptions::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
-@@ -8709,7 +8709,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8716,7 +8716,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -144,7 +144,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
-@@ -8751,7 +8751,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8758,7 +8758,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -153,7 +153,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
-@@ -9040,7 +9040,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9047,7 +9047,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -162,7 +162,7 @@
{"policy-indication-for-managed-default-search",
flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
-@@ -9344,7 +9344,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9351,7 +9351,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -171,7 +171,7 @@
{"media-session-enter-picture-in-picture",
flag_descriptions::kMediaSessionEnterPictureInPictureName,
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
-@@ -10334,7 +10334,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10341,7 +10341,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@@ -180,7 +180,7 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10365,7 +10365,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10372,7 +10372,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -189,7 +189,7 @@
{"site-search-settings-policy",
flag_descriptions::kSiteSearchSettingsPolicyName,
flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
-@@ -10495,7 +10495,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10502,7 +10502,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)},
#endif
@@ -198,7 +198,7 @@
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -10838,7 +10838,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10845,7 +10845,7 @@ const FeatureEntry kFeatureEntries[] = {
trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
#endif
@@ -207,7 +207,7 @@
{"restart-to-gain-access-to-keychain",
flag_descriptions::kRestartToGainAccessToKeychainName,
flag_descriptions::kRestartToGainAccessToKeychainDescription,
-@@ -11092,7 +11092,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11099,7 +11099,7 @@ const FeatureEntry kFeatureEntries[] = {
// Controls the view mode for (history) sync screen.
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
diff --git a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
index e5050b8953ac..3480496cccdd 100644
--- a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
+++ b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
@@ -1,15 +1,15 @@
---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-03-22 08:19:40 UTC
+--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-03-27 13:31:02 UTC
+++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
#include "third_party/widevine/cdm/buildflags.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/path_service.h"
- #include "chrome/common/chrome_paths.h"
#include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
-@@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
+ #endif
+
+@@ -78,7 +78,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
const char ImageLoaderComponentName[] = "WidevineCdm";
#endif
@@ -18,16 +18,7 @@
// On Linux and ChromeOS the Widevine CDM is loaded at startup before the
// zygote is locked down. As a result there is no need to register the CDM
// with Chrome as it can't be used until Chrome is restarted.
-@@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const base::Version
- }
- #endif // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
- // zygote is locked down. To locate the Widevine CDM at startup, a hint file
- // is used. Update the hint file with the new Widevine CDM path.
-@@ -388,7 +388,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
+@@ -364,7 +364,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
return;
}
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 10ffec41be84..e50203c7aa06 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig 2024-03-22 08:19:40 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2024-03-27 13:31:02 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -2931,7 +2931,7 @@ const char kCbdTimeframeRequiredDescription[] =
+@@ -2936,7 +2936,7 @@ const char kCbdTimeframeRequiredDescription[] =
"value to the list.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
const char kPolicyIndicationForManagedDefaultSearchName[] =
"Enable policy indication for managed Default Search provider";
const char kPolicyIndicationForManagedDefaultSearchDescription[] =
-@@ -3256,7 +3256,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
+@@ -3261,7 +3261,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
"but in the same SiteInstanceGroup, and thus the same process.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
const char kSiteSearchSettingsPolicyDescription[] =
"Allow site search engines to be defined by the SiteSearchSettings policy.";
-@@ -7485,7 +7485,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
+@@ -7490,7 +7490,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -27,7 +27,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -7731,7 +7731,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
+@@ -7736,7 +7736,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
// Linux -----------------------------------------------------------------------
@@ -36,7 +36,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -7779,7 +7779,7 @@ const char kZeroCopyVideoCaptureDescription[] =
+@@ -7784,7 +7784,7 @@ const char kZeroCopyVideoCaptureDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -45,7 +45,7 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
-@@ -7794,7 +7794,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
+@@ -7799,7 +7799,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"instead of JSON.";
#endif
@@ -54,7 +54,7 @@
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
-@@ -7826,7 +7826,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -7831,7 +7831,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -63,7 +63,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
-@@ -7846,7 +7846,7 @@ const char kRestartToGainAccessToKeychainDescription[]
+@@ -7851,7 +7851,7 @@ const char kRestartToGainAccessToKeychainDescription[]
"to restart Chrome to gain access to computer's password manager.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -72,7 +72,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-@@ -7947,7 +7947,7 @@ const char kElementCaptureDescription[] =
+@@ -7952,7 +7952,7 @@ const char kElementCaptureDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -81,7 +81,7 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
-@@ -7996,7 +7996,7 @@ const char kComposeTextSelectionDescription[] =
+@@ -8001,7 +8001,7 @@ const char kComposeTextSelectionDescription[] =
"Enables feature for different heuristics for selecting text for Compose";
#endif // BUILDFLAG(ENABLE_COMPOSE)
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 3da1325c2917..7618f517b045 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig 2024-03-22 08:19:40 UTC
+--- chrome/browser/flag_descriptions.h.orig 2024-03-27 13:31:02 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -1691,7 +1691,7 @@ extern const char kCbdTimeframeRequiredName[];
+@@ -1694,7 +1694,7 @@ extern const char kCbdTimeframeRequiredName[];
extern const char kCbdTimeframeRequiredDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
extern const char kPolicyIndicationForManagedDefaultSearchName[];
extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
#endif
-@@ -1876,7 +1876,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
+@@ -1879,7 +1879,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
extern const char kSiteInstanceGroupsForDataUrlsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
extern const char kSiteSearchSettingsPolicyName[];
extern const char kSiteSearchSettingsPolicyDescription[];
#endif
-@@ -4302,7 +4302,7 @@ extern const char kLacrosMergeIcuDataFileName[];
+@@ -4305,7 +4305,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -27,7 +27,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4442,7 +4442,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
+@@ -4445,7 +4445,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
// Linux ---------------------------------------------------------------------
@@ -36,7 +36,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -4484,7 +4484,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -4487,7 +4487,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -45,7 +45,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
-@@ -4495,13 +4495,13 @@ extern const char kRestartToGainAccessToKeychainName[]
+@@ -4498,13 +4498,13 @@ extern const char kRestartToGainAccessToKeychainName[]
extern const char kRestartToGainAccessToKeychainDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -61,7 +61,7 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -4512,7 +4512,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
+@@ -4515,7 +4515,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@@ -70,7 +70,7 @@
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
-@@ -4589,7 +4589,7 @@ extern const char kElementCaptureDescription[];
+@@ -4592,7 +4592,7 @@ extern const char kElementCaptureDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -79,7 +79,7 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
-@@ -4623,7 +4623,7 @@ extern const char kComposeTextSelectionName[];
+@@ -4626,7 +4626,7 @@ extern const char kComposeTextSelectionName[];
extern const char kComposeTextSelectionDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)
diff --git a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc
index 60c11659d41d..b0e90719d0d0 100644
--- a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc
+++ b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc
@@ -1,6 +1,6 @@
---- chrome/common/media/cdm_registration.cc.orig 2024-03-22 08:19:40 UTC
+--- chrome/common/media/cdm_registration.cc.orig 2024-03-27 13:31:02 UTC
+++ chrome/common/media/cdm_registration.cc
-@@ -30,11 +30,11 @@
+@@ -26,11 +26,11 @@
#if BUILDFLAG(ENABLE_WIDEVINE)
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
@@ -14,7 +14,7 @@
#include "base/no_destructor.h"
#include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
#include "media/cdm/supported_audio_codecs.h"
-@@ -60,7 +60,7 @@ using Robustness = content::CdmInfo::Robustness;
+@@ -56,7 +56,7 @@ using Robustness = content::CdmInfo::Robustness;
#if BUILDFLAG(ENABLE_WIDEVINE)
#if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \
BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \
@@ -23,25 +23,25 @@
// Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and
// |capability|.
std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo(
-@@ -105,7 +105,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid
+@@ -101,7 +101,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid
// BUILDFLAG(IS_CHROMEOS))
#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
// On Linux/ChromeOS we have to preload the CDM since it uses the zygote
- // sandbox. On Windows and Mac, CDM registration is handled by Component
- // Update (as the CDM can be loaded only when needed).
-@@ -129,7 +129,7 @@ content::CdmInfo* GetBundledWidevine() {
+ // sandbox. On Windows and Mac, the bundled CDM is handled by the component
+ // updater.
+@@ -125,7 +125,7 @@ content::CdmInfo* GetBundledWidevine() {
// (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- // This code checks to see if Component Updater picked a version of the Widevine
- // CDM to be used last time it ran. (Component Updater may choose the bundled
- // CDM if there is not a new version available for download.) If there is one
-@@ -171,7 +171,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd
+ // This code checks to see if a component updated Widevine CDM can be found. If
+ // there is one and it looks valid, return the CdmInfo for that CDM. Otherwise
+ // return nullptr.
+@@ -160,7 +160,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd
/*supports_sub_key_systems=*/false, kWidevineCdmDisplayName,
kWidevineCdmType, base::Version(), base::FilePath());
@@ -50,12 +50,3 @@
#if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
base::Version glibc_version(gnu_get_libc_version());
DCHECK(glibc_version.IsValid());
-@@ -414,7 +414,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd
- DVLOG(3) << __func__ << " done with " << cdms->size() << " cdms";
- }
-
--#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
- std::vector<content::CdmInfo> GetSoftwareSecureWidevineForTesting() {
- std::vector<content::CdmInfo> cdms;
- AddSoftwareSecureWidevine(&cdms);
diff --git a/www/chromium/files/patch-chrome_common_media_cdm__registration.h b/www/chromium/files/patch-chrome_common_media_cdm__registration.h
deleted file mode 100644
index c3c26db9a6ec..000000000000
--- a/www/chromium/files/patch-chrome_common_media_cdm__registration.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/common/media/cdm_registration.h.orig 2024-03-22 08:19:40 UTC
-+++ chrome/common/media/cdm_registration.h
-@@ -14,7 +14,7 @@
- // Register CdmInfo for Content Decryption Modules (CDM) supported.
- void RegisterCdmInfo(std::vector<content::CdmInfo>* cdms);
-
--#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
- // Returns the software secure Widevine CDM.
- std::vector<content::CdmInfo> GetSoftwareSecureWidevineForTesting();
- #endif
diff --git a/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
index e3a0477c5df7..0f655eb82788 100644
--- a/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
+++ b/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
@@ -1,6 +1,6 @@
---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2024-03-22 08:19:40 UTC
+--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2024-03-27 13:31:02 UTC
+++ chrome/common/media/component_widevine_cdm_hint_file_linux.h
-@@ -17,7 +17,7 @@
+@@ -15,7 +15,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/www/chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
index b156fd3a5f5b..abde5e0367d0 100644
--- a/www/chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2022-07-22 17:30:31 UTC
+--- ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2024-03-27 13:31:02 UTC
+++ ui/ozone/platform/headless/ozone_platform_headless.cc
-@@ -102,7 +102,7 @@ class OzonePlatformHeadless : public OzonePlatform {
+@@ -103,7 +103,7 @@ class OzonePlatformHeadless : public OzonePlatform {
}
// Desktop Linux, not CastOS.