Page MenuHomeFreeBSD
Files F102980740

D39473.id.diff
No OneTemporary
Actions

D39473.id.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
-PORTVERSION= 111.0.5563.147
+PORTVERSION= 112.0.5615.49
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
@@ -127,7 +127,6 @@
disable_fieldtrial_testing_config=true \
enable_backup_ref_ptr_support=false \
enable_hangout_services_extension=false \
- enable_js_type_check=false \
enable_mdns=false \
enable_mse_mpeg2ts_stream_parser=true \
enable_nacl=false \
@@ -230,8 +229,8 @@
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif
-.if ${COMPILER_VERSION} != 130
-LLVM_DEFAULT= 13
+.if ${COMPILER_VERSION} < 150
+LLVM_DEFAULT= 15
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1680189467
-SHA256 (chromium-111.0.5563.147.tar.xz) = c49d4e0bd01b264529991e74ab58aeac33903532e413cc62bfa9fca99bf77a29
-SIZE (chromium-111.0.5563.147.tar.xz) = 1741186492
-SHA256 (ungoogled-chromium-111.0.5563.147-1.tar.gz) = f6b4eeebfc7ea67dba3d80e75f735186d3c52a82256385ff88341c37cff9497f
-SIZE (ungoogled-chromium-111.0.5563.147-1.tar.gz) = 672667
-SHA256 (chromium-111.0.5563.147-testdata.tar.xz) = ab5ba7d703e962126829298d0d0053839d5c40159e592017aab3f8463ac3d8ab
-SIZE (chromium-111.0.5563.147-testdata.tar.xz) = 259363560
+TIMESTAMP = 1680950965
+SHA256 (chromium-112.0.5615.49.tar.xz) = ddfd37373c1fa0f433a6ac11f0baa2b1f3fdfb9c7b5867e32a4300f2eb5aff41
+SIZE (chromium-112.0.5615.49.tar.xz) = 1730346508
+SHA256 (ungoogled-chromium-112.0.5615.49-1.tar.gz) = 9048669535558d2a6cd264539c6588d0218ba2b12950d3ed057ef3ec5fee1baa
+SIZE (ungoogled-chromium-112.0.5615.49-1.tar.gz) = 674494
+SHA256 (chromium-112.0.5615.49-testdata.tar.xz) = 157e9c99242c13b906e08e5693c1a13fc7888a3d1207f5cf9bd96b62d6760ff1
+SIZE (chromium-112.0.5615.49-testdata.tar.xz) = 263752520
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn
--- a/www/ungoogled-chromium/files/patch-BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ BUILD.gn
@@ -60,7 +60,7 @@ declare_args() {
root_extra_deps = []
@@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
-@@ -417,7 +416,7 @@ group("gn_all") {
+@@ -423,7 +422,7 @@ group("gn_all") {
}
}
@@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -608,6 +607,15 @@ group("gn_all") {
+@@ -614,6 +613,15 @@ group("gn_all") {
}
}
@@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
-@@ -656,7 +664,7 @@ group("gn_all") {
+@@ -662,7 +670,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1078,7 +1086,7 @@ if (!is_ios) {
+@@ -1085,7 +1093,7 @@ if (!is_ios) {
]
}
@@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
-@@ -1178,7 +1186,7 @@ if (!is_ios) {
+@@ -1185,7 +1193,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1187,7 +1195,7 @@ if (!is_ios) {
+@@ -1194,7 +1202,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1653,7 +1661,7 @@ group("chromium_builder_perf") {
+@@ -1662,7 +1670,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-base_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- base/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ base/BUILD.gn
-@@ -168,7 +168,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -188,7 +188,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@@ -9,31 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
-@@ -1053,7 +1053,7 @@ component("base") {
- "timer/hi_res_timer_manager_posix.cc",
- ]
-
-- if (!is_nacl && !is_apple) {
-+ if (!is_nacl && !is_apple && !is_bsd) {
- sources += [
- "profiler/stack_base_address_posix.cc",
- "profiler/stack_base_address_posix.h",
-@@ -1064,6 +1064,14 @@ component("base") {
- "profiler/thread_delegate_posix.h",
- ]
- }
-+
-+ if (is_bsd) {
-+ sources += [
-+ "profiler/stack_base_address_posix.cc",
-+ "profiler/stack_base_address_posix.h",
-+ "profiler/stack_sampler_posix.cc",
-+ ]
-+ }
- }
-
- if (is_win) {
-@@ -1544,11 +1552,23 @@ component("base") {
+@@ -1093,11 +1093,23 @@ component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
@@ -58,7 +34,7 @@
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
-@@ -1576,7 +1596,7 @@ component("base") {
+@@ -1125,7 +1137,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@@ -67,7 +43,7 @@
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1617,7 +1637,7 @@ component("base") {
+@@ -1166,7 +1178,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -76,7 +52,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2208,6 +2228,39 @@ component("base") {
+@@ -2107,6 +2119,43 @@ component("base") {
}
}
@@ -88,7 +64,11 @@
+ "system/sys_info_linux.cc",
+ "process/process_iterator_linux.cc",
+ "process/process_metrics_linux.cc",
-+ "process/process_handle_linux.cc"
++ "process/process_handle_linux.cc",
++ "profiler/stack_copier_signal.cc",
++ "profiler/stack_copier_signal.h",
++ "profiler/thread_delegate_posix.cc",
++ "profiler/thread_delegate_posix.h",
+ ]
+ sources += [
+ "files/file_path_watcher_kqueue.cc",
@@ -115,8 +95,8 @@
+
# iOS
if (is_ios) {
- sources -= [
-@@ -2303,7 +2356,7 @@ component("base") {
+ sources += [
+@@ -2202,7 +2251,7 @@ component("base") {
}
if (dep_libevent) {
@@ -125,8 +105,8 @@
}
if (use_libevent) {
-@@ -3556,7 +3609,7 @@ test("base_unittests") {
- }
+@@ -3470,7 +3519,7 @@ test("base_unittests") {
+ ]
}
- if (is_linux || is_chromeos) {
@@ -134,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3602,7 +3655,7 @@ test("base_unittests") {
+@@ -3519,7 +3568,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -143,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3613,7 +3666,7 @@ test("base_unittests") {
+@@ -3530,7 +3579,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -152,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3829,7 +3882,7 @@ test("base_unittests") {
+@@ -3751,7 +3800,7 @@ test("base_unittests") {
}
}
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,8 +1,8 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-02-11 09:11:04 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-04-08 11:38:38 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -371,8 +371,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -380,8 +380,12 @@ bool TryRecommitSystemPagesInternal(
+
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
- #if !BUILDFLAG(IS_NACL)
void* ptr = reinterpret_cast<void*>(address);
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-03-10 11:01:21 UTC
+--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-08 11:38:38 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
-@@ -416,7 +416,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
+@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
}
#endif
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-03-10 11:01:21 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-04-08 11:38:38 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -233,7 +233,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
+@@ -276,7 +276,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
"AsanBackupRefPtr requires RawPtrHookableImpl")
declare_args() {
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-03-10 11:01:21 UTC
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-04-08 11:38:38 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
-@@ -120,7 +120,7 @@ static_assert(sizeof(void*) != 8, "");
+@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
#define PA_CONFIG_HAS_LINUX_KERNEL() \
@@ -9,7 +9,7 @@
// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
-@@ -267,7 +267,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
@@ -18,7 +18,7 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
-@@ -312,7 +312,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -296,7 +296,7 @@ constexpr bool kUseLazyCommit = false;
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-03-10 11:01:21 UTC
+--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-04-08 11:38:38 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
-@@ -91,7 +91,7 @@ PartitionPageShift() {
+@@ -92,7 +92,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
@@ -9,10 +9,10 @@
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
-@@ -277,7 +277,7 @@ constexpr size_t kNumPools = 3;
- //
+@@ -296,7 +296,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// When pointer compression is enabled, we cannot use large pools (at most
// 8GB for each of the glued pools).
+ #if BUILDFLAG(HAS_64_BIT_POINTERS)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
constexpr size_t kPoolMaxSize = 8 * kGiB;
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__page.h
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__page.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__page.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_page.h.orig 2023-01-13 08:56:02 UTC
+--- base/allocator/partition_allocator/partition_page.h.orig 2023-04-08 11:38:38 UTC
+++ base/allocator/partition_allocator/partition_page.h
-@@ -144,7 +144,7 @@ struct SlotSpanMetadata {
+@@ -143,7 +143,7 @@ struct SlotSpanMetadata {
// PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan =
4 * (1 << 14) / kSmallestBucket;
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_root.cc.orig 2023-03-10 11:01:21 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig 2023-04-08 11:38:38 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -42,7 +42,7 @@
#include "wow64apiset.h"
@@ -27,7 +27,7 @@
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
-@@ -800,7 +800,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -811,7 +811,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-10-01 07:40:07 UTC
+--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-04-08 11:38:38 UTC
+++ base/allocator/partition_allocator/starscan/stack/stack.cc
-@@ -17,6 +17,10 @@
+@@ -18,6 +18,10 @@
#include <pthread.h>
#endif
@@ -11,7 +11,7 @@
#if defined(LIBC_GLIBC)
extern "C" void* __libc_stack_end;
#endif
-@@ -47,6 +51,36 @@ void* GetStackTop() {
+@@ -48,6 +52,36 @@ void* GetStackTop() {
void* GetStackTop() {
return pthread_get_stackaddr_np(pthread_self());
diff --git a/www/ungoogled-chromium/files/patch-base_atomicops.h b/www/ungoogled-chromium/files/patch-base_atomicops.h
--- a/www/ungoogled-chromium/files/patch-base_atomicops.h
+++ b/www/ungoogled-chromium/files/patch-base_atomicops.h
@@ -1,6 +1,6 @@
---- base/atomicops.h.orig 2022-10-01 07:40:07 UTC
+--- base/atomicops.h.orig 2023-04-08 11:38:38 UTC
+++ base/atomicops.h
-@@ -56,7 +56,11 @@ typedef intptr_t Atomic64;
+@@ -71,7 +71,11 @@ typedef intptr_t Atomic64;
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
// Atomic64 routines below, depending on your architecture.
diff --git a/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc
--- a/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,6 +1,6 @@
---- base/debug/stack_trace_posix.cc.orig 2023-03-10 11:01:21 UTC
+--- base/debug/stack_trace_posix.cc.orig 2023-04-08 11:38:38 UTC
+++ base/debug/stack_trace_posix.cc
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
// libc.
#if BUILDFLAG(IS_APPLE) || \
@@ -9,7 +9,7 @@
#define HAVE_BACKTRACE
#include <execinfo.h>
#endif
-@@ -58,7 +58,7 @@
+@@ -59,7 +59,7 @@
#include <AvailabilityMacros.h>
#endif
@@ -18,7 +18,7 @@
#include "base/debug/proc_maps_linux.h"
#endif
-@@ -761,6 +761,9 @@ class SandboxSymbolizeHelper {
+@@ -799,6 +799,9 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
@@ -28,7 +28,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
-@@ -778,6 +781,7 @@ class SandboxSymbolizeHelper {
+@@ -816,6 +819,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;
diff --git a/www/ungoogled-chromium/files/patch-base_process_kill__posix.cc b/www/ungoogled-chromium/files/patch-base_process_kill__posix.cc
--- a/www/ungoogled-chromium/files/patch-base_process_kill__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_process_kill__posix.cc
@@ -1,6 +1,6 @@
---- base/process/kill_posix.cc.orig 2022-10-01 07:40:07 UTC
+--- base/process/kill_posix.cc.orig 2023-04-08 11:38:38 UTC
+++ base/process/kill_posix.cc
-@@ -158,7 +158,7 @@ void EnsureProcessTerminated(Process process) {
+@@ -157,7 +157,7 @@ void EnsureProcessTerminated(Process process) {
0, new BackgroundReaper(std::move(process), Seconds(2)));
}
diff --git a/www/ungoogled-chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/ungoogled-chromium/files/patch-base_process_process__iterator__freebsd.cc
--- a/www/ungoogled-chromium/files/patch-base_process_process__iterator__freebsd.cc
+++ b/www/ungoogled-chromium/files/patch-base_process_process__iterator__freebsd.cc
@@ -1,15 +1,15 @@
---- base/process/process_iterator_freebsd.cc.orig 2022-10-01 07:40:07 UTC
+--- base/process/process_iterator_freebsd.cc.orig 2023-04-08 11:38:38 UTC
+++ base/process/process_iterator_freebsd.cc
-@@ -20,7 +20,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
- : index_of_kinfo_proc_(),
- filter_(filter) {
+@@ -18,7 +18,7 @@ namespace base {
+ ProcessIterator::ProcessIterator(const ProcessFilter* filter)
+ : filter_(filter) {
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid() };
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid() };
bool done = false;
int try_num = 1;
-@@ -39,7 +39,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
+@@ -37,7 +37,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
num_of_kinfo_proc += 16;
kinfo_procs_.resize(num_of_kinfo_proc);
len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
@@ -18,7 +18,7 @@
// If we get a mem error, it just means we need a bigger buffer, so
// loop around again. Anything else is a real error and give up.
if (errno != ENOMEM) {
-@@ -49,7 +49,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
+@@ -47,7 +47,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
}
} else {
// Got the list, just make sure we're sized exactly right
@@ -27,7 +27,7 @@
kinfo_procs_.resize(num_of_kinfo_proc);
done = true;
}
-@@ -71,18 +71,13 @@ bool ProcessIterator::CheckForNextProcess() {
+@@ -68,18 +68,13 @@ bool ProcessIterator::CheckForNextProcess() {
for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
size_t length;
struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
diff --git a/www/ungoogled-chromium/files/patch-base_process_process__iterator__openbsd.cc b/www/ungoogled-chromium/files/patch-base_process_process__iterator__openbsd.cc
--- a/www/ungoogled-chromium/files/patch-base_process_process__iterator__openbsd.cc
+++ b/www/ungoogled-chromium/files/patch-base_process_process__iterator__openbsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_iterator_openbsd.cc.orig 2022-10-01 07:40:07 UTC
+--- base/process/process_iterator_openbsd.cc.orig 2023-04-08 11:38:38 UTC
+++ base/process/process_iterator_openbsd.cc
@@ -6,6 +6,9 @@
@@ -10,10 +10,10 @@
#include <sys/sysctl.h>
#include "base/logging.h"
-@@ -18,12 +21,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
- : index_of_kinfo_proc_(),
- filter_(filter) {
+@@ -16,12 +19,13 @@ namespace base {
+ ProcessIterator::ProcessIterator(const ProcessFilter* filter)
+ : filter_(filter) {
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid(),
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, static_cast<int>(getuid()),
sizeof(struct kinfo_proc), 0 };
@@ -25,7 +25,7 @@
do {
size_t len = 0;
-@@ -32,7 +36,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
+@@ -30,7 +34,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
kinfo_procs_.resize(0);
done = true;
} else {
@@ -34,7 +34,7 @@
// Leave some spare room for process table growth (more could show up
// between when we check and now)
num_of_kinfo_proc += 16;
-@@ -48,7 +52,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
+@@ -46,7 +50,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
}
} else {
// Got the list, just make sure we're sized exactly right
diff --git a/www/ungoogled-chromium/files/patch-base_process_process__posix.cc b/www/ungoogled-chromium/files/patch-base_process_process__posix.cc
--- a/www/ungoogled-chromium/files/patch-base_process_process__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_process_process__posix.cc
@@ -1,8 +1,8 @@
---- base/process/process_posix.cc.orig 2022-10-01 07:40:07 UTC
+--- base/process/process_posix.cc.orig 2023-04-08 11:38:38 UTC
+++ base/process/process_posix.cc
-@@ -25,10 +25,15 @@
+@@ -23,10 +23,15 @@
+ #include "base/trace_event/base_tracing.h"
#include "build/build_config.h"
- #include "third_party/abseil-cpp/absl/types/optional.h"
-#if BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
@@ -17,7 +17,7 @@
#if BUILDFLAG(CLANG_PROFILING)
#include "base/test/clang_profiling.h"
#endif
-@@ -95,7 +100,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
+@@ -93,7 +98,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
return ret_pid > 0;
}
@@ -26,7 +26,7 @@
// Using kqueue on Mac so that we can wait on non-child processes.
// We can't use kqueues on child processes because we need to reap
// our own children using wait.
-@@ -200,7 +205,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
+@@ -198,7 +203,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
const bool exited = (parent_pid < 0);
if (!exited && parent_pid != our_pid) {
@@ -35,7 +35,7 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
-@@ -392,7 +397,55 @@ void Process::Exited(int exit_code) const {
+@@ -387,7 +392,55 @@ void Process::Exited(int exit_code) const {
int Process::GetPriority() const {
DCHECK(IsValid());
diff --git a/www/ungoogled-chromium/files/patch-base_profiler_module__cache.cc b/www/ungoogled-chromium/files/patch-base_profiler_module__cache.cc
--- a/www/ungoogled-chromium/files/patch-base_profiler_module__cache.cc
+++ b/www/ungoogled-chromium/files/patch-base_profiler_module__cache.cc
@@ -1,11 +1,11 @@
---- base/profiler/module_cache.cc.orig 2022-10-01 07:40:07 UTC
+--- base/profiler/module_cache.cc.orig 2023-04-08 11:38:38 UTC
+++ base/profiler/module_cache.cc
-@@ -34,7 +34,7 @@ struct ModuleAddressCompare {
-
- std::string TransformModuleIDToBreakpadFormat(StringPiece module_id) {
- std::string mangled_id(module_id);
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri
+ // Android and Linux Chrome builds use the "breakpad" format to index their
+ // build id, so we transform the build id for these platforms. All other
+ // platforms keep their symbols indexed by the original build ID.
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Linux ELF module IDs are 160bit integers, which we need to mangle
// down to 128bit integers to match the id that Breakpad outputs.
// Example on version '66.0.3359.170' x64:
diff --git a/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h b/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h
--- a/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h
+++ b/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h
@@ -1,6 +1,6 @@
---- base/synchronization/lock_impl.h.orig 2022-10-01 07:40:07 UTC
+--- base/synchronization/lock_impl.h.orig 2023-04-08 11:38:38 UTC
+++ base/synchronization/lock_impl.h
-@@ -107,6 +107,10 @@ void LockImpl::Unlock() {
+@@ -104,6 +104,10 @@ void LockImpl::Unlock() {
}
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -11,7 +11,7 @@
#if DCHECK_IS_ON()
BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -127,6 +131,9 @@ void LockImpl::Unlock() {
+@@ -124,6 +128,9 @@ void LockImpl::Unlock() {
dcheck_unlock_result(rv);
#endif
}
diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc
--- a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc
@@ -1,15 +1,15 @@
---- base/threading/platform_thread_posix.cc.orig 2023-03-10 11:01:21 UTC
+--- base/threading/platform_thread_posix.cc.orig 2023-04-08 11:38:38 UTC
+++ base/threading/platform_thread_posix.cc
-@@ -77,7 +77,7 @@ void* ThreadFunc(void* params) {
+@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::DisallowSingleton();
--#if !BUILDFLAG(IS_NACL)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN)
+-#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN)
++#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) && !BUILDFLAG(IS_BSD)
partition_alloc::internal::PCScan::NotifyThreadCreated(
partition_alloc::internal::GetStackPointer());
-@@ -379,6 +379,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
+ #endif
+@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
MessagePumpType pump_type_hint) {
#if BUILDFLAG(IS_NACL)
NOTIMPLEMENTED();
diff --git a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- build/config/compiler/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ build/config/compiler/BUILD.gn
-@@ -232,13 +232,16 @@ config("default_include_dirs") {
+@@ -237,13 +237,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
config("no_unresolved_symbols") {
@@ -18,7 +18,7 @@
}
# compiler ---------------------------------------------------------------------
-@@ -462,6 +465,10 @@ config("compiler") {
+@@ -467,6 +470,10 @@ config("compiler") {
}
}
@@ -29,7 +29,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
-@@ -537,7 +544,7 @@ config("compiler") {
+@@ -542,7 +549,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -38,16 +38,16 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
-@@ -825,7 +832,7 @@ config("compiler") {
+@@ -826,7 +833,7 @@ config("compiler") {
+ # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
# lldb doesn't have the needed changes yet.
- # * Fuchsia isn't supported as zxdb doesn't support simple template names yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
-- if (is_clang && !is_nacl && !is_win && !is_apple && !is_fuchsia) {
-+ if (is_clang && !is_nacl && !is_win && !is_apple && !is_fuchsia && !is_bsd) {
+- if (is_clang && !is_nacl && !is_win && !is_apple) {
++ if (is_clang && !is_nacl && !is_win && !is_apple && !is_bsd) {
cflags_cc += [ "-gsimple-template-names" ]
}
-@@ -1001,7 +1008,7 @@ config("compiler_cpu_abi") {
+@@ -1009,7 +1016,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@@ -56,7 +56,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
-@@ -1016,7 +1023,7 @@ config("compiler_cpu_abi") {
+@@ -1024,7 +1031,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -65,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
-@@ -1350,7 +1357,7 @@ config("compiler_deterministic") {
+@@ -1359,7 +1366,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@@ -74,7 +74,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
-@@ -1402,7 +1409,7 @@ config("compiler_deterministic") {
+@@ -1411,7 +1418,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@@ -83,7 +83,7 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
-@@ -1643,7 +1650,7 @@ config("default_warnings") {
+@@ -1649,7 +1656,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@@ -92,7 +92,7 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
-@@ -1822,7 +1829,7 @@ config("no_chromium_code") {
+@@ -1831,7 +1838,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -101,7 +101,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -2330,7 +2337,7 @@ config("afdo_optimize_size") {
+@@ -2339,7 +2346,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@@ -110,8 +110,8 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2346,7 +2353,7 @@ config("afdo") {
- cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
+@@ -2358,7 +2365,7 @@ config("afdo") {
+ }
inputs = [ _clang_sample_profile ]
}
- } else if (auto_profile_path != "" && is_a_target_toolchain) {
@@ -119,7 +119,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2501,7 +2508,8 @@ config("symbols") {
+@@ -2513,7 +2520,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}
diff --git a/www/ungoogled-chromium/files/patch-build_config_rust.gni b/www/ungoogled-chromium/files/patch-build_config_rust.gni
--- a/www/ungoogled-chromium/files/patch-build_config_rust.gni
+++ b/www/ungoogled-chromium/files/patch-build_config_rust.gni
@@ -1,6 +1,6 @@
---- build/config/rust.gni.orig 2023-03-10 11:01:21 UTC
+--- build/config/rust.gni.orig 2023-04-08 11:38:38 UTC
+++ build/config/rust.gni
-@@ -134,7 +134,7 @@ if (enable_rust) {
+@@ -135,7 +135,7 @@ if (enable_rust) {
rust_sysroot = "//third_party/rust-toolchain"
use_unverified_rust_toolchain = false
} else {
diff --git a/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni
--- a/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,4 +1,4 @@
---- build/toolchain/gcc_toolchain.gni.orig 2023-03-10 11:01:21 UTC
+--- build/toolchain/gcc_toolchain.gni.orig 2023-04-08 11:38:38 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@@ -14,7 +14,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -832,22 +839,12 @@ template("gcc_toolchain") {
+@@ -825,22 +832,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {
diff --git a/www/ungoogled-chromium/files/patch-cc_BUILD.gn b/www/ungoogled-chromium/files/patch-cc_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-cc_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-cc_BUILD.gn
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- cc/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ cc/BUILD.gn
-@@ -666,7 +666,7 @@ cc_test_static_library("test_support") {
+@@ -668,7 +668,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
-@@ -893,7 +893,6 @@ cc_test("cc_unittests") {
+@@ -913,7 +913,6 @@ cc_test("cc_unittests") {
data = [ "//components/viz/test/data/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",
diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc
--- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/app/chrome_main.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/app/chrome_main.cc
-@@ -27,7 +27,7 @@
+@@ -28,7 +28,7 @@
#include "chrome/app/notification_metrics.h"
#endif
@@ -9,7 +9,7 @@
#include "base/base_switches.h"
#endif
-@@ -157,7 +157,7 @@ int ChromeMain(int argc, const char** argv) {
+@@ -167,7 +167,7 @@ int ChromeMain(int argc, const char** argv) {
headless::SetUpCommandLine(command_line);
} else {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
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
--- 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,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/app/chrome_main_delegate.cc
-@@ -137,7 +137,7 @@
+@@ -136,7 +136,7 @@
#include "components/about_ui/credit_utils.h"
#endif
@@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -181,16 +181,16 @@
+@@ -180,16 +180,16 @@
#include "v8/include/v8.h"
#endif
@@ -29,7 +29,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -352,7 +352,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -328,7 +328,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@@ -38,7 +38,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
-@@ -437,7 +437,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -413,7 +413,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -47,7 +47,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) ||
-@@ -551,7 +551,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -527,7 +527,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -56,7 +56,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.
-@@ -640,7 +640,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -616,7 +616,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -65,7 +65,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
-@@ -928,6 +928,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
+@@ -915,6 +915,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
// not always enabled on ChromeOS.
#if BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@@ -74,7 +74,7 @@
#else
bool enable_gwp_asan = true;
#endif
-@@ -984,7 +986,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
+@@ -970,7 +972,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
base::internal::TimerBase::InitializeFeatures();
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
@@ -83,7 +83,7 @@
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
-@@ -1116,7 +1118,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1102,7 +1104,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@@ -92,7 +92,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -1146,7 +1148,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1132,7 +1134,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@@ -101,7 +101,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -1528,7 +1530,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1514,7 +1516,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@@ -110,7 +110,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
-@@ -1608,7 +1610,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1616,7 +1618,7 @@ absl::variant<int, content::MainFunctionParams> 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_app_generated__resources.grd b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd
--- a/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,4 +1,4 @@
---- chrome/app/generated_resources.grd.orig 2023-03-10 11:01:21 UTC
+--- chrome/app/generated_resources.grd.orig 2023-04-08 11:38:38 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@@ -9,7 +9,7 @@
for making strings OS specific. Other platform defines such as use_titlecase
are declared in tools/grit/grit_rule.gni.
-->
-@@ -3181,7 +3181,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3187,7 +3187,7 @@ are declared in tools/grit/grit_rule.gni.
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@@ -18,7 +18,7 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
-@@ -4936,7 +4936,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4942,7 +4942,7 @@ are declared in tools/grit/grit_rule.gni.
Read information about your browser, OS, device, installed software, registry values and files
</message>
</if>
@@ -27,7 +27,7 @@
<message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
Read information about your browser, OS, device, installed software and files
</message>
-@@ -5603,7 +5603,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5612,7 +5612,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
</if>
@@ -36,7 +36,7 @@
<message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
-@@ -5649,7 +5649,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5658,7 +5658,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
</message>
</if>
@@ -45,7 +45,7 @@
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
-@@ -9448,7 +9448,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -9551,7 +9551,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@@ -54,7 +54,7 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
-@@ -10789,7 +10789,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -10892,7 +10892,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@@ -63,7 +63,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
-@@ -12904,7 +12904,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -13004,7 +13004,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>
diff --git a/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp b/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp
--- a/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/settings_strings.grdp.orig 2023-03-10 11:01:21 UTC
+--- chrome/app/settings_strings.grdp.orig 2023-04-08 11:38:38 UTC
+++ chrome/app/settings_strings.grdp
-@@ -163,7 +163,7 @@
+@@ -166,7 +166,7 @@
Theme
</message>
</if>
@@ -9,7 +9,7 @@
<message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
GTK
</message>
-@@ -183,7 +183,7 @@
+@@ -186,7 +186,7 @@
Use Classic
</message>
</if>
diff --git a/www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
--- a/www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
+++ b/www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
@@ -1,4 +1,4 @@
---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-03-10 11:01:21 UTC
+--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-04-08 11:38:38 UTC
+++ chrome/app/theme/chrome_unscaled_resources.grd
@@ -16,7 +16,7 @@
<includes>
@@ -9,7 +9,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" />
-@@ -62,7 +62,7 @@
+@@ -63,7 +63,7 @@
<else> <!-- not _google_chrome -->
<if expr="_is_chrome_for_testing_branded">
<then>
@@ -18,7 +18,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" />
-@@ -76,7 +76,7 @@
+@@ -77,7 +77,7 @@
</if>
</then>
<else> <!-- not _is_chrome_for_testing_branded -->
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/about_flags.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/about_flags.cc
-@@ -220,7 +220,7 @@
+@@ -217,7 +217,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -302,7 +302,7 @@
+@@ -304,7 +304,7 @@
#include "device/vr/public/cpp/features.h"
#endif
@@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -408,7 +408,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+@@ -410,7 +410,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@@ -27,7 +27,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1323,7 +1323,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval
+@@ -1351,7 +1351,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -36,7 +36,7 @@
const FeatureEntry::FeatureParam
kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = {
{"DocumentProviderMaxLowQualitySuggestions", "1"},
-@@ -4382,13 +4382,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4404,13 +4404,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -52,7 +52,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -4640,7 +4640,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4674,7 +4674,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -61,7 +61,7 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
-@@ -5198,7 +5198,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5278,7 +5278,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -70,7 +70,7 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -5841,7 +5841,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5922,7 +5922,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kPointerLockOptionsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kPointerLockOptions)},
@@ -79,7 +79,7 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
-@@ -6796,7 +6796,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6845,7 +6845,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -88,7 +88,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
-@@ -7539,7 +7539,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7580,7 +7580,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -97,7 +97,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -7766,7 +7766,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7796,7 +7796,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -106,7 +106,7 @@
{"enable-get-display-media-set", flag_descriptions::kGetDisplayMediaSetName,
flag_descriptions::kGetDisplayMediaSetDescription,
kOsCrOS | kOsLacros | kOsLinux,
-@@ -7816,7 +7816,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7855,7 +7855,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -115,7 +115,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
-@@ -8353,7 +8353,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8388,7 +8388,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -113,13 +113,13 @@
+@@ -114,13 +114,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
-@@ -192,7 +192,7 @@
+@@ -194,7 +194,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,7 +25,7 @@
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
-@@ -853,7 +853,7 @@ void PopulateChromeFrameBinders(
+@@ -859,7 +859,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -861,7 +861,7 @@ void PopulateChromeFrameBinders(
+@@ -867,7 +867,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -43,7 +43,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
-@@ -926,14 +926,14 @@ void PopulateChromeWebUIFrameBinders(
+@@ -932,14 +932,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
-@@ -1332,7 +1332,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1375,7 +1375,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -240,11 +240,11 @@
+@@ -239,11 +239,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -14,7 +14,7 @@
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -279,7 +279,7 @@
+@@ -278,7 +278,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -23,7 +23,7 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
-@@ -986,7 +986,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -988,7 +988,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@@ -32,7 +32,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1042,7 +1042,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1044,7 +1044,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -411,7 +411,7 @@
+@@ -416,7 +416,7 @@
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "storage/browser/file_system/external_mount_points.h"
#include "ui/display/screen.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
-@@ -496,12 +496,12 @@
+@@ -502,12 +502,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -24,7 +24,7 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -510,13 +510,13 @@
+@@ -516,13 +516,13 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@@ -40,7 +40,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -545,11 +545,11 @@
+@@ -551,11 +551,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -54,7 +54,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1534,7 +1534,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+@@ -1546,7 +1546,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true);
registry->RegisterBooleanPref(
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false);
@@ -63,7 +63,7 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1641,7 +1641,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1653,7 +1653,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@@ -72,7 +72,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
-@@ -1680,7 +1680,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1692,7 +1692,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -81,7 +81,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
-@@ -1701,7 +1701,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1713,7 +1713,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@@ -90,7 +90,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1720,7 +1720,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1732,7 +1732,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@@ -99,7 +99,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2554,6 +2554,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2552,6 +2552,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#if(0)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@@ -108,7 +108,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2925,7 +2927,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2933,7 +2935,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@@ -117,7 +117,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4418,7 +4420,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -4451,7 +4453,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -126,7 +126,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -4935,14 +4937,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4968,14 +4970,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@@ -143,7 +143,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -4973,7 +4975,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5006,7 +5008,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
#endif
@@ -152,7 +152,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -6553,7 +6555,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
+@@ -6607,7 +6609,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
}
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
@@ -1,6 +1,6 @@
---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2022-10-01 07:40:07 UTC
+--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/devtools/devtools_eye_dropper.cc
-@@ -186,7 +186,7 @@ void DevToolsEyeDropper::UpdateCursor() {
+@@ -185,7 +185,7 @@ void DevToolsEyeDropper::UpdateCursor() {
// magnified projection only with centered hotspot.
// Mac Retina requires cursor to be > 120px in order to render smoothly.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1534,7 +1534,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1541,7 +1541,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
-@@ -1600,7 +1600,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
+@@ -1607,7 +1607,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__commands.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__commands.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_commands.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/download/download_commands.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/download/download_commands.cc
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,7 @@
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
-@@ -168,7 +168,7 @@ void DownloadCommands::ExecuteCommand(Command command)
+@@ -167,7 +167,7 @@ void DownloadCommands::ExecuteCommand(Command command)
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_item_model.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/download/download_item_model.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/download/download_item_model.cc
-@@ -753,7 +753,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -762,7 +762,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
-@@ -796,7 +796,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -805,7 +805,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1119,7 +1119,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
+@@ -1128,7 +1128,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.h b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.h.orig 2022-12-02 17:56:32 UTC
+--- chrome/browser/download/download_prefs.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/download/download_prefs.h
@@ -118,7 +118,7 @@ class DownloadPrefs {
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
@@ -9,7 +9,7 @@
// Store the user preference to disk. If |should_open| is true, also disable
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -178,7 +178,7 @@ class DownloadPrefs {
+@@ -183,7 +183,7 @@ class DownloadPrefs {
std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
@@ -8,8 +8,8 @@
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/functional/bind.h"
-@@ -61,6 +62,10 @@
- #include "chrome/browser/ui/pdf/adobe_reader_info_win.h"
+@@ -64,6 +65,10 @@
+ #include "chrome/browser/download/bubble/download_bubble_prefs.h"
#endif
+#if BUILDFLAG(IS_OPENBSD)
@@ -19,7 +19,7 @@
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
-@@ -71,7 +76,7 @@ namespace {
+@@ -74,7 +79,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) {
@@ -28,7 +28,7 @@
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
-@@ -182,7 +187,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
+@@ -185,7 +190,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
-@@ -295,7 +300,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -305,7 +310,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
/*default_value=*/base::Time());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -464,7 +469,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
+@@ -474,7 +479,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -55,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
-@@ -496,7 +501,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -506,7 +511,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
-@@ -527,7 +532,7 @@ void DownloadPrefs::SaveAutoOpenState() {
+@@ -537,7 +542,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
@@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
-@@ -651,7 +656,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -661,7 +666,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.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__prefs.cc
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__prefs.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/enterprise/connectors/connectors_prefs.cc.orig 2023-04-08 11:38:38 UTC
++++ chrome/browser/enterprise/connectors/connectors_prefs.cc
+@@ -69,7 +69,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
+ }
+
+ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
+-#if !BUILDFLAG(IS_FUCHSIA)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
+ registry->RegisterInt64Pref(kLatestCrashReportCreationTime, 0);
+ #endif
+ }
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -478,7 +478,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
+@@ -482,7 +482,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
Profile* profile = Profile::FromBrowserContext(context_);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-12-02 17:56:32 UTC
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
@@ -21,7 +21,7 @@
#include "components/policy/core/common/management/management_service.h"
@@ -8,4 +8,13 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h"
- #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
+@@ -75,7 +75,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
+ DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
+ DependsOn(policy::ManagementServiceFactory::GetInstance());
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Depends on this service via the SignalsService having a dependency on it.
+ DependsOn(enterprise_signals::SignalsAggregatorFactory::GetInstance());
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
@@ -1,17 +1,17 @@
---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-01-13 08:56:02 UTC
+--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
-@@ -22,7 +22,7 @@
- #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/win/win_signals_decorator.h"
- #endif // BUILDFLAG(IS_WIN)
+@@ -18,7 +18,7 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "components/policy/core/common/management/management_service.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "base/check.h"
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
- #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -62,7 +62,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
- decorators.push_back(std::make_unique<WinSignalsDecorator>());
- #endif // BUILDFLAG(IS_WIN)
+ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
+@@ -55,7 +55,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
+ enterprise_signals::ContextInfoFetcher::CreateInstance(
+ profile, ConnectorsServiceFactory::GetForBrowserContext(profile))));
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2023-02-11 09:11:04 UTC
-+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h
-@@ -9,7 +9,7 @@
- #include "chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h"
- #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
-
--#if !BUILDFLAG(IS_FUCHSIA)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
- #include "third_party/crashpad/crashpad/client/crash_report_database.h"
- #endif // !BUILDFLAG(IS_FUCHSIA)
- namespace enterprise_connectors {
-@@ -31,7 +31,7 @@ class BrowserCrashEventRouter
- BrowserCrashEventRouter& operator=(BrowserCrashEventRouter&&) = delete;
- ~BrowserCrashEventRouter() override;
-
--#if !BUILDFLAG(IS_FUCHSIA)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
- void OnCloudReportingLaunched(
- enterprise_reporting::ReportScheduler* report_scheduler) override;
- void UploadToReportingServer(
-@@ -46,7 +46,7 @@ class BrowserCrashEventRouter
- raw_ptr<policy::ChromeBrowserCloudManagementController, DanglingUntriaged>
- controller_ = nullptr;
-
--#if !BUILDFLAG(IS_FUCHSIA)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
- // ReportCrashes() checks the enterprise policy settings, retrieves crash
- // reports from the crashpad local database and sends reports that have not
- // been sent to the reporting server.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
@@ -1,19 +1,20 @@
---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2022-10-29 17:50:56 UTC
+--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
-@@ -19,14 +19,14 @@
- #include "chrome/common/chrome_paths.h"
- #include "components/version_info/version_info.h"
-
--#if !BUILDFLAG(IS_FUCHSIA)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
- #include "components/crash/core/app/crashpad.h"
- #include "third_party/crashpad/crashpad/client/crash_report_database.h"
- #endif // !BUILDFLAG(IS_FUCHSIA)
-
- namespace enterprise_connectors {
-
--#if !BUILDFLAG(IS_FUCHSIA)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
- namespace {
- // key names used when building the dictionary to pass to the real-time
- // reporting API
+@@ -14,7 +14,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter(
+ if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) {
+ return;
+ }
+-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+ CrashReportingContext* crash_reporting_context =
+ CrashReportingContext::GetInstance();
+ Profile* profile = Profile::FromBrowserContext(context);
+@@ -27,7 +27,7 @@ BrowserCrashEventRouter::~BrowserCrashEventRouter() {
+ if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) {
+ return;
+ }
+-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+ CrashReportingContext* crash_reporting_context =
+ CrashReportingContext::GetInstance();
+ crash_reporting_context->RemoveProfile(this);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.h
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.h
@@ -0,0 +1,29 @@
+--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.h.orig 2023-04-08 11:38:38 UTC
++++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.h
+@@ -10,7 +10,7 @@
+ #include "chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h"
+ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
+
+-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+ #include "third_party/crashpad/crashpad/client/crash_report_database.h"
+ #endif
+
+@@ -29,7 +29,7 @@ class CrashReportingContext
+ CrashReportingContext operator=(CrashReportingContext&&) = delete;
+ ~CrashReportingContext() override;
+
+-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+ static CrashReportingContext* GetInstance();
+
+ void AddProfile(BrowserCrashEventRouter* router, Profile* profile);
+@@ -51,7 +51,7 @@ class CrashReportingContext
+ #endif
+ };
+
+-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+
+ // Utility function to parse reports from a crash database that were
+ // created past a given timestamp. Included in header for testing.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2023-04-08 11:38:38 UTC
++++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
+@@ -18,7 +18,7 @@
+
+ namespace enterprise_connectors {
+
+-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+
+ namespace {
+
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1330,6 +1330,10 @@ static_library("extensions") {
+@@ -1334,6 +1334,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-02-11 09:11:04 UTC
+--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
#include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
-@@ -91,7 +91,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+@@ -99,7 +99,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
extensions::SidePanelService::GetFactoryInstance();
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -32,7 +32,7 @@
#include "components/reporting/util/statusor.h"
@@ -17,8 +17,8 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
device_signals::SignalsAggregationRequest CreateAggregationRequest(
- const std::string& user_id,
-@@ -166,7 +166,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+ device_signals::SignalName signal_name) {
+@@ -167,7 +167,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret
@@ -27,7 +27,7 @@
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
-@@ -593,7 +593,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
+@@ -594,7 +594,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
}
#endif
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
-@@ -520,7 +520,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
+@@ -523,7 +523,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -190,7 +190,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
-@@ -200,7 +200,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-04-08 11:38:38 UTC
++++ chrome/browser/extensions/api/tabs/tabs_api.cc
+@@ -831,7 +831,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
+ // ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as
+ // minimized.
+ // TODO(crbug.com/1410400): Remove this workaround when linux is fixed.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // TODO(crbug.com/1410400): Find a fix for wayland as well.
+
+ // Must be defined inside IS_LINUX to compile on windows/mac.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
@@ -1,6 +1,6 @@
---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -307,7 +307,7 @@ const struct {
+@@ -312,7 +312,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
kDontBlockChildren},
#endif
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/flag_descriptions.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -3523,7 +3523,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
+@@ -3571,7 +3571,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
extern const char kLacrosScreenCoordinatesEnabledDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -9,7 +9,7 @@
extern const char kGetDisplayMediaSetName[];
extern const char kGetDisplayMediaSetDescription[];
-@@ -3642,14 +3642,14 @@ extern const char kSearchWebInSidePanelDescription[];
+@@ -3693,14 +3693,14 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -26,7 +26,7 @@
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -3659,7 +3659,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -3710,7 +3710,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -35,7 +35,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -3669,7 +3669,7 @@ extern const char kOzonePlatformHintName[];
+@@ -3720,7 +3720,7 @@ extern const char kOzonePlatformHintName[];
extern const char kOzonePlatformHintDescription[];
#endif // BUILDFLAG(IS_LINUX)
@@ -44,7 +44,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
-@@ -3677,13 +3677,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
+@@ -3728,13 +3728,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -60,7 +60,7 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -3763,7 +3763,7 @@ extern const char kElasticOverscrollDescription[];
+@@ -3814,7 +3814,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -6091,7 +6091,7 @@ const char kLibAssistantV2MigrationDescription[] =
+@@ -6170,7 +6170,7 @@ const char kLibAssistantV2MigrationDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -9,7 +9,7 @@
const char kGetDisplayMediaSetName[] = "GetDisplayMediaSet API";
const char kGetDisplayMediaSetDescription[] =
"When enabled, the getDisplayMediaSet API for capturing multiple surfaces "
-@@ -6320,7 +6320,7 @@ const char kSearchWebInSidePanelDescription[] =
+@@ -6406,7 +6406,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
-@@ -6329,7 +6329,7 @@ const char kQuickCommandsDescription[] =
+@@ -6415,7 +6415,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
-@@ -6350,7 +6350,7 @@ const char kWebShareDescription[] =
+@@ -6436,7 +6436,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -36,7 +36,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -6370,7 +6370,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -6456,7 +6456,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -45,7 +45,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
-@@ -6384,7 +6384,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
+@@ -6470,7 +6470,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -54,7 +54,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-@@ -6485,7 +6485,7 @@ const char kElasticOverscrollDescription[] =
+@@ -6571,7 +6571,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/headless/headless_mode_util.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/headless/headless_mode_util.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/headless/headless_mode_util.cc
-@@ -10,11 +10,11 @@
+@@ -10,12 +10,12 @@
// New headless mode is available on Linux, Windows and Mac platforms.
// More platforms will be added later, so avoid function level clutter
// by providing stub implementations at the end of the file.
@@ -8,13 +8,14 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "base/base_switches.h"
+ #include "chrome/common/chrome_switches.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/gl/gl_switches.h" // nogncheck
#include "ui/ozone/public/ozone_switches.h" // nogncheck
#endif // BUILDFLAG(IS_LINUX)
-@@ -64,7 +64,7 @@ void SetUpCommandLine(const base::CommandLine* command
+@@ -72,7 +72,7 @@ void SetUpCommandLine(const base::CommandLine* command
base::CommandLine::ForCurrentProcess()->AppendSwitch(
::switches::kNoErrorDialogs);
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
@@ -0,0 +1,20 @@
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-04-08 11:38:38 UTC
++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
+@@ -22,7 +22,7 @@ class PowerMetricsReporter;
+ class ProcessMonitor;
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ class PressureMetricsReporter;
+ #endif // BUILDFLAG(IS_LINUX)
+
+@@ -88,7 +88,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
+ std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_;
+ #endif // !BUILDFLAG(IS_ANDROID)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Reports pressure metrics.
+ std::unique_ptr<PressureMetricsReporter> pressure_metrics_reporter_;
+ #endif // BUILDFLAG(IS_LINUX)
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
--- 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 2023-03-10 11:01:21 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -61,8 +61,10 @@
@@ -12,7 +12,16 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
-@@ -491,7 +493,7 @@ void RecordStartupMetrics() {
+@@ -92,7 +94,7 @@
+ #include "chromeos/crosapi/cpp/crosapi_constants.h"
+ #endif // BUILDFLAG(IS_CHROMEOS_LACROS)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
+ #endif // BUILDFLAG(IS_LINUX)
+
+@@ -495,7 +497,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -21,3 +30,12 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
+@@ -685,7 +687,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+ }
+ #endif // !BUILDFLAG(IS_ANDROID)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ pressure_metrics_reporter_ = std::make_unique<PressureMetricsReporter>();
+ #endif // BUILDFLAG(IS_LINUX)
+ }
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -174,7 +174,7 @@
+@@ -176,7 +176,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@@ -9,7 +9,7 @@
#include "components/metrics/motherboard_metrics_provider.h"
#endif
-@@ -736,7 +736,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -738,7 +738,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@@ -18,7 +18,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
-@@ -817,7 +817,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -819,7 +819,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +27,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
-@@ -912,7 +912,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -919,7 +919,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@@ -36,7 +36,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
-@@ -1096,7 +1096,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -1103,7 +1103,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h
@@ -0,0 +1,11 @@
+--- chrome/browser/net/system_network_context_manager.h.orig 2023-04-08 11:38:38 UTC
++++ chrome/browser/net/system_network_context_manager.h
+@@ -194,7 +194,7 @@ class SystemNetworkContextManager {
+ void UpdateExplicitlyAllowedNetworkPorts();
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
+ // pref to the enforcement state.
+ void UpdateEnforceLocalAnchorConstraintsEnabled();
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2023-02-11 09:11:04 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/net/system_network_context_manager.cc
-@@ -92,7 +92,7 @@
+@@ -93,7 +93,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
-@@ -177,7 +177,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -178,7 +178,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@@ -18,7 +18,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -455,7 +455,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -456,7 +456,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@@ -27,7 +27,16 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -527,7 +527,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -489,7 +489,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+ base::Unretained(this)));
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ pref_change_registrar_.Add(
+ prefs::kEnforceLocalAnchorConstraintsEnabled,
+ base::BindRepeating(&SystemNetworkContextManager::
+@@ -539,7 +539,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -36,3 +45,21 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+@@ -568,7 +568,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+ registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
+ #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ // Note that the default value is not relevant because the pref is only
+ // evaluated when it is managed.
+ registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
+@@ -944,7 +944,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
+ }
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ void SystemNetworkContextManager::UpdateEnforceLocalAnchorConstraintsEnabled() {
+ const PrefService::Preference* enforce_local_anchor_constraints_enabled_pref =
+ local_state_->FindPreference(
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc
@@ -1,11 +1,11 @@
---- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2022-10-01 07:40:07 UTC
+--- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/new_tab_page/modules/drive/drive_service.cc
@@ -28,7 +28,7 @@
#include "services/network/public/cpp/resource_request.h"
namespace {
--#if OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
constexpr char kPlatform[] = "LINUX";
- #elif OS_WIN
+ #elif BUILDFLAG(IS_WIN)
constexpr char kPlatform[] = "WINDOWS";
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -199,17 +199,17 @@
+@@ -200,17 +200,17 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@@ -21,7 +21,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -719,14 +719,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -729,14 +729,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -38,8 +38,8 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
-@@ -1356,7 +1356,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
- base::Value::Type::BOOLEAN },
+@@ -1373,7 +1373,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@@ -47,7 +47,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
-@@ -1426,18 +1426,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1443,18 +1443,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -69,7 +69,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
-@@ -1450,7 +1450,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1467,7 +1467,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@@ -78,7 +78,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
-@@ -1554,7 +1554,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1568,7 +1568,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@@ -87,7 +87,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
-@@ -1641,13 +1641,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1655,13 +1655,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -103,7 +103,16 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
-@@ -1694,7 +1694,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1692,7 +1692,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ { key::kEnforceLocalAnchorConstraintsEnabled,
+ prefs::kEnforceLocalAnchorConstraintsEnabled,
+ base::Value::Type::BOOLEAN },
+@@ -1721,7 +1721,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \
@@ -112,16 +121,16 @@
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
-@@ -1754,7 +1754,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
- { key::kPrefixedStorageInfoEnabled,
- storage::kPrefixedStorageInfoEnabled,
- base::Value::Type::BOOLEAN },
+@@ -1781,7 +1781,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ ash::prefs::kUrlParameterToAutofillSAMLUsername,
+ base::Value::Type::STRING },
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
{ key::kHighEfficiencyModeEnabled,
performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled,
base::Value::Type::BOOLEAN },
-@@ -1799,7 +1799,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1826,7 +1826,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(ENABLE_PPAPI)
@@ -130,7 +139,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
-@@ -2048,7 +2048,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2075,7 +2075,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -139,7 +148,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
-@@ -2106,7 +2106,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2133,7 +2133,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@@ -148,7 +157,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -2464,7 +2464,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2497,7 +2497,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
extensions::pref_names::kManifestV2Availability, /*min=*/0, /*max=*/3,
/*clamp=*/false));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -157,7 +166,7 @@
handlers->AddHandler(
std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -2477,7 +2477,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2510,7 +2510,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -166,7 +175,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -2485,7 +2485,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2518,7 +2518,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@@ -175,7 +184,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
-@@ -2498,7 +2498,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2531,7 +2531,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
handlers->AddHandler(
std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
chrome_schema));
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
--- 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,12 +1,11 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -455,14 +455,14 @@
+@@ -455,13 +455,13 @@
#include "components/os_crypt/os_crypt.h"
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/web_applications/url_handler_prefs.h"
#include "components/device_signals/core/browser/pref_names.h"
#endif
@@ -17,7 +16,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -495,7 +495,7 @@
+@@ -494,7 +494,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@@ -26,7 +25,25 @@
#include "ui/color/system_theme.h"
#endif
-@@ -1066,7 +1066,7 @@ void RegisterProfilePrefsForMigration(
+@@ -787,7 +787,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
+ const char kPluginsShowDetails[] = "plugins.show_details";
+
+ // Deprecated 02/2023.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+
+@@ -869,7 +869,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+ // Deprecated 02/2023.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ }
+@@ -982,7 +982,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
@@ -35,16 +52,7 @@
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
-@@ -1342,7 +1342,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
- #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
- #endif // BUILDFLAG(IS_WIN)
-
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
- #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-
-@@ -1676,11 +1676,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1616,11 +1616,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
#endif
@@ -58,7 +66,16 @@
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
-@@ -2079,7 +2079,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
+@@ -1817,7 +1817,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+ // Added 02/2023
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ local_state->ClearPref(kWebAppsUrlHandlerInfo);
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+
+@@ -1962,7 +1962,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
-@@ -139,7 +139,7 @@ const char* const kPersistentPrefNames[] = {
+@@ -167,7 +167,7 @@ const char* const kPersistentPrefNames[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
@@ -547,7 +547,7 @@ PrintBackendServiceManager::RegisterClient(
query_clients_.insert(client_id);
@@ -9,7 +9,7 @@
if (!query_with_ui_clients_.empty())
return absl::nullopt;
#endif
-@@ -811,7 +811,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -813,7 +813,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
break;
case ClientType::kQueryWithUi:
@@ -18,7 +18,7 @@
// No need to update if there were other query with UI clients.
if (query_with_ui_clients_.size() > 1)
return absl::nullopt;
-@@ -868,7 +868,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -870,7 +870,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,13 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -262,7 +262,7 @@
+@@ -338,17 +338,17 @@
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
+ #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +16,36 @@
#include "chrome/browser/enterprise/idle/idle_service_factory.h"
#endif
-@@ -451,12 +451,12 @@ void ChromeBrowserMainExtraPartsProfiles::
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
+ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
+ #endif
+@@ -495,7 +495,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+ BreadcrumbManagerKeyedServiceFactory::GetInstance();
+ }
+ browser_sync::UserEventServiceFactory::GetInstance();
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
+ #endif
+ BrowsingDataHistoryObserverService::Factory::GetInstance();
+@@ -557,12 +557,12 @@ void ChromeBrowserMainExtraPartsProfiles::
+ DomainDiversityReporterFactory::GetInstance();
+ dom_distiller::DomDistillerServiceFactory::GetInstance();
+ DownloadCoreServiceFactory::GetInstance();
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ enterprise_signals::SignalsAggregatorFactory::GetInstance();
+ #endif
+ enterprise::ProfileIdServiceFactory::GetInstance();
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
+ enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
+ #endif
+@@ -660,12 +660,12 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profile_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/profiles/profile_impl.cc
-@@ -255,6 +255,10 @@
+@@ -259,6 +259,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
-@@ -850,7 +854,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
+@@ -855,7 +859,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_preferences_util.cc.orig 2022-10-29 17:50:56 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/renderer_preferences_util.cc
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
#include "ui/views/controls/textfield/textfield.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/linux/linux_ui.h"
-@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -155,7 +155,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
#endif
@@ -18,7 +18,7 @@
auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
if (linux_ui_theme) {
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -179,7 +179,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -178,7 +178,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts
--- a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts
@@ -1,6 +1,6 @@
---- chrome/browser/resources/settings/route.ts.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/resources/settings/route.ts.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/resources/settings/route.ts
-@@ -220,7 +220,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
+@@ -223,7 +223,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection(
'/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-12-02 17:56:32 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.h
@@ -18,7 +18,7 @@
#include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -18,12 +18,12 @@
void StartExtractDocumentFeatures();
void OnDocumentAnalysisFinished(
const DocumentAnalyzerResults& document_results);
-@@ -133,7 +133,7 @@ class FileAnalyzer {
- scoped_refptr<SandboxedDMGAnalyzer> dmg_analyzer_;
+@@ -136,7 +136,7 @@ class FileAnalyzer {
+ dmg_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- scoped_refptr<SandboxedDocumentAnalyzer> document_analyzer_;
+ std::unique_ptr<SandboxedDocumentAnalyzer, base::OnTaskRunnerDeleter>
+ document_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
base::TimeTicks document_analysis_start_time_;
- #endif
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-12-02 17:56:32 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -20,7 +20,7 @@
#include "content/public/browser/browser_thread.h"
@@ -18,7 +18,7 @@
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
StartExtractDocumentFeatures();
#endif
-@@ -326,7 +326,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
+@@ -325,7 +325,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
-@@ -126,7 +126,7 @@
+@@ -127,7 +127,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-@@ -467,7 +467,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -469,7 +469,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,7 +18,7 @@
if (features::kTabGroupsSaveSyncIntegration.Get()) {
controllers.push_back(std::make_unique<syncer::ModelTypeController>(
syncer::SAVED_TAB_GROUP,
-@@ -480,7 +480,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -482,7 +482,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
// Chrome prefers OS provided spell checkers where they exist. So only sync the
// custom dictionary on platforms that typically don't provide one.
@@ -27,7 +27,7 @@
// Dictionary sync is enabled by default.
if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
controllers.push_back(
-@@ -639,7 +639,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
+@@ -641,7 +641,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
switch (type) {
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/sync_service_factory.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/sync/sync_service_factory.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/sync/sync_service_factory.cc
-@@ -75,7 +75,7 @@
+@@ -76,7 +76,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
// BUILDFLAG(IS_WIN)
-@@ -116,7 +116,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+@@ -117,7 +117,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
// TODO(crbug.com/1052397): Reassess whether the following block needs to be
// included in lacros-chrome once build flag switch of lacros-chrome is
// complete.
@@ -18,7 +18,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
-@@ -250,7 +250,7 @@ SyncServiceFactory::SyncServiceFactory()
+@@ -251,7 +251,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ThemeServiceFactory::GetInstance());
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser.h.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/browser.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/browser.h
-@@ -281,7 +281,7 @@ class Browser : public TabStripModelObserver,
+@@ -290,7 +290,7 @@ class Browser : public TabStripModelObserver,
int32_t restore_id = kDefaultRestoreId;
#endif
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/browser_command_controller.cc
-@@ -104,7 +104,7 @@
+@@ -103,7 +103,7 @@
#include "components/user_manager/user_manager.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#endif
-@@ -289,7 +289,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -288,7 +288,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
-@@ -541,7 +541,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -540,7 +540,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -1096,7 +1096,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1099,7 +1099,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/chrome_pages.h.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/chrome_pages.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/chrome_pages.h
-@@ -33,7 +33,7 @@ enum class ConsentLevel;
+@@ -34,7 +34,7 @@ enum class ConsentLevel;
} // namespace signin
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
namespace web_app {
enum class AppSettingsPageEntryPoint;
} // namespace web_app
-@@ -225,7 +225,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -241,7 +241,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/chrome_pages.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/chrome_pages.cc
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
-@@ -608,7 +608,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -618,7 +618,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig 2022-10-01 07:40:07 UTC
+--- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
@@ -37,7 +37,7 @@ class SharingHubBubbleController {
virtual bool ShouldOfferOmniboxIcon() = 0;
@@ -6,6 +6,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // These two methods return the sets of first- and third-party actions;
- // first-party actions are internal to Chrome and third-party actions are
- // other websites or apps.
+ // This method returns the set of first-party actions, which are actions
+ // internal to Chrome. Third-party actions (those outside Chrome) are
+ // currently not supported.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-02-11 09:11:04 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -132,7 +132,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@@ -6,10 +6,19 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/headless/headless_mode_util.h"
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
- #endif
+ #include "components/headless/policy/headless_mode_policy.h"
+@@ -918,7 +918,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+ TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
+ ComputeAndRecordLaunchMode(command_line);
-@@ -1006,7 +1006,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ if (headless::IsHeadlessMode() &&
+ headless::HeadlessModePolicy::IsHeadlessModeDisabled(
+ g_browser_process->local_state())) {
+@@ -1022,7 +1022,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@@ -18,7 +27,7 @@
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
-@@ -1198,7 +1198,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1214,7 +1214,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
<< "Failed launch with app: couldn't pick a profile";
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -205,7 +205,7 @@
+@@ -203,7 +203,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/hats/hats_helper.h"
-@@ -527,12 +527,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -526,12 +526,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-01-13 08:56:02 UTC
+--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -12,7 +12,7 @@
#include "ui/views/context_menu_controller.h"
@@ -9,7 +9,7 @@
#include "ui/base/ui_base_types.h"
#endif
-@@ -63,7 +63,7 @@ class BrowserFrame : public views::Widget, public view
+@@ -64,7 +64,7 @@ class BrowserFrame : public views::Widget, public view
~BrowserFrame() override;
@@ -18,7 +18,7 @@
// Returns which edges of the frame are tiled.
const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
-@@ -210,7 +210,7 @@ class BrowserFrame : public views::Widget, public view
+@@ -223,7 +223,7 @@ class BrowserFrame : public views::Widget, public view
// contents for smoother dragging.
TabDragKind tab_drag_kind_ = TabDragKind::kNone;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -47,7 +47,7 @@
#include "components/user_manager/user_manager.h"
@@ -18,7 +18,7 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
-@@ -271,7 +271,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -290,7 +290,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@@ -27,7 +27,7 @@
// If the window was sent to a different workspace, prioritize it if
// it was sent to the current workspace and deprioritize it
// otherwise. This is done by MoveBrowsersInWorkspaceToFront()
-@@ -394,7 +394,7 @@ void BrowserFrame::SelectNativeTheme() {
+@@ -413,7 +413,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@@ -36,7 +36,7 @@
const auto* linux_ui_theme =
ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
// Ignore the system theme for web apps with window-controls-overlay as the
-@@ -411,7 +411,7 @@ void BrowserFrame::SelectNativeTheme() {
+@@ -430,7 +430,7 @@ void BrowserFrame::SelectNativeTheme() {
bool BrowserFrame::RegenerateFrameOnThemeChange(
BrowserThemeChangeType theme_change_type) {
bool need_regenerate = false;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2037,7 +2037,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -2096,7 +2096,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
// CrOS cleanup is done.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-01-13 08:56:02 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
-@@ -113,7 +113,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
+@@ -117,7 +117,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
const gfx::Rect& bounding_rect) const override;
bool IsTranslucentWindowOpacitySupported() const override;
bool ShouldDrawRestoredFrameShadow() const override;
@@ -8,8 +8,8 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
ui::WindowTiledEdges GetTiledEdges() const override;
#endif
-
-@@ -229,7 +229,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
+ int WebAppButtonHeight() const override;
+@@ -234,7 +234,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
// Background painter for the window frame.
std::unique_ptr<views::FrameBackground> frame_background_;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
#include "ui/views/window/vector_icons/vector_icons.h"
#include "ui/views/window/window_shape.h"
@@ -9,7 +9,7 @@
#include "ui/views/controls/menu/menu_runner.h"
#endif
-@@ -555,7 +555,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
+@@ -585,7 +585,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
OpaqueBrowserFrameView::GetFrameButtonStyle() const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
return FrameButtonStyle::kMdButton;
#else
return FrameButtonStyle::kImageButton;
-@@ -578,7 +578,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
+@@ -608,7 +608,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
return false;
}
@@ -27,7 +27,7 @@
ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const {
return frame()->tiled_edges();
}
-@@ -774,7 +774,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
+@@ -810,7 +810,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
}
void OpaqueBrowserFrameView::WindowIconPressed() {
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
@@ -20,7 +20,7 @@
#include "ui/views/controls/image_view.h"
@@ -9,7 +9,7 @@
#include "ui/linux/window_frame_provider.h"
#endif
-@@ -74,7 +74,7 @@ class PictureInPictureBrowserFrameView
+@@ -78,7 +78,7 @@ class PictureInPictureBrowserFrameView
void Layout() override;
void AddedToWidget() override;
void RemovedFromWidget() override;
@@ -18,7 +18,7 @@
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
-@@ -155,7 +155,7 @@ class PictureInPictureBrowserFrameView
+@@ -159,7 +159,7 @@ class PictureInPictureBrowserFrameView
// Called when mouse entered or exited the pip window.
void OnMouseEnteredOrExitedWindow(bool entered);
@@ -27,7 +27,7 @@
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
-@@ -218,7 +218,7 @@ class PictureInPictureBrowserFrameView
+@@ -222,7 +222,7 @@ class PictureInPictureBrowserFrameView
gfx::MultiAnimation show_close_button_animation_;
gfx::MultiAnimation hide_close_button_animation_;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -40,7 +40,7 @@
#include "ui/aura/window.h"
@@ -36,7 +36,7 @@
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
-@@ -460,7 +460,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
+@@ -469,7 +469,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
for (ContentSettingImageView* view : content_setting_views_)
view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
@@ -45,7 +45,7 @@
// On Linux the top bar background will be drawn in OnPaint().
top_bar_container_view_->SetBackground(views::CreateSolidBackground(
color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -505,7 +505,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
+@@ -514,7 +514,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@@ -54,7 +54,7 @@
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
-@@ -710,7 +710,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
+@@ -719,7 +719,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
// views::View implementations:
void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -63,7 +63,7 @@
// Draw the PiP window frame borders and shadows, including the top bar
// background.
if (window_frame_provider_) {
-@@ -833,7 +833,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
+@@ -842,7 +842,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
}
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -72,7 +72,7 @@
if (window_frame_provider_) {
const auto insets = window_frame_provider_->GetFrameThicknessDip();
const auto tiled_edges = frame()->tiled_edges();
-@@ -854,7 +854,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
+@@ -863,7 +863,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@@ -81,7 +81,7 @@
return FrameBorderInsets();
#else
return gfx::Insets(kResizeBorder);
-@@ -865,7 +865,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight
+@@ -874,7 +874,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight
return FrameBorderInsets().top() + kTopControlsHeight;
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -81,7 +81,7 @@
+@@ -82,7 +82,7 @@
#include "components/remote_cocoa/browser/window.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/aura/client/drag_drop_client.h"
#endif
-@@ -259,7 +259,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
+@@ -260,7 +260,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
void UpdateSystemDnDDragImage(TabDragContext* attached_context,
const gfx::ImageSkia& image) {
@@ -18,16 +18,16 @@
aura::Window* root_window =
attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
if (aura::client::GetDragDropClient(root_window)) {
-@@ -511,7 +511,7 @@ void TabDragController::Init(TabDragContext* source_co
+@@ -512,7 +512,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
- // - Chrome OS
+ // - ChromeOS Ash
// Releasing capture on Ash cancels gestures so avoid it.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
-@@ -1112,7 +1112,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+@@ -1151,7 +1151,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -36,7 +36,7 @@
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
-@@ -2106,7 +2106,7 @@ void TabDragController::CompleteDrag() {
+@@ -2202,7 +2202,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@@ -45,7 +45,7 @@
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2500,7 +2500,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2596,7 +2596,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-10-29 17:50:56 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
-@@ -79,7 +79,7 @@ void FixWidgetStackOrder(views::Widget* widget, const
+@@ -78,7 +78,7 @@ void FixWidgetStackOrder(views::Widget* widget, const
return;
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
-@@ -385,7 +385,7 @@ std::string GetFileExtension(FileExtension file_extens
+@@ -401,7 +401,7 @@ std::string GetFileExtension(FileExtension file_extens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
SiteConfig config;
bool is_app_found = false;
-@@ -559,7 +559,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
+@@ -582,7 +582,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
}
#endif
@@ -18,7 +18,7 @@
bool IconManagerCheckIconTopLeftColor(WebAppIconManager& icon_manager,
const AppId& app_id,
std::vector<int> sizes_px,
-@@ -890,7 +890,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
+@@ -917,7 +917,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
LOG(INFO) << "TearDownOnMainThread: Deleting dangling shortcuts.";
// TODO(crbug.com/1273568): Investigate the true source of flakiness instead
// of papering over it here.
@@ -27,7 +27,7 @@
ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts());
#endif
LOG(INFO)
-@@ -1637,7 +1637,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
+@@ -1715,7 +1715,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
if (app_name.empty()) {
app_name = GetSiteConfiguration(site).app_name;
}
@@ -36,7 +36,7 @@
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
profile(), app_id, app_name));
ASSERT_TRUE(
-@@ -2591,7 +2591,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
+@@ -2749,7 +2749,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
app_state->id, app_state->name);
ASSERT_TRUE(icon_color.has_value());
ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
@@ -45,7 +45,7 @@
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
-@@ -2605,7 +2605,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -2764,7 +2764,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
ASSERT_TRUE(app_state);
base::ScopedAllowBlockingForTesting allow_blocking;
@@ -54,25 +54,25 @@
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
-@@ -2615,7 +2615,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -2774,7 +2774,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
Site site,
FileExtension file_extension) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- if (!BeforeStateCheckAction(__FUNCTION__))
+ if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
- ASSERT_TRUE(IsFileHandledBySite(site, file_extension));
-@@ -2626,7 +2626,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
+ }
+@@ -2786,7 +2786,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
Site site,
FileExtension file_extension) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- if (!BeforeStateCheckAction(__FUNCTION__))
+ if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
- ASSERT_FALSE(IsFileHandledBySite(site, file_extension));
-@@ -3137,7 +3137,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
+ }
+@@ -3362,7 +3362,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
base::FilePath shortcut_dir,
const std::string& app_name,
const AppId& app_id) {
@@ -81,7 +81,7 @@
return override_registration_->test_override->GetShortcutPath(
profile(), shortcut_dir, app_id, app_name);
#else
-@@ -3307,7 +3307,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
+@@ -3537,7 +3537,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
const AppId& id) {
base::ScopedAllowBlockingForTesting allow_blocking;
bool is_shortcut_and_icon_correct = false;
@@ -90,7 +90,7 @@
bool is_shortcut_correct =
override_registration_->test_override->IsShortcutCreated(profile, id,
name);
-@@ -3351,7 +3351,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
+@@ -3581,7 +3581,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
do_icon_colors_match =
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
}
@@ -99,7 +99,7 @@
SkColor expected_icon_pixel_color =
GetSiteConfigurationFromAppName(name).icon_color;
do_icon_colors_match = IconManagerCheckIconTopLeftColor(
-@@ -3404,7 +3404,7 @@ bool WebAppIntegrationTestDriver::IsFileHandledBySite(
+@@ -3634,7 +3634,7 @@ bool WebAppIntegrationTestDriver::IsFileHandledBySite(
app_id);
is_file_handled =
shell_integration::CanApplicationHandleURL(app_path, test_file_url);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/webui/about_ui.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/webui/about_ui.cc
-@@ -603,7 +603,7 @@ std::string ChromeURLs() {
+@@ -602,7 +602,7 @@ std::string ChromeURLs() {
return html;
}
@@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data,
-@@ -657,7 +657,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -656,7 +656,7 @@ void AboutUIHTMLSource::StartDataRequest(
response =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -1,8 +1,17 @@
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -392,7 +392,7 @@ void AppHomePageHandler::FillExtensionInfoList(
+@@ -353,7 +353,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
+
+ bool deprecated_app = false;
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ auto* context = extension_system_->extension_service()->GetBrowserContext();
+ deprecated_app =
+ extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
+@@ -419,7 +419,7 @@ void AppHomePageHandler::FillExtensionInfoList(
bool is_deprecated_app = false;
- auto* context = extension_service_->GetBrowserContext();
+ auto* context = extension_system_->extension_service()->GetBrowserContext();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -325,7 +325,7 @@
+@@ -329,7 +329,7 @@
#include "chrome/browser/ui/webui/app_launcher_page_ui.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
#endif
-@@ -351,17 +351,17 @@
+@@ -355,17 +355,17 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -30,7 +30,7 @@
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
-@@ -721,7 +721,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -735,7 +735,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@@ -39,7 +39,7 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1017,7 +1017,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1037,7 +1037,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<ash::personalization_app::PersonalizationAppUI>;
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
-@@ -1075,7 +1075,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1092,7 +1092,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@@ -57,7 +57,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
-@@ -1139,27 +1139,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1159,27 +1159,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -124,7 +124,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
@@ -18,7 +18,7 @@
#include "ui/linux/linux_ui_factory.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
-@@ -232,7 +232,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
+@@ -233,7 +233,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
#endif
html_source->AddBoolean("isChildAccount", profile->IsChild());
@@ -27,7 +27,7 @@
bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
#else
bool allow_qt_theme = false;
-@@ -378,7 +378,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -379,7 +379,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
{"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
{"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
@@ -36,7 +36,7 @@
{"gtkTheme", IDS_SETTINGS_GTK_THEME},
{"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
{"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -388,7 +388,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@@ -45,7 +45,7 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
-@@ -410,7 +410,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -411,7 +411,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/web_applications/commands/install_app_locally_command.cc
-@@ -84,7 +84,7 @@ void InstallAppLocallyCommand::StartWithLock(
+@@ -71,7 +71,7 @@ void InstallAppLocallyCommand::StartWithLock(
options.os_hooks[OsHookType::kUninstallationViaOsSettings] =
web_app->CanUserUninstallWebApp();
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/web_applications/os_integration/os_integration_test_override.h
-@@ -23,7 +23,7 @@ class Profile;
+@@ -33,7 +33,7 @@ class ShellLinkItem;
namespace web_app {
@@ -9,7 +9,7 @@
struct LinuxFileRegistration {
std::string xdg_command;
std::string file_contents;
-@@ -145,7 +145,7 @@ class OsIntegrationTestOverride
+@@ -183,7 +183,7 @@ class OsIntegrationTestOverride
}
void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
bool enable_on_login);
@@ -18,7 +18,7 @@
bool DeleteDesktopDirOnLinux();
const base::FilePath& desktop() { return desktop_.GetPath(); }
const base::FilePath& startup() { return startup_.GetPath(); }
-@@ -184,7 +184,7 @@ class OsIntegrationTestOverride
+@@ -230,7 +230,7 @@ class OsIntegrationTestOverride
#elif BUILDFLAG(IS_MAC)
base::ScopedTempDir chrome_apps_folder_;
std::map<base::FilePath, bool> startup_enabled_;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/os_integration_test_override.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/web_applications/os_integration/os_integration_test_override.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/web_applications/os_integration/os_integration_test_override.cc
-@@ -147,7 +147,7 @@ bool OsIntegrationTestOverride::IsRunOnOsLoginEnabled(
+@@ -179,7 +179,7 @@ bool OsIntegrationTestOverride::IsRunOnOsLoginEnabled(
Profile* profile,
const AppId& app_id,
const std::string& app_name) {
@@ -9,7 +9,7 @@
std::string shortcut_filename =
"chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
return base::PathExists(startup().Append(shortcut_filename));
-@@ -217,7 +217,7 @@ base::FilePath OsIntegrationTestOverride::GetShortcutP
+@@ -349,7 +349,7 @@ base::FilePath OsIntegrationTestOverride::GetShortcutP
app_installed_profiles.end()) {
return shortcut_path;
}
@@ -18,7 +18,7 @@
std::string shortcut_filename =
"chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename);
-@@ -242,7 +242,7 @@ bool OsIntegrationTestOverride::IsShortcutCreated(Prof
+@@ -374,7 +374,7 @@ bool OsIntegrationTestOverride::IsShortcutCreated(Prof
base::FilePath app_shortcut_path =
GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
return base::PathExists(app_shortcut_path);
@@ -27,7 +27,7 @@
base::FilePath desktop_shortcut_path =
GetShortcutPath(profile, desktop(), app_id, app_name);
return base::PathExists(desktop_shortcut_path);
-@@ -270,7 +270,7 @@ bool OsIntegrationTestOverride::SimulateDeleteShortcut
+@@ -402,7 +402,7 @@ bool OsIntegrationTestOverride::SimulateDeleteShortcut
GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
DCHECK(base::PathExists(app_folder_shortcut_path));
return base::DeletePathRecursively(app_folder_shortcut_path);
@@ -36,7 +36,7 @@
base::FilePath desktop_shortcut_path =
GetShortcutPath(profile, desktop(), app_id, app_name);
LOG(INFO) << desktop_shortcut_path;
-@@ -287,7 +287,7 @@ bool OsIntegrationTestOverride::ForceDeleteAllShortcut
+@@ -419,7 +419,7 @@ bool OsIntegrationTestOverride::ForceDeleteAllShortcut
return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin();
#elif BUILDFLAG(IS_MAC)
return DeleteChromeAppsDir();
@@ -45,7 +45,7 @@
return DeleteDesktopDirOnLinux();
#else
NOTREACHED() << "Not implemented on ChromeOS/Fuchsia ";
-@@ -327,7 +327,7 @@ void OsIntegrationTestOverride::EnableOrDisablePathOnL
+@@ -459,7 +459,7 @@ void OsIntegrationTestOverride::EnableOrDisablePathOnL
startup_enabled_[file_path] = enable_on_login;
}
@@ -54,7 +54,7 @@
bool OsIntegrationTestOverride::DeleteDesktopDirOnLinux() {
if (desktop_.IsValid()) {
return desktop_.Delete();
-@@ -360,7 +360,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
+@@ -492,7 +492,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
#elif BUILDFLAG(IS_MAC)
bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path);
DCHECK(success);
@@ -63,7 +63,7 @@
bool success = desktop_.CreateUniqueTempDirUnderPath(base_path);
DCHECK(success);
success = startup_.CreateUniqueTempDirUnderPath(base_path);
-@@ -379,7 +379,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
+@@ -511,7 +511,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
#elif BUILDFLAG(IS_MAC)
bool success = chrome_apps_folder_.CreateUniqueTempDir();
DCHECK(success);
@@ -72,7 +72,7 @@
bool success = desktop_.CreateUniqueTempDir();
DCHECK(success);
success = startup_.CreateUniqueTempDir();
-@@ -387,7 +387,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
+@@ -519,7 +519,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
#endif
}
@@ -81,7 +81,7 @@
auto callback =
base::BindRepeating([](base::FilePath filename, std::string xdg_command,
std::string file_contents) {
-@@ -421,7 +421,7 @@ OsIntegrationTestOverride::~OsIntegrationTestOverride(
+@@ -553,7 +553,7 @@ OsIntegrationTestOverride::~OsIntegrationTestOverride(
}
}
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc
-@@ -226,7 +226,7 @@ void ShortcutSubManager::Execute(
+@@ -170,7 +170,7 @@ void ShortcutSubManager::Execute(
return;
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/web_applications/os_integration/web_app_shortcut.h
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
#include "ui/gfx/image/image_family.h"
#include "url/gurl.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -66,7 +66,7 @@ struct ShortcutInfo {
+@@ -70,7 +70,7 @@ struct ShortcutInfo {
std::set<std::string> file_handler_extensions;
std::set<std::string> file_handler_mime_types;
std::set<std::string> protocol_handlers;
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc
-@@ -52,7 +52,7 @@ namespace {
+@@ -65,7 +65,7 @@ namespace {
#if BUILDFLAG(IS_MAC)
const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512};
@@ -9,3 +9,12 @@
// Linux supports icons of any size. FreeDesktop Icon Theme Specification states
// that "Minimally you should install a 48x48 icon in the hicolor theme."
const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512};
+@@ -221,7 +221,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout
+
+ // TODO(crbug.com/1416965): Implement tests on Linux for using shortcuts_menu
+ // actions.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const std::vector<WebAppShortcutsMenuItemInfo>& shortcuts_menu_item_infos =
+ CreateShortcutsMenuItemInfos(state.shortcut_menus());
+ DCHECK_LE(shortcuts_menu_item_infos.size(), kMaxApplicationDockMenuItems);
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc
-@@ -452,7 +452,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
+@@ -439,7 +439,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
}
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/web_applications/web_app_provider.cc.orig 2023-03-10 11:01:21 UTC
-+++ chrome/browser/web_applications/web_app_provider.cc
-@@ -283,7 +283,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
- protocol_handler_manager.get());
-
- std::unique_ptr<UrlHandlerManager> url_handler_manager;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- url_handler_manager = std::make_unique<UrlHandlerManagerImpl>(profile);
- #endif
-
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
--- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -590,7 +590,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
+@@ -587,7 +587,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
g_observer->ConfiguringCable(request_type);
}
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.h.orig 2023-03-10 11:01:21 UTC
+--- chrome/common/chrome_features.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/common/chrome_features.h
@@ -64,13 +64,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns);
@@ -16,7 +16,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -176,7 +176,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
+@@ -192,7 +192,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,16 +25,16 @@
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps);
-@@ -422,7 +422,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
+@@ -439,7 +439,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
COMPONENT_EXPORT(CHROME_FEATURES)
- BASE_DECLARE_FEATURE(kUpdateHistoryEntryPointsInIncognito);
+ BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -430,7 +430,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -447,7 +447,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/common/chrome_features.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/common/chrome_features.cc
@@ -82,7 +82,7 @@ BASE_FEATURE(kAsyncDns,
);
@@ -45,16 +45,16 @@
true
#else
false
-@@ -731,7 +731,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito,
- "UpdateHistoryEntryPointsInIncognito",
- base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -740,7 +740,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
+ "KAnonymityServiceStorage",
+ base::FEATURE_DISABLED_BY_DEFAULT);
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
BASE_FEATURE(kLinuxLowMemoryMonitor,
"LinuxLowMemoryMonitor",
base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -744,7 +744,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -753,7 +753,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
&kLinuxLowMemoryMonitor, "critical_level", 255};
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig 2023-02-11 09:11:04 UTC
+--- chrome/common/chrome_switches.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/common/chrome_switches.h
-@@ -265,12 +265,12 @@ extern const char kAllowNaClSocketAPI[];
+@@ -266,12 +266,12 @@ extern const char kAllowNaClSocketAPI[];
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/common/chrome_switches.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/common/chrome_switches.cc
-@@ -855,14 +855,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -860,14 +860,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h
--- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig 2023-03-10 11:01:21 UTC
+--- chrome/common/pref_names.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/common/pref_names.h
-@@ -390,7 +390,7 @@ extern const char kUseAshProxy[];
+@@ -388,7 +388,7 @@ extern const char kUseAshProxy[];
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// TODO(https://crbug.com/1317782): Remove in M110.
extern const char kUsesSystemThemeDeprecated[];
extern const char kSystemTheme[];
-@@ -417,7 +417,7 @@ extern const char kShowUpdatePromotionInfoBar[];
+@@ -409,7 +409,7 @@ extern const char kShowUpdatePromotionInfoBar[];
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -17,8 +17,8 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
extern const char kUseCustomChromeFrame[];
#endif
- #if BUILDFLAG(ENABLE_PLUGINS)
-@@ -608,7 +608,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
+ extern const char kPartitionDefaultZoomLevel[];
+@@ -599,7 +599,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
extern const char kDownloadDirUpgraded[];
extern const char kDownloadLastCompleteTime[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
extern const char kOpenPdfDownloadInSystemReader[];
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -723,7 +723,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
+@@ -716,7 +716,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
extern const char kWebAppsPreferences[];
extern const char kWebAppsIsolationState[];
@@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
extern const char kWebAppsUrlHandlerInfo[];
#endif
-@@ -854,7 +854,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
+@@ -845,7 +845,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
extern const char kAmbientAuthenticationInPrivateModesEnabled[];
extern const char kBasicAuthOverHttpEnabled[];
@@ -45,7 +45,7 @@
extern const char kAuthNegotiateDelegateByKdcPolicy[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -1133,7 +1133,7 @@ extern const char kBlockAutoplayEnabled[];
+@@ -1124,7 +1124,7 @@ extern const char kBlockAutoplayEnabled[];
#endif
extern const char kSandboxExternalProtocolBlocked[];
@@ -54,7 +54,16 @@
extern const char kAllowSystemNotifications[];
#endif
-@@ -1303,7 +1303,7 @@ extern const char kDIPSTimerLastUpdate[];
+@@ -1150,7 +1150,7 @@ extern const char kCACertificateManagementAllowed[];
+ extern const char kChromeRootStoreEnabled[];
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ // TODO(https://crbug.com/1406103): delete this after a few milestones.
+ extern const char kEnforceLocalAnchorConstraintsEnabled[];
+ #endif
+@@ -1299,7 +1299,7 @@ extern const char kDIPSTimerLastUpdate[];
extern const char kThrottleNonVisibleCrossOriginIframesAllowed[];
extern const char kNewBaseUrlInheritanceBehaviorAllowed[];
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc
--- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/common/pref_names.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/common/pref_names.cc
-@@ -1222,7 +1222,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
+@@ -1213,7 +1213,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemThemeDeprecated[] = "extensions.theme.use_system";
const char kSystemTheme[] = "extensions.theme.system_theme";
-@@ -1341,7 +1341,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1317,7 +1317,7 @@ const char kShowUpdatePromotionInfoBar[] =
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
// Boolean that is false if we should show window manager decorations. If
// true, we draw a custom chrome frame (thicker title bar and blue border).
const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1852,7 +1852,7 @@ const char kDownloadDirUpgraded[] = "download.director
+@@ -1828,7 +1828,7 @@ const char kDownloadDirUpgraded[] = "download.director
const char kDownloadLastCompleteTime[] = "download.last_complete_time";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,16 +27,7 @@
const char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
#endif
-@@ -2166,7 +2166,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
- // its isolation requirements.
- const char kWebAppsIsolationState[] = "web_apps.isolation_state";
-
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
- (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
- // Dictionary that maps origins to web apps that can act as URL handlers.
- const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
-@@ -2266,7 +2266,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
+@@ -2244,7 +2244,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
// requests.
const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled";
@@ -45,7 +36,7 @@
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
// along with kAuthNegotiateDelegateAllowlist.
const char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3303,7 +3303,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
+@@ -3274,7 +3274,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
const char kSandboxExternalProtocolBlocked[] =
"profile.sandbox_external_protocol_blocked";
@@ -54,7 +45,16 @@
// Boolean that indicates if system notifications are allowed to be used in
// place of Chrome notifications.
const char kAllowSystemNotifications[] = "system_notifications.allowed";
-@@ -3674,7 +3674,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe
+@@ -3327,7 +3327,7 @@ const char kCACertificateManagementAllowed[] =
+ const char kChromeRootStoreEnabled[] = "chrome_root_store_enabled";
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ const char kEnforceLocalAnchorConstraintsEnabled[] =
+ "enforce_local_anchor_constraints_enabled";
+ #endif
+@@ -3650,7 +3650,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe
const char kNewBaseUrlInheritanceBehaviorAllowed[] =
"new_base_url_inheritance_behavior_allowed";
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h
--- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig 2023-03-10 11:01:21 UTC
+--- chrome/common/webui_url_constants.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/common/webui_url_constants.h
-@@ -419,24 +419,24 @@ extern const char kOsUIShortcutCustomizationAppURL[];
+@@ -432,24 +432,24 @@ extern const char kOsUIShortcutCustomizationAppURL[];
extern const char kOsUIVersionURL[];
#endif
@@ -29,7 +29,7 @@
extern const char kChromeUIWebAppSettingsURL[];
extern const char kChromeUIWebAppSettingsHost[];
#endif
-@@ -451,14 +451,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -464,14 +464,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
extern const char kChromeUIBrowserSwitchHost[];
extern const char kChromeUIBrowserSwitchURL[];
extern const char kChromeUIEnterpriseProfileWelcomeHost[];
-@@ -472,7 +472,7 @@ extern const char kChromeUIProfilePickerUrl[];
+@@ -485,7 +485,7 @@ extern const char kChromeUIProfilePickerUrl[];
extern const char kChromeUIProfilePickerStartupQuery[];
#endif
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc
--- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/common/webui_url_constants.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -497,18 +497,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os://
+@@ -510,18 +510,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os://
const char kOsUIVersionURL[] = "os://version";
#endif
@@ -22,7 +22,7 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
#endif
-@@ -523,14 +523,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -536,14 +536,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -39,7 +39,7 @@
const char kChromeUIBrowserSwitchHost[] = "browser-switch";
const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
const char kChromeUIEnterpriseProfileWelcomeHost[] =
-@@ -547,7 +547,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+@@ -560,7 +560,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
const char kChromeUIProfilePickerStartupQuery[] = "startup";
#endif
@@ -48,7 +48,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
-@@ -625,7 +625,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
+@@ -638,7 +638,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -57,7 +57,7 @@
const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
const char kChromeUIWebAppSettingsHost[] = "app-settings";
#endif
-@@ -839,7 +839,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -859,7 +859,7 @@ const char* const kChromeDebugURLs[] = {
blink::kChromeUIGpuJavaCrashURL,
kChromeUIJavaCrashURL,
#endif
diff --git a/www/ungoogled-chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h b/www/ungoogled-chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h
--- a/www/ungoogled-chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h
+++ b/www/ungoogled-chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h
@@ -1,4 +1,4 @@
---- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2022-10-01 07:40:07 UTC
+--- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2023-04-08 11:38:38 UTC
+++ chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h
@@ -16,7 +16,7 @@
#include "mojo/public/cpp/bindings/struct_traits.h"
@@ -6,6 +6,6 @@
#if !BUILDFLAG(FULL_SAFE_BROWSING) || \
- (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN))
+ (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD))
- #error BUILDFLAG(FULL_SAFE_BROWSING) should be set and either OS_LINUX or OS_WIN defined.
+ #error FULL_SAFE_BROWSING should be set and either IS_LINUX or IS_WIN set.
#endif
diff --git a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
--- a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,4 +1,4 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ chrome/services/printing/print_backend_service_impl.cc
@@ -43,7 +43,7 @@
#include "printing/backend/cups_connection_pool.h"
@@ -27,7 +27,7 @@
// Test framework already initializes the UI, so this should not go in
// `InitCommon()`. Additionally, low-level Linux UI is not needed when tests
// are using `TestPrintingContext`.
-@@ -677,7 +677,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -679,7 +679,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend_->GetPrinterDriverInfo(*printer_name));
diff --git a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- chrome/test/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ chrome/test/BUILD.gn
-@@ -10041,7 +10041,7 @@ test("chrome_app_unittests") {
+@@ -10150,7 +10150,7 @@ test("chrome_app_unittests") {
"//components/heap_profiling/in_process",
"//components/safe_browsing:buildflags",
]
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/personal_data_manager.cc.orig 2023-03-10 11:01:21 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-04-08 11:38:38 UTC
+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -2233,7 +2233,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -2253,7 +2253,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig 2023-03-10 11:01:21 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-04-08 11:38:38 UTC
+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -266,7 +266,7 @@ const base::FeatureParam<int>
+@@ -270,7 +270,7 @@ const base::FeatureParam<int>
bool ShouldShowImprovedUserConsentForCreditCardSave() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc
--- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc
+++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_util.cc.orig 2022-10-01 07:40:07 UTC
+--- components/autofill/core/common/autofill_util.cc.orig 2023-04-08 11:38:38 UTC
+++ components/autofill/core/common/autofill_util.cc
-@@ -154,7 +154,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
+@@ -156,7 +156,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
bool ShouldAutoselectFirstSuggestionOnArrowDown() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_configurations.cc.orig 2023-03-10 11:01:21 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig 2023-04-08 11:38:38 UTC
+++ components/feature_engagement/public/feature_configurations.cc
-@@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
+@@ -39,7 +39,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
absl::optional<FeatureConfig> GetClientSideFeatureConfig(
const base::Feature* feature) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
absl::optional<FeatureConfig> config = FeatureConfig();
config->valid = true;
-@@ -1066,7 +1066,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
+@@ -1070,7 +1070,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig 2023-03-10 11:01:21 UTC
+--- components/feature_engagement/public/feature_constants.h.orig 2023-04-08 11:38:38 UTC
+++ components/feature_engagement/public/feature_constants.h
@@ -22,7 +22,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH);
BASE_DECLARE_FEATURE(kIPHDummyFeature);
@@ -9,7 +9,7 @@
BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature);
BASE_DECLARE_FEATURE(kIPHDesktopSharedHighlightingFeature);
BASE_DECLARE_FEATURE(kIPHDesktopTabGroupsNewGroupFeature);
-@@ -180,7 +180,8 @@ BASE_DECLARE_FEATURE(kIPHiOSDefaultBrowserSettingsBadg
+@@ -181,7 +181,8 @@ BASE_DECLARE_FEATURE(kIPHiOSAppStorePromoFeature);
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig 2023-03-10 11:01:21 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig 2023-04-08 11:38:38 UTC
+++ components/feature_engagement/public/feature_constants.cc
@@ -19,7 +19,7 @@ BASE_FEATURE(kUseClientConfigIPH,
BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -9,7 +9,7 @@
BASE_FEATURE(kIPHBatterySaverModeFeature,
"IPH_BatterySaverMode",
base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -434,7 +434,8 @@ BASE_FEATURE(kIPHiOSDefaultBrowserSettingsBadgeFeature
+@@ -437,7 +437,8 @@ BASE_FEATURE(kIPHiOSAppStorePromoFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig 2023-03-10 11:01:21 UTC
+--- components/feature_engagement/public/feature_list.h.orig 2023-04-08 11:38:38 UTC
+++ components/feature_engagement/public/feature_list.h
-@@ -232,7 +232,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDefaultBrowserSettingsBa
+@@ -233,7 +233,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSAppStorePromoFeature, "I
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode");
DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature,
"IPH_DesktopTabGroupsNewGroup");
-@@ -278,7 +278,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea
+@@ -279,7 +279,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -19,16 +19,16 @@
DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature,
"IPH_AutofillVirtualCardSuggestion");
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
-@@ -396,7 +397,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
- VARIATION_ENTRY(kIPHiOSDefaultBrowserOverflowMenuBadgeFeature),
+@@ -398,7 +399,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
VARIATION_ENTRY(kIPHiOSDefaultBrowserSettingsBadgeFeature),
+ VARIATION_ENTRY(kIPHiOSAppStorePromoFeature),
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
VARIATION_ENTRY(kIPHBatterySaverModeFeature),
VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature),
VARIATION_ENTRY(kIPHExtensionsMenuFeature),
-@@ -429,7 +430,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -431,7 +432,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc
--- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,7 +1,7 @@
---- components/feature_engagement/public/feature_list.cc.orig 2023-03-10 11:01:21 UTC
+--- components/feature_engagement/public/feature_list.cc.orig 2023-04-08 11:38:38 UTC
+++ components/feature_engagement/public/feature_list.cc
-@@ -127,7 +127,7 @@ const base::Feature* const kAllFeatures[] = {
- &kIPHiOSDefaultBrowserSettingsBadgeFeature,
+@@ -128,7 +128,7 @@ const base::Feature* const kAllFeatures[] = {
+ &kIPHiOSAppStorePromoFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -9,7 +9,7 @@
&kIPHBatterySaverModeFeature,
&kIPHDesktopTabGroupsNewGroupFeature,
&kIPHExtensionsMenuFeature,
-@@ -159,7 +159,8 @@ const base::Feature* const kAllFeatures[] = {
+@@ -160,7 +160,8 @@ const base::Feature* const kAllFeatures[] = {
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc
--- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc
@@ -1,6 +1,6 @@
---- components/feed/core/v2/proto_util_unittest.cc.orig 2022-10-01 07:40:07 UTC
+--- components/feed/core/v2/proto_util_unittest.cc.orig 2023-04-08 11:38:38 UTC
+++ components/feed/core/v2/proto_util_unittest.cc
-@@ -42,8 +42,8 @@ TEST(ProtoUtilTest, CreateClientInfo) {
+@@ -43,8 +43,8 @@ TEST(ProtoUtilTest, CreateClientInfo) {
feedwire::ClientInfo result = CreateClientInfo(request_metadata);
EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, result.app_type());
EXPECT_EQ(feedwire::Version::RELEASE, result.app_version().build_type());
diff --git a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
--- a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
+++ b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2022-10-01 07:40:07 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2023-04-08 11:38:38 UTC
+++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -824,7 +824,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -807,7 +807,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
}
#endif // #if !BUILDFLAG(IS_ANDROID)
diff --git a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
--- a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-10-01 07:40:07 UTC
+--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2023-04-08 11:38:38 UTC
+++ components/network_session_configurator/browser/network_session_configurator_unittest.cc
-@@ -833,7 +833,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
+@@ -794,7 +794,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
}
TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) {
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/login_database.cc.orig 2023-02-11 09:11:04 UTC
+--- components/password_manager/core/browser/login_database.cc.orig 2023-04-08 11:38:38 UTC
+++ components/password_manager/core/browser/login_database.cc
-@@ -728,7 +728,7 @@ std::string GeneratePlaceholders(size_t count) {
+@@ -757,7 +757,7 @@ std::string GeneratePlaceholders(size_t count) {
return result;
}
@@ -9,7 +9,7 @@
// Fills |form| with necessary data required to be removed from the database
// and returns it.
PasswordForm GetFormForRemoval(sql::Statement& statement) {
-@@ -745,7 +745,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
+@@ -774,7 +774,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
// Whether we should try to return the decryptable passwords while the
// encryption service fails for some passwords.
bool ShouldReturnPartialPasswords() {
@@ -18,7 +18,7 @@
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
#else
return false;
-@@ -1559,7 +1559,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
+@@ -1602,7 +1602,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
}
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_features.h.orig 2023-03-10 11:01:21 UTC
+--- components/password_manager/core/common/password_manager_features.h.orig 2023-04-08 11:38:38 UTC
+++ components/password_manager/core/common/password_manager_features.h
@@ -35,7 +35,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear
BASE_DECLARE_FEATURE(kEnablePasswordManagerWithinFencedFrame);
@@ -9,7 +9,7 @@
BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails);
#endif
BASE_DECLARE_FEATURE(kInferConfirmationPasswordField);
-@@ -62,7 +62,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
+@@ -67,7 +67,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop
BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble);
#endif
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/common/password_manager_features.cc.orig 2023-03-10 11:01:21 UTC
+--- components/password_manager/core/common/password_manager_features.cc.orig 2023-04-08 11:38:38 UTC
+++ components/password_manager/core/common/password_manager_features.cc
-@@ -69,7 +69,7 @@ BASE_FEATURE(kFillOnAccountSelect,
+@@ -76,7 +76,7 @@ BASE_FEATURE(kFillOnAccountSelect,
"fill-on-account-select",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -9,7 +9,7 @@
// When enabled, initial sync will be forced during startup if the password
// store has encryption service failures.
BASE_FEATURE(kForceInitialSyncWhenDecryptionFails,
-@@ -186,7 +186,7 @@ BASE_FEATURE(kPasswordStrengthIndicator,
+@@ -197,7 +197,7 @@ BASE_FEATURE(kPasswordStrengthIndicator,
"PasswordStrengthIndicator",
base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
--- a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2023-03-10 11:01:21 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2023-04-08 11:38:38 UTC
+++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -424,7 +424,7 @@ void CloudPolicyClient::FetchPolicy() {
+@@ -453,7 +453,7 @@ void CloudPolicyClient::FetchPolicy() {
fetch_request->set_invalidation_payload(invalidation_payload_);
}
}
diff --git a/www/ungoogled-chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
--- a/www/ungoogled-chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
+++ b/www/ungoogled-chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
@@ -1,6 +1,6 @@
---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-03-10 11:01:21 UTC
+--- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-04-08 11:38:38 UTC
+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
-@@ -34,6 +34,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
+@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
}
}
@@ -8,7 +8,7 @@
auto* instance = sandbox::policy::SandboxLinux::GetInstance();
std::vector<BrokerFilePermission> permissions{
-@@ -57,6 +58,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
+@@ -76,6 +77,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
sandbox::syscall_broker::COMMAND_OPEN}),
permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options);
instance->EngageNamespaceSandboxIfPossible();
diff --git a/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc b/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc
--- a/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc
+++ b/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc
@@ -1,11 +1,11 @@
---- components/translate/core/common/translate_util.cc.orig 2022-12-02 17:56:32 UTC
+--- components/translate/core/common/translate_util.cc.orig 2023-04-08 11:38:38 UTC
+++ components/translate/core/common/translate_util.cc
-@@ -35,7 +35,7 @@ BASE_FEATURE(kTranslateSubFrames,
+@@ -33,7 +33,7 @@ BASE_FEATURE(kTranslateSubFrames,
BASE_FEATURE(kTFLiteLanguageDetectionEnabled,
"TFLiteLanguageDetectionEnabled",
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
-- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/ungoogled-chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/ungoogled-chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
--- a/www/ungoogled-chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
+++ b/www/ungoogled-chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
@@ -1,6 +1,6 @@
---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-02-11 09:11:04 UTC
+--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-04-08 11:38:38 UTC
+++ components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -286,7 +286,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
+@@ -292,7 +292,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
// The ideal fix would be to change the omnibox font used for Thai. In
// that case, the Linux-only list should be revisited and potentially
// removed.
diff --git a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
--- a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,4 +1,4 @@
---- content/app/content_main_runner_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- content/app/content_main_runner_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ content/app/content_main_runner_impl.cc
@@ -139,13 +139,13 @@
#include "content/browser/posix_file_descriptor_info_impl.h"
@@ -76,7 +76,7 @@
PreSandboxInit();
#endif
-@@ -823,11 +834,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -824,11 +835,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -90,7 +90,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -1012,6 +1022,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1023,6 +1033,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
}
#endif
@@ -107,7 +107,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE)
-@@ -1079,7 +1099,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1090,7 +1110,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
->ReconfigureAfterFeatureListInit(process_type);
}
@@ -116,7 +116,7 @@
// If dynamic Mojo Core is being used, ensure that it's loaded very early in
// the child/zygote process, before any sandbox is initialized. The library
// is not fully initialized with IPC support until a ChildProcess is later
-@@ -1112,6 +1132,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1128,6 +1148,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
content_main_params_.reset();
RegisterMainThreadFactories();
diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- content/browser/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ content/browser/BUILD.gn
-@@ -2386,6 +2386,13 @@ source_set("browser") {
+@@ -2360,6 +2360,13 @@ source_set("browser") {
]
}
diff --git a/www/ungoogled-chromium/files/patch-content_browser_audio_audio__service.cc b/www/ungoogled-chromium/files/patch-content_browser_audio_audio__service.cc
--- a/www/ungoogled-chromium/files/patch-content_browser_audio_audio__service.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_audio_audio__service.cc
@@ -1,4 +1,4 @@
---- content/browser/audio/audio_service.cc.orig 2023-01-13 08:56:02 UTC
+--- content/browser/audio/audio_service.cc.orig 2023-04-08 11:38:38 UTC
+++ content/browser/audio/audio_service.cc
@@ -33,7 +33,7 @@
#if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
@@ -9,7 +9,7 @@
#include "ui/display/display_util.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -213,7 +213,7 @@ audio::mojom::AudioService& GetAudioService() {
+@@ -225,7 +225,7 @@ audio::mojom::AudioService& GetAudioService() {
->PostTaskAndReplyWithResult(
FROM_HERE, base::BindOnce(&ScanEdidBitstreams),
base::BindOnce(&LaunchAudioService, std::move(receiver)));
diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc
--- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_process_host.cc.orig 2023-02-11 09:11:04 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig 2023-04-08 11:38:38 UTC
+++ content/browser/gpu/gpu_process_host.cc
-@@ -249,6 +249,7 @@ static const char* const kSwitchNames[] = {
+@@ -250,6 +250,7 @@ static const char* const kSwitchNames[] = {
switches::kEnableBackgroundThreadPool,
switches::kEnableGpuRasterization,
switches::kEnableLogging,
@@ -8,7 +8,7 @@
switches::kDoubleBufferCompositing,
switches::kHeadless,
switches::kLoggingLevel,
-@@ -280,7 +281,7 @@ static const char* const kSwitchNames[] = {
+@@ -281,7 +282,7 @@ static const char* const kSwitchNames[] = {
switches::kOzoneDumpFile,
switches::kDisableBufferBWCompression,
#endif
diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
--- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -215,7 +215,7 @@
#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
@@ -36,7 +36,7 @@
mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
video_encode_accelerator_factory_remote_;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -2174,7 +2174,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
+@@ -2155,7 +2155,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -44,8 +44,8 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
void RenderProcessHostImpl::CreateStableVideoDecoder(
mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {
- if (!stable_video_decoder_factory_remote_.is_bound()) {
-@@ -3349,6 +3349,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+@@ -3331,6 +3331,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
switches::kDisableSpeechAPI,
switches::kDisableThreadedCompositing,
switches::kDisableTouchDragDrop,
@@ -53,7 +53,7 @@
switches::kDisableUseMojoVideoDecoderForPepper,
switches::kDisableV8IdleTasks,
switches::kDisableVideoCaptureUseGpuMemoryBuffer,
-@@ -4830,7 +4831,7 @@ void RenderProcessHostImpl::ResetIPC() {
+@@ -4814,7 +4815,7 @@ void RenderProcessHostImpl::ResetIPC() {
coordinator_connector_receiver_.reset();
tracing_registration_.reset();
diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
--- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-03-10 11:01:21 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-04-08 11:38:38 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -119,7 +119,7 @@
#include "ui/gfx/gdi_util.h"
@@ -18,7 +18,7 @@
BrowserAccessibilityManager* manager =
host()->GetOrCreateRootBrowserAccessibilityManager();
if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1590,7 +1590,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1588,7 +1588,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
return GetTextInputManager() && GetTextInputManager()->should_do_learning();
}
@@ -27,7 +27,7 @@
bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
const gfx::Range& range,
const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2422,7 +2422,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2420,7 +2420,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,7 +36,7 @@
return NeedsInputGrab();
#else
return false;
-@@ -2599,7 +2599,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2597,7 +2597,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
diff --git a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- content/common/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ content/common/BUILD.gn
-@@ -426,6 +426,9 @@ if (is_linux || is_chromeos) {
+@@ -432,6 +432,9 @@ if (is_linux || is_chromeos) {
public = [ "set_process_title_linux.h" ]
sources = [ "set_process_title_linux.cc" ]
deps = [ "//base" ]
@@ -10,7 +10,7 @@
}
}
-@@ -474,7 +477,7 @@ mojom("mojo_bindings") {
+@@ -480,7 +483,7 @@ mojom("mojo_bindings") {
if (enable_ipc_logging) {
enabled_features += [ "ipc_logging" ]
}
diff --git a/www/ungoogled-chromium/files/patch-content_common_user__agent.cc b/www/ungoogled-chromium/files/patch-content_common_user__agent.cc
--- a/www/ungoogled-chromium/files/patch-content_common_user__agent.cc
+++ b/www/ungoogled-chromium/files/patch-content_common_user__agent.cc
@@ -1,6 +1,6 @@
---- content/common/user_agent.cc.orig 2022-10-01 07:40:07 UTC
+--- content/common/user_agent.cc.orig 2023-04-08 11:38:38 UTC
+++ content/common/user_agent.cc
-@@ -41,7 +41,7 @@ std::string GetUserAgentPlatform() {
+@@ -45,7 +45,7 @@ std::string GetUserAgentPlatform() {
return "";
#elif BUILDFLAG(IS_MAC)
return "Macintosh; ";
@@ -9,16 +9,16 @@
return "X11; "; // strange, but that's what Firefox uses
#elif BUILDFLAG(IS_ANDROID)
return "Linux; ";
-@@ -63,7 +63,7 @@ std::string GetUnifiedPlatform() {
+@@ -71,7 +71,7 @@ std::string GetUnifiedPlatform() {
return "Windows NT 10.0; Win64; x64";
#elif BUILDFLAG(IS_FUCHSIA)
return "Fuchsia";
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return "X11; Linux x86_64";
- #else
- #error Unsupported platform
-@@ -275,6 +275,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
+ #elif BUILDFLAG(IS_IOS)
+ if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
+@@ -296,6 +296,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
"Android %s", os_version.c_str()
#elif BUILDFLAG(IS_FUCHSIA)
"Fuchsia"
@@ -32,6 +32,6 @@
+#endif
+ unixinfo.sysname, // e.g. Linux
+ cpu_type.c_str() // e.g. i686
- #elif BUILDFLAG(IS_POSIX)
- "%s %s",
- unixinfo.sysname, // e.g. Linux
+ #elif BUILDFLAG(IS_IOS)
+ "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
+ os_version.c_str()
diff --git a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc
--- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig 2023-02-11 09:11:04 UTC
+--- content/gpu/gpu_main.cc.orig 2023-04-08 11:38:38 UTC
+++ content/gpu/gpu_main.cc
-@@ -88,7 +88,7 @@
+@@ -89,7 +89,7 @@
#include "sandbox/win/src/sandbox.h"
#endif
@@ -9,7 +9,7 @@
#include "content/gpu/gpu_sandbox_hook_linux.h"
#include "sandbox/policy/linux/sandbox_linux.h"
#include "sandbox/policy/sandbox_type.h"
-@@ -109,7 +109,7 @@ namespace content {
+@@ -110,7 +110,7 @@ namespace content {
namespace {
@@ -18,7 +18,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
-@@ -171,7 +171,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) override {
@@ -27,7 +27,7 @@
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
#elif BUILDFLAG(IS_WIN)
return StartSandboxWindows(sandbox_info_);
-@@ -269,7 +269,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -270,7 +270,7 @@ int GpuMain(MainFunctionParams parameters) {
std::make_unique<base::SingleThreadTaskExecutor>(
gpu_preferences.message_pump_type);
}
@@ -36,7 +36,7 @@
#error "Unsupported Linux platform."
#elif BUILDFLAG(IS_MAC)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -404,7 +404,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -405,7 +405,7 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
diff --git a/www/ungoogled-chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
--- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
+++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2023-03-10 11:01:21 UTC
+--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2023-04-08 11:38:38 UTC
+++ content/gpu/gpu_sandbox_hook_linux.cc
@@ -126,6 +126,7 @@ void AddStandardChromeOsPermissions(
}
@@ -8,7 +8,7 @@
void AddV4L2GpuPermissions(
std::vector<BrokerFilePermission>* permissions,
const sandbox::policy::SandboxSeccompBPF::Options& options) {
-@@ -481,8 +482,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
+@@ -484,8 +485,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
AddStandardGpuPermissions(&permissions);
return permissions;
}
@@ -19,7 +19,7 @@
// Preload the Mali library.
if (UseChromecastSandboxAllowlist()) {
for (const char* path : kAllowedChromecastPaths) {
-@@ -527,6 +530,7 @@ void LoadArmGpuLibraries() {
+@@ -530,6 +533,7 @@ void LoadArmGpuLibraries() {
dlopen(driver_paths[i], dlopen_flag);
}
}
@@ -27,7 +27,7 @@
}
bool LoadAmdGpuLibraries() {
-@@ -594,12 +598,14 @@ void LoadV4L2Libraries(
+@@ -597,12 +601,14 @@ void LoadV4L2Libraries(
}
void LoadChromecastV4L2Libraries() {
@@ -42,7 +42,7 @@
}
bool LoadLibrariesForGpu(
-@@ -626,6 +632,7 @@ bool LoadLibrariesForGpu(
+@@ -629,6 +635,7 @@ bool LoadLibrariesForGpu(
return true;
}
@@ -50,7 +50,7 @@
sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
const sandbox::policy::SandboxLinux::Options& options) {
sandbox::syscall_broker::BrokerCommandSet command_set;
-@@ -649,13 +656,17 @@ bool BrokerProcessPreSandboxHook(
+@@ -652,13 +659,17 @@ bool BrokerProcessPreSandboxHook(
SetProcessTitleFromCommandLine(nullptr);
return true;
}
diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__features.h b/www/ungoogled-chromium/files/patch-content_public_common_content__features.h
--- a/www/ungoogled-chromium/files/patch-content_public_common_content__features.h
+++ b/www/ungoogled-chromium/files/patch-content_public_common_content__features.h
@@ -1,6 +1,6 @@
---- content/public/common/content_features.h.orig 2023-03-10 11:01:21 UTC
+--- content/public/common/content_features.h.orig 2023-04-08 11:38:38 UTC
+++ content/public/common/content_features.h
-@@ -114,7 +114,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO
+@@ -115,7 +115,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO
CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSet);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH);
diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc
--- a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc
+++ b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig 2023-03-10 11:01:21 UTC
+--- content/public/common/content_features.cc.orig 2023-04-08 11:38:38 UTC
+++ content/public/common/content_features.cc
@@ -39,7 +39,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
"AudioServiceOutOfProcess",
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -539,7 +539,7 @@ BASE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens,
+@@ -547,7 +547,7 @@ BASE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens,
// (activated by kUserAgentClientHint)
BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
@@ -27,7 +27,7 @@
// Supports proxying thread type changes of renderer processes to browser
// process and having browser process handle adjusting thread properties (nice
// value, c-group, latency sensitivity...) for renderers which have sandbox
-@@ -1333,7 +1333,7 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -1367,7 +1367,7 @@ BASE_FEATURE(kWebAssemblyTiering,
BASE_FEATURE(kWebAssemblyTrapHandler,
"WebAssemblyTrapHandler",
#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -36,7 +36,7 @@
defined(ARCH_CPU_X86_64)) || \
(BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
base::FEATURE_ENABLED_BY_DEFAULT
-@@ -1404,7 +1404,11 @@ BASE_FEATURE(kWebUICodeCache,
+@@ -1425,7 +1425,11 @@ BASE_FEATURE(kWebUICodeCache,
// Controls whether the WebUSB API is enabled:
// https://wicg.github.io/webusb
diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h
--- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h
+++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h
@@ -1,14 +1,14 @@
---- content/public/common/content_switches.h.orig 2023-03-10 11:01:21 UTC
+--- content/public/common/content_switches.h.orig 2023-04-08 11:38:38 UTC
+++ content/public/common/content_switches.h
-@@ -116,6 +116,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu
- CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[];
+@@ -117,6 +117,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
+ CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
CONTENT_EXPORT extern const char kEnableLCDText[];
CONTENT_EXPORT extern const char kEnableLogging[];
+CONTENT_EXPORT extern const char kDisableUnveil[];
CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -267,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc
--- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig 2023-03-10 11:01:21 UTC
+--- content/public/common/content_switches.cc.orig 2023-04-08 11:38:38 UTC
+++ content/public/common/content_switches.cc
-@@ -359,6 +359,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] =
+@@ -368,6 +368,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
// builds.
const char kEnableLogging[] = "enable-logging";
diff --git a/www/ungoogled-chromium/files/patch-content_public_common_zygote_features.gni b/www/ungoogled-chromium/files/patch-content_public_common_zygote_features.gni
--- a/www/ungoogled-chromium/files/patch-content_public_common_zygote_features.gni
+++ b/www/ungoogled-chromium/files/patch-content_public_common_zygote_features.gni
@@ -1,8 +1,8 @@
---- content/public/common/zygote/features.gni.orig 2023-03-10 11:01:21 UTC
+--- content/public/common/zygote/features.gni.orig 2023-04-08 11:38:38 UTC
+++ content/public/common/zygote/features.gni
@@ -2,4 +2,4 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
--use_zygote = is_posix && !is_android && !is_mac
+-use_zygote = is_posix && !is_android && !is_apple
+use_zygote = is_posix && !is_android && !is_mac && !is_bsd
diff --git a/www/ungoogled-chromium/files/patch-content_renderer_media_render__media__client.cc b/www/ungoogled-chromium/files/patch-content_renderer_media_render__media__client.cc
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-content_renderer_media_render__media__client.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/renderer/media/render_media_client.cc.orig 2022-10-29 17:50:56 UTC
-+++ content/renderer/media/render_media_client.cc
-@@ -22,7 +22,7 @@ namespace {
- // when it's needed synchronously.
- #if BUILDFLAG(ENABLE_PLATFORM_HEVC) && \
- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_MAC))
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD))
- #define NEEDS_PROFILE_UPDATER 1
- #else
- #define NEEDS_PROFILE_UPDATER 0
diff --git a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc
--- a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,15 +1,15 @@
---- content/renderer/render_thread_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- content/renderer/render_thread_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ content/renderer/render_thread_impl.cc
-@@ -200,6 +200,8 @@
+@@ -201,6 +201,8 @@
- #if BUILDFLAG(IS_MAC)
+ #if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
+#elif BUILDFLAG(IS_BSD)
+#include <stdlib.h>
#else
#include <malloc.h>
#endif
-@@ -1051,7 +1053,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
kGpuStreamPriorityMedia);
const bool enable_video_decode_accelerator =
@@ -18,7 +18,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
#endif // BUILDFLAG(IS_LINUX)
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1060,7 +1062,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
gpu::kGpuFeatureStatusEnabled);
const bool enable_video_encode_accelerator =
@@ -27,7 +27,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) &&
#else
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1843,7 +1845,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
+@@ -1863,7 +1865,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
bool enable_video_encode_accelerator) {
mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
vea_provider;
diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
--- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2023-03-10 11:01:21 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2023-04-08 11:38:38 UTC
+++ content/renderer/renderer_blink_platform_impl.h
@@ -31,7 +31,7 @@
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
@@ -9,7 +9,7 @@
#include "components/services/font/public/cpp/font_loader.h" // nogncheck
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
#endif
-@@ -245,7 +245,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -241,7 +241,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
const gpu::GPUInfo& gpu_info) const;
@@ -18,7 +18,7 @@
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-@@ -265,7 +265,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -261,7 +261,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
mutable base::WaitableEvent io_thread_id_ready_event_;
base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;
diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
--- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -112,7 +112,7 @@
+@@ -111,7 +111,7 @@
#if BUILDFLAG(IS_MAC)
#include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#endif
-@@ -178,7 +178,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -177,7 +177,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
main_thread_scheduler_(main_thread_scheduler) {
// RenderThread may not exist in some tests.
if (RenderThreadImpl::current()) {
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
RenderThreadImpl::current()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -188,7 +188,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -187,7 +187,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
#endif
}
@@ -27,7 +27,7 @@
if (sandboxEnabled()) {
#if BUILDFLAG(IS_MAC)
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -270,7 +270,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -245,7 +245,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
#endif
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- content/shell/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ content/shell/BUILD.gn
-@@ -905,7 +905,7 @@ group("content_shell_crash_test") {
+@@ -966,7 +966,7 @@ group("content_shell_crash_test") {
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
}
diff --git a/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc
--- a/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc
@@ -1,6 +1,6 @@
---- content/shell/app/shell_main_delegate.cc.orig 2023-02-11 09:11:04 UTC
+--- content/shell/app/shell_main_delegate.cc.orig 2023-04-08 11:38:38 UTC
+++ content/shell/app/shell_main_delegate.cc
-@@ -214,7 +214,7 @@ void ShellMainDelegate::PreSandboxStartup() {
+@@ -221,7 +221,7 @@ void ShellMainDelegate::PreSandboxStartup() {
// Reporting for sub-processes will be initialized in ZygoteForked.
if (process_type != switches::kZygoteProcess) {
crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
diff --git a/www/ungoogled-chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/ungoogled-chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
--- a/www/ungoogled-chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/ungoogled-chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,4 +1,4 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig 2023-02-11 09:11:04 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig 2023-04-08 11:38:38 UTC
+++ content/shell/browser/shell_browser_main_parts.cc
@@ -50,7 +50,7 @@
#include "net/base/network_change_notifier.h"
@@ -9,7 +9,7 @@
#include "ui/base/ime/init/input_method_initializer.h"
#endif
-@@ -65,7 +65,7 @@
+@@ -67,7 +67,7 @@
#include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h"
#endif
@@ -18,7 +18,7 @@
#include "ui/linux/linux_ui.h" // nogncheck
#include "ui/linux/linux_ui_factory.h" // nogncheck
#endif
-@@ -129,7 +129,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
+@@ -136,7 +136,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
}
int ShellBrowserMainParts::PreEarlyInitialization() {
@@ -27,7 +27,7 @@
ui::InitializeInputMethodForTesting();
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -158,7 +158,7 @@ void ShellBrowserMainParts::ToolkitInitialized() {
+@@ -167,7 +167,7 @@ void ShellBrowserMainParts::ToolkitInitialized() {
if (switches::IsRunWebTestsSwitchPresent())
return;
@@ -36,7 +36,7 @@
ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi());
#endif
}
-@@ -201,7 +201,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
+@@ -210,7 +210,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
ShellDevToolsManagerDelegate::StopHttpHandler();
browser_context_.reset();
off_the_record_browser_context_.reset();
diff --git a/www/ungoogled-chromium/files/patch-content_test_BUILD.gn b/www/ungoogled-chromium/files/patch-content_test_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-content_test_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-content_test_BUILD.gn
@@ -1,6 +1,6 @@
---- content/test/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- content/test/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ content/test/BUILD.gn
-@@ -2103,7 +2103,7 @@ static_library("run_all_unittests") {
+@@ -2119,7 +2119,7 @@ static_library("run_all_unittests") {
":test_support",
"//base/test:test_support",
]
@@ -9,7 +9,7 @@
deps += [ "//content/common:set_process_title_linux" ]
}
}
-@@ -3130,7 +3130,7 @@ test("content_unittests") {
+@@ -3159,7 +3159,7 @@ test("content_unittests") {
deps += [ "//third_party/boringssl" ]
}
diff --git a/www/ungoogled-chromium/files/patch-content_utility_services.cc b/www/ungoogled-chromium/files/patch-content_utility_services.cc
--- a/www/ungoogled-chromium/files/patch-content_utility_services.cc
+++ b/www/ungoogled-chromium/files/patch-content_utility_services.cc
@@ -1,4 +1,4 @@
---- content/utility/services.cc.orig 2023-03-10 11:01:21 UTC
+--- content/utility/services.cc.orig 2023-04-08 11:38:38 UTC
+++ content/utility/services.cc
@@ -64,7 +64,7 @@
extern sandbox::TargetServices* g_utility_target_services;
@@ -16,7 +16,7 @@
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- #include "media/mojo/services/stable_video_decoder_factory_service.h" // nogncheck
+ #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
@@ -215,7 +215,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
<< "task_policy_set TASK_QOS_POLICY";
@@ -34,9 +34,9 @@
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- auto RunStableVideoDecoderFactoryService(
- mojo::PendingReceiver<media::stable::mojom::StableVideoDecoderFactory>
-@@ -331,7 +331,7 @@ auto RunStableVideoDecoderFactoryService(
+ auto RunStableVideoDecoderFactoryProcessService(
+ mojo::PendingReceiver<
+@@ -330,7 +330,7 @@ auto RunStableVideoDecoderFactoryProcessService(
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
// (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
@@ -45,14 +45,14 @@
auto RunVideoEncodeAcceleratorProviderFactory(
mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
receiver) {
-@@ -389,13 +389,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -388,13 +388,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- services.Add(RunStableVideoDecoderFactoryService);
+ services.Add(RunStableVideoDecoderFactoryProcessService);
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
// (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
--- a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
@@ -1,8 +1,8 @@
---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-01-13 08:56:02 UTC
+--- 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
-@@ -71,7 +71,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
- IdleManagerFactory::GetInstance();
- ManagementAPI::GetFactoryInstance();
+@@ -94,7 +94,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+ MessageService::GetFactoryInstance();
+ MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc
--- a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/messaging/message_service.cc.orig 2023-01-13 08:56:02 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig 2023-04-08 11:38:38 UTC
+++ extensions/browser/api/messaging/message_service.cc
@@ -70,7 +70,7 @@ namespace {
const char kReceivingEndDoesntExistError[] =
@@ -9,7 +9,7 @@
const char kMissingPermissionError[] =
"Access to native messaging requires nativeMessaging permission.";
const char kProhibitedByPoliciesError[] =
-@@ -411,7 +411,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -464,7 +464,7 @@ void MessageService::OpenChannelToNativeApp(
return;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
--- a/www/ungoogled-chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2022-10-01 07:40:07 UTC
+--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-04-08 11:38:38 UTC
+++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc
@@ -14,7 +14,7 @@
#include "extensions/browser/api/networking_private/networking_private_chromeos.h"
@@ -9,7 +9,7 @@
#include "extensions/browser/api/networking_private/networking_private_linux.h"
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
#include "components/wifi/wifi_service.h"
-@@ -66,7 +66,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
+@@ -68,7 +68,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
delegate = new NetworkingPrivateChromeOS(browser_context);
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
delegate = new NetworkingPrivateLacros(browser_context);
diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_extension__prefs.cc b/www/ungoogled-chromium/files/patch-extensions_browser_extension__prefs.cc
--- a/www/ungoogled-chromium/files/patch-extensions_browser_extension__prefs.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_browser_extension__prefs.cc
@@ -1,11 +1,11 @@
---- extensions/browser/extension_prefs.cc.orig 2023-03-10 11:01:21 UTC
+--- extensions/browser/extension_prefs.cc.orig 2023-04-08 11:38:38 UTC
+++ extensions/browser/extension_prefs.cc
-@@ -2210,7 +2210,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
- registry->RegisterDictionaryPref(kInstallSignature);
- registry->RegisterListPref(kExternalUninstalls);
+@@ -2228,7 +2228,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
+ registry->RegisterListPref(
+ pref_names::kExtendedBackgroundLifetimeForPortConnectionsToUrls);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(pref_names::kChromeAppsEnabled, false);
#endif
-
+ registry->RegisterBooleanPref(
diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_pref__names.h b/www/ungoogled-chromium/files/patch-extensions_browser_pref__names.h
--- a/www/ungoogled-chromium/files/patch-extensions_browser_pref__names.h
+++ b/www/ungoogled-chromium/files/patch-extensions_browser_pref__names.h
@@ -1,7 +1,7 @@
---- extensions/browser/pref_names.h.orig 2023-02-11 09:11:04 UTC
+--- extensions/browser/pref_names.h.orig 2023-04-08 11:38:38 UTC
+++ extensions/browser/pref_names.h
-@@ -103,7 +103,7 @@ extern const char kStorageGarbageCollect[];
- extern const char kDeletedComponentExtensions[];
+@@ -114,7 +114,7 @@ extern const char kPinnedExtensions[];
+ extern const char kStorageGarbageCollect[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_pref__names.cc b/www/ungoogled-chromium/files/patch-extensions_browser_pref__names.cc
--- a/www/ungoogled-chromium/files/patch-extensions_browser_pref__names.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_browser_pref__names.cc
@@ -1,11 +1,11 @@
---- extensions/browser/pref_names.cc.orig 2023-02-11 09:11:04 UTC
+--- extensions/browser/pref_names.cc.orig 2023-04-08 11:38:38 UTC
+++ extensions/browser/pref_names.cc
-@@ -49,7 +49,7 @@ const char kStorageGarbageCollect[] = "extensions.stor
- const char kDeletedComponentExtensions[] =
- "extensions.deleted_component_extensions";
+@@ -53,7 +53,7 @@ const char kManifestV2Availability[] = "extensions.man
+ const char kPinnedExtensions[] = "extensions.pinned_extensions";
+ const char kStorageGarbageCollect[] = "extensions.storage.garbagecollect";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
extern const char kChromeAppsEnabled[] = "extensions.chrome_apps_enabled";
#endif
-
+ const char kChromeAppsWebViewPermissiveBehaviorAllowed[] =
diff --git a/www/ungoogled-chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/ungoogled-chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
--- a/www/ungoogled-chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
@@ -1,6 +1,6 @@
---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2022-10-01 07:40:07 UTC
+--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-04-08 11:38:38 UTC
+++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc
-@@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin
+@@ -44,7 +44,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin
bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
info->os = api::runtime::PLATFORM_OS_CROS;
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-02-11 09:11:04 UTC
+--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/command_buffer/common/gpu_memory_buffer_support.cc
@@ -173,7 +173,7 @@ uint32_t GetPlatformSpecificTextureTarget() {
#if BUILDFLAG(IS_MAC)
@@ -7,9 +7,9 @@
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
return GL_TEXTURE_EXTERNAL_OES;
- #elif BUILDFLAG(IS_FUCHSIA)
- // Fuchsia uses Vulkan.
-@@ -206,7 +206,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu
+ #elif BUILDFLAG(IS_IOS)
+ return GL_TEXTURE_2D;
+@@ -208,7 +208,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu
gfx::BufferFormat format,
gfx::BufferPlane plane) {
#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
@@ -0,0 +1,11 @@
+--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-04-08 11:38:38 UTC
++++ gpu/command_buffer/service/gles2_cmd_decoder.cc
+@@ -3460,7 +3460,7 @@ GLES2Decoder* GLES2Decoder::Create(
+ }
+
+ // Allow linux to run fuzzers.
+-#if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return new GLES2DecoderImpl(client, command_buffer_service, outputter, group);
+ #else
+ LOG(FATAL) << "Validating command decoder is not supported.";
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
@@ -1,11 +1,11 @@
---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-03-10 11:01:21 UTC
+--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
-@@ -122,7 +122,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan
- // TODO(penghuang): verify the scanout is the right usage for video playback.
- // crbug.com/1280798
- constexpr auto kSupportedUsages =
+@@ -20,7 +20,7 @@ namespace {
+ // TODO(penghuang): verify the scanout is the right usage for video playback.
+ // crbug.com/1280798
+ constexpr uint32_t kSupportedUsage =
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- SHARED_IMAGE_USAGE_SCANOUT |
+ SHARED_IMAGE_USAGE_SCANOUT |
#endif
- SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT |
+ SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT |
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-03-10 11:01:21 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
-@@ -34,7 +34,7 @@
+@@ -36,7 +36,7 @@
#include "ui/gl/gl_version_info.h"
#include "ui/gl/scoped_binders.h"
@@ -9,7 +9,7 @@
#include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
#endif
-@@ -582,7 +582,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
+@@ -534,7 +534,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
WGPUDevice wgpuDevice,
WGPUBackendType backend_type,
std::vector<WGPUTextureFormat> view_formats) {
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-03-10 11:01:21 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
-@@ -172,7 +172,7 @@ bool ExternalVkImageBackingFactory::IsSupported(
+@@ -191,7 +191,7 @@ bool ExternalVkImageBackingFactory::IsSupported(
// TODO: remove it when below formats are converted to multi plane shared
// image formats.
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2023-02-11 09:11:04 UTC
+--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/command_buffer/service/shared_image/shared_image_manager.cc
-@@ -472,7 +472,7 @@ bool SharedImageManager::SupportsScanoutImages() {
+@@ -481,7 +481,7 @@ bool SharedImageManager::SupportsScanoutImages() {
return true;
#elif BUILDFLAG(IS_ANDROID)
return base::AndroidHardwareBufferCompat::IsSupportAvailable();
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
@@ -1,11 +1,11 @@
---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-03-10 11:01:21 UTC
+--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
-@@ -186,7 +186,7 @@ bool WrappedSkImageBacking::Initialize() {
- : GrMipMapped::kNo;
- const std::string label = "WrappedSkImageBackingFactory_Initialize" +
- CreateLabelForSharedImageUsage(usage());
+@@ -181,7 +181,7 @@ bool WrappedSkImageBacking::Initialize() {
+ for (int plane = 0; plane < num_planes; ++plane) {
+ auto& texture = textures_[plane];
+ gfx::Size plane_size = format().GetPlaneSize(plane, size());
-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX)
+#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- // Initializing to bright green makes it obvious if the pixels are not
- // properly set before they are displayed (e.g. https://crbug.com/956555).
- // We don't do this on release builds because there is a slight overhead.
+ // Blue for single-planar and magenta-ish for multi-planar.
+ SkColor4f fallback_color =
+ format().is_single_plane() ? SkColors::kBlue : SkColors::kWhite;
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1237,7 +1237,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+@@ -1225,7 +1225,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
if (gr_context_type_ != GrContextType::kVulkan &&
use_webgpu_adapter_ != WebGPUAdapterName::kCompat) {
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
@@ -1,8 +1,8 @@
---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2022-10-01 07:40:07 UTC
+--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
@@ -28,7 +28,7 @@
#include "ui/gl/gl_image.h"
- #include "ui/gl/test/gl_image_test_support.h"
+ #include "ui/gl/test/gl_test_support.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc.orig 2023-03-10 11:01:21 UTC
-+++ gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc
-@@ -14,7 +14,7 @@
- #include "ui/gl/gl_image.h"
- #include "ui/gl/init/gl_factory.h"
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "ui/gl/gl_image_native_pixmap.h"
- #endif
-
-@@ -46,7 +46,7 @@ class GpuOESEGLImageTest : public testing::Test,
- bool egl_initialized_{false};
- };
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // TODO(crbug.com/835072): re-enable this test on ASAN once bugs are fixed.
- #if !defined(ADDRESS_SANITIZER)
-
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h b/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpu/command_buffer/tests/gl_test_utils.h.orig 2022-10-01 07:40:07 UTC
-+++ gpu/command_buffer/tests/gl_test_utils.h
-@@ -122,7 +122,7 @@ class GpuCommandBufferTestEGL {
- return gfx::HasExtension(gl_extensions_, extension);
- }
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Create GLImageNativePixmap filled in with the given pixels.
- scoped_refptr<gl::GLImageNativePixmap> CreateGLImageNativePixmap(
- gfx::BufferFormat format,
diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2023-03-10 11:01:21 UTC
-+++ gpu/command_buffer/tests/gl_test_utils.cc
-@@ -24,7 +24,7 @@
- #include "ui/gl/gl_version_info.h"
- #include "ui/gl/init/gl_factory.h"
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "ui/gl/gl_image_native_pixmap.h"
- #endif
-
-@@ -459,7 +459,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
- window_system_binding_info_ = gl::GLWindowSystemBindingInfo();
- }
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- scoped_refptr<gl::GLImageNativePixmap>
- GpuCommandBufferTestEGL::CreateGLImageNativePixmap(gfx::BufferFormat format,
- gfx::Size size,
diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc
--- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc
@@ -1,4 +1,4 @@
---- gpu/config/gpu_finch_features.cc.orig 2022-12-13 12:44:51 UTC
+--- gpu/config/gpu_finch_features.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/config/gpu_finch_features.cc
@@ -57,7 +57,7 @@ bool IsDeviceBlocked(const char* field, const std::str
BASE_FEATURE(kUseGles2ForOopR,
@@ -12,7 +12,7 @@
@@ -135,7 +135,8 @@ const base::FeatureParam<std::string>
BASE_FEATURE(kDefaultEnableGpuRasterization,
"DefaultEnableGpuRasterization",
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
+ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
+ BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc
--- a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/service/gpu_init.cc.orig 2023-03-10 11:01:21 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2023-04-08 11:38:38 UTC
+++ gpu/ipc/service/gpu_init.cc
@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
enable_watchdog = false;
@@ -36,7 +36,7 @@
// The ContentSandboxHelper is currently the only one implementation of
// GpuSandboxHelper and it has no dependency. Except on Linux where
// VaapiWrapper checks the GL implementation to determine which display
-@@ -549,7 +549,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -575,7 +575,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
command_line, gpu_feature_info_,
gpu_preferences_.disable_software_rasterizer, false);
if (gl_use_swiftshader_) {
@@ -45,7 +45,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -677,7 +677,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -703,7 +703,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
@@ -54,7 +54,7 @@
// Driver may create a compatibility profile context when collect graphics
// information on Linux platform. Try to collect graphics information
// based on core profile context after disabling platform extensions.
-@@ -729,7 +729,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -755,7 +755,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
gl_use_swiftshader_ = true;
}
}
@@ -63,7 +63,7 @@
(BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
// https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -873,7 +873,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -899,7 +899,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
}
bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
@@ -72,7 +72,7 @@
(BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
// https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -937,7 +937,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -963,7 +963,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
diff --git a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- headless/lib/browser/headless_browser_main_parts.h.orig 2022-10-01 07:40:07 UTC
-+++ headless/lib/browser/headless_browser_main_parts.h
-@@ -48,7 +48,7 @@ class HEADLESS_EXPORT HeadlessBrowserMainParts
- #if BUILDFLAG(IS_MAC)
- void PreCreateMainMessageLoop() override;
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void PostCreateMainMessageLoop() override;
- #endif
- void QuitMainMessageLoop();
diff --git a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- headless/lib/browser/headless_browser_main_parts_linux.cc.orig 2022-10-01 07:40:07 UTC
-+++ headless/lib/browser/headless_browser_main_parts_linux.cc
-@@ -24,7 +24,7 @@ constexpr char kProductName[] = "HeadlessChrome";
- #endif
-
- void HeadlessBrowserMainParts::PostCreateMainMessageLoop() {
--#if defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS_ASH)
-+#if defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD)
- bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr);
- #endif
-
diff --git a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
@@ -0,0 +1,39 @@
+--- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2023-04-08 11:38:38 UTC
++++ headless/lib/browser/headless_browser_main_parts_posix.cc
+@@ -19,13 +19,13 @@
+ #include "content/public/browser/browser_thread.h"
+ #include "headless/lib/browser/headless_browser_impl.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/command_line.h"
+ #include "components/os_crypt/key_storage_config_linux.h"
+ #include "components/os_crypt/os_crypt.h"
+ #include "headless/public/switches.h"
+
+-#if defined(USE_DBUS)
++#if defined(USE_DBUS) && !BUILDFLAG(IS_BSD)
+ #include "device/bluetooth/dbus/bluez_dbus_manager.h"
+ #endif
+
+@@ -120,7 +120,7 @@ class BrowserShutdownHandler {
+
+ } // namespace
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr char kProductName[] = "HeadlessChrome";
+ #endif
+
+@@ -128,9 +128,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo
+ BrowserShutdownHandler::Install(
+ base::BindOnce(&HeadlessBrowserImpl::Shutdown, browser_->GetWeakPtr()));
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+
+-#if defined(USE_DBUS)
++#if defined(USE_DBUS) && !BUILDFLAG(IS_BSD)
+ bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr);
+ #endif
+
diff --git a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc
--- a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,6 +1,6 @@
---- headless/lib/headless_content_main_delegate.cc.orig 2023-03-10 11:01:21 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig 2023-04-08 11:38:38 UTC
+++ headless/lib/headless_content_main_delegate.cc
-@@ -326,7 +326,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+@@ -327,7 +327,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
if (process_type != ::switches::kZygoteProcess) {
g_headless_crash_client.Pointer()->set_crash_dumps_dir(
command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
diff --git a/www/ungoogled-chromium/files/patch-media_BUILD.gn b/www/ungoogled-chromium/files/patch-media_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-media_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-media_BUILD.gn
@@ -1,6 +1,6 @@
---- media/BUILD.gn.orig 2023-02-11 09:11:04 UTC
+--- media/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ media/BUILD.gn
-@@ -87,6 +87,9 @@ config("media_config") {
+@@ -94,6 +94,9 @@ config("media_config") {
defines += [ "DLOPEN_PULSEAUDIO" ]
}
}
diff --git a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig 2023-02-11 09:11:04 UTC
+--- media/audio/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ media/audio/BUILD.gn
-@@ -246,9 +246,20 @@ source_set("audio") {
+@@ -266,9 +266,20 @@ source_set("audio") {
]
}
diff --git a/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc b/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc
--- a/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc
+++ b/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc
@@ -1,9 +1,9 @@
---- media/base/audio_latency.cc.orig 2022-12-02 17:56:32 UTC
+--- media/base/audio_latency.cc.orig 2023-04-08 11:38:38 UTC
+++ media/base/audio_latency.cc
@@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in
}
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// On Linux, MacOS and Fuchsia, the low level IO implementations on the
diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.h b/www/ungoogled-chromium/files/patch-media_base_media__switches.h
--- a/www/ungoogled-chromium/files/patch-media_base_media__switches.h
+++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.h
@@ -1,6 +1,6 @@
---- media/base/media_switches.h.orig 2023-03-10 11:01:21 UTC
+--- media/base/media_switches.h.orig 2023-04-08 11:38:38 UTC
+++ media/base/media_switches.h
-@@ -271,7 +271,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor
+@@ -277,7 +277,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture);
@@ -9,7 +9,7 @@
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux);
-@@ -388,11 +388,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(
+@@ -396,11 +396,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(
kAllowClearDolbyVisionInMseWhenPlatformEncryptedDvEnabled);
#endif
diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
--- 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 2023-03-10 11:01:21 UTC
+--- media/base/media_switches.cc.orig 2023-04-08 11:38:38 UTC
+++ media/base/media_switches.cc
@@ -12,7 +12,7 @@
#include "components/system_media_controls/linux/buildflags/buildflags.h"
@@ -9,7 +9,7 @@
#include "base/cpu.h"
#endif
-@@ -584,7 +584,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
+@@ -586,7 +586,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
// Show toolbar button that opens dialog for controlling media sessions.
BASE_FEATURE(kGlobalMediaControls,
"GlobalMediaControls",
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -637,7 +637,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
+@@ -634,7 +634,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
"GlobalMediaControlsPictureInPicture",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -681,7 +681,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -678,7 +678,7 @@ BASE_FEATURE(kUnifiedAutoplay,
"UnifiedAutoplay",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -36,7 +36,7 @@
// Enable vaapi video decoding on linux. This is already enabled by default on
// chromeos, but needs an experiment on linux.
BASE_FEATURE(kVaapiVideoDecodeLinux,
-@@ -1179,14 +1179,14 @@ BASE_FEATURE(kAllowClearDolbyVisionInMseWhenPlatformEn
+@@ -1198,14 +1198,14 @@ BASE_FEATURE(kAllowClearDolbyVisionInMseWhenPlatformEn
base::FEATURE_DISABLED_BY_DEFAULT);
#endif
diff --git a/www/ungoogled-chromium/files/patch-media_base_supported__types.cc b/www/ungoogled-chromium/files/patch-media_base_supported__types.cc
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-media_base_supported__types.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/base/supported_types.cc.orig 2023-03-10 11:01:21 UTC
-+++ media/base/supported_types.cc
-@@ -209,7 +209,7 @@ bool IsHevcProfileSupported(const VideoType& type) {
-
- #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_MAC)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(IS_CHROMEOS_LACROS)
- // TODO(b/171813538): For Lacros, the supplemental profile cache will be
- // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the
diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.h b/www/ungoogled-chromium/files/patch-media_base_video__frame.h
--- a/www/ungoogled-chromium/files/patch-media_base_video__frame.h
+++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.h
@@ -1,6 +1,6 @@
---- media/base/video_frame.h.orig 2023-01-13 08:56:02 UTC
+--- media/base/video_frame.h.orig 2023-04-08 11:38:38 UTC
+++ media/base/video_frame.h
-@@ -42,7 +42,7 @@
+@@ -44,7 +44,7 @@
#include "base/mac/scoped_cftyperef.h"
#endif // BUILDFLAG(IS_MAC)
@@ -9,7 +9,7 @@
#include "base/files/scoped_file.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -86,7 +86,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -113,7 +113,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers.
STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer.
STORAGE_SHMEM = 4, // Backed by read-only shared memory.
@@ -18,7 +18,7 @@
// TODO(mcasas): Consider turning this type into STORAGE_NATIVE
// based on the idea of using this same enum value for both DMA
// buffers on Linux and CVPixelBuffers on Mac (which currently use
-@@ -281,7 +281,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -308,7 +308,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
base::TimeDelta timestamp);
@@ -27,7 +27,7 @@
// Wraps provided dmabufs
// (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
// VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -550,7 +550,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -596,7 +596,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// mailbox, the caller must wait for the included sync point.
const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
@@ -36,7 +36,7 @@
// Returns a vector containing the backing DmaBufs for this frame. The number
// of returned DmaBufs will be equal or less than the number of planes of
// the frame. If there are less, this means that the last FD contains the
-@@ -763,7 +763,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -809,7 +809,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc
--- a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc
+++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig 2023-03-22 09:35:28 UTC
+--- media/base/video_frame.cc.orig 2023-04-08 11:38:38 UTC
+++ media/base/video_frame.cc
@@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString(
return "OWNED_MEMORY";
@@ -54,7 +54,7 @@
DCHECK(frame->dmabuf_fds_);
// If there are any |dmabuf_fds_| plugged in, we should refer them too.
wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
-@@ -1293,7 +1293,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
+@@ -1302,7 +1302,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
: mailbox_holders_[texture_index];
}
@@ -63,7 +63,7 @@
const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
-@@ -1406,7 +1406,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+@@ -1415,7 +1415,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
storage_type_(storage_type),
visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
natural_size_(natural_size),
diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/ungoogled-chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
--- a/www/ungoogled-chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
+++ b/www/ungoogled-chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
@@ -1,4 +1,4 @@
---- media/capture/video/fake_video_capture_device_factory.cc.orig 2022-10-01 07:40:07 UTC
+--- media/capture/video/fake_video_capture_device_factory.cc.orig 2023-04-08 11:38:38 UTC
+++ media/capture/video/fake_video_capture_device_factory.cc
@@ -213,7 +213,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo(
int entry_index = 0;
@@ -7,5 +7,5 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE;
- #elif BUILDFLAG(IS_MAC)
- VideoCaptureApi::MACOSX_AVFOUNDATION;
+ #elif BUILDFLAG(IS_IOS)
+ VideoCaptureApi::UNKNOWN;
diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
--- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
+++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
@@ -1,6 +1,6 @@
---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-12-02 17:56:32 UTC
+--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ media/capture/video/linux/fake_v4l2_impl.cc
-@@ -426,7 +426,7 @@ int FakeV4L2Impl::close(int fd) {
+@@ -486,7 +486,7 @@ int FakeV4L2Impl::close(int fd) {
return kSuccessReturnValue;
}
diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
--- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
+++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-03-10 11:01:21 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-04-08 11:38:38 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.h
@@ -87,10 +87,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
// device file descriptor or (re)starting streaming, can fail but works after
@@ -11,5 +11,5 @@
- int DoIoctl(int request, void* argp);
+ int DoIoctl(unsigned int request, void* argp);
- // Creates a mojom::RangePtr with the (min, max, current, step) values of the
- // control associated with |control_id|. Returns an empty Range otherwise.
+ // Check whether the control is controllable (and not changed automatically).
+ bool IsControllableControl(int control_id);
diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
--- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-03-10 11:01:21 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-04-08 11:38:38 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.cc
@@ -4,8 +4,10 @@
@@ -24,7 +24,7 @@
// TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the
// format is introduced to kernel.
-@@ -668,7 +670,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate
+@@ -728,7 +730,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate
V4L2CaptureDelegate::~V4L2CaptureDelegate() = default;
@@ -33,7 +33,7 @@
int num_retries = 0;
for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries;
++num_retries) {
-@@ -678,7 +680,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
+@@ -738,7 +740,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
return num_retries != kMaxIOCtrlRetries;
}
@@ -42,3 +42,22 @@
return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp));
}
+@@ -778,6 +780,10 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
+ }
+
+ void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() {
++// these ioctls are not implemented on *BSDs
++#if BUILDFLAG(IS_BSD)
++ NOTIMPLEMENTED();
++#else
+ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS,
+ V4L2_CID_AUTO_WHITE_BALANCE,
+ V4L2_CID_BRIGHTNESS,
+@@ -805,6 +811,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
+ << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}";
+ }
+ }
++#endif
+ }
+
+ mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) {
diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.h b/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
rename from www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.h
rename to www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
--- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.h
+++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
@@ -1,6 +1,6 @@
---- media/capture/video/linux/video_capture_device_factory_linux.h.orig 2022-10-01 07:40:07 UTC
-+++ media/capture/video/linux/video_capture_device_factory_linux.h
-@@ -52,7 +52,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryLinux
+--- media/capture/video/linux/video_capture_device_factory_v4l2.h.orig 2023-04-08 11:38:38 UTC
++++ media/capture/video/linux/video_capture_device_factory_v4l2.h
+@@ -51,7 +51,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryV4L2
private:
// Simple wrapper to do HANDLE_EINTR(v4l2_->ioctl(fd, ...)).
diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
rename from www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc
rename to www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
--- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc
+++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
@@ -1,7 +1,7 @@
---- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2023-03-10 11:01:21 UTC
-+++ media/capture/video/linux/video_capture_device_factory_linux.cc
-@@ -73,6 +73,9 @@ class DevVideoFilePathsDeviceProvider
- : public VideoCaptureDeviceFactoryLinux::DeviceProvider {
+--- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2023-04-08 11:38:38 UTC
++++ media/capture/video/linux/video_capture_device_factory_v4l2.cc
+@@ -75,6 +75,9 @@ class DevVideoFilePathsDeviceProvider
+ : public VideoCaptureDeviceFactoryV4L2::DeviceProvider {
public:
void GetDeviceIds(std::vector<std::string>* target_container) override {
+#if defined(OS_OPENBSD)
@@ -10,7 +10,7 @@
const base::FilePath path("/dev/");
base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES,
"video*");
-@@ -80,9 +83,13 @@ class DevVideoFilePathsDeviceProvider
+@@ -82,9 +85,13 @@ class DevVideoFilePathsDeviceProvider
const base::FileEnumerator::FileInfo info = enumerator.GetInfo();
target_container->emplace_back(path.value() + info.GetName().value());
}
@@ -24,7 +24,7 @@
const std::string file_name = ExtractFileNameFromDeviceId(device_id);
std::string usb_id;
const std::string vid_path =
-@@ -100,6 +107,9 @@ class DevVideoFilePathsDeviceProvider
+@@ -104,6 +111,9 @@ class DevVideoFilePathsDeviceProvider
}
std::string GetDeviceDisplayName(const std::string& device_id) override {
@@ -34,12 +34,12 @@
const std::string file_name = ExtractFileNameFromDeviceId(device_id);
const std::string interface_path =
base::StringPrintf(kInterfacePathTemplate, file_name.c_str());
-@@ -214,7 +224,7 @@ void VideoCaptureDeviceFactoryLinux::GetDevicesInfo(
+@@ -219,7 +229,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo(
std::move(callback).Run(std::move(devices_info));
}
--int VideoCaptureDeviceFactoryLinux::DoIoctl(int fd, int request, void* argp) {
-+int VideoCaptureDeviceFactoryLinux::DoIoctl(int fd, unsigned int request, void* argp) {
+-int VideoCaptureDeviceFactoryV4L2::DoIoctl(int fd, int request, void* argp) {
++int VideoCaptureDeviceFactoryV4L2::DoIoctl(int fd, unsigned int request, void* argp) {
return HANDLE_EINTR(v4l2_->ioctl(fd, request, argp));
}
diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc
--- a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc
+++ b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc
@@ -1,6 +1,6 @@
---- media/capture/video/video_capture_device_client.cc.orig 2023-02-11 09:11:04 UTC
+--- media/capture/video/video_capture_device_client.cc.orig 2023-04-08 11:38:38 UTC
+++ media/capture/video/video_capture_device_client.cc
-@@ -318,7 +318,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
+@@ -322,7 +322,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
// Windows RGB24 defines blue at lowest byte,
// see https://msdn.m1cr050ft.qjz9zk/en-us/library/windows/desktop/dd407253
diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
--- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,4 +1,4 @@
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-03-10 11:01:21 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-04-08 11:38:38 UTC
+++ media/gpu/chromeos/video_decoder_pipeline.cc
@@ -213,7 +213,7 @@ std::unique_ptr<VideoDecoder> VideoDecoderPipeline::Cr
#if BUILDFLAG(USE_VAAPI)
@@ -9,12 +9,12 @@
create_decoder_function_cb = base::BindOnce(&V4L2VideoDecoder::Create);
#else
return nullptr;
-@@ -807,14 +807,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -860,14 +860,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
}
}
-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_VAAPI)
-+#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_VAAPI)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_VAAPI)
// Linux should always use a custom allocator (to allocate buffers using
// libva) and a PlatformVideoFramePool.
CHECK(allocator.has_value());
@@ -22,16 +22,16 @@
main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
*allocator);
-#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC)
-+#elif (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_V4L2_CODEC)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC)
// Linux w/ V4L2 should not use a custom allocator
// Only tested with video_decode_accelerator_tests
// TODO(wenst@) Test with full Chromium Browser
-@@ -842,7 +842,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
- #error "Unsupported platform"
- #endif
+@@ -997,7 +997,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+ << " VideoFrames";
+ auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // viable_candidate should always be set unless using L1 protected content,
- // which isn't an option on linux.
- CHECK(viable_candidate);
+ auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
+ *allocator);
+ #endif
diff --git a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
--- a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
+++ b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-02-23 13:06:30 UTC
+--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-04-08 11:38:38 UTC
+++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -768,7 +768,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -769,7 +769,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
const gfx::Size decoder_natural_size =
aspect_ratio_.GetNaturalSize(decoder_visible_rect);
diff --git a/www/ungoogled-chromium/files/patch-media_media__options.gni b/www/ungoogled-chromium/files/patch-media_media__options.gni
--- a/www/ungoogled-chromium/files/patch-media_media__options.gni
+++ b/www/ungoogled-chromium/files/patch-media_media__options.gni
@@ -1,6 +1,6 @@
---- media/media_options.gni.orig 2023-02-11 09:11:04 UTC
+--- media/media_options.gni.orig 2023-04-08 11:38:38 UTC
+++ media/media_options.gni
-@@ -172,12 +172,15 @@ declare_args() {
+@@ -188,12 +188,15 @@ declare_args() {
# Enables runtime selection of ALSA library for audio.
use_alsa = false
@@ -12,12 +12,12 @@
#
# TODO(crbug.com/1336055): Remove legacy target_cpu hack used for targeting
# desktop Chromecast builds.
-- if (is_posix && !is_android && !is_mac &&
-+ if (is_posix && !is_android && !is_mac && !is_bsd &&
+- if (is_posix && !is_android && !is_apple &&
++ if (is_posix && !is_android && !is_apple && !is_bsd &&
(!is_castos || (target_cpu == "x86" || target_cpu == "x64") ||
is_cast_audio_only)) {
use_alsa = true
-@@ -193,6 +196,10 @@ declare_args() {
+@@ -209,6 +212,10 @@ declare_args() {
if (!use_cras && !is_castos && !is_asan && !is_tsan) {
use_pulseaudio = true
}
diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
--- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
+++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
@@ -1,6 +1,6 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-02-11 09:11:04 UTC
+--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-04-08 11:38:38 UTC
+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
-@@ -42,7 +42,7 @@ media::stable::mojom::VideoFrameDataPtr MakeVideoFrame
+@@ -39,7 +39,7 @@ gfx::GpuMemoryBufferHandle GetVideoFrameGpuMemoryBuffe
gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle =
input->GetGpuMemoryBuffer()->CloneHandle();
diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
--- a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
+++ b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
@@ -1,6 +1,6 @@
---- media/video/video_encode_accelerator_adapter.cc.orig 2023-03-10 11:01:21 UTC
+--- media/video/video_encode_accelerator_adapter.cc.orig 2023-04-08 11:38:38 UTC
+++ media/video/video_encode_accelerator_adapter.cc
-@@ -141,7 +141,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
+@@ -140,7 +140,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
if (is_rgb)
config.input_format = PIXEL_FORMAT_I420;
@@ -9,7 +9,7 @@
if (format != PIXEL_FORMAT_I420 ||
!VideoFrame::IsStorageTypeMappable(storage_type)) {
// ChromeOS/Linux hardware video encoders supports I420 on-memory
-@@ -464,7 +464,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
+@@ -465,7 +465,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(),
supported_rc_modes_, required_encoder_type_);
diff --git a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni
--- a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni
+++ b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni
@@ -1,7 +1,7 @@
---- mojo/public/tools/bindings/mojom.gni.orig 2023-03-10 11:01:21 UTC
+--- mojo/public/tools/bindings/mojom.gni.orig 2023-04-08 11:38:38 UTC
+++ mojo/public/tools/bindings/mojom.gni
-@@ -703,6 +703,16 @@ template("mojom") {
- enabled_features += [ "is_win" ]
+@@ -723,6 +723,16 @@ template("mojom") {
+ enabled_features += [ "is_apple" ]
}
+ if (is_openbsd) {
@@ -15,5 +15,5 @@
+ }
+
action(parser_target_name) {
- script = mojom_parser_script
- inputs = mojom_parser_sources + ply_sources + [ build_metadata_filename ]
+ allow_remote = true
+ custom_processor = "mojom_parser"
diff --git a/www/ungoogled-chromium/files/patch-net_BUILD.gn b/www/ungoogled-chromium/files/patch-net_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-net_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-net_BUILD.gn
@@ -1,6 +1,6 @@
---- net/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- net/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ net/BUILD.gn
-@@ -103,7 +103,7 @@ net_configs = [
+@@ -104,7 +104,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
]
@@ -9,7 +9,7 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1216,6 +1216,15 @@ component("net") {
+@@ -1219,6 +1219,15 @@ component("net") {
deps += [ "//third_party/xdg_shared_mime_info" ]
}
@@ -25,7 +25,7 @@
if (is_mac) {
sources += [
"base/network_notification_thread_mac.cc",
-@@ -1348,7 +1357,7 @@ component("net") {
+@@ -1351,7 +1360,7 @@ component("net") {
}
}
@@ -34,7 +34,7 @@
sources += [
"base/network_change_notifier_posix.cc",
"base/network_change_notifier_posix.h",
-@@ -1381,7 +1390,7 @@ component("net") {
+@@ -1384,7 +1393,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
@@ -43,7 +43,7 @@
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -4724,7 +4733,7 @@ test("net_unittests") {
+@@ -2828,7 +2837,7 @@ test("net_unittests") {
sources += [ "proxy_resolution/proxy_config_service_linux_unittest.cc" ]
}
@@ -52,7 +52,7 @@
sources += [
"base/address_tracker_linux_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
-@@ -4796,6 +4805,10 @@ test("net_unittests") {
+@@ -2900,6 +2909,10 @@ test("net_unittests") {
"//url:buildflags",
]
@@ -63,7 +63,7 @@
if (enable_websockets) {
deps += [ "//net/server:tests" ]
}
-@@ -4863,7 +4876,7 @@ test("net_unittests") {
+@@ -2967,7 +2980,7 @@ test("net_unittests") {
]
}
@@ -72,7 +72,7 @@
sources += [ "tools/quic/quic_simple_server_test.cc" ]
}
-@@ -4988,7 +5001,7 @@ test("net_unittests") {
+@@ -3092,7 +3105,7 @@ test("net_unittests") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h
--- a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h
+++ b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h
@@ -1,7 +1,7 @@
---- net/cert/cert_verify_proc.h.orig 2022-12-02 17:56:32 UTC
+--- net/cert/cert_verify_proc.h.orig 2023-04-08 11:38:38 UTC
+++ net/cert/cert_verify_proc.h
-@@ -81,7 +81,7 @@ class NET_EXPORT CertVerifyProc
- kMaxValue = kOther
+@@ -68,7 +68,7 @@ class NET_EXPORT CertVerifyProc
+ kMaxValue = kChainLengthOne
};
-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
diff --git a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.cc b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.cc
--- a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.cc
+++ b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.cc
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc.cc.orig 2023-03-10 11:01:21 UTC
+--- net/cert/cert_verify_proc.cc.orig 2023-04-08 11:38:38 UTC
+++ net/cert/cert_verify_proc.cc
-@@ -495,7 +495,7 @@ base::Value CertVerifyParams(X509Certificate* cert,
+@@ -414,7 +414,7 @@ base::Value CertVerifyParams(X509Certificate* cert,
} // namespace
diff --git a/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.h b/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.h
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- net/dns/dns_reloader.h.orig 2022-12-02 17:56:32 UTC
-+++ net/dns/dns_reloader.h
-@@ -7,7 +7,7 @@
-
- #include "build/build_config.h"
-
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
- namespace net {
-
- // Call on the network thread before calling DnsReloaderMaybeReload() anywhere.
-@@ -18,6 +18,6 @@ void EnsureDnsReloaderInit();
- void DnsReloaderMaybeReload();
-
- } // namespace net
--#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD)
-+#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE)
-
- #endif // NET_DNS_DNS_RELOADER_H_
diff --git a/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.cc b/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.cc
--- a/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.cc
+++ b/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.cc
@@ -1,18 +1,10 @@
---- net/dns/dns_reloader.cc.orig 2022-10-01 07:40:07 UTC
+--- net/dns/dns_reloader.cc.orig 2023-04-08 11:38:38 UTC
+++ net/dns/dns_reloader.cc
-@@ -6,7 +6,7 @@
-
- #include "build/build_config.h"
-
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \
- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
+@@ -10,6 +10,7 @@
+ // - there's not guarantee it exists at all. :(
+ #if BUILDFLAG(IS_POSIX)
++#include <netinet/in.h>
#include <resolv.h>
-@@ -113,5 +113,5 @@ void DnsReloaderMaybeReload() {
-
- } // namespace net
--#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD)
-+#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) &&
- // && !BUILDFLAG(IS_ANDROID)
+ // This code only works on systems where the C library provides res_ninit(3) and
diff --git a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__system__task.cc b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__system__task.cc
deleted file mode 100644
--- a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__system__task.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- net/dns/host_resolver_system_task.cc.orig 2023-02-11 09:11:04 UTC
-+++ net/dns/host_resolver_system_task.cc
-@@ -353,8 +353,8 @@ void HostResolverSystemTask::OnLookupComplete(const ui
- }
-
- void EnsureSystemHostResolverCallReady() {
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
-- !BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && \
-+ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
- EnsureDnsReloaderInit();
- #elif BUILDFLAG(IS_WIN)
- EnsureWinsockInit();
-@@ -440,7 +440,7 @@ int SystemHostResolverCall(const std::string& host,
- base::BlockingType::WILL_BLOCK);
-
- #if BUILDFLAG(IS_POSIX) && \
-- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID))
-+ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD))
- DnsReloaderMaybeReload();
- #endif
- auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network);
diff --git a/www/ungoogled-chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/ungoogled-chromium/files/patch-net_socket_tcp__socket__posix.cc
--- a/www/ungoogled-chromium/files/patch-net_socket_tcp__socket__posix.cc
+++ b/www/ungoogled-chromium/files/patch-net_socket_tcp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/tcp_socket_posix.cc.orig 2022-10-01 07:40:07 UTC
+--- net/socket/tcp_socket_posix.cc.orig 2023-04-08 11:38:38 UTC
+++ net/socket/tcp_socket_posix.cc
-@@ -100,6 +100,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
+@@ -99,6 +99,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
return false;
}
diff --git a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc
--- a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_posix.cc.orig 2023-02-11 09:11:04 UTC
+--- net/socket/udp_socket_posix.cc.orig 2023-04-08 11:38:38 UTC
+++ net/socket/udp_socket_posix.cc
-@@ -559,7 +559,7 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -577,7 +577,7 @@ int UDPSocketPosix::SetDoNotFragment() {
}
void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -9,7 +9,7 @@
if (confirm) {
sendto_flags_ |= MSG_CONFIRM;
} else {
-@@ -580,7 +580,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -598,7 +598,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
int value = broadcast ? 1 : 0;
int rv;
@@ -18,7 +18,7 @@
// SO_REUSEPORT on OSX permits multiple processes to each receive
// UDP multicast or broadcast datagrams destined for the bound
// port.
-@@ -893,7 +893,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address)
+@@ -911,7 +911,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address)
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (last_error == EINVAL)
return ERR_ADDRESS_IN_USE;
diff --git a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc
--- a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_unittest.cc.orig 2023-02-11 09:11:04 UTC
+--- net/socket/udp_socket_unittest.cc.orig 2023-04-08 11:38:38 UTC
+++ net/socket/udp_socket_unittest.cc
-@@ -341,7 +341,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
+@@ -345,7 +345,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
EXPECT_EQ(second_packet, received);
}
@@ -9,7 +9,7 @@
// - MacOS: requires root permissions on OSX 10.7+.
// - Android: devices attached to testbots don't have default network, so
// broadcasting to 255.255.255.255 returns error -109 (Address not reachable).
-@@ -601,7 +601,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) {
+@@ -656,7 +656,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) {
EXPECT_THAT(rv, IsOk());
rv = client.SetDoNotFragment();
@@ -18,7 +18,7 @@
// TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia.
EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
#elif BUILDFLAG(IS_MAC)
-@@ -629,7 +629,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) {
+@@ -684,7 +684,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) {
EXPECT_THAT(rv, IsOk());
rv = server.SetDoNotFragment();
@@ -27,7 +27,7 @@
// TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia.
EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
#elif BUILDFLAG(IS_MAC)
-@@ -694,7 +694,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
+@@ -749,7 +749,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
// TODO(https://crbug.com/947115): failing on device on iOS 12.2.
// TODO(https://crbug.com/1227554): flaky on Mac 11.
@@ -36,7 +36,7 @@
#define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress
#else
#define MAYBE_SharedMulticastAddress SharedMulticastAddress
-@@ -748,7 +748,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
+@@ -803,7 +803,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
NetLogSource());
ASSERT_THAT(client_socket.Connect(send_address), IsOk());
diff --git a/www/ungoogled-chromium/files/patch-printing_backend_cups__helper.cc b/www/ungoogled-chromium/files/patch-printing_backend_cups__helper.cc
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-printing_backend_cups__helper.cc
@@ -0,0 +1,11 @@
+--- printing/backend/cups_helper.cc.orig 2023-04-08 11:38:38 UTC
++++ printing/backend/cups_helper.cc
+@@ -127,7 +127,7 @@ void GetResolutionSettings(ppd_file_t* ppd,
+ // found.
+ #if BUILDFLAG(IS_MAC)
+ constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr gfx::Size kDefaultMissingDpi(kPixelsPerInch, kPixelsPerInch);
+ #else
+ constexpr gfx::Size kDefaultMissingDpi(kDefaultPdfDpi, kDefaultPdfDpi);
diff --git a/www/ungoogled-chromium/files/patch-printing_backend_cups__ipp__helper.cc b/www/ungoogled-chromium/files/patch-printing_backend_cups__ipp__helper.cc
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-printing_backend_cups__ipp__helper.cc
@@ -0,0 +1,11 @@
+--- printing/backend/cups_ipp_helper.cc.orig 2023-04-08 11:38:38 UTC
++++ printing/backend/cups_ipp_helper.cc
+@@ -210,7 +210,7 @@ void ExtractResolutions(const CupsOptionProvider& prin
+ // Provide a default DPI if no valid DPI is found.
+ #if BUILDFLAG(IS_MAC)
+ constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr gfx::Size kDefaultMissingDpi(kPixelsPerInch, kPixelsPerInch);
+ #else
+ constexpr gfx::Size kDefaultMissingDpi(kDefaultPdfDpi, kDefaultPdfDpi);
diff --git a/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc b/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc
--- a/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc
+++ b/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc
@@ -1,4 +1,4 @@
---- printing/mojom/printing_context_mojom_traits.cc.orig 2023-03-10 11:01:21 UTC
+--- printing/mojom/printing_context_mojom_traits.cc.orig 2023-04-08 11:38:38 UTC
+++ printing/mojom/printing_context_mojom_traits.cc
@@ -15,7 +15,7 @@
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
@@ -9,7 +9,7 @@
#include "mojo/public/mojom/base/values.mojom.h"
#endif
-@@ -149,7 +149,7 @@ bool StructTraits<
+@@ -150,7 +150,7 @@ bool StructTraits<
}
out->set_pages_per_sheet(data.pages_per_sheet());
diff --git a/www/ungoogled-chromium/files/patch-printing_print__settings.h b/www/ungoogled-chromium/files/patch-printing_print__settings.h
--- a/www/ungoogled-chromium/files/patch-printing_print__settings.h
+++ b/www/ungoogled-chromium/files/patch-printing_print__settings.h
@@ -1,4 +1,4 @@
---- printing/print_settings.h.orig 2023-03-10 11:01:21 UTC
+--- printing/print_settings.h.orig 2023-04-08 11:38:38 UTC
+++ printing/print_settings.h
@@ -21,7 +21,7 @@
#include "ui/gfx/geometry/rect.h"
@@ -9,8 +9,8 @@
#include <map>
#include "base/values.h"
-@@ -69,7 +69,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
- }
+@@ -74,7 +74,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+ std::string vendor_id;
};
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -18,7 +18,7 @@
using AdvancedSettings = std::map<std::string, base::Value>;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -234,7 +234,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -241,7 +241,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
pages_per_sheet_ = pages_per_sheet;
}
@@ -27,7 +27,7 @@
AdvancedSettings& advanced_settings() { return advanced_settings_; }
const AdvancedSettings& advanced_settings() const {
return advanced_settings_;
-@@ -351,7 +351,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -372,7 +372,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
// Number of pages per sheet.
int pages_per_sheet_;
diff --git a/www/ungoogled-chromium/files/patch-printing_print__settings.cc b/www/ungoogled-chromium/files/patch-printing_print__settings.cc
--- a/www/ungoogled-chromium/files/patch-printing_print__settings.cc
+++ b/www/ungoogled-chromium/files/patch-printing_print__settings.cc
@@ -1,6 +1,6 @@
---- printing/print_settings.cc.orig 2023-03-10 11:01:21 UTC
+--- printing/print_settings.cc.orig 2023-04-08 11:38:38 UTC
+++ printing/print_settings.cc
-@@ -256,7 +256,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
+@@ -309,7 +309,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
#endif
is_modifiable_ = settings.is_modifiable_;
pages_per_sheet_ = settings.pages_per_sheet_;
@@ -9,7 +9,7 @@
for (const auto& item : settings.advanced_settings_)
advanced_settings_.emplace(item.first, item.second.Clone());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -298,7 +298,7 @@ void PrintSettings::Clear() {
+@@ -353,7 +353,7 @@ void PrintSettings::Clear() {
#endif
is_modifiable_ = true;
pages_per_sheet_ = 1;
diff --git a/www/ungoogled-chromium/files/patch-printing_print__settings__conversion.cc b/www/ungoogled-chromium/files/patch-printing_print__settings__conversion.cc
--- a/www/ungoogled-chromium/files/patch-printing_print__settings__conversion.cc
+++ b/www/ungoogled-chromium/files/patch-printing_print__settings__conversion.cc
@@ -1,6 +1,6 @@
---- printing/print_settings_conversion.cc.orig 2023-03-10 11:01:21 UTC
+--- printing/print_settings_conversion.cc.orig 2023-04-08 11:38:38 UTC
+++ printing/print_settings_conversion.cc
-@@ -275,7 +275,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
+@@ -277,7 +277,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
settings->set_is_modifiable(is_modifiable.value());
}
diff --git a/www/ungoogled-chromium/files/patch-printing_printing__context__linux.cc b/www/ungoogled-chromium/files/patch-printing_printing__context__linux.cc
--- a/www/ungoogled-chromium/files/patch-printing_printing__context__linux.cc
+++ b/www/ungoogled-chromium/files/patch-printing_printing__context__linux.cc
@@ -1,4 +1,4 @@
---- printing/printing_context_linux.cc.orig 2022-10-01 07:40:07 UTC
+--- printing/printing_context_linux.cc.orig 2023-04-08 11:38:38 UTC
+++ printing/printing_context_linux.cc
@@ -19,7 +19,7 @@
#include "printing/units.h"
@@ -18,7 +18,7 @@
if (!ui::LinuxUi::instance())
return mojom::ResultCode::kSuccess;
-@@ -81,7 +81,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett
+@@ -84,7 +84,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett
}
gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() {
@@ -27,7 +27,7 @@
if (ui::LinuxUi::instance())
return ui::LinuxUi::instance()->GetPdfPaperSize(this);
#endif
-@@ -94,7 +94,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS
+@@ -97,7 +97,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS
DCHECK(!printer_settings.show_system_dialog);
DCHECK(!in_print_job_);
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_desktop__and__cursor__conditional__composer.cc b/www/ungoogled-chromium/files/patch-remoting_host_desktop__and__cursor__conditional__composer.cc
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-remoting_host_desktop__and__cursor__conditional__composer.cc
@@ -0,0 +1,20 @@
+--- remoting/host/desktop_and_cursor_conditional_composer.cc.orig 2023-04-08 11:38:38 UTC
++++ remoting/host/desktop_and_cursor_conditional_composer.cc
+@@ -7,7 +7,7 @@
+ #include "base/functional/bind.h"
+ #include "build/build_config.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "remoting/host/linux/wayland_utils.h"
+ #endif
+
+@@ -96,7 +96,7 @@ bool DesktopAndCursorConditionalComposer::IsOccluded(
+ }
+
+ bool DesktopAndCursorConditionalComposer::SupportsFrameCallbacks() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return IsRunningWayland();
+ #else
+ return false;
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__proxy.cc b/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__proxy.cc
--- a/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__proxy.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__proxy.cc
@@ -1,4 +1,4 @@
---- remoting/host/desktop_capturer_proxy.cc.orig 2023-03-10 11:01:21 UTC
+--- remoting/host/desktop_capturer_proxy.cc.orig 2023-04-08 11:38:38 UTC
+++ remoting/host/desktop_capturer_proxy.cc
@@ -30,7 +30,7 @@
#include "remoting/host/chromeos/frame_sink_desktop_capturer.h"
@@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#include "remoting/host/linux/wayland_desktop_capturer.h"
-@@ -96,7 +96,7 @@ void DesktopCapturerProxy::Core::CreateCapturer(
+@@ -99,7 +99,7 @@ void DesktopCapturerProxy::Core::CreateCapturer(
capturer_ = std::make_unique<webrtc::DesktopCapturerDifferWrapper>(
std::make_unique<AuraDesktopCapturer>());
}
@@ -18,3 +18,12 @@
static base::nix::SessionType session_type = base::nix::SessionType::kUnset;
if (session_type == base::nix::SessionType::kUnset) {
std::unique_ptr<base::Environment> env = base::Environment::Create();
+@@ -303,7 +303,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC
+ bool DesktopCapturerProxy::SupportsFrameCallbacks() {
+ DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return IsRunningWayland();
+ #else
+ return false;
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc b/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc
@@ -0,0 +1,20 @@
+--- remoting/host/desktop_capturer_wrapper.cc.orig 2023-04-08 11:38:38 UTC
++++ remoting/host/desktop_capturer_wrapper.cc
+@@ -13,7 +13,7 @@
+ #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
+ #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "remoting/host/linux/wayland_utils.h"
+ #endif
+
+@@ -100,7 +100,7 @@ void DesktopCapturerWrapper::OnCaptureResult(
+ bool DesktopCapturerWrapper::SupportsFrameCallbacks() {
+ DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return capturer_ && IsRunningWayland();
+ #else
+ return false;
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_heartbeat__sender.cc b/www/ungoogled-chromium/files/patch-remoting_host_heartbeat__sender.cc
--- a/www/ungoogled-chromium/files/patch-remoting_host_heartbeat__sender.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_host_heartbeat__sender.cc
@@ -1,11 +1,11 @@
---- remoting/host/heartbeat_sender.cc.orig 2022-10-01 07:40:07 UTC
+--- remoting/host/heartbeat_sender.cc.orig 2023-04-08 11:38:38 UTC
+++ remoting/host/heartbeat_sender.cc
@@ -111,7 +111,7 @@ const net::BackoffEntry::Policy kBackoffPolicy = {
std::string GetHostname() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
return net::GetHostName();
#elif BUILDFLAG(IS_WIN)
wchar_t buffer[MAX_PATH] = {0};
diff --git a/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc b/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc
--- a/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc
@@ -1,7 +1,7 @@
---- remoting/host/remote_open_url/remote_open_url_util.cc.orig 2023-03-10 11:01:21 UTC
+--- remoting/host/remote_open_url/remote_open_url_util.cc.orig 2023-04-08 11:38:38 UTC
+++ remoting/host/remote_open_url/remote_open_url_util.cc
@@ -29,7 +29,7 @@ const wchar_t kRegisteredApplicationsKeyName[] =
- #endif // defined (OS_WIN)
+ #endif // BUILDFLAG(IS_WIN)
bool IsRemoteOpenUrlSupported() {
-#if BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc b/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc
--- a/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc
+++ b/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc
@@ -1,6 +1,6 @@
---- remoting/protocol/webrtc_video_stream.cc.orig 2023-02-11 09:11:04 UTC
+--- remoting/protocol/webrtc_video_stream.cc.orig 2023-04-08 11:38:38 UTC
+++ remoting/protocol/webrtc_video_stream.cc
-@@ -242,7 +242,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string
+@@ -260,7 +260,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string
: stream_name_(stream_name), session_options_(session_options) {
// TODO(joedow): Dig into the threading model on other platforms to see if they
// can also be updated to run on a dedicated thread.
diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/policy/BUILD.gn.orig 2023-01-13 08:56:02 UTC
+--- sandbox/policy/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ sandbox/policy/BUILD.gn
@@ -35,7 +35,7 @@ component("policy") {
"//sandbox/policy/mojom",
@@ -9,7 +9,7 @@
sources += [
"linux/bpf_audio_policy_linux.cc",
"linux/bpf_audio_policy_linux.h",
-@@ -101,6 +101,27 @@ component("policy") {
+@@ -103,6 +103,27 @@ component("policy") {
"//sandbox/linux:sandbox_services",
"//sandbox/linux:seccomp_bpf",
"//sandbox/linux:suid_sandbox_client",
diff --git a/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc
--- a/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc
+++ b/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc
@@ -1,4 +1,4 @@
---- services/cert_verifier/cert_verifier_creation.cc.orig 2023-03-10 11:01:21 UTC
+--- services/cert_verifier/cert_verifier_creation.cc.orig 2023-04-08 11:38:38 UTC
+++ services/cert_verifier/cert_verifier_creation.cc
@@ -12,7 +12,7 @@
#include "net/cert_net/cert_net_fetcher_url_request.h"
@@ -18,7 +18,7 @@
verify_proc = net::CreateCertVerifyProcBuiltin(
std::move(cert_net_fetcher), net::CreateSslSystemTrustStore());
#else
-@@ -219,6 +219,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
+@@ -226,6 +226,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
bool IsUsingCertNetFetcher() {
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/ungoogled-chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
--- a/www/ungoogled-chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
+++ b/www/ungoogled-chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
@@ -1,4 +1,4 @@
---- services/device/hid/hid_connection_freebsd.cc.orig 2023-03-10 11:01:21 UTC
+--- services/device/hid/hid_connection_freebsd.cc.orig 2023-04-08 11:38:38 UTC
+++ services/device/hid/hid_connection_freebsd.cc
@@ -0,0 +1,240 @@
+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
@@ -30,7 +30,7 @@
+ base::WeakPtr<HidConnectionFreeBSD> connection)
+ : fd_(std::move(fd)),
+ connection_(connection),
-+ origin_task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
++ origin_task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
+ DETACH_FROM_SEQUENCE(sequence_checker_);
+ // Report buffers must always have room for the report ID.
+ report_buffer_size_ = device_info->max_input_report_size() + 1;
diff --git a/www/ungoogled-chromium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/ungoogled-chromium/files/patch-services_device_hid_hid__service__freebsd.cc
--- a/www/ungoogled-chromium/files/patch-services_device_hid_hid__service__freebsd.cc
+++ b/www/ungoogled-chromium/files/patch-services_device_hid_hid__service__freebsd.cc
@@ -1,4 +1,4 @@
---- services/device/hid/hid_service_freebsd.cc.orig 2023-03-10 11:01:21 UTC
+--- services/device/hid/hid_service_freebsd.cc.orig 2023-04-08 11:38:38 UTC
+++ services/device/hid/hid_service_freebsd.cc
@@ -0,0 +1,395 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
@@ -49,7 +49,7 @@
+ allow_protected_reports(allow_protected_reports),
+ allow_fido_reports(allow_fido_reports),
+ callback(std::move(callback)),
-+ task_runner(base::SequencedTaskRunner::GetCurrentDefault()),
++ task_runner(base::SequencedTaskRunner::GetCurrentDefault()),
+ blocking_task_runner(
+ base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)) {}
+ ~ConnectParams() {}
@@ -67,7 +67,7 @@
+ public:
+ BlockingTaskRunnerHelper(base::WeakPtr<HidServiceFreeBSD> service)
+ : service_(std::move(service)),
-+ task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
++ task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
+ DETACH_FROM_SEQUENCE(sequence_checker_);
+
+ timer_.reset(new base::RepeatingTimer());
diff --git a/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn
@@ -1,7 +1,7 @@
---- services/device/public/mojom/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- services/device/public/mojom/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ services/device/public/mojom/BUILD.gn
-@@ -89,7 +89,7 @@ mojom("device_service") {
- disable_variants = true
+@@ -90,7 +90,7 @@ mojom("device_service") {
+ cpp_only = true
enabled_features = []
- if ((is_linux || is_chromeos) && use_udev) {
diff --git a/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
--- a/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
+++ b/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
@@ -1,6 +1,6 @@
---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2022-10-01 07:40:07 UTC
+--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2023-04-08 11:38:38 UTC
+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
-@@ -137,7 +137,11 @@ class TimeZoneMonitorLinuxImpl
+@@ -131,7 +131,11 @@ class TimeZoneMonitorLinuxImpl
// false positives are harmless, assuming the false positive rate is
// reasonable.
const char* const kFilesToWatch[] = {
diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- services/network/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ services/network/BUILD.gn
-@@ -337,7 +337,6 @@ if (is_linux || is_chromeos) {
+@@ -338,7 +338,6 @@ if (is_linux || is_chromeos) {
]
deps = [
"//base:base",
diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.cc b/www/ungoogled-chromium/files/patch-services_network_network__service.cc
--- a/www/ungoogled-chromium/files/patch-services_network_network__service.cc
+++ b/www/ungoogled-chromium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig 2023-01-13 08:56:02 UTC
+--- services/network/network_service.cc.orig 2023-04-08 11:38:38 UTC
+++ services/network/network_service.cc
-@@ -88,7 +88,7 @@
+@@ -89,7 +89,7 @@
#include "third_party/boringssl/src/include/openssl/cpu.h"
#endif
diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
@@ -1,6 +1,6 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2022-10-01 07:40:07 UTC
+--- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn
-@@ -29,8 +29,12 @@ component("memory_instrumentation") {
+@@ -33,8 +33,12 @@ component("memory_instrumentation") {
sources += [ "os_metrics_win.cc" ]
}
diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/angle/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- third_party/angle/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ third_party/angle/BUILD.gn
@@ -280,7 +280,6 @@ config("extra_warnings") {
"-Wtautological-type-limit-compare",
@@ -8,7 +8,7 @@
"-Wsuggest-destructor-override",
"-Wsuggest-override",
-@@ -464,7 +463,7 @@ template("angle_common_lib") {
+@@ -451,7 +450,7 @@ template("angle_common_lib") {
all_dependent_configs = [ ":angle_disable_pool_alloc" ]
}
@@ -17,7 +17,7 @@
libs = [ "dl" ]
}
-@@ -619,6 +618,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -606,6 +605,9 @@ angle_static_library("angle_gpu_info_util") {
"Xi",
"Xext",
]
diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
--- a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-02-11 09:11:04 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-04-08 11:38:38 UTC
+++ third_party/angle/src/libANGLE/Display.cpp
@@ -55,7 +55,7 @@
# include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
@@ -9,7 +9,7 @@
# include "libANGLE/renderer/gl/egl/DisplayEGL.h"
# if defined(ANGLE_USE_X11)
# include "libANGLE/renderer/gl/glx/DisplayGLX.h"
-@@ -343,7 +343,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
impl = rx::CreateDisplayCGLOrEAGL(state);
break;
@@ -18,7 +18,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0)
{
-@@ -384,7 +384,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -387,7 +387,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
#if defined(ANGLE_ENABLE_OPENGL)
# if defined(ANGLE_PLATFORM_WINDOWS)
impl = new rx::DisplayWGL(state);
@@ -27,7 +27,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0 ||
platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE)
-@@ -433,7 +433,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -436,7 +436,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
impl = rx::CreateVulkanWin32Display(state);
}
break;
@@ -36,7 +36,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
{
-@@ -2038,7 +2038,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2046,7 +2046,7 @@ static ClientExtensions GenerateClientExtensions()
extensions.x11Visual = true;
#endif
diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
--- a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
+++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
@@ -1,6 +1,6 @@
---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-12-02 17:56:32 UTC
+--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-04-08 11:38:38 UTC
+++ third_party/angle/src/libANGLE/formatutils.cpp
-@@ -1466,7 +1466,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
+@@ -1471,7 +1471,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported);
AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported);
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h
--- a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h
@@ -1,6 +1,6 @@
---- third_party/blink/public/platform/platform.h.orig 2023-02-11 09:11:04 UTC
+--- third_party/blink/public/platform/platform.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/public/platform/platform.h
-@@ -357,7 +357,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -349,7 +349,7 @@ class BLINK_PLATFORM_EXPORT Platform {
return nullptr;
}
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-03-10 11:01:21 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -73,12 +73,12 @@
+@@ -74,12 +74,12 @@
#include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
#endif
@@ -15,7 +15,7 @@
#include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
#include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
#endif
-@@ -208,7 +208,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+@@ -222,7 +222,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
main_thread_task_runner);
#endif
@@ -24,7 +24,7 @@
binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
ConvertToBaseRepeatingCallback(
CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -241,7 +241,7 @@ void BlinkInitializer::RegisterMemoryWatchers() {
+@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterMemoryWatchers() {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2023-03-10 11:01:21 UTC
+--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/core/editing/editing_behavior.cc
-@@ -281,7 +281,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb
+@@ -284,7 +284,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb
// unexpected behaviour
if (ch < ' ')
return false;
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/execution_context/navigator_base.cc.orig 2022-10-01 07:40:07 UTC
+--- third_party/blink/renderer/core/execution_context/navigator_base.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/core/execution_context/navigator_base.cc
@@ -31,7 +31,7 @@ String GetReducedNavigatorPlatform() {
return "Win32";
@@ -7,5 +7,5 @@
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
return "Linux x86_64";
- #else
- #error Unsupported platform
+ #elif BUILDFLAG(IS_IOS)
+ return "iPhone";
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -407,7 +407,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
+@@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
const blink::RendererPreferences& prefs) {
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
@@ -9,7 +9,7 @@
if (!prefs.should_antialias_text) {
// When anti-aliasing is off, GTK maps all non-zero hinting settings to
// 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3295,7 +3295,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3344,7 +3344,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
renderer_preferences_.use_subpixel_positioning);
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
@@ -1,15 +1,15 @@
---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-03-10 11:01:21 UTC
+--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6452,7 +6452,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
- MoveCaretStaysHorizontallyAlignedWhenMoved
- #endif
- // TODO(crbug.com/1317375): Build these tests on all platforms.
--#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
- TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) {
- RegisterMockedHttpURLLoad("move_caret.html");
+@@ -6439,7 +6439,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+ }
-@@ -6849,7 +6849,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
+ #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
+ // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable.
+ // TODO(crbug.com/1317375): Build these tests on all platforms.
+ #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \
+@@ -6847,7 +6847,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) {
RunTest("composited_selection_bounds_large_selection_noscroll.html");
}
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-01-13 08:56:02 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/core/layout/layout_view.cc
-@@ -68,7 +68,7 @@
+@@ -67,7 +67,7 @@
#include "ui/display/screen_info.h"
#include "ui/gfx/geometry/quad_f.h"
@@ -9,7 +9,7 @@
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
#endif
-@@ -370,7 +370,7 @@ void LayoutView::UpdateLayout() {
+@@ -365,7 +365,7 @@ void LayoutView::UpdateLayout() {
DCHECK(!layout_state_);
LayoutState root_layout_state(*this);
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
@@ -1,9 +1,9 @@
---- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-01-13 08:56:02 UTC
+--- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/modules/ml/webnn/features.gni
@@ -7,5 +7,5 @@ declare_args() {
# This enables building WebNN with XNNPACK. Currently only available for
- # Linux or Windows on x64 that aligns with build_tflite_with_xnnpack.
- # See third_party/tflite/features.gni
-- build_webnn_with_xnnpack = (is_win || is_linux) && current_cpu == "x64"
-+ build_webnn_with_xnnpack = !is_bsd && (is_win || is_linux) && current_cpu == "x64"
+ # Windows on x64 or x86.
+ build_webnn_with_xnnpack =
+- is_win && (current_cpu == "x64" || current_cpu == "x86")
++ !is_bsd && (is_win && (current_cpu == "x64" || current_cpu == "x86"))
}
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-03-10 11:01:21 UTC
+--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc
-@@ -174,7 +174,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
+@@ -177,7 +177,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
~SharedXnnpackContext() {
base::AutoLock auto_lock(SharedXnnpackContextLock());
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
@@ -1,9 +1,9 @@
---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-03-10 11:01:21 UTC
+--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
@@ -290,7 +290,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
SetupRenderer(kDefaultOutputDeviceId);
renderer_proxy_->Start();
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
static const int kExpectedBufferSize = kHardwareSampleRate / 100;
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2023-01-13 08:56:02 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc
@@ -102,7 +102,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
@@ -8,4 +8,4 @@
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// TODO(jie.a.chen@intel.com): Add Linux support.
return false;
- #elif BUILDFLAG(IS_MAC)
+ #elif BUILDFLAG(IS_APPLE)
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
@@ -1,11 +1,11 @@
---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-02-11 09:11:04 UTC
+--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -699,7 +699,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
- // TODO(crbug.com/1309194): GPU-GPU copy on linux platform requires interop
- // supported. According to the bug, this change will be a long time task.
- // So disable GPU-GPU copy path on linux platform.
+@@ -707,7 +707,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
+ // platform requires interop supported. According to the bug, this change will
+ // be a long time task. So disable using webgpu mailbox texture uploading path
+ // on linux platform.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ use_webgpu_mailbox_texture = false;
unaccelerated_image = image->MakeUnaccelerated();
image = unaccelerated_image.get();
- #endif // BUILDFLAG(IS_LINUX)
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1927,7 +1927,7 @@ static_library("test_support") {
+@@ -1935,7 +1935,7 @@ static_library("test_support") {
]
# fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-02-11 09:11:04 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/platform/fonts/font_cache.cc
@@ -72,7 +72,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo
@@ -9,12 +9,12 @@
float FontCache::device_scale_factor_ = 1.0;
#endif
-@@ -118,7 +118,7 @@ FontCache::~FontCache() = default;
- FontPlatformData* FontCache::SystemFontPlatformData(
+@@ -119,7 +119,7 @@ FontPlatformData* FontCache::SystemFontPlatformData(
const FontDescription& font_description) {
const AtomicString& family = FontCache::SystemFontFamily();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
+- BUILDFLAG(IS_IOS)
++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
if (family.empty() || family == font_family_names::kSystemUi)
return nullptr;
#else
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-10-01 07:40:07 UTC
+--- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
-@@ -76,8 +76,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
+@@ -77,8 +77,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
// Once we are using RAF, this thread is driving user interactive display
// updates. Update priority accordingly.
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-01-13 08:56:02 UTC
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -347,7 +347,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+@@ -358,7 +358,7 @@ void VideoFrameSubmitter::OnBeginFrame(
continue;
auto& feedback =
timing_details.find(frame_token)->value.presentation_feedback;
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
--- 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,15 +1,6 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-03-22 09:35:28 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-04-08 11:38:38 UTC
+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1127,7 +1127,7 @@
- {
- name: "DocumentPictureInPictureAPI",
- origin_trial_feature_name: "DocumentPictureInPictureAPI",
-- origin_trial_os: ["win", "mac", "linux", "chromeos"],
-+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
- status: {
- "Android": "",
- "ChromeOS_Lacros": "",
-@@ -1348,7 +1348,7 @@
+@@ -1531,7 +1531,7 @@
depends_on: ["FileSystemAccessLocal"],
status: {"Android": "test", "default": "stable"},
origin_trial_feature_name: "FileHandling",
@@ -18,16 +9,16 @@
base_feature: "FileHandlingAPI",
},
{
-@@ -2925,7 +2925,7 @@
- {
+@@ -3367,7 +3367,7 @@
name: "UnrestrictedSharedArrayBuffer",
+ base_feature: "none",
origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
+ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
},
{
name: "URLPatternCompareComponent",
-@@ -2945,7 +2945,7 @@
+@@ -3388,7 +3388,7 @@
origin_trial_feature_name: "UserAgentReduction",
origin_trial_allows_third_party: true,
// iOS not included as it should not send a reduced User-Agent string.
@@ -36,9 +27,9 @@
base_feature: "ReduceUserAgent",
},
{
-@@ -3108,12 +3108,12 @@
- name: "WebAppUrlHandling",
+@@ -3562,12 +3562,12 @@
status: "experimental",
+ base_feature: "none",
origin_trial_feature_name: "WebAppUrlHandling",
- origin_trial_os: ["win", "mac", "linux"],
+ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"],
@@ -49,5 +40,5 @@
- origin_trial_os: ["win", "mac", "linux", "chromeos"],
+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
status: "stable",
+ base_feature: "none",
},
- {
diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.generated.gni
--- a/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.generated.gni
+++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.generated.gni
@@ -1,6 +1,6 @@
---- third_party/boringssl/BUILD.generated.gni.orig 2023-02-11 09:11:04 UTC
+--- third_party/boringssl/BUILD.generated.gni.orig 2023-04-08 11:38:38 UTC
+++ third_party/boringssl/BUILD.generated.gni
-@@ -77,6 +77,7 @@ crypto_sources = [
+@@ -87,6 +87,7 @@ crypto_sources = [
"src/crypto/cpu_aarch64_freebsd.c",
"src/crypto/cpu_aarch64_fuchsia.c",
"src/crypto/cpu_aarch64_linux.c",
@@ -8,7 +8,7 @@
"src/crypto/cpu_aarch64_win.c",
"src/crypto/cpu_arm.c",
"src/crypto/cpu_arm_freebsd.c",
-@@ -184,6 +185,7 @@ crypto_sources = [
+@@ -193,6 +194,7 @@ crypto_sources = [
"src/crypto/rand_extra/deterministic.c",
"src/crypto/rand_extra/forkunsafe.c",
"src/crypto/rand_extra/fuchsia.c",
diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl
--- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl
+++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-02-11 09:11:04 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-04-08 11:38:38 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl
-@@ -4727,6 +4727,7 @@ ___
+@@ -3778,6 +3778,7 @@ ___
}
$code.=<<___;
@@ -8,7 +8,7 @@
.align 64
.Lbswap_mask:
.byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -4749,6 +4750,7 @@ $code.=<<___;
+@@ -3800,6 +3801,7 @@ $code.=<<___;
.asciz "AES for Intel AES-NI, CRYPTOGAMS by <appro\@openssl.org>"
.align 64
diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl
--- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl
+++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig 2023-03-10 11:01:21 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig 2023-04-08 11:38:38 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl
-@@ -985,6 +985,7 @@ $code.=<<___;
+@@ -1053,6 +1053,7 @@ $code.=<<___;
___
$code.=<<___;
@@ -8,11 +8,11 @@
.align 64
.Lbswap_mask:
.byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -998,6 +999,7 @@ $code.=<<___;
+@@ -1066,6 +1067,7 @@ $code.=<<___;
.byte 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
.asciz "AES-NI GCM module for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
.align 64
+.previous
___
- if ($win64) {
- $rec="%rcx";
+ }}} else {{{
+ $code=<<___; # assembler is too old
diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl
--- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl
+++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl
@@ -1,18 +1,18 @@
---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig 2023-02-11 09:11:04 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig 2023-04-08 11:38:38 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl
-@@ -333,6 +333,7 @@ $code .= <<____;
- .cfi_endproc
+@@ -331,6 +331,7 @@ $code .= <<____;
+ .seh_endproc
.size gcm_ghash_ssse3,.-gcm_ghash_ssse3
+.rodata
.align 16
# .Lreverse_bytes is a permutation which, if applied with pshufb, reverses the
# bytes in an XMM register.
-@@ -341,6 +342,7 @@ $code .= <<____;
+@@ -339,6 +340,7 @@ $code .= <<____;
# .Llow4_mask is an XMM mask which selects the low four bits of each byte.
.Llow4_mask:
.quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
+.previous
____
- if ($win64) {
+ print $code;
diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl
--- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl
+++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig 2023-02-11 09:11:04 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig 2023-04-08 11:38:38 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl
-@@ -1275,6 +1275,7 @@ ___
+@@ -1297,6 +1297,7 @@ ___
}
$code.=<<___;
@@ -8,11 +8,11 @@
.align 64
.Lbswap_mask:
.byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -1286,6 +1287,7 @@ $code.=<<___;
+@@ -1308,6 +1309,7 @@ $code.=<<___;
.asciz "GHASH for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
.align 64
+.previous
___
- if ($win64) {
+ $code =~ s/\`([^\`]*)\`/eval($1)/gem;
diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_include_openssl_base.h b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_include_openssl_base.h
--- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_include_openssl_base.h
+++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_include_openssl_base.h
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/include/openssl/base.h.orig 2022-10-29 17:50:56 UTC
+--- third_party/boringssl/src/include/openssl/base.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/boringssl/src/include/openssl/base.h
-@@ -154,6 +154,11 @@ extern "C" {
+@@ -151,6 +151,11 @@ extern "C" {
#define OPENSSL_FUCHSIA
#endif
diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py
--- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py
+++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/util/generate_build_files.py.orig 2023-03-10 11:01:21 UTC
+--- third_party/boringssl/src/util/generate_build_files.py.orig 2023-04-08 11:38:38 UTC
+++ third_party/boringssl/src/util/generate_build_files.py
-@@ -859,10 +859,10 @@ def main(platforms):
+@@ -785,10 +785,10 @@ def main(platforms):
]
# Generate err_data.c
@@ -15,7 +15,7 @@
crypto_c_files.append('err_data.c')
crypto_c_files.sort()
-@@ -875,11 +875,11 @@ def main(platforms):
+@@ -801,11 +801,11 @@ def main(platforms):
crypto_test_files = []
if EMBED_TEST_DATA:
# Generate crypto_test_data.cc
diff --git a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ third_party/crashpad/crashpad/client/BUILD.gn
-@@ -132,6 +132,13 @@ static_library("common") {
+@@ -133,6 +133,13 @@ static_library("common") {
if (crashpad_is_win) {
sources += [ "crash_report_database_win.cc" ]
}
diff --git a/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h b/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h
--- a/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h
+++ b/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h
@@ -1,6 +1,6 @@
---- third_party/dawn/src/dawn/common/Platform.h.orig 2022-10-01 07:40:07 UTC
+--- third_party/dawn/src/dawn/common/Platform.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/dawn/src/dawn/common/Platform.h
-@@ -45,6 +45,11 @@
+@@ -46,6 +46,11 @@
#error "Unsupported Windows platform."
#endif
diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h
--- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h
+++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h
@@ -1,12 +1,12 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2023-03-10 11:01:21 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h
-@@ -0,0 +1,748 @@
+@@ -0,0 +1,749 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H
+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
-+#define CONFIG_THIS_YEAR 2022
++#define CONFIG_THIS_YEAR 2023
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
+#define CC_IDENT "OpenBSD clang version 13.0.0"
@@ -209,8 +209,6 @@
+#define HAVE_RDTSC 0
+#define HAVE_SEM_TIMEDWAIT 1
+#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+#define HAVE_CABS 0
-+#define HAVE_CEXP 0
+#define HAVE_INLINE_ASM 1
+#define HAVE_SYMVER 0
+#define HAVE_X86ASM 0
@@ -452,6 +450,7 @@
+#define CONFIG_TRANSCODING_EXAMPLE 0
+#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
+#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
++#define CONFIG_QSV_TRANSCODE_EXAMPLE 0
+#define CONFIG_AVISYNTH 0
+#define CONFIG_FREI0R 0
+#define CONFIG_LIBCDIO 0
@@ -688,7 +687,9 @@
+#define CONFIG_H264PARSE 1
+#define CONFIG_H264PRED 1
+#define CONFIG_H264QPEL 1
++#define CONFIG_H264_SEI 1
+#define CONFIG_HEVCPARSE 0
++#define CONFIG_HEVC_SEI 0
+#define CONFIG_HPELDSP 1
+#define CONFIG_HUFFMAN 0
+#define CONFIG_HUFFYUVDSP 0
diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h
--- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h
+++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h
@@ -1,6 +1,6 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h.orig 2023-03-10 11:01:21 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h
-@@ -0,0 +1,2125 @@
+@@ -0,0 +1,2146 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_COMPONENTS_H
+#define FFMPEG_CONFIG_COMPONENTS_H
@@ -23,6 +23,7 @@
+#define CONFIG_HEVC_METADATA_BSF 0
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
+#define CONFIG_IMX_DUMP_HEADER_BSF 0
++#define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
+#define CONFIG_MJPEG2JPEG_BSF 0
+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
@@ -472,6 +473,7 @@
+#define CONFIG_PCM_U32BE_DECODER 0
+#define CONFIG_PCM_U32LE_DECODER 0
+#define CONFIG_PCM_VIDC_DECODER 0
++#define CONFIG_CBD2_DPCM_DECODER 0
+#define CONFIG_DERF_DPCM_DECODER 0
+#define CONFIG_GREMLIN_DPCM_DECODER 0
+#define CONFIG_INTERPLAY_DPCM_DECODER 0
@@ -479,6 +481,7 @@
+#define CONFIG_SDX2_DPCM_DECODER 0
+#define CONFIG_SOL_DPCM_DECODER 0
+#define CONFIG_XAN_DPCM_DECODER 0
++#define CONFIG_WADY_DPCM_DECODER 0
+#define CONFIG_ADPCM_4XM_DECODER 0
+#define CONFIG_ADPCM_ADX_DECODER 0
+#define CONFIG_ADPCM_AFC_DECODER 0
@@ -528,6 +531,7 @@
+#define CONFIG_ADPCM_THP_LE_DECODER 0
+#define CONFIG_ADPCM_VIMA_DECODER 0
+#define CONFIG_ADPCM_XA_DECODER 0
++#define CONFIG_ADPCM_XMD_DECODER 0
+#define CONFIG_ADPCM_YAMAHA_DECODER 0
+#define CONFIG_ADPCM_ZORK_DECODER 0
+#define CONFIG_SSA_DECODER 0
@@ -594,6 +598,7 @@
+#define CONFIG_LIBAOM_AV1_DECODER 0
+#define CONFIG_AV1_DECODER 0
+#define CONFIG_AV1_CUVID_DECODER 0
++#define CONFIG_AV1_MEDIACODEC_DECODER 0
+#define CONFIG_AV1_QSV_DECODER 0
+#define CONFIG_LIBOPENH264_DECODER 0
+#define CONFIG_H264_CUVID_DECODER 0
@@ -612,6 +617,8 @@
+#define CONFIG_VP9_CUVID_DECODER 0
+#define CONFIG_VP9_MEDIACODEC_DECODER 0
+#define CONFIG_VP9_QSV_DECODER 0
++#define CONFIG_VNULL_DECODER 0
++#define CONFIG_ANULL_DECODER 0
+#define CONFIG_A64MULTI_ENCODER 0
+#define CONFIG_A64MULTI5_ENCODER 0
+#define CONFIG_ALIAS_PIX_ENCODER 0
@@ -829,6 +836,7 @@
+#define CONFIG_H263_V4L2M2M_ENCODER 0
+#define CONFIG_AV1_NVENC_ENCODER 0
+#define CONFIG_AV1_QSV_ENCODER 0
++#define CONFIG_AV1_AMF_ENCODER 0
+#define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_AMF_ENCODER 0
+#define CONFIG_H264_MF_ENCODER 0
@@ -859,6 +867,8 @@
+#define CONFIG_VP8_VAAPI_ENCODER 0
+#define CONFIG_VP9_VAAPI_ENCODER 0
+#define CONFIG_VP9_QSV_ENCODER 0
++#define CONFIG_VNULL_ENCODER 0
++#define CONFIG_ANULL_ENCODER 0
+#define CONFIG_AV1_D3D11VA_HWACCEL 0
+#define CONFIG_AV1_D3D11VA2_HWACCEL 0
+#define CONFIG_AV1_DXVA2_HWACCEL 0
@@ -1024,6 +1034,7 @@
+#define CONFIG_ADELAY_FILTER 0
+#define CONFIG_ADENORM_FILTER 0
+#define CONFIG_ADERIVATIVE_FILTER 0
++#define CONFIG_ADRC_FILTER 0
+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
+#define CONFIG_ADYNAMICSMOOTH_FILTER 0
+#define CONFIG_AECHO_FILTER 0
@@ -1146,6 +1157,7 @@
+#define CONFIG_VOLUME_FILTER 0
+#define CONFIG_VOLUMEDETECT_FILTER 0
+#define CONFIG_AEVALSRC_FILTER 0
++#define CONFIG_AFDELAYSRC_FILTER 0
+#define CONFIG_AFIRSRC_FILTER 0
+#define CONFIG_ANOISESRC_FILTER 0
+#define CONFIG_ANULLSRC_FILTER 0
@@ -1207,6 +1219,7 @@
+#define CONFIG_CONVOLVE_FILTER 0
+#define CONFIG_COPY_FILTER 0
+#define CONFIG_COREIMAGE_FILTER 0
++#define CONFIG_CORR_FILTER 0
+#define CONFIG_COVER_RECT_FILTER 0
+#define CONFIG_CROP_FILTER 0
+#define CONFIG_CROPDETECT_FILTER 0
@@ -1441,6 +1454,7 @@
+#define CONFIG_SPP_FILTER 0
+#define CONFIG_SR_FILTER 0
+#define CONFIG_SSIM_FILTER 0
++#define CONFIG_SSIM360_FILTER 0
+#define CONFIG_STEREO3D_FILTER 0
+#define CONFIG_STREAMSELECT_FILTER 0
+#define CONFIG_SUBTITLES_FILTER 0
@@ -1505,6 +1519,9 @@
+#define CONFIG_ZMQ_FILTER 0
+#define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ZSCALE_FILTER 0
++#define CONFIG_HSTACK_VAAPI_FILTER 0
++#define CONFIG_VSTACK_VAAPI_FILTER 0
++#define CONFIG_XSTACK_VAAPI_FILTER 0
+#define CONFIG_ALLRGB_FILTER 0
+#define CONFIG_ALLYUV_FILTER 0
+#define CONFIG_CELLAUTO_FILTER 0
@@ -1540,6 +1557,7 @@
+#define CONFIG_AVECTORSCOPE_FILTER 0
+#define CONFIG_CONCAT_FILTER 0
+#define CONFIG_SHOWCQT_FILTER 0
++#define CONFIG_SHOWCWT_FILTER 0
+#define CONFIG_SHOWFREQS_FILTER 0
+#define CONFIG_SHOWSPATIAL_FILTER 0
+#define CONFIG_SHOWSPECTRUM_FILTER 0
@@ -1841,6 +1859,7 @@
+#define CONFIG_VPLAYER_DEMUXER 0
+#define CONFIG_VQF_DEMUXER 0
+#define CONFIG_W64_DEMUXER 0
++#define CONFIG_WADY_DEMUXER 0
+#define CONFIG_WAV_DEMUXER 1
+#define CONFIG_WC3_DEMUXER 0
+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
@@ -1853,6 +1872,7 @@
+#define CONFIG_WV_DEMUXER 0
+#define CONFIG_XA_DEMUXER 0
+#define CONFIG_XBIN_DEMUXER 0
++#define CONFIG_XMD_DEMUXER 0
+#define CONFIG_XMV_DEMUXER 0
+#define CONFIG_XVAG_DEMUXER 0
+#define CONFIG_XWMA_DEMUXER 0
@@ -2080,6 +2100,7 @@
+#define CONFIG_CONCATF_PROTOCOL 0
+#define CONFIG_CRYPTO_PROTOCOL 0
+#define CONFIG_DATA_PROTOCOL 0
++#define CONFIG_FD_PROTOCOL 0
+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
+#define CONFIG_FILE_PROTOCOL 0
@@ -2123,6 +2144,6 @@
+#define CONFIG_LIBSSH_PROTOCOL 0
+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
+#define CONFIG_LIBZMQ_PROTOCOL 0
-+#define CONFIG_IPFS_PROTOCOL 0
-+#define CONFIG_IPNS_PROTOCOL 0
++#define CONFIG_IPFS_GATEWAY_PROTOCOL 0
++#define CONFIG_IPNS_GATEWAY_PROTOCOL 0
+#endif /* FFMPEG_CONFIG_COMPONENTS_H */
diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h
--- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h
+++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h
@@ -1,12 +1,12 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2023-03-10 11:01:21 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h
-@@ -0,0 +1,748 @@
+@@ -0,0 +1,749 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/liberato/src/release_chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
-+#define CONFIG_THIS_YEAR 2022
++#define CONFIG_THIS_YEAR 2023
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
+#define CC_IDENT "OpenBSD clang version 13.0.0"
@@ -209,8 +209,6 @@
+#define HAVE_RDTSC 0
+#define HAVE_SEM_TIMEDWAIT 1
+#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+#define HAVE_CABS 0
-+#define HAVE_CEXP 0
+#define HAVE_INLINE_ASM 1
+#define HAVE_SYMVER 0
+#define HAVE_X86ASM 1
@@ -452,6 +450,7 @@
+#define CONFIG_TRANSCODING_EXAMPLE 0
+#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
+#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
++#define CONFIG_QSV_TRANSCODE_EXAMPLE 0
+#define CONFIG_AVISYNTH 0
+#define CONFIG_FREI0R 0
+#define CONFIG_LIBCDIO 0
@@ -688,7 +687,9 @@
+#define CONFIG_H264PARSE 1
+#define CONFIG_H264PRED 1
+#define CONFIG_H264QPEL 1
++#define CONFIG_H264_SEI 1
+#define CONFIG_HEVCPARSE 0
++#define CONFIG_HEVC_SEI 0
+#define CONFIG_HPELDSP 1
+#define CONFIG_HUFFMAN 0
+#define CONFIG_HUFFYUVDSP 0
diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm
--- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm
+++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm
@@ -1,6 +1,6 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2023-03-10 11:01:21 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2023-04-08 11:38:38 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm
-@@ -0,0 +1,731 @@
+@@ -0,0 +1,732 @@
+; Automatically generated by configure - do not modify!
+%define ARCH_AARCH64 0
+%define ARCH_ALPHA 0
@@ -193,8 +193,6 @@
+%define HAVE_RDTSC 0
+%define HAVE_SEM_TIMEDWAIT 1
+%define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+%define HAVE_CABS 0
-+%define HAVE_CEXP 0
+%define HAVE_INLINE_ASM 1
+%define HAVE_SYMVER 0
+%define HAVE_X86ASM 1
@@ -436,6 +434,7 @@
+%define CONFIG_TRANSCODING_EXAMPLE 0
+%define CONFIG_VAAPI_ENCODE_EXAMPLE 0
+%define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
++%define CONFIG_QSV_TRANSCODE_EXAMPLE 0
+%define CONFIG_AVISYNTH 0
+%define CONFIG_FREI0R 0
+%define CONFIG_LIBCDIO 0
@@ -672,7 +671,9 @@
+%define CONFIG_H264PARSE 1
+%define CONFIG_H264PRED 1
+%define CONFIG_H264QPEL 1
++%define CONFIG_H264_SEI 1
+%define CONFIG_HEVCPARSE 0
++%define CONFIG_HEVC_SEI 0
+%define CONFIG_HPELDSP 1
+%define CONFIG_HUFFMAN 0
+%define CONFIG_HUFFYUVDSP 0
diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h
--- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h
+++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h
@@ -1,6 +1,6 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h.orig 2023-03-10 11:01:21 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h
-@@ -0,0 +1,2125 @@
+@@ -0,0 +1,2146 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_COMPONENTS_H
+#define FFMPEG_CONFIG_COMPONENTS_H
@@ -23,6 +23,7 @@
+#define CONFIG_HEVC_METADATA_BSF 0
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
+#define CONFIG_IMX_DUMP_HEADER_BSF 0
++#define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
+#define CONFIG_MJPEG2JPEG_BSF 0
+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
@@ -472,6 +473,7 @@
+#define CONFIG_PCM_U32BE_DECODER 0
+#define CONFIG_PCM_U32LE_DECODER 0
+#define CONFIG_PCM_VIDC_DECODER 0
++#define CONFIG_CBD2_DPCM_DECODER 0
+#define CONFIG_DERF_DPCM_DECODER 0
+#define CONFIG_GREMLIN_DPCM_DECODER 0
+#define CONFIG_INTERPLAY_DPCM_DECODER 0
@@ -479,6 +481,7 @@
+#define CONFIG_SDX2_DPCM_DECODER 0
+#define CONFIG_SOL_DPCM_DECODER 0
+#define CONFIG_XAN_DPCM_DECODER 0
++#define CONFIG_WADY_DPCM_DECODER 0
+#define CONFIG_ADPCM_4XM_DECODER 0
+#define CONFIG_ADPCM_ADX_DECODER 0
+#define CONFIG_ADPCM_AFC_DECODER 0
@@ -528,6 +531,7 @@
+#define CONFIG_ADPCM_THP_LE_DECODER 0
+#define CONFIG_ADPCM_VIMA_DECODER 0
+#define CONFIG_ADPCM_XA_DECODER 0
++#define CONFIG_ADPCM_XMD_DECODER 0
+#define CONFIG_ADPCM_YAMAHA_DECODER 0
+#define CONFIG_ADPCM_ZORK_DECODER 0
+#define CONFIG_SSA_DECODER 0
@@ -594,6 +598,7 @@
+#define CONFIG_LIBAOM_AV1_DECODER 0
+#define CONFIG_AV1_DECODER 0
+#define CONFIG_AV1_CUVID_DECODER 0
++#define CONFIG_AV1_MEDIACODEC_DECODER 0
+#define CONFIG_AV1_QSV_DECODER 0
+#define CONFIG_LIBOPENH264_DECODER 0
+#define CONFIG_H264_CUVID_DECODER 0
@@ -612,6 +617,8 @@
+#define CONFIG_VP9_CUVID_DECODER 0
+#define CONFIG_VP9_MEDIACODEC_DECODER 0
+#define CONFIG_VP9_QSV_DECODER 0
++#define CONFIG_VNULL_DECODER 0
++#define CONFIG_ANULL_DECODER 0
+#define CONFIG_A64MULTI_ENCODER 0
+#define CONFIG_A64MULTI5_ENCODER 0
+#define CONFIG_ALIAS_PIX_ENCODER 0
@@ -829,6 +836,7 @@
+#define CONFIG_H263_V4L2M2M_ENCODER 0
+#define CONFIG_AV1_NVENC_ENCODER 0
+#define CONFIG_AV1_QSV_ENCODER 0
++#define CONFIG_AV1_AMF_ENCODER 0
+#define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_AMF_ENCODER 0
+#define CONFIG_H264_MF_ENCODER 0
@@ -859,6 +867,8 @@
+#define CONFIG_VP8_VAAPI_ENCODER 0
+#define CONFIG_VP9_VAAPI_ENCODER 0
+#define CONFIG_VP9_QSV_ENCODER 0
++#define CONFIG_VNULL_ENCODER 0
++#define CONFIG_ANULL_ENCODER 0
+#define CONFIG_AV1_D3D11VA_HWACCEL 0
+#define CONFIG_AV1_D3D11VA2_HWACCEL 0
+#define CONFIG_AV1_DXVA2_HWACCEL 0
@@ -1024,6 +1034,7 @@
+#define CONFIG_ADELAY_FILTER 0
+#define CONFIG_ADENORM_FILTER 0
+#define CONFIG_ADERIVATIVE_FILTER 0
++#define CONFIG_ADRC_FILTER 0
+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
+#define CONFIG_ADYNAMICSMOOTH_FILTER 0
+#define CONFIG_AECHO_FILTER 0
@@ -1146,6 +1157,7 @@
+#define CONFIG_VOLUME_FILTER 0
+#define CONFIG_VOLUMEDETECT_FILTER 0
+#define CONFIG_AEVALSRC_FILTER 0
++#define CONFIG_AFDELAYSRC_FILTER 0
+#define CONFIG_AFIRSRC_FILTER 0
+#define CONFIG_ANOISESRC_FILTER 0
+#define CONFIG_ANULLSRC_FILTER 0
@@ -1207,6 +1219,7 @@
+#define CONFIG_CONVOLVE_FILTER 0
+#define CONFIG_COPY_FILTER 0
+#define CONFIG_COREIMAGE_FILTER 0
++#define CONFIG_CORR_FILTER 0
+#define CONFIG_COVER_RECT_FILTER 0
+#define CONFIG_CROP_FILTER 0
+#define CONFIG_CROPDETECT_FILTER 0
@@ -1441,6 +1454,7 @@
+#define CONFIG_SPP_FILTER 0
+#define CONFIG_SR_FILTER 0
+#define CONFIG_SSIM_FILTER 0
++#define CONFIG_SSIM360_FILTER 0
+#define CONFIG_STEREO3D_FILTER 0
+#define CONFIG_STREAMSELECT_FILTER 0
+#define CONFIG_SUBTITLES_FILTER 0
@@ -1505,6 +1519,9 @@
+#define CONFIG_ZMQ_FILTER 0
+#define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ZSCALE_FILTER 0
++#define CONFIG_HSTACK_VAAPI_FILTER 0
++#define CONFIG_VSTACK_VAAPI_FILTER 0
++#define CONFIG_XSTACK_VAAPI_FILTER 0
+#define CONFIG_ALLRGB_FILTER 0
+#define CONFIG_ALLYUV_FILTER 0
+#define CONFIG_CELLAUTO_FILTER 0
@@ -1540,6 +1557,7 @@
+#define CONFIG_AVECTORSCOPE_FILTER 0
+#define CONFIG_CONCAT_FILTER 0
+#define CONFIG_SHOWCQT_FILTER 0
++#define CONFIG_SHOWCWT_FILTER 0
+#define CONFIG_SHOWFREQS_FILTER 0
+#define CONFIG_SHOWSPATIAL_FILTER 0
+#define CONFIG_SHOWSPECTRUM_FILTER 0
@@ -1841,6 +1859,7 @@
+#define CONFIG_VPLAYER_DEMUXER 0
+#define CONFIG_VQF_DEMUXER 0
+#define CONFIG_W64_DEMUXER 0
++#define CONFIG_WADY_DEMUXER 0
+#define CONFIG_WAV_DEMUXER 1
+#define CONFIG_WC3_DEMUXER 0
+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
@@ -1853,6 +1872,7 @@
+#define CONFIG_WV_DEMUXER 0
+#define CONFIG_XA_DEMUXER 0
+#define CONFIG_XBIN_DEMUXER 0
++#define CONFIG_XMD_DEMUXER 0
+#define CONFIG_XMV_DEMUXER 0
+#define CONFIG_XVAG_DEMUXER 0
+#define CONFIG_XWMA_DEMUXER 0
@@ -2080,6 +2100,7 @@
+#define CONFIG_CONCATF_PROTOCOL 0
+#define CONFIG_CRYPTO_PROTOCOL 0
+#define CONFIG_DATA_PROTOCOL 0
++#define CONFIG_FD_PROTOCOL 0
+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
+#define CONFIG_FILE_PROTOCOL 0
@@ -2123,6 +2144,6 @@
+#define CONFIG_LIBSSH_PROTOCOL 0
+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
+#define CONFIG_LIBZMQ_PROTOCOL 0
-+#define CONFIG_IPFS_PROTOCOL 0
-+#define CONFIG_IPNS_PROTOCOL 0
++#define CONFIG_IPFS_GATEWAY_PROTOCOL 0
++#define CONFIG_IPNS_GATEWAY_PROTOCOL 0
+#endif /* FFMPEG_CONFIG_COMPONENTS_H */
diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h
--- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h
+++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h
@@ -1,16 +1,16 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2023-02-11 09:11:04 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h
-@@ -0,0 +1,748 @@
+@@ -0,0 +1,749 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --arch=x86_64 --target-os=openbsd --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/liberato/src/release_chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
-+#define CONFIG_THIS_YEAR 2022
++#define CONFIG_THIS_YEAR 2023
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
+#define CC_IDENT "OpenBSD clang version 13.0.0"
-+#define OS_NAME openbsd
++#define OS_NAME linux
+#define av_restrict restrict
+#define EXTERN_PREFIX ""
+#define EXTERN_ASM
@@ -209,8 +209,6 @@
+#define HAVE_RDTSC 0
+#define HAVE_SEM_TIMEDWAIT 1
+#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+#define HAVE_CABS 0
-+#define HAVE_CEXP 0
+#define HAVE_INLINE_ASM 1
+#define HAVE_SYMVER 0
+#define HAVE_X86ASM 1
@@ -452,6 +450,7 @@
+#define CONFIG_TRANSCODING_EXAMPLE 0
+#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
+#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
++#define CONFIG_QSV_TRANSCODE_EXAMPLE 0
+#define CONFIG_AVISYNTH 0
+#define CONFIG_FREI0R 0
+#define CONFIG_LIBCDIO 0
@@ -688,7 +687,9 @@
+#define CONFIG_H264PARSE 1
+#define CONFIG_H264PRED 1
+#define CONFIG_H264QPEL 1
++#define CONFIG_H264_SEI 1
+#define CONFIG_HEVCPARSE 0
++#define CONFIG_HEVC_SEI 0
+#define CONFIG_HPELDSP 1
+#define CONFIG_HUFFMAN 0
+#define CONFIG_HUFFYUVDSP 0
diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm
--- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm
+++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm
@@ -1,6 +1,6 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2023-02-11 09:11:04 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2023-04-08 11:38:38 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm
-@@ -0,0 +1,731 @@
+@@ -0,0 +1,732 @@
+; Automatically generated by configure - do not modify!
+%define ARCH_AARCH64 0
+%define ARCH_ALPHA 0
@@ -193,8 +193,6 @@
+%define HAVE_RDTSC 0
+%define HAVE_SEM_TIMEDWAIT 1
+%define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+%define HAVE_CABS 0
-+%define HAVE_CEXP 0
+%define HAVE_INLINE_ASM 1
+%define HAVE_SYMVER 0
+%define HAVE_X86ASM 1
@@ -436,6 +434,7 @@
+%define CONFIG_TRANSCODING_EXAMPLE 0
+%define CONFIG_VAAPI_ENCODE_EXAMPLE 0
+%define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
++%define CONFIG_QSV_TRANSCODE_EXAMPLE 0
+%define CONFIG_AVISYNTH 0
+%define CONFIG_FREI0R 0
+%define CONFIG_LIBCDIO 0
@@ -672,7 +671,9 @@
+%define CONFIG_H264PARSE 1
+%define CONFIG_H264PRED 1
+%define CONFIG_H264QPEL 1
++%define CONFIG_H264_SEI 1
+%define CONFIG_HEVCPARSE 0
++%define CONFIG_HEVC_SEI 0
+%define CONFIG_HPELDSP 1
+%define CONFIG_HUFFMAN 0
+%define CONFIG_HUFFYUVDSP 0
diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h
--- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h
+++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h
@@ -1,6 +1,6 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h.orig 2023-02-11 09:11:04 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h
-@@ -0,0 +1,2125 @@
+@@ -0,0 +1,2146 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_COMPONENTS_H
+#define FFMPEG_CONFIG_COMPONENTS_H
@@ -23,6 +23,7 @@
+#define CONFIG_HEVC_METADATA_BSF 0
+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
+#define CONFIG_IMX_DUMP_HEADER_BSF 0
++#define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
+#define CONFIG_MJPEG2JPEG_BSF 0
+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
@@ -472,6 +473,7 @@
+#define CONFIG_PCM_U32BE_DECODER 0
+#define CONFIG_PCM_U32LE_DECODER 0
+#define CONFIG_PCM_VIDC_DECODER 0
++#define CONFIG_CBD2_DPCM_DECODER 0
+#define CONFIG_DERF_DPCM_DECODER 0
+#define CONFIG_GREMLIN_DPCM_DECODER 0
+#define CONFIG_INTERPLAY_DPCM_DECODER 0
@@ -479,6 +481,7 @@
+#define CONFIG_SDX2_DPCM_DECODER 0
+#define CONFIG_SOL_DPCM_DECODER 0
+#define CONFIG_XAN_DPCM_DECODER 0
++#define CONFIG_WADY_DPCM_DECODER 0
+#define CONFIG_ADPCM_4XM_DECODER 0
+#define CONFIG_ADPCM_ADX_DECODER 0
+#define CONFIG_ADPCM_AFC_DECODER 0
@@ -528,6 +531,7 @@
+#define CONFIG_ADPCM_THP_LE_DECODER 0
+#define CONFIG_ADPCM_VIMA_DECODER 0
+#define CONFIG_ADPCM_XA_DECODER 0
++#define CONFIG_ADPCM_XMD_DECODER 0
+#define CONFIG_ADPCM_YAMAHA_DECODER 0
+#define CONFIG_ADPCM_ZORK_DECODER 0
+#define CONFIG_SSA_DECODER 0
@@ -594,6 +598,7 @@
+#define CONFIG_LIBAOM_AV1_DECODER 0
+#define CONFIG_AV1_DECODER 0
+#define CONFIG_AV1_CUVID_DECODER 0
++#define CONFIG_AV1_MEDIACODEC_DECODER 0
+#define CONFIG_AV1_QSV_DECODER 0
+#define CONFIG_LIBOPENH264_DECODER 0
+#define CONFIG_H264_CUVID_DECODER 0
@@ -612,6 +617,8 @@
+#define CONFIG_VP9_CUVID_DECODER 0
+#define CONFIG_VP9_MEDIACODEC_DECODER 0
+#define CONFIG_VP9_QSV_DECODER 0
++#define CONFIG_VNULL_DECODER 0
++#define CONFIG_ANULL_DECODER 0
+#define CONFIG_A64MULTI_ENCODER 0
+#define CONFIG_A64MULTI5_ENCODER 0
+#define CONFIG_ALIAS_PIX_ENCODER 0
@@ -829,6 +836,7 @@
+#define CONFIG_H263_V4L2M2M_ENCODER 0
+#define CONFIG_AV1_NVENC_ENCODER 0
+#define CONFIG_AV1_QSV_ENCODER 0
++#define CONFIG_AV1_AMF_ENCODER 0
+#define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_AMF_ENCODER 0
+#define CONFIG_H264_MF_ENCODER 0
@@ -859,6 +867,8 @@
+#define CONFIG_VP8_VAAPI_ENCODER 0
+#define CONFIG_VP9_VAAPI_ENCODER 0
+#define CONFIG_VP9_QSV_ENCODER 0
++#define CONFIG_VNULL_ENCODER 0
++#define CONFIG_ANULL_ENCODER 0
+#define CONFIG_AV1_D3D11VA_HWACCEL 0
+#define CONFIG_AV1_D3D11VA2_HWACCEL 0
+#define CONFIG_AV1_DXVA2_HWACCEL 0
@@ -1024,6 +1034,7 @@
+#define CONFIG_ADELAY_FILTER 0
+#define CONFIG_ADENORM_FILTER 0
+#define CONFIG_ADERIVATIVE_FILTER 0
++#define CONFIG_ADRC_FILTER 0
+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
+#define CONFIG_ADYNAMICSMOOTH_FILTER 0
+#define CONFIG_AECHO_FILTER 0
@@ -1146,6 +1157,7 @@
+#define CONFIG_VOLUME_FILTER 0
+#define CONFIG_VOLUMEDETECT_FILTER 0
+#define CONFIG_AEVALSRC_FILTER 0
++#define CONFIG_AFDELAYSRC_FILTER 0
+#define CONFIG_AFIRSRC_FILTER 0
+#define CONFIG_ANOISESRC_FILTER 0
+#define CONFIG_ANULLSRC_FILTER 0
@@ -1207,6 +1219,7 @@
+#define CONFIG_CONVOLVE_FILTER 0
+#define CONFIG_COPY_FILTER 0
+#define CONFIG_COREIMAGE_FILTER 0
++#define CONFIG_CORR_FILTER 0
+#define CONFIG_COVER_RECT_FILTER 0
+#define CONFIG_CROP_FILTER 0
+#define CONFIG_CROPDETECT_FILTER 0
@@ -1441,6 +1454,7 @@
+#define CONFIG_SPP_FILTER 0
+#define CONFIG_SR_FILTER 0
+#define CONFIG_SSIM_FILTER 0
++#define CONFIG_SSIM360_FILTER 0
+#define CONFIG_STEREO3D_FILTER 0
+#define CONFIG_STREAMSELECT_FILTER 0
+#define CONFIG_SUBTITLES_FILTER 0
@@ -1505,6 +1519,9 @@
+#define CONFIG_ZMQ_FILTER 0
+#define CONFIG_ZOOMPAN_FILTER 0
+#define CONFIG_ZSCALE_FILTER 0
++#define CONFIG_HSTACK_VAAPI_FILTER 0
++#define CONFIG_VSTACK_VAAPI_FILTER 0
++#define CONFIG_XSTACK_VAAPI_FILTER 0
+#define CONFIG_ALLRGB_FILTER 0
+#define CONFIG_ALLYUV_FILTER 0
+#define CONFIG_CELLAUTO_FILTER 0
@@ -1540,6 +1557,7 @@
+#define CONFIG_AVECTORSCOPE_FILTER 0
+#define CONFIG_CONCAT_FILTER 0
+#define CONFIG_SHOWCQT_FILTER 0
++#define CONFIG_SHOWCWT_FILTER 0
+#define CONFIG_SHOWFREQS_FILTER 0
+#define CONFIG_SHOWSPATIAL_FILTER 0
+#define CONFIG_SHOWSPECTRUM_FILTER 0
@@ -1841,6 +1859,7 @@
+#define CONFIG_VPLAYER_DEMUXER 0
+#define CONFIG_VQF_DEMUXER 0
+#define CONFIG_W64_DEMUXER 0
++#define CONFIG_WADY_DEMUXER 0
+#define CONFIG_WAV_DEMUXER 1
+#define CONFIG_WC3_DEMUXER 0
+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
@@ -1853,6 +1872,7 @@
+#define CONFIG_WV_DEMUXER 0
+#define CONFIG_XA_DEMUXER 0
+#define CONFIG_XBIN_DEMUXER 0
++#define CONFIG_XMD_DEMUXER 0
+#define CONFIG_XMV_DEMUXER 0
+#define CONFIG_XVAG_DEMUXER 0
+#define CONFIG_XWMA_DEMUXER 0
@@ -2080,6 +2100,7 @@
+#define CONFIG_CONCATF_PROTOCOL 0
+#define CONFIG_CRYPTO_PROTOCOL 0
+#define CONFIG_DATA_PROTOCOL 0
++#define CONFIG_FD_PROTOCOL 0
+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
+#define CONFIG_FILE_PROTOCOL 0
@@ -2123,6 +2144,6 @@
+#define CONFIG_LIBSSH_PROTOCOL 0
+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
+#define CONFIG_LIBZMQ_PROTOCOL 0
-+#define CONFIG_IPFS_PROTOCOL 0
-+#define CONFIG_IPNS_PROTOCOL 0
++#define CONFIG_IPFS_GATEWAY_PROTOCOL 0
++#define CONFIG_IPNS_GATEWAY_PROTOCOL 0
+#endif /* FFMPEG_CONFIG_COMPONENTS_H */
diff --git a/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_config.h b/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_config.h
--- a/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_config.h
+++ b/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_config.h
@@ -1,22 +1,22 @@
---- third_party/fontconfig/include/config.h.orig 2022-10-01 07:40:07 UTC
+--- third_party/fontconfig/include/config.h.orig 2023-04-08 11:38:38 UTC
+++ third_party/fontconfig/include/config.h
@@ -18,13 +18,13 @@
#define ENABLE_NLS 1
/* Additional font directories */
-#define FC_ADD_FONTS "yes"
-+#define FC_ADD_FONTS "/usr/local/share/fonts"
++#define FC_ADD_FONTS "/usr/local/share/fonts"
/* Architecture prefix to use for cache file names */
/* #undef FC_ARCHITECTURE */
/* System font directory */
--#define FC_DEFAULT_FONTS "/usr/share/fonts"
-+#define FC_DEFAULT_FONTS "/usr/X11R6/lib/X11/fonts"
+-#define FC_DEFAULT_FONTS "<dir>/usr/share/fonts</dir>"
++#define FC_DEFAULT_FONTS "<dir>/usr/X11R6/lib/X11/fonts</dir>"
/* The type of len parameter of the gperf hash/lookup function */
#define FC_GPERF_SIZE_T size_t
-@@ -100,7 +100,7 @@
+@@ -99,7 +99,7 @@
#define HAVE_GETPAGESIZE 1
/* Define to 1 if you have the `getprogname' function. */
@@ -25,7 +25,7 @@
/* Define if the GNU gettext() function is already present or preinstalled. */
#define HAVE_GETTEXT 1
-@@ -142,7 +142,7 @@
+@@ -141,7 +141,7 @@
/* #undef HAVE_NDIR_H */
/* Define to 1 if you have the 'posix_fadvise' function. */
@@ -34,7 +34,7 @@
/* Have POSIX threads */
#define HAVE_PTHREAD 1
-@@ -157,11 +157,14 @@
+@@ -156,11 +156,14 @@
#define HAVE_RANDOM 1
/* Define to 1 if you have the `random_r' function. */
@@ -50,7 +50,7 @@
/* Define to 1 if you have the `readlink' function. */
#define HAVE_READLINK 1
-@@ -199,7 +202,7 @@
+@@ -204,7 +207,7 @@
#define HAVE_STRUCT_STATFS_F_FLAGS 1
/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
@@ -59,7 +59,7 @@
/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
-@@ -225,7 +228,7 @@
+@@ -230,7 +233,7 @@
#define HAVE_SYS_PARAM_H 1
/* Define to 1 if you have the <sys/statfs.h> header file. */
@@ -68,7 +68,7 @@
/* Define to 1 if you have the <sys/statvfs.h> header file. */
#define HAVE_SYS_STATVFS_H 1
-@@ -237,7 +240,7 @@
+@@ -242,7 +245,7 @@
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <sys/vfs.h> header file. */
@@ -77,7 +77,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
-@@ -257,7 +260,8 @@
+@@ -265,7 +268,8 @@
/* Define to 1 if you have the `_mktemp_s' function. */
/* #undef HAVE__MKTEMP_S */
diff --git a/www/ungoogled-chromium/files/patch-third__party_fontconfig_src_src_fccompat.c b/www/ungoogled-chromium/files/patch-third__party_fontconfig_src_src_fccompat.c
--- a/www/ungoogled-chromium/files/patch-third__party_fontconfig_src_src_fccompat.c
+++ b/www/ungoogled-chromium/files/patch-third__party_fontconfig_src_src_fccompat.c
@@ -1,6 +1,6 @@
---- third_party/fontconfig/src/src/fccompat.c.orig 2022-10-01 07:40:07 UTC
+--- third_party/fontconfig/src/src/fccompat.c.orig 2023-04-08 11:38:38 UTC
+++ third_party/fontconfig/src/src/fccompat.c
-@@ -169,7 +169,9 @@ FcRandom(void)
+@@ -184,7 +184,9 @@ FcRandom(void)
{
int32_t result;
diff --git a/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc
--- a/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc
@@ -1,6 +1,6 @@
---- third_party/leveldatabase/env_chromium.cc.orig 2022-12-02 17:56:32 UTC
+--- third_party/leveldatabase/env_chromium.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/leveldatabase/env_chromium.cc
-@@ -319,7 +319,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std::
+@@ -318,7 +318,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std::
Status ChromiumWritableFile::SyncParent() {
TRACE_EVENT0("leveldb", "SyncParent");
diff --git a/www/ungoogled-chromium/files/patch-third__party_maldoca_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_maldoca_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-third__party_maldoca_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-third__party_maldoca_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/maldoca/BUILD.gn.orig 2022-10-01 07:40:07 UTC
+--- third_party/maldoca/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ third_party/maldoca/BUILD.gn
-@@ -299,6 +299,10 @@ static_library("maldoca") {
+@@ -264,6 +264,10 @@ source_set("maldoca-public-headers") {
":maldoca_chromium_config",
":maldoca_flags",
]
@@ -10,4 +10,4 @@
+ }
}
- fuzzer_test("process_doc_fuzzer") {
+ static_library("maldoca") {
diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_tracing_track__event__legacy.h b/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_tracing_track__event__legacy.h
new file mode 100644
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_tracing_track__event__legacy.h
@@ -0,0 +1,11 @@
+--- third_party/perfetto/include/perfetto/tracing/track_event_legacy.h.orig 2023-04-08 11:38:38 UTC
++++ third_party/perfetto/include/perfetto/tracing/track_event_legacy.h
+@@ -267,7 +267,7 @@ class PERFETTO_EXPORT_COMPONENT LegacyTraceId {
+ // are different. E.g. on Mac size_t is considered a different type from
+ // uint64_t even though it has the same size and signedness.
+ // Below we add overloads for those types that are known to cause ambiguity.
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
++#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || defined(__OpenBSD__)
+ explicit LegacyTraceId(size_t raw_id) : raw_id_(raw_id) {}
+ explicit LegacyTraceId(intptr_t raw_id)
+ : raw_id_(static_cast<uint64_t>(raw_id)) {}
diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_periodic__task.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_periodic__task.cc
--- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_periodic__task.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_periodic__task.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/periodic_task.cc.orig 2022-10-01 07:40:07 UTC
+--- third_party/perfetto/src/base/periodic_task.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/perfetto/src/base/periodic_task.cc
@@ -24,7 +24,7 @@
#include "perfetto/base/time.h"
@@ -9,12 +9,12 @@
(PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19)
#include <sys/timerfd.h>
#endif
-@@ -34,7 +34,7 @@ namespace base {
+@@ -44,7 +44,7 @@ uint32_t GetNextDelayMs(const TimeMillis& now_ms,
+ }
- namespace {
- base::ScopedPlatformHandle CreateTimerFd(uint32_t period_ms) {
+ ScopedPlatformHandle CreateTimerFd(const PeriodicTask::Args& args) {
-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
(PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19)
- base::ScopedPlatformHandle tfd(
+ ScopedPlatformHandle tfd(
timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK));
diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
--- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
@@ -1,6 +1,6 @@
---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-02-11 09:11:04 UTC
+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -3080,7 +3080,8 @@ bool TracingServiceImpl::SnapshotClocks(
+@@ -3122,7 +3122,8 @@ bool TracingServiceImpl::SnapshotClocks(
#if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \
!PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \
diff --git a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
--- a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
+++ b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2023-03-10 11:01:21 UTC
+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2023-04-08 11:38:38 UTC
+++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -43302,7 +43302,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -43591,7 +43591,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
memset(zBuf, 0, nBuf);
randomnessPid = osGetpid(0);
#if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -13,7 +13,7 @@
int fd, got;
fd = robust_open("/dev/urandom", O_RDONLY, 0);
if( fd<0 ){
-@@ -43317,6 +43322,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -43606,6 +43611,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
robust_close(0, fd, __LINE__);
}
}
diff --git a/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
--- a/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
@@ -1,10 +1,10 @@
---- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig 2023-01-14 16:09:37 UTC
+--- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig 2023-04-08 11:38:38 UTC
+++ third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc
@@ -56,7 +56,7 @@ int main() {
FcFini();
// Check existence of intended fontconfig cache file.
-- auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-7";
+- auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-9";
+ auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-" + FC_CACHE_VERSION;
bool cache_exists = access(cache.c_str(), F_OK) == 0;
return !cache_exists;
diff --git a/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
--- a/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
+++ b/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
@@ -1,6 +1,6 @@
---- tools/json_schema_compiler/feature_compiler.py.orig 2023-03-10 11:01:21 UTC
+--- tools/json_schema_compiler/feature_compiler.py.orig 2023-04-08 11:38:38 UTC
+++ tools/json_schema_compiler/feature_compiler.py
-@@ -266,6 +266,8 @@ FEATURE_GRAMMAR = ({
+@@ -271,6 +271,8 @@ FEATURE_GRAMMAR = ({
'linux': 'Feature::LINUX_PLATFORM',
'mac': 'Feature::MACOSX_PLATFORM',
'win': 'Feature::WIN_PLATFORM',
diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__id.h b/www/ungoogled-chromium/files/patch-ui_color_color__id.h
--- a/www/ungoogled-chromium/files/patch-ui_color_color__id.h
+++ b/www/ungoogled-chromium/files/patch-ui_color_color__id.h
@@ -1,6 +1,6 @@
---- ui/color/color_id.h.orig 2023-03-10 11:01:21 UTC
+--- ui/color/color_id.h.orig 2023-04-08 11:38:38 UTC
+++ ui/color/color_id.h
-@@ -414,7 +414,7 @@
+@@ -435,7 +435,7 @@
E_CPONLY(kColorNativeColor6) \
E_CPONLY(kColorNativeBaseColor) \
E_CPONLY(kColorNativeSecondaryColor)
diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h
--- a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h
+++ b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.h.orig 2023-03-10 11:01:21 UTC
+--- ui/compositor/compositor.h.orig 2023-04-08 11:38:38 UTC
+++ ui/compositor/compositor.h
-@@ -446,7 +446,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+@@ -453,7 +453,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc
--- a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc
+++ b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.cc.orig 2023-03-10 11:01:21 UTC
+--- ui/compositor/compositor.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/compositor/compositor.cc
-@@ -887,7 +887,7 @@ void Compositor::OnResume() {
+@@ -886,7 +886,7 @@ void Compositor::OnResume() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- ui/gfx/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ ui/gfx/BUILD.gn
-@@ -594,7 +594,7 @@ source_set("memory_buffer_sources") {
+@@ -610,7 +610,7 @@ source_set("memory_buffer_sources") {
deps += [ "//build/config/linux/libdrm" ]
}
diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h
--- a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h
+++ b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,4 +1,4 @@
---- ui/gfx/gpu_memory_buffer.h.orig 2023-01-13 08:56:02 UTC
+--- ui/gfx/gpu_memory_buffer.h.orig 2023-04-08 11:38:38 UTC
+++ ui/gfx/gpu_memory_buffer.h
@@ -15,7 +15,7 @@
#include "ui/gfx/geometry/rect.h"
@@ -7,7 +7,7 @@
-#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "ui/gfx/native_pixmap_handle.h"
- #elif BUILDFLAG(IS_MAC)
+ #elif BUILDFLAG(IS_APPLE)
#include "ui/gfx/mac/io_surface.h"
@@ -75,7 +75,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
base::UnsafeSharedMemoryRegion region;
@@ -16,5 +16,5 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
NativePixmapHandle native_pixmap_handle;
- #elif BUILDFLAG(IS_MAC)
+ #elif BUILDFLAG(IS_APPLE)
ScopedIOSurface io_surface;
diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
--- a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
+++ b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
@@ -1,4 +1,4 @@
---- ui/gfx/gpu_memory_buffer.cc.orig 2022-10-01 07:40:07 UTC
+--- ui/gfx/gpu_memory_buffer.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/gfx/gpu_memory_buffer.cc
@@ -54,7 +54,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c
handle.region = region.Duplicate();
@@ -7,5 +7,5 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle);
- #elif BUILDFLAG(IS_MAC)
+ #elif BUILDFLAG(IS_APPLE)
handle.io_surface = io_surface;
diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_switches.h b/www/ungoogled-chromium/files/patch-ui_gfx_switches.h
--- a/www/ungoogled-chromium/files/patch-ui_gfx_switches.h
+++ b/www/ungoogled-chromium/files/patch-ui_gfx_switches.h
@@ -1,6 +1,6 @@
---- ui/gfx/switches.h.orig 2023-01-13 08:56:02 UTC
+--- ui/gfx/switches.h.orig 2023-04-08 11:38:38 UTC
+++ ui/gfx/switches.h
-@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu
+@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu
GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[];
GFX_SWITCHES_EXPORT extern const char kHeadless[];
diff --git a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn
@@ -1,4 +1,4 @@
---- ui/gl/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- ui/gl/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ ui/gl/BUILD.gn
@@ -162,8 +162,6 @@ component("gl") {
defines += [ "GPU_ENABLE_SERVICE_LOGGING" ]
@@ -17,7 +17,7 @@
"//ui/events/platform",
"//ui/gfx",
"//ui/gfx/geometry",
-@@ -391,7 +388,6 @@ component("gl") {
+@@ -398,7 +395,6 @@ component("gl") {
data_deps += [
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
@@ -25,7 +25,7 @@
]
if (enable_swiftshader) {
data_deps += [
-@@ -607,7 +603,6 @@ test("gl_unittests") {
+@@ -632,7 +628,6 @@ test("gl_unittests") {
data_deps = [
"//testing/buildbot/filters:gl_unittests_filters",
diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__bindings.h b/www/ungoogled-chromium/files/patch-ui_gl_gl__bindings.h
--- a/www/ungoogled-chromium/files/patch-ui_gl_gl__bindings.h
+++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__bindings.h
@@ -1,8 +1,8 @@
---- ui/gl/gl_bindings.h.orig 2023-02-11 09:11:04 UTC
+--- ui/gl/gl_bindings.h.orig 2023-04-08 11:38:38 UTC
+++ ui/gl/gl_bindings.h
@@ -37,7 +37,7 @@
#include <GL/wglext.h>
- #elif BUILDFLAG(IS_APPLE)
+ #elif BUILDFLAG(IS_MAC)
#include <OpenGL/OpenGL.h>
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc
--- a/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc
+++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc
@@ -1,6 +1,6 @@
---- ui/gl/gl_context.cc.orig 2022-12-02 17:56:32 UTC
+--- ui/gl/gl_context.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/gl/gl_context.cc
-@@ -414,7 +414,7 @@ bool GLContext::MakeVirtuallyCurrent(
+@@ -416,7 +416,7 @@ bool GLContext::MakeVirtuallyCurrent(
DCHECK(virtual_context->IsCurrent(surface));
if (switched_real_contexts || virtual_context != current_virtual_context_) {
diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc
--- a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc
+++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc
@@ -1,6 +1,6 @@
---- ui/gl/gl_implementation.cc.orig 2023-03-10 11:01:21 UTC
+--- ui/gl/gl_implementation.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/gl/gl_implementation.cc
-@@ -292,7 +292,7 @@ GetRequestedGLImplementationFromCommandLine(
+@@ -284,7 +284,7 @@ GetRequestedGLImplementationFromCommandLine(
*fallback_to_software_gl = false;
bool overrideUseSoftwareGL =
command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests);
diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc
--- a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc
+++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_switches.cc.orig 2023-01-13 08:56:02 UTC
+--- ui/gl/gl_switches.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/gl/gl_switches.cc
@@ -11,7 +11,7 @@
#include "base/android/build_info.h"
@@ -9,7 +9,7 @@
#include <vulkan/vulkan_core.h>
#include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck
#endif
-@@ -290,7 +290,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -295,7 +295,7 @@ bool IsDefaultANGLEVulkan() {
base::android::SDK_VERSION_Q)
return false;
#endif // BUILDFLAG(IS_ANDROID)
diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
--- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
+++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-03-10 11:01:21 UTC
+--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
-@@ -446,7 +446,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
+@@ -448,7 +448,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
const bool did_active_change = is_active_ != window_states.is_activated;
is_active_ = window_states.is_activated;
diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
--- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
+++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-03-10 11:01:21 UTC
+--- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc
-@@ -269,7 +269,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel(
+@@ -272,7 +272,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel(
CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED),
};
diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
--- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
+++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
@@ -1,4 +1,4 @@
---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-03-10 11:01:21 UTC
+--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/ozone/platform/wayland/ozone_platform_wayland.cc
@@ -71,7 +71,7 @@
#include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h"
@@ -18,7 +18,7 @@
linux_ui_delegate_ =
std::make_unique<LinuxUiDelegateWayland>(connection_.get());
#endif
-@@ -469,7 +469,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -470,7 +470,7 @@ class OzonePlatformWayland : public OzonePlatform,
DrmRenderNodePathFinder path_finder_;
#endif
diff --git a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h
--- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h
+++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h
@@ -1,6 +1,6 @@
---- ui/platform_window/platform_window_delegate.h.orig 2023-02-11 09:11:04 UTC
+--- ui/platform_window/platform_window_delegate.h.orig 2023-04-08 11:38:38 UTC
+++ ui/platform_window/platform_window_delegate.h
-@@ -103,7 +103,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
+@@ -130,7 +130,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
virtual void OnWindowStateChanged(PlatformWindowState old_state,
PlatformWindowState new_state) = 0;
diff --git a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc
--- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc
@@ -1,6 +1,6 @@
---- ui/platform_window/platform_window_delegate.cc.orig 2022-12-02 17:56:32 UTC
+--- ui/platform_window/platform_window_delegate.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/platform_window/platform_window_delegate.cc
-@@ -16,7 +16,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def
+@@ -29,7 +29,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def
PlatformWindowDelegate::~PlatformWindowDelegate() = default;
diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc
--- a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/textfield/textfield.cc.orig 2023-03-10 11:01:21 UTC
+--- ui/views/controls/textfield/textfield.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/views/controls/textfield/textfield.cc
-@@ -72,7 +72,7 @@
+@@ -74,7 +74,7 @@
#include "base/win/win_util.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/linux/linux_ui.h"
#endif
-@@ -166,7 +166,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -168,7 +168,7 @@ bool IsControlKeyModifier(int flags) {
// Control-modified key combination, but we cannot extend it to other platforms
// as Control has different meanings and behaviors.
// https://crrev.com/2580483002/#msg46
@@ -18,7 +18,7 @@
return flags & ui::EF_CONTROL_DOWN;
#else
return false;
-@@ -703,7 +703,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -706,7 +706,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
if (!textfield)
return handled;
@@ -27,7 +27,7 @@
auto* linux_ui = ui::LinuxUi::instance();
std::vector<ui::TextEditCommandAuraLinux> commands;
if (!handled && linux_ui &&
-@@ -847,7 +847,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -878,7 +878,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
}
bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -36,7 +36,7 @@
// Skip any accelerator handling that conflicts with custom keybindings.
auto* linux_ui = ui::LinuxUi::instance();
std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -1740,7 +1740,7 @@ bool Textfield::ShouldDoLearning() {
+@@ -1831,7 +1831,7 @@ bool Textfield::ShouldDoLearning() {
return false;
}
@@ -45,7 +45,7 @@
// TODO(https://crbug.com/952355): Implement this method to support Korean IME
// reconversion feature on native text fields (e.g. find bar).
bool Textfield::SetCompositionFromExistingText(
-@@ -2254,14 +2254,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2344,14 +2344,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
#endif
return ui::TextEditCommand::DELETE_BACKWARD;
}
diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
--- a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-03-10 11:01:21 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -43,7 +43,7 @@
#include "ui/wm/core/window_util.h"
@@ -9,7 +9,7 @@
#include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
#endif
-@@ -259,7 +259,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
+@@ -257,7 +257,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
if (params.type == Widget::InitParams::TYPE_WINDOW)
GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true);
@@ -18,7 +18,7 @@
const bool requires_accelerated_widget = params.requires_accelerated_widget;
#else
const bool requires_accelerated_widget = false;
-@@ -331,7 +331,7 @@ std::unique_ptr<aura::client::DragDropClient>
+@@ -329,7 +329,7 @@ std::unique_ptr<aura::client::DragDropClient>
DesktopWindowTreeHostPlatform::CreateDragDropClient() {
ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
@@ -27,7 +27,7 @@
std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
#else
std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1041,7 +1041,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis
+@@ -1039,7 +1039,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis
// DesktopWindowTreeHost:
// Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc
--- a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc
+++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/widget.cc.orig 2023-01-13 08:56:02 UTC
+--- ui/views/widget/widget.cc.orig 2023-04-08 11:38:38 UTC
+++ ui/views/widget/widget.cc
@@ -52,7 +52,7 @@
#include "ui/views/window/custom_frame_view.h"
@@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#endif
-@@ -1991,7 +1991,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const
+@@ -1989,7 +1989,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const
if (parent_)
return parent_->GetNativeTheme();
diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn
--- a/www/ungoogled-chromium/files/patch-v8_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-v8_BUILD.gn
@@ -1,9 +1,9 @@
---- v8/BUILD.gn.orig 2023-03-10 11:01:21 UTC
+--- v8/BUILD.gn.orig 2023-04-08 11:38:38 UTC
+++ v8/BUILD.gn
-@@ -1299,6 +1299,14 @@ config("toolchain") {
- } else if (target_os == "win") {
+@@ -1304,6 +1304,14 @@ config("toolchain") {
+ } else if (target_os == "chromeos") {
defines += [ "V8_HAVE_TARGET_OS" ]
- defines += [ "V8_TARGET_OS_WIN" ]
+ defines += [ "V8_TARGET_OS_CHROMEOS" ]
+ } else if (target_os == "openbsd") {
+ defines += [ "V8_HAVE_TARGET_OS" ]
+ defines += [ "V8_TARGET_OS_OPENBSD" ]
@@ -15,7 +15,7 @@
}
# TODO(infra): Support v8_enable_prof on Windows.
-@@ -5702,7 +5710,7 @@ v8_component("v8_libbase") {
+@@ -5717,7 +5725,7 @@ v8_component("v8_libbase") {
}
}
@@ -24,7 +24,7 @@
sources += [
"src/base/debug/stack_trace_posix.cc",
"src/base/platform/platform-linux.cc",
-@@ -5713,6 +5721,18 @@ v8_component("v8_libbase") {
+@@ -5728,6 +5736,18 @@ v8_component("v8_libbase") {
"dl",
"rt",
]
diff --git a/www/ungoogled-chromium/files/patch-v8_include_v8-internal.h b/www/ungoogled-chromium/files/patch-v8_include_v8-internal.h
--- a/www/ungoogled-chromium/files/patch-v8_include_v8-internal.h
+++ b/www/ungoogled-chromium/files/patch-v8_include_v8-internal.h
@@ -1,6 +1,6 @@
---- v8/include/v8-internal.h.orig 2022-10-29 17:50:56 UTC
+--- v8/include/v8-internal.h.orig 2023-04-08 11:38:38 UTC
+++ v8/include/v8-internal.h
-@@ -174,7 +174,7 @@ using SandboxedPointer_t = Address;
+@@ -176,7 +176,7 @@ using SandboxedPointer_t = Address;
#ifdef V8_ENABLE_SANDBOX
// Size of the sandbox, excluding the guard regions surrounding it.
diff --git a/www/ungoogled-chromium/files/patch-v8_include_v8config.h b/www/ungoogled-chromium/files/patch-v8_include_v8config.h
--- a/www/ungoogled-chromium/files/patch-v8_include_v8config.h
+++ b/www/ungoogled-chromium/files/patch-v8_include_v8config.h
@@ -1,27 +1,29 @@
---- v8/include/v8config.h.orig 2023-03-15 07:46:50 UTC
+--- v8/include/v8config.h.orig 2023-04-08 11:38:38 UTC
+++ v8/include/v8config.h
-@@ -183,6 +183,8 @@ path. Add it with -I<path> to the command line
+@@ -184,6 +184,8 @@ path. Add it with -I<path> to the command line
&& !defined(V8_TARGET_OS_FUCHSIA) \
&& !defined(V8_TARGET_OS_IOS) \
&& !defined(V8_TARGET_OS_LINUX) \
+ && !defined(V8_TARGET_OS_OPENBSD) \
+ && !defined(V8_TARGET_OS_FREEBSD) \
&& !defined(V8_TARGET_OS_MACOS) \
- && !defined(V8_TARGET_OS_WIN)
- # error No known target OS defined.
-@@ -194,6 +196,8 @@ path. Add it with -I<path> to the command line
+ && !defined(V8_TARGET_OS_WIN) \
+ && !defined(V8_TARGET_OS_CHROMEOS)
+@@ -196,6 +198,8 @@ path. Add it with -I<path> to the command line
|| defined(V8_TARGET_OS_FUCHSIA) \
|| defined(V8_TARGET_OS_IOS) \
|| defined(V8_TARGET_OS_LINUX) \
+ || defined(V8_TARGET_OS_OPENBSD) \
+ || defined(V8_TARGET_OS_FREEBSD) \
|| defined(V8_TARGET_OS_MACOS) \
- || defined(V8_TARGET_OS_WIN)
- # error A target OS is defined but V8_HAVE_TARGET_OS is unset.
-@@ -216,6 +220,16 @@ path. Add it with -I<path> to the command line
- # define V8_TARGET_OS_LINUX
- #endif
+ || defined(V8_TARGET_OS_WIN) \
+ || defined(V8_TARGET_OS_CHROMEOS)
+@@ -217,6 +221,16 @@ path. Add it with -I<path> to the command line
+ #ifdef V8_OS_LINUX
+ # define V8_TARGET_OS_LINUX
++#endif
++
+#ifdef V8_OS_OPENBSD
+# define V8_TARGET_OS_OPENBSD
+# define V8_TARGET_OS_BSD
@@ -30,24 +32,6 @@
+#ifdef V8_OS_FREEBSD
+# define V8_TARGET_OS_OPENBSD
+# define V8_TARGET_OS_BSD
-+#endif
-+
- #ifdef V8_OS_MACOS
- # define V8_TARGET_OS_MACOS
- #endif
-@@ -351,10 +365,14 @@ path. Add it with -I<path> to the command line
- // - component builds fail because _dl_runtime_resolve clobbers registers,
- // - we see crashes on arm64 on Windows (https://crbug.com/1409934), which can
- // hopefully be fixed in the future.
-+// Additionally, the initial implementation in clang <= 16 overwrote the return
-+// register(s) in the epilogue of a preserve_most function, so we only use
-+// preserve_most in clang >= 17 (see https://reviews.llvm.org/D143425).
- #if (defined(_M_X64) || defined(__x86_64__) /* x64 (everywhere) */ \
- || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */ \
- && !defined(_WIN32))) /* not on windows */ \
-- && !defined(COMPONENT_BUILD) /* no component build */
-+ && !defined(COMPONENT_BUILD) /* no component build */\
-+ && __clang_major__ >= 17 /* clang >= 17 */
- # define V8_HAS_ATTRIBUTE_PRESERVE_MOST (__has_attribute(preserve_most))
#endif
- # define V8_HAS_ATTRIBUTE_VISIBILITY (__has_attribute(visibility))
+
+ #ifdef V8_OS_MACOS
diff --git a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc
--- a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc
+++ b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc
@@ -1,6 +1,6 @@
---- v8/src/api/api.cc.orig 2023-03-10 11:01:21 UTC
+--- v8/src/api/api.cc.orig 2023-04-08 11:38:38 UTC
+++ v8/src/api/api.cc
-@@ -141,7 +141,7 @@
+@@ -142,7 +142,7 @@
#include "src/wasm/wasm-serialization.h"
#endif // V8_ENABLE_WEBASSEMBLY
@@ -9,7 +9,7 @@
#include <signal.h>
#if V8_ENABLE_WEBASSEMBLY
-@@ -6364,7 +6364,7 @@ bool v8::V8::Initialize(const int build_config) {
+@@ -6343,7 +6343,7 @@ bool v8::V8::Initialize(const int build_config) {
return true;
}
diff --git a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc
--- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc
+++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc
@@ -1,4 +1,4 @@
---- v8/src/execution/isolate.cc.orig 2023-03-10 11:01:21 UTC
+--- v8/src/execution/isolate.cc.orig 2023-04-08 11:38:38 UTC
+++ v8/src/execution/isolate.cc
@@ -146,6 +146,10 @@
#include "src/execution/simulator-base.h"
@@ -11,12 +11,12 @@
extern "C" const uint8_t v8_Default_embedded_blob_code_[];
extern "C" uint32_t v8_Default_embedded_blob_code_size_;
extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -3924,6 +3928,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -3849,6 +3853,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
uint32_t code_size = DefaultEmbeddedBlobCodeSize();
const uint8_t* data = DefaultEmbeddedBlobData();
uint32_t data_size = DefaultEmbeddedBlobDataSize();
+
-+#if defined(V8_OS_OPENBSD)
++#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
+ mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)),
+ code_size, PROT_READ | PROT_EXEC);
+#endif
diff --git a/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
--- a/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
+++ b/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
@@ -1,4 +1,4 @@
---- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-02-11 09:11:04 UTC
+--- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-04-08 11:38:38 UTC
+++ v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
@@ -9,6 +9,10 @@
@@ -11,29 +11,31 @@
namespace v8 {
namespace internal {
-@@ -35,6 +39,8 @@ const char* DirectiveAsString(DataDirective directive)
+@@ -35,6 +39,10 @@ const char* DirectiveAsString(DataDirective directive)
void PlatformEmbeddedFileWriterGeneric::SectionText() {
if (target_os_ == EmbeddedTargetOs::kChromeOS) {
fprintf(fp_, ".section .text.hot.embedded\n");
++#if !defined(V8_TARGET_ARCH_IA32)
+ } else if (target_os_ == EmbeddedTargetOs::kOpenBSD) {
+ fprintf(fp_, ".section .openbsd.mutable,\"a\"\n");
++#endif
} else {
fprintf(fp_, ".section .text\n");
}
-@@ -66,6 +72,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli
+@@ -66,6 +74,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli
// On these architectures and platforms, we remap the builtins, so need these
// to be aligned on a page boundary.
fprintf(fp_, ".balign 4096\n");
-+#elif V8_OS_OPENBSD
++#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
+ fprintf(fp_, ".balign %d\n", PAGE_SIZE);
#elif V8_TARGET_ARCH_X64
// On x64 use 64-bytes code alignment to allow 64-bytes loop header alignment.
static_assert(64 >= kCodeAlignment);
-@@ -86,6 +94,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz
+@@ -86,6 +96,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz
(V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64)
// Since the builtins are remapped, need to pad until the next page boundary.
fprintf(fp_, ".balign 4096\n");
-+#elif V8_OS_OPENBSD
++#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
+ fprintf(fp_, ".balign %d\n", PAGE_SIZE);
#endif
}
diff --git a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h
--- a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h
+++ b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h
@@ -1,15 +1,15 @@
---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-01-13 08:56:02 UTC
+--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-04-08 11:38:38 UTC
+++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
-@@ -448,7 +448,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
+@@ -424,7 +424,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
}
void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
- Register offset_reg, uint32_t offset_imm,
+ Register offset_reg, uintptr_t offset_imm,
LoadType type, uint32_t* protected_load_pc,
- bool /* is_load_mem */, bool i64_offset,
+ bool /* is_load_mem */, bool /* i64_offset */,
bool needs_shift) {
-@@ -528,7 +528,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
+@@ -504,7 +504,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
}
void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
@@ -18,84 +18,111 @@
StoreType type, LiftoffRegList pinned,
uint32_t* protected_store_pc,
bool /* is_store_mem */, bool /* i64_offset */) {
-@@ -597,7 +597,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
+@@ -573,7 +573,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
}
void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
- Register offset_reg, uint32_t offset_imm,
+ Register offset_reg, uintptr_t offset_imm,
- LoadType type, LiftoffRegList /* pinned */) {
+ LoadType type, LiftoffRegList /* pinned */,
+ bool /* i64_offset */) {
if (type.value() != LoadType::kI64Load) {
- Load(dst, src_addr, offset_reg, offset_imm, type, nullptr, true);
-@@ -616,7 +616,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
+@@ -593,7 +593,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
}
void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
- uint32_t offset_imm, LiftoffRegister src,
+ uintptr_t offset_imm, LiftoffRegister src,
- StoreType type, LiftoffRegList pinned) {
+ StoreType type, LiftoffRegList pinned,
+ bool /* i64_offset */) {
DCHECK_NE(offset_reg, no_reg);
- DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max());
-@@ -956,7 +956,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
+@@ -663,7 +663,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
+
+ inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop,
+ Register dst_addr, Register offset_reg,
+- uint32_t offset_imm,
++ uintptr_t offset_imm,
+ LiftoffRegister value,
+ LiftoffRegister result, StoreType type) {
+ DCHECK_EQ(value, result);
+@@ -730,7 +730,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
+ }
+
+ inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr,
+- Register offset_reg, uint32_t offset_imm,
++ Register offset_reg, uintptr_t offset_imm,
+ LiftoffRegister value, LiftoffRegister result,
+ StoreType type) {
+ DCHECK_EQ(value, result);
+@@ -842,7 +842,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
+ }
+
+ inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr,
+- Register offset_reg, uint32_t offset_imm,
++ Register offset_reg, uintptr_t offset_imm,
+ LiftoffRegister value, LiftoffRegister result) {
+ // We need {ebx} here, which is the root register. As the root register it
+ // needs special treatment. As we use {ebx} directly in the code below, we
+@@ -934,7 +934,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
} // namespace liftoff
void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
- uint32_t offset_imm, LiftoffRegister value,
+ uintptr_t offset_imm, LiftoffRegister value,
- LiftoffRegister result, StoreType type) {
+ LiftoffRegister result, StoreType type,
+ bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
- liftoff::AtomicBinop64(this, liftoff::kAdd, dst_addr, offset_reg,
-@@ -969,7 +969,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
+@@ -948,7 +948,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
}
void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
- uint32_t offset_imm, LiftoffRegister value,
+ uintptr_t offset_imm, LiftoffRegister value,
- LiftoffRegister result, StoreType type) {
+ LiftoffRegister result, StoreType type,
+ bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
- liftoff::AtomicBinop64(this, liftoff::kSub, dst_addr, offset_reg,
-@@ -981,7 +981,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
+@@ -961,7 +961,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
}
void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
- uint32_t offset_imm, LiftoffRegister value,
+ uintptr_t offset_imm, LiftoffRegister value,
- LiftoffRegister result, StoreType type) {
+ LiftoffRegister result, StoreType type,
+ bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
- liftoff::AtomicBinop64(this, liftoff::kAnd, dst_addr, offset_reg,
-@@ -994,7 +994,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
+@@ -975,7 +975,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
}
void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
- uint32_t offset_imm, LiftoffRegister value,
+ uintptr_t offset_imm, LiftoffRegister value,
- LiftoffRegister result, StoreType type) {
+ LiftoffRegister result, StoreType type,
+ bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
- liftoff::AtomicBinop64(this, liftoff::kOr, dst_addr, offset_reg, offset_imm,
-@@ -1007,7 +1007,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
+@@ -989,7 +989,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
}
void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
- uint32_t offset_imm, LiftoffRegister value,
+ uintptr_t offset_imm, LiftoffRegister value,
- LiftoffRegister result, StoreType type) {
+ LiftoffRegister result, StoreType type,
+ bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
- liftoff::AtomicBinop64(this, liftoff::kXor, dst_addr, offset_reg,
-@@ -1020,7 +1020,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
+@@ -1003,7 +1003,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
}
void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
- uint32_t offset_imm,
+ uintptr_t offset_imm,
LiftoffRegister value,
- LiftoffRegister result, StoreType type) {
- if (type.value() == StoreType::kI64Store) {
-@@ -1034,7 +1034,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
+ LiftoffRegister result, StoreType type,
+ bool /* i64_offset */) {
+@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
}
void LiftoffAssembler::AtomicCompareExchange(
- Register dst_addr, Register offset_reg, uint32_t offset_imm,
+ Register dst_addr, Register offset_reg, uintptr_t offset_imm,
LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result,
- StoreType type) {
+ StoreType type, bool /* i64_offset */) {
// We expect that the offset has already been added to {dst_addr}, and no

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 20, 10:51 AM (11 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14736511
Default Alt Text
D39473.id.diff (475 KB)

Event Timeline