Skip to content

Commit

Permalink
www/chromium: update to 113.0.5672.126
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Nagy authored and Robert Nagy committed May 17, 2023
1 parent 68255d9 commit 2c70781
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
PORTVERSION= 113.0.5672.92
PORTVERSION= 113.0.5672.126
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
Expand Down
14 changes: 7 additions & 7 deletions www/chromium/distinfo
@@ -1,9 +1,9 @@
TIMESTAMP = 1683615486
SHA256 (chromium-113.0.5672.92.tar.xz) = a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5
SIZE (chromium-113.0.5672.92.tar.xz) = 1556728164
SHA256 (chrome-linux-113.0.5672.92-llvm13.profdata.tar.xz) = e484a562a12ef01e4ec360090443302de3f3a15d90d220b9fc388724649c49b8
SIZE (chrome-linux-113.0.5672.92-llvm13.profdata.tar.xz) = 27022892
SHA256 (chromium-113.0.5672.92-testdata.tar.xz) = e2e085a5014f4dde9c1ea904213f9985d8ed8b5b227cf35bcc6afb656630d51f
SIZE (chromium-113.0.5672.92-testdata.tar.xz) = 263959532
TIMESTAMP = 1684318714
SHA256 (chromium-113.0.5672.126.tar.xz) = 0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93
SIZE (chromium-113.0.5672.126.tar.xz) = 1556790928
SHA256 (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 401df2b0b0452bcb0841b52383a98649e15ad4f6baea47dc99e913a35ae40111
SIZE (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 27020448
SHA256 (chromium-113.0.5672.126-testdata.tar.xz) = 89088e4cdc494ad5c468c7cf7e7ed26c4f76244d42ec74dac0ee141ead0fd6e6
SIZE (chromium-113.0.5672.126-testdata.tar.xz) = 262980780
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
@@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.cc.orig 2023-04-28 17:01:32 UTC
--- chrome/browser/download/download_prefs.cc.orig 2023-05-17 10:17:13 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@

Expand All @@ -8,7 +8,7 @@
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/functional/bind.h"
@@ -64,6 +65,10 @@
@@ -63,6 +64,10 @@
#include "chrome/browser/download/bubble/download_bubble_prefs.h"
#endif

Expand All @@ -19,7 +19,7 @@
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
@@ -74,7 +79,7 @@ namespace {
@@ -73,7 +78,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform.
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
Expand All @@ -28,7 +28,7 @@
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
@@ -185,7 +190,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
@@ -181,7 +186,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS_ASH)

#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
Expand All @@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
@@ -312,7 +317,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -308,7 +313,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
/*default_value=*/base::Time());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
Expand All @@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -485,7 +490,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -481,7 +486,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}

#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
Expand All @@ -55,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
@@ -517,7 +522,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -513,7 +518,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons

void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
Expand All @@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
@@ -548,7 +553,7 @@ void DownloadPrefs::SaveAutoOpenState() {
@@ -544,7 +549,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
Expand All @@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
@@ -672,7 +677,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -668,7 +673,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
#else
// If the stored download directory is an absolute path, we presume it's
// correct; there's not really much more validation we can do here.
Expand Down
@@ -1,6 +1,6 @@
--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-04-05 11:05:06 UTC
--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-05-17 10:17:13 UTC
+++ extensions/browser/api/api_browser_context_keyed_service_factories.cc
@@ -94,7 +94,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
@@ -96,7 +96,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
MessageService::GetFactoryInstance();
MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
Expand Down
@@ -1,4 +1,4 @@
--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-05-02 13:49:23 UTC
--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-05-17 10:17:13 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.cc
@@ -4,8 +4,10 @@

Expand All @@ -24,7 +24,7 @@

// TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the
// format is introduced to kernel.
@@ -729,7 +733,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate
@@ -727,7 +731,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate

V4L2CaptureDelegate::~V4L2CaptureDelegate() = default;

Expand All @@ -33,7 +33,7 @@
int num_retries = 0;
for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries;
++num_retries) {
@@ -739,7 +743,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
@@ -737,7 +741,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
return num_retries != kMaxIOCtrlRetries;
}

Expand All @@ -42,23 +42,23 @@
return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp));
}

@@ -779,6 +783,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
@@ -777,6 +781,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
}

void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() {
+#if !BUILDFLAG(IS_BSD)
constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS,
V4L2_CID_AUTO_WHITE_BALANCE,
V4L2_CID_BRIGHTNESS,
@@ -806,6 +811,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
@@ -804,6 +809,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
<< ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}";
}
}
+#endif
}

mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) {
@@ -975,7 +981,11 @@ void V4L2CaptureDelegate::DoCapture() {
@@ -984,7 +990,11 @@ void V4L2CaptureDelegate::DoCapture() {

pollfd device_pfd = {};
device_pfd.fd = device_fd_.get();
Expand All @@ -70,15 +70,15 @@

const int result =
HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs));
@@ -1013,6 +1023,7 @@ void V4L2CaptureDelegate::DoCapture() {
@@ -1022,6 +1032,7 @@ void V4L2CaptureDelegate::DoCapture() {
timeout_count_ = 0;
}

+#if !BUILDFLAG(IS_BSD)
// Dequeue events if the driver has filled in some.
if (device_pfd.revents & POLLPRI) {
bool controls_changed = false;
@@ -1047,6 +1058,7 @@ void V4L2CaptureDelegate::DoCapture() {
@@ -1056,6 +1067,7 @@ void V4L2CaptureDelegate::DoCapture() {
client_->OnCaptureConfigurationChanged();
}
}
Expand Down
@@ -1,6 +1,6 @@
--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-04-28 17:01:32 UTC
--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-05-17 10:17:13 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.h
@@ -90,10 +90,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
@@ -87,10 +87,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
// device file descriptor or (re)starting streaming, can fail but works after
// retrying (https://crbug.com/670262). Returns false if the |request| ioctl
// fails too many times.
Expand Down
@@ -1,4 +1,4 @@
--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-04-28 17:01:32 UTC
--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-05-17 10:17:13 UTC
+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1320,7 +1320,7 @@
{
Expand Down Expand Up @@ -45,7 +45,7 @@
base_feature: "ReduceUserAgent",
},
{
@@ -3616,12 +3616,12 @@
@@ -3621,12 +3621,12 @@
status: "experimental",
base_feature: "none",
origin_trial_feature_name: "WebAppUrlHandling",
Expand Down
4 changes: 2 additions & 2 deletions www/chromium/files/patch-v8_src_api_api.cc
@@ -1,4 +1,4 @@
--- v8/src/api/api.cc.orig 2023-04-28 17:01:32 UTC
--- v8/src/api/api.cc.orig 2023-05-17 10:17:13 UTC
+++ v8/src/api/api.cc
@@ -142,7 +142,7 @@
#include "src/wasm/wasm-serialization.h"
Expand All @@ -9,7 +9,7 @@
#include <signal.h>
#include <unistd.h>

@@ -6435,7 +6435,7 @@ bool v8::V8::Initialize(const int build_config) {
@@ -6446,7 +6446,7 @@ bool v8::V8::Initialize(const int build_config) {
return true;
}

Expand Down

0 comments on commit 2c70781

Please sign in to comment.