Skip to content

Commit

Permalink
www/ungoogled-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 20, 2023
1 parent 7220627 commit adb1153
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 113.0.5672.92
PORTVERSION= 113.0.5672.126
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
Expand Down
14 changes: 7 additions & 7 deletions www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
TIMESTAMP = 1683825131
SHA256 (chromium-113.0.5672.92.tar.xz) = a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5
SIZE (chromium-113.0.5672.92.tar.xz) = 1556728164
SHA256 (ungoogled-chromium-113.0.5672.92-1.tar.gz) = b36ecce88a380b760c468592c1bb69be4b5dbae20b084ae0aba01236720b3690
SIZE (ungoogled-chromium-113.0.5672.92-1.tar.gz) = 672556
SHA256 (chromium-113.0.5672.92-testdata.tar.xz) = e2e085a5014f4dde9c1ea904213f9985d8ed8b5b227cf35bcc6afb656630d51f
SIZE (chromium-113.0.5672.92-testdata.tar.xz) = 263959532
TIMESTAMP = 1684563730
SHA256 (chromium-113.0.5672.126.tar.xz) = 0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93
SIZE (chromium-113.0.5672.126.tar.xz) = 1556790928
SHA256 (ungoogled-chromium-113.0.5672.126-1.tar.gz) = 1025329c38041b3b8b200fe3405d4b873345e87cba6333e036b83ad2f0000d3e
SIZE (ungoogled-chromium-113.0.5672.126-1.tar.gz) = 674145
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,6 +1,6 @@
--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-04-08 11:38:38 UTC
--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-05-20 06:21:07 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-05 12:12:41 UTC
--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-05-20 06:21:07 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-05-05 12:12:41 UTC
--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-05-20 06:21:07 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-05-05 12:12:41 UTC
--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-05-20 06:21:07 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",
},
{
@@ -3625,12 +3625,12 @@
@@ -3630,12 +3630,12 @@
status: "experimental",
base_feature: "none",
origin_trial_feature_name: "WebAppUrlHandling",
Expand Down
4 changes: 2 additions & 2 deletions www/ungoogled-chromium/files/patch-v8_src_api_api.cc
@@ -1,4 +1,4 @@
--- v8/src/api/api.cc.orig 2023-05-05 12:12:41 UTC
--- v8/src/api/api.cc.orig 2023-05-20 06:21:07 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 adb1153

Please sign in to comment.