diff options
Diffstat (limited to 'www/ungoogled-chromium')
549 files changed, 3011 insertions, 2631 deletions
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 895f67c9dfc1..4eee72e83634 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,6 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 135.0.7049.114 +PORTVERSION= 137.0.7151.103 +PORTREVISION= 3 PULSEMV= 16 PULSEV= ${PULSEMV}.1 UGVERSION= ${DISTVERSION}-1 @@ -20,7 +21,7 @@ WWW= https://github.com/ungoogled-software/ungoogled-chromium LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi -ONLY_FOR_ARCHS= aarch64 amd64 i386 +ONLY_FOR_ARCHS= aarch64 amd64 PATCH_DEPENDS= gpatch:devel/patch \ ${PYTHON_VERSION}:lang/python${PYTHON_SUFFIX} @@ -98,8 +99,7 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome -BINARY_ALIAS= python3=${PYTHON_CMD} \ - moc=${PREFIX}/bin/moc-qt5 +BINARY_ALIAS= python3=${PYTHON_CMD} # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # @@ -111,6 +111,7 @@ GN_ARGS+= enable_widevine=true \ fatal_linker_warnings=false \ icu_use_data_file=false \ is_clang=true \ + moc_qt5_path="${QT_TOOLDIR}/moc" \ optimize_webui=true \ toolkit_views=true \ use_allocator_shim=false \ @@ -120,6 +121,7 @@ GN_ARGS+= enable_widevine=true \ use_lld=true \ use_partition_alloc=true \ use_partition_alloc_as_malloc=false \ + use_qt5=true \ use_sysroot=false \ use_system_freetype=false \ use_system_harfbuzz=true \ diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 002207d5b589..654cae1eeaa9 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1745557530 -SHA256 (chromium-135.0.7049.114.tar.xz) = aa85ce2bf36ed71261109fd7e700fac596a28b7be035a40a518c6a6fcf973c22 -SIZE (chromium-135.0.7049.114.tar.xz) = 7133024128 +TIMESTAMP = 1750145170 +SHA256 (chromium-137.0.7151.103.tar.xz) = 31083a39c661942a3617e272787a3927f9b7eeaf2a4e2de1ac3affc8a7f05ef3 +SIZE (chromium-137.0.7151.103.tar.xz) = 7262299176 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-135.0.7049.114-testdata.tar.xz) = 587010be844abae797a57ddcab83ffa29dc441fcffeb9c66806d63eac6f9fe91 -SIZE (chromium-135.0.7049.114-testdata.tar.xz) = 646720320 -SHA256 (ungoogled-software-ungoogled-chromium-135.0.7049.114-135.0.7049.114-1_GH0.tar.gz) = bac5b844e936ec0340cdaa7e9a8d5b4cc3875d30828a1d6fa816f980d0f96e2e -SIZE (ungoogled-software-ungoogled-chromium-135.0.7049.114-135.0.7049.114-1_GH0.tar.gz) = 631055 +SHA256 (chromium-137.0.7151.103-testdata.tar.xz) = e0c77df2a530acfe30eda4da5c908054bec5cf2592e6bb898283dc130a1b8aac +SIZE (chromium-137.0.7151.103-testdata.tar.xz) = 656736324 +SHA256 (ungoogled-software-ungoogled-chromium-137.0.7151.103-137.0.7151.103-1_GH0.tar.gz) = e5bba1205daee5e1c7a6ff9714b58d88b2257126deef514b3cdcdd16d32d3005 +SIZE (ungoogled-software-ungoogled-chromium-137.0.7151.103-137.0.7151.103-1_GH0.tar.gz) = 636696 diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn index ebb9f69a85a7..a2d240a897d9 100644 --- a/www/ungoogled-chromium/files/patch-BUILD.gn +++ b/www/ungoogled-chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ BUILD.gn @@ -71,7 +71,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -448,7 +447,7 @@ group("gn_all") { +@@ -449,7 +448,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -630,6 +629,15 @@ group("gn_all") { +@@ -628,6 +627,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", -@@ -678,7 +686,7 @@ group("gn_all") { +@@ -676,7 +684,7 @@ group("gn_all") { } } @@ -51,7 +51,7 @@ # The official builders use this binary from the default toolchain's # output directory after building in order to upload the symbols of that # binary. They build the binary like `ninja symupload` which requires the -@@ -713,7 +721,7 @@ group("gn_all") { +@@ -711,7 +719,7 @@ group("gn_all") { ] } @@ -60,16 +60,16 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -1118,7 +1126,7 @@ if (use_blink && !is_cronet_build) { +@@ -1120,7 +1128,7 @@ if (use_blink && !is_cronet_build) { + "//third_party/blink/public:all_blink", ] - if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && -- !is_castos) { -+ !is_castos && !is_bsd) { +- if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos) { ++ if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { deps += [ ":chrome_wpt_tests", ":headless_shell_wpt", -@@ -1265,7 +1273,7 @@ if (use_blink && !is_cronet_build) { +@@ -1267,7 +1275,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -78,7 +78,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1279,7 +1287,7 @@ if (use_blink && !is_cronet_build) { +@@ -1281,7 +1289,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms" ] } @@ -87,7 +87,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1749,7 +1757,7 @@ group("chromium_builder_perf") { +@@ -1735,7 +1743,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 index 86b846d1dee6..ff7f4229a3ca 100644 --- 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 2025-04-15 08:30:07 UTC +--- base/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ base/BUILD.gn -@@ -1094,11 +1094,26 @@ component("base") { +@@ -1108,11 +1108,26 @@ 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. @@ -28,7 +28,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1118,7 +1133,7 @@ component("base") { +@@ -1132,7 +1147,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -37,7 +37,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2142,6 +2157,22 @@ component("base") { +@@ -2166,6 +2181,22 @@ component("base") { ] } @@ -60,7 +60,7 @@ # iOS if (is_ios) { sources += [ -@@ -2300,6 +2331,33 @@ component("base") { +@@ -2334,6 +2365,33 @@ component("base") { } } @@ -94,7 +94,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2649,7 +2707,7 @@ buildflag_header("protected_memory_buildflags") { +@@ -2729,7 +2787,7 @@ buildflag_header("protected_memory_buildflags") { header = "protected_memory_buildflags.h" header_dir = "base/memory" @@ -103,7 +103,7 @@ (is_win || is_linux || is_android || is_mac) flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ] -@@ -3122,7 +3180,7 @@ if (is_apple) { +@@ -3236,7 +3294,7 @@ if (is_apple) { } } @@ -112,7 +112,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3808,7 +3866,7 @@ test("base_unittests") { +@@ -3924,7 +3982,7 @@ test("base_unittests") { ] } @@ -121,7 +121,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3836,7 +3894,7 @@ test("base_unittests") { +@@ -3952,7 +4010,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -130,7 +130,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3847,7 +3905,7 @@ test("base_unittests") { +@@ -3963,7 +4021,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -139,7 +139,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4037,7 +4095,7 @@ test("base_unittests") { +@@ -4151,7 +4209,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__alloc__features.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__alloc__features.cc new file mode 100644 index 000000000000..78459e48bb85 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__alloc__features.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_alloc_features.cc.orig 2025-05-31 17:16:41 UTC ++++ base/allocator/partition_alloc_features.cc +@@ -164,7 +164,7 @@ BASE_FEATURE(kPartitionAllocEventuallyZeroFreedMemory, + // disabled elsewhere (for now). Does not apply to Windows. + BASE_FEATURE(kPartitionAllocFewerMemoryRegions, + "PartitionAllocFewerMemoryRegions", +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + FEATURE_ENABLED_BY_DEFAULT); + #else + FEATURE_DISABLED_BY_DEFAULT); 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 index 08b8b36dfc42..44af31a145e2 100644 --- 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,15 +1,15 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-03-09 21:38:10 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-05-31 17:16:41 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -89,7 +89,7 @@ if (is_nacl) { +@@ -91,7 +91,7 @@ if (is_nacl) { + # TODO(crbug.com/329199197): Clean this up when experiments are complete. use_large_empty_slot_span_ring = true - has_memory_tagging = -- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) -+ current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android) +-has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && ++has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && + !is_hwasan && (is_linux || is_android) declare_args() { - # Debug configuration. -@@ -344,7 +344,7 @@ declare_args() { +@@ -350,7 +350,7 @@ declare_args() { declare_args() { # Shadow metadata is still under development and only supports Linux # for now. @@ -18,7 +18,7 @@ } declare_args() { -@@ -487,7 +487,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -493,7 +493,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. is_pkeys_available = diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index c6d9ee6d9cf6..ca3720102527 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -884,7 +884,7 @@ if (is_clang_or_gcc) { +@@ -893,7 +893,7 @@ if (is_clang_or_gcc) { configs -= [ partition_alloc_enable_arc_config ] } } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h index cd879deb5d17..abb176e60d46 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2025-04-15 08:30:07 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2025-05-31 17:16:41 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h -@@ -309,8 +309,12 @@ bool TryRecommitSystemPagesInternal( +@@ -317,8 +317,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc index bf78804a53a8..9341892e0673 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2025-02-20 09:59:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2025-05-06 12:23:00 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc @@ -18,7 +18,7 @@ #include "partition_alloc/partition_alloc_base/logging.h" @@ -7,5 +7,5 @@ -#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) +#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) #include <sys/syscall.h> - #include <atomic> + #endif diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index 09fc3554a839..850f16384937 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2025-03-09 21:38:10 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2025-05-31 17:16:41 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h -@@ -327,7 +327,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); +@@ -312,7 +312,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); // 8GB for each of the glued pools). #if PA_BUILDFLAG(HAS_64_BIT_POINTERS) #if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_IOS) || \ @@ -9,7 +9,7 @@ constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; -@@ -444,7 +444,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { +@@ -429,7 +429,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { // TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation // where a normal slot span will be large enough to contain multiple items, // but the address will go over the final partition page after being aligned. diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index a6903b6b81cc..4a844f3647fb 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2025-02-20 09:59:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2025-05-31 17:16:41 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #if PA_CONFIG(ENABLE_SHADOW_METADATA) #include <sys/mman.h> -@@ -297,7 +297,7 @@ void PartitionAllocMallocInitOnce() { +@@ -298,7 +298,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,7 +18,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -1117,7 +1117,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1118,7 +1118,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // 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_src_partition__alloc_spinning__mutex.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc index 801a74d5d10a..21f89708e2df 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-08-26 14:40:28 UTC +--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2025-05-31 17:16:41 UTC +++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc -@@ -17,7 +17,16 @@ +@@ -19,7 +19,16 @@ #endif #if PA_CONFIG(HAS_LINUX_KERNEL) @@ -17,37 +17,20 @@ #include <sys/syscall.h> #include <unistd.h> -@@ -106,8 +115,16 @@ void SpinningMutex::FutexWait() { - // |kLockedContended| anymore. Note that even without spurious wakeups, the - // value of |state_| is not guaranteed when this returns, as another thread - // may get the lock before we get to run. +@@ -92,8 +101,16 @@ PA_ALWAYS_INLINE long FutexSyscall(volatile void* ftx, + int saved_errno = errno; + errno = 0; + +#if defined(OS_FREEBSD) -+ int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE, ++ long retval = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE, + kLockedContended, nullptr, nullptr); +#elif defined(OS_OPENBSD) -+ int err = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, ++ long retval = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, + kLockedContended, nullptr, nullptr); +#else - int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, - kLockedContended, nullptr, nullptr, 0); -+#endif - - if (err) { - // These are programming error, check them. -@@ -119,8 +136,16 @@ void SpinningMutex::FutexWait() { - - void SpinningMutex::FutexWake() { - int saved_errno = errno; -+#if defined(OS_FREEBSD) -+ long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE, -+ 1 /* wake up a single waiter */, nullptr, nullptr); -+#elif defined(OS_OPENBSD) -+ long retval = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, -+ 1 /* wake up a single waiter */, nullptr, nullptr); -+#else - long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG, - 1 /* wake up a single waiter */, nullptr, nullptr, 0); + long retval = syscall(SYS_futex, ftx, op | FUTEX_PRIVATE_FLAG, value, nullptr, + nullptr, 0); +#endif - PA_CHECK(retval != -1); - errno = saved_errno; - } + if (retval == -1) { + // These are programming errors, check them. + PA_DCHECK((errno != EPERM) || (errno != EACCES) || (errno != EINVAL) || diff --git a/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc b/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc index bb8278e2c4dc..5907cba49fc9 100644 --- a/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2025-03-09 21:38:10 UTC +--- base/debug/debugger_posix.cc.orig 2025-05-31 17:16:41 UTC +++ base/debug/debugger_posix.cc -@@ -41,6 +41,10 @@ +@@ -42,6 +42,10 @@ #include <sys/sysctl.h> #endif @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_FREEBSD) #include <sys/user.h> #endif -@@ -99,33 +103,52 @@ bool BeingDebugged() { +@@ -100,33 +104,52 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. diff --git a/www/ungoogled-chromium/files/patch-base_files_drive__info.h b/www/ungoogled-chromium/files/patch-base_files_drive__info.h index 762e18908ee1..f69c1d6e328b 100644 --- a/www/ungoogled-chromium/files/patch-base_files_drive__info.h +++ b/www/ungoogled-chromium/files/patch-base_files_drive__info.h @@ -1,4 +1,4 @@ ---- base/files/drive_info.h.orig 2025-02-20 09:59:21 UTC +--- base/files/drive_info.h.orig 2025-05-31 17:16:41 UTC +++ base/files/drive_info.h @@ -48,7 +48,7 @@ struct BASE_EXPORT DriveInfo { std::optional<bool> has_seek_penalty; @@ -6,6 +6,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Whether the drive is a removable drive. + // Whether the drive is a "removable" drive. // - // Note on macOS: that SSDs that are connected over USB that you can eject + // In macOS's IOKit API, a drive is "removable" if "the media is removable diff --git a/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc b/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc index f9e68c8ca580..16ea957612c8 100644 --- a/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc @@ -1,15 +1,14 @@ ---- base/files/file_util_posix.cc.orig 2025-04-15 08:30:07 UTC +--- base/files/file_util_posix.cc.orig 2025-05-06 12:23:00 UTC +++ base/files/file_util_posix.cc -@@ -902,6 +902,8 @@ bool CreateNewTempDirectory(const FilePath::StringType +@@ -934,6 +934,7 @@ bool CreateNewTempDirectory(const FilePath::StringType bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). + const FilePath kFileSystemRoot("/"); -+ + // Avoid checking subdirs if directory already exists. if (DirectoryExists(full_path)) { - return true; -@@ -910,8 +912,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -943,8 +944,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p // Collect a list of all missing directories. std::vector<FilePath> missing_subpaths({full_path}); FilePath last_path = full_path; @@ -20,11 +19,11 @@ if (DirectoryExists(path)) { break; } -@@ -921,21 +923,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -962,21 +963,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p + } + #endif // BUILDFLAG(IS_CHROMEOS) - // Iterate through the missing directories and create. - for (const FilePath& subpath : base::Reversed(missing_subpaths)) { -- if (mkdir(subpath.value().c_str(), 0700) == 0) { +- if (mkdir(subpath.value().c_str(), mode) == 0) { - continue; - } - // Mkdir failed, but it might have failed with EEXIST, or some other error @@ -34,7 +33,7 @@ - int saved_errno = errno; - if (!DirectoryExists(subpath)) { - if (error) { -+ if ((mkdir(subpath.value().c_str(), 0700) == -1) && ++ if ((mkdir(subpath.value().c_str(), mode) == -1) && + ((full_path != subpath) ? (errno != ENOENT) : (-1))) { + int saved_errno = errno; + if (error) diff --git a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc index 323f559d3155..30109a001a1f 100644 --- a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc +++ b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2024-03-22 14:16:19 UTC +--- base/i18n/icu_util.cc.orig 2025-05-06 12:23:00 UTC +++ base/i18n/icu_util.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() { +@@ -329,7 +329,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/ungoogled-chromium/files/patch-base_logging__unittest.cc b/www/ungoogled-chromium/files/patch-base_logging__unittest.cc index 4fe12aa3b5ca..63b70957600a 100644 --- a/www/ungoogled-chromium/files/patch-base_logging__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_logging__unittest.cc @@ -1,4 +1,4 @@ ---- base/logging_unittest.cc.orig 2025-04-15 08:30:07 UTC +--- base/logging_unittest.cc.orig 2025-05-06 12:23:00 UTC +++ base/logging_unittest.cc @@ -40,7 +40,7 @@ #include "base/posix/eintr_wrapper.h" @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -588,14 +588,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -586,14 +586,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h index 3371cf2cf061..50d6618130e7 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,4 +1,4 @@ ---- base/memory/platform_shared_memory_region.h.orig 2025-01-25 09:34:31 UTC +--- base/memory/platform_shared_memory_region.h.orig 2025-05-31 17:16:41 UTC +++ base/memory/platform_shared_memory_region.h @@ -18,7 +18,7 @@ #include "base/unguessable_token.h" @@ -27,3 +27,12 @@ , bool executable = false #endif +@@ -236,7 +236,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { + #if BUILDFLAG(IS_FUCHSIA) + kNotVmo, + #endif +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + kFcntlFailed, + kReadOnlyFdNotReadOnly, + kUnexpectedReadOnlyFd, diff --git a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 6060a48395f1..c4a0d892b230 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2025-03-09 21:38:10 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2025-05-31 17:16:41 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { +@@ -61,7 +61,7 @@ std::optional<FDAccessModeError> CheckFDAccessMode(int } // namespace @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -175,7 +175,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { +@@ -183,7 +183,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +18,7 @@ , bool executable #endif -@@ -204,7 +204,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -212,7 +212,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/ungoogled-chromium/files/patch-base_process_launch.h b/www/ungoogled-chromium/files/patch-base_process_launch.h index 9454688589b4..b010a5a87921 100644 --- a/www/ungoogled-chromium/files/patch-base_process_launch.h +++ b/www/ungoogled-chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2024-11-16 12:20:41 UTC +--- base/process/launch.h.orig 2025-05-31 17:16:41 UTC +++ base/process/launch.h -@@ -241,7 +241,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -245,7 +245,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc b/www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc index ada93bec92ae..6a2f332681e0 100644 --- a/www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_base_address_posix.cc.orig 2025-04-15 08:30:07 UTC +--- base/profiler/stack_base_address_posix.cc.orig 2025-05-06 12:23:00 UTC +++ base/profiler/stack_base_address_posix.cc -@@ -17,6 +17,10 @@ +@@ -18,6 +18,10 @@ #include "base/files/scoped_file.h" #endif @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_CHROMEOS) extern "C" void* __libc_stack_end; #endif -@@ -47,7 +51,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase +@@ -49,7 +53,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase #if !BUILDFLAG(IS_LINUX) uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { @@ -33,7 +33,7 @@ // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox // and pthread_id refers to a different thread, due to the use of // sched_getaffinity(). -@@ -60,12 +78,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr +@@ -62,12 +80,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr << logging::SystemErrorCodeToString(result); // See crbug.com/617730 for limitations of this approach on Linux-like // systems. @@ -48,7 +48,7 @@ const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; return base_address; } -@@ -82,7 +102,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla +@@ -84,7 +104,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla // trying to work around the problem. return std::nullopt; #else diff --git a/www/ungoogled-chromium/files/patch-base_rand__util.h b/www/ungoogled-chromium/files/patch-base_rand__util.h index 4f4da58121be..3b1bd71ae65a 100644 --- a/www/ungoogled-chromium/files/patch-base_rand__util.h +++ b/www/ungoogled-chromium/files/patch-base_rand__util.h @@ -1,6 +1,6 @@ ---- base/rand_util.h.orig 2025-03-09 21:38:10 UTC +--- base/rand_util.h.orig 2025-05-06 12:23:00 UTC +++ base/rand_util.h -@@ -209,7 +209,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -213,7 +213,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } diff --git a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc index e4e56f2772b8..aae758c07404 100644 --- a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc @@ -1,6 +1,6 @@ ---- base/rand_util_posix.cc.orig 2025-03-09 21:38:10 UTC +--- base/rand_util_posix.cc.orig 2025-05-06 12:23:00 UTC +++ base/rand_util_posix.cc -@@ -28,7 +28,7 @@ +@@ -29,7 +29,7 @@ #include "base/time/time.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK. -@@ -44,6 +44,7 @@ namespace base { +@@ -45,6 +45,7 @@ namespace base { namespace { @@ -17,7 +17,7 @@ #if BUILDFLAG(IS_AIX) // AIX has no 64-bit support for O_CLOEXEC. static constexpr int kOpenFlags = O_RDONLY; -@@ -68,10 +69,11 @@ class URandomFd { +@@ -69,10 +70,11 @@ class URandomFd { private: const int fd_; }; @@ -27,10 +27,10 @@ BUILDFLAG(IS_ANDROID)) && \ - !BUILDFLAG(IS_NACL) + !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - // TODO(pasko): Unify reading kernel version numbers in: - // mojo/core/channel_linux.cc - // chrome/browser/android/seccomp_support_detector.cc -@@ -156,6 +158,7 @@ bool UseBoringSSLForRandBytes() { + + bool KernelSupportsGetRandom() { + return base::SysInfo::KernelVersionNumber::Current() >= +@@ -129,6 +131,7 @@ bool UseBoringSSLForRandBytes() { namespace { void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) { @@ -38,7 +38,7 @@ #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -190,6 +193,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi +@@ -163,6 +166,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi const int urandom_fd = GetUrandomFD(); const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); @@ -48,7 +48,7 @@ } } // namespace -@@ -209,9 +215,11 @@ void RandBytes(span<uint8_t> output) { +@@ -182,9 +188,11 @@ void RandBytes(span<uint8_t> output) { RandBytesInternal(output, /*avoid_allocation=*/false); } diff --git a/www/ungoogled-chromium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/ungoogled-chromium/files/patch-base_strings_safe__sprintf__unittest.cc index b59d453a750a..8e98fa69c830 100644 --- a/www/ungoogled-chromium/files/patch-base_strings_safe__sprintf__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_strings_safe__sprintf__unittest.cc @@ -1,6 +1,6 @@ ---- base/strings/safe_sprintf_unittest.cc.orig 2025-03-09 21:38:10 UTC +--- base/strings/safe_sprintf_unittest.cc.orig 2025-05-31 17:16:41 UTC +++ base/strings/safe_sprintf_unittest.cc -@@ -743,6 +743,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { +@@ -746,6 +746,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { #endif } @@ -8,7 +8,7 @@ TEST(SafeSPrintfTest, EmitNULL) { char buf[40]; #if defined(__GNUC__) -@@ -759,6 +760,7 @@ TEST(SafeSPrintfTest, EmitNULL) { +@@ -762,6 +763,7 @@ TEST(SafeSPrintfTest, EmitNULL) { #pragma GCC diagnostic pop #endif } diff --git a/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h b/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h index 66e88b247d66..c9aea0b8d8e5 100644 --- 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 2024-08-26 14:40:28 UTC +--- base/synchronization/lock_impl.h.orig 2025-05-06 12:23:00 UTC +++ base/synchronization/lock_impl.h -@@ -109,6 +109,10 @@ void LockImpl::Unlock() { +@@ -110,6 +110,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); -@@ -129,6 +133,9 @@ void LockImpl::Unlock() { +@@ -130,6 +134,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info.h b/www/ungoogled-chromium/files/patch-base_system_sys__info.h index dcbe5ca72706..8fc08853b222 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info.h +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2025-03-09 21:38:10 UTC +--- base/system/sys_info.h.orig 2025-05-06 12:23:00 UTC +++ base/system/sys_info.h -@@ -332,6 +332,8 @@ class BASE_EXPORT SysInfo { +@@ -355,6 +355,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -344,7 +346,7 @@ class BASE_EXPORT SysInfo { +@@ -367,7 +369,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc index d7398aef1ab1..608ee0cdabbf 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2025-03-09 21:38:10 UTC +--- base/system/sys_info_posix.cc.orig 2025-05-06 12:23:00 UTC +++ base/system/sys_info_posix.cc -@@ -124,7 +124,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -143,7 +143,7 @@ void GetKernelVersionNumbers(int32_t* major_version, namespace base { @@ -9,7 +9,7 @@ // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) -@@ -180,7 +180,7 @@ int SysInfo::NumberOfProcessors() { +@@ -199,7 +199,7 @@ int SysInfo::NumberOfProcessors() { return cached_num_cpus; } @@ -18,7 +18,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -268,6 +268,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -285,6 +285,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc index 1b2e7837ae52..b659e41a07c2 100644 --- a/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,15 +1,15 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2025-03-09 21:38:10 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2025-05-06 12:23:00 UTC +++ base/task/thread_pool/environment_config_unittest.cc -@@ -14,7 +14,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) - EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread()); - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ +@@ -21,7 +21,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio + base::FeatureList::IsEnabled( + FeatureControllingBackgroundPriorityWorkerThreads())); + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread()); #else #error Platform doesn't match any block -@@ -23,7 +23,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio +@@ -30,7 +30,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread()); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \ diff --git a/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn b/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn index 7dff9f4f284c..1301100bc60a 100644 --- a/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2025-01-25 09:34:31 UTC +--- build/config/BUILDCONFIG.gn.orig 2025-05-06 12:23:00 UTC +++ build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -234,6 +235,10 @@ if (host_toolchain == "") { +@@ -235,6 +236,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,7 +21,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -278,6 +283,8 @@ if (target_os == "android") { +@@ -279,6 +284,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -30,7 +30,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -312,7 +319,11 @@ is_android = current_os == "android" +@@ -313,7 +320,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" @@ -42,4 +42,4 @@ +is_bsd = current_os == "openbsd" || current_os == "freebsd" is_mac = current_os == "mac" is_nacl = current_os == "nacl" - is_watchos = current_os == "watchos" + is_wasm = current_os == "emscripten" diff --git a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn index 2c4c4e0b3cfb..cba054032aec 100644 --- a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/clang/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- build/config/clang/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ build/config/clang/BUILD.gn -@@ -251,7 +251,12 @@ template("clang_lib") { +@@ -252,7 +252,12 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { @@ -13,4 +13,4 @@ + } else if (is_mac) { libname = "osx" } else if (is_ios) { - if (target_environment == "simulator") { + if (target_platform == "iphoneos") { diff --git a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn index ddbe826f5d08..eaade58e5d6a 100644 --- 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 2025-04-15 08:30:07 UTC +--- build/config/compiler/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ build/config/compiler/BUILD.gn -@@ -198,7 +198,7 @@ declare_args() { +@@ -197,7 +197,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of # debugging information which is required by some specialized # debugging tools. @@ -9,7 +9,7 @@ } declare_args() { -@@ -255,13 +255,16 @@ config("default_include_dirs") { +@@ -254,13 +254,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") { @@ -27,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -519,6 +522,10 @@ config("compiler") { +@@ -509,6 +512,10 @@ config("compiler") { } } @@ -38,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -578,7 +585,7 @@ config("compiler") { +@@ -569,7 +576,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -47,7 +47,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1223,7 +1230,7 @@ config("compiler_cpu_abi") { +@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +56,7 @@ cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -1238,7 +1245,7 @@ config("compiler_cpu_abi") { +@@ -1242,7 +1249,7 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia && @@ -65,7 +65,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1572,7 +1579,7 @@ config("compiler_deterministic") { +@@ -1576,7 +1583,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,41 +74,35 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1630,7 +1637,7 @@ config("compiler_deterministic") { +@@ -1634,7 +1641,7 @@ config("compiler_deterministic") { } config("clang_revision") { - if (is_clang && clang_base_path == default_clang_base_path && + if (is_clang && !is_bsd && clang_base_path == default_clang_base_path && current_os != "zos") { - update_args = [ - "--print-revision", -@@ -1960,23 +1967,12 @@ config("default_warnings") { - ] - } + _perform_consistency_checks = current_toolchain == default_toolchain + if (llvm_force_head_revision) { +@@ -1719,7 +1726,7 @@ config("clang_revision") { + # e.g. by setting in the the project's .gn file. + config("clang_warning_suppression") { + # Some build configs use older versions of clang that don't support WSMs +- if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" && ++ if (!is_bsd && !is_nacl && default_toolchain != "//build/toolchain/cros:target" && + !llvm_android_mainline && is_clang && + clang_warning_suppression_file != "") { + from_build_root = +@@ -2053,9 +2060,6 @@ config("default_warnings") { -- cflags += [ -- # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now. -- "-Wno-cast-function-type", -- -- # TODO(crbug.com/40284799): Fix and re-enable. -- "-Wno-thread-safety-reference-return", + # TODO(crbug.com/40284799): Fix and re-enable. + "-Wno-thread-safety-reference-return", - - # TODO(crbug.com/376641662): Fix and re-enable. - "-Wno-nontrivial-memcall", -- ] -- - cflags_cc += [ - # TODO(crbug.com/328490295): Fix and re-enable for C flags. - "-Wenum-compare-conditional", ] -- if (!is_nacl) { -+ if (!is_nacl && !is_bsd) { - cflags_cc += [ - # TODO(crbug.com/41486292): Fix and re-enable. - "-Wno-c++11-narrowing-const-reference", -@@ -2742,7 +2738,7 @@ config("afdo_optimize_size") { + cflags_cc += [ +@@ -2837,7 +2841,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") { @@ -117,7 +111,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2769,7 +2765,7 @@ config("afdo") { +@@ -2864,7 +2868,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -126,7 +120,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2946,7 +2942,7 @@ config("symbols") { +@@ -3041,7 +3045,7 @@ config("symbols") { cflags += [ "-gomit-unreferenced-methods" ] } diff --git a/www/ungoogled-chromium/files/patch-build_config_ozone.gni b/www/ungoogled-chromium/files/patch-build_config_ozone.gni index fcc90adb1ba5..c5a4c7f66283 100644 --- a/www/ungoogled-chromium/files/patch-build_config_ozone.gni +++ b/www/ungoogled-chromium/files/patch-build_config_ozone.gni @@ -1,6 +1,6 @@ ---- build/config/ozone.gni.orig 2025-04-15 08:30:07 UTC +--- build/config/ozone.gni.orig 2025-05-06 12:23:00 UTC +++ build/config/ozone.gni -@@ -81,7 +81,15 @@ declare_args() { +@@ -80,7 +80,15 @@ declare_args() { ozone_platform = "x11" ozone_platform_drm = true ozone_platform_x11 = true diff --git a/www/ungoogled-chromium/files/patch-build_config_rust.gni b/www/ungoogled-chromium/files/patch-build_config_rust.gni index 803ef95b68e8..2c730c3bddb6 100644 --- 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 2025-02-20 09:59:21 UTC +--- build/config/rust.gni.orig 2025-05-31 17:16:41 UTC +++ build/config/rust.gni -@@ -297,6 +297,10 @@ if (is_linux || is_chromeos) { +@@ -361,6 +361,10 @@ if (is_linux || is_chromeos) { } } diff --git a/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn b/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn index 0a5335d58d48..397b80811c57 100644 --- a/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn @@ -1,6 +1,6 @@ ---- build/rust/std/BUILD.gn.orig 2025-04-05 13:54:50 UTC +--- build/rust/std/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ build/rust/std/BUILD.gn -@@ -89,13 +89,20 @@ if (toolchain_has_rust) { +@@ -50,13 +50,20 @@ if (toolchain_has_rust) { # These are no longer present in the Windows toolchain. stdlib_files += [ "addr2line", @@ -22,7 +22,7 @@ } if (toolchain_for_rust_host_build_tools) { -@@ -115,7 +122,6 @@ if (toolchain_has_rust) { +@@ -76,7 +83,6 @@ if (toolchain_has_rust) { # don't need to pass to the C++ linker because they're used for specialized # purposes. skip_stdlib_files = [ diff --git a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni index 6776361443e6..647a75106c5e 100644 --- a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni +++ b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/toolchain.gni.orig 2025-04-15 08:30:07 UTC +--- build/toolchain/toolchain.gni.orig 2025-05-06 12:23:00 UTC +++ build/toolchain/toolchain.gni -@@ -72,7 +72,7 @@ if (host_os == "mac") { +@@ -75,7 +75,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" diff --git a/www/ungoogled-chromium/files/patch-cc_base_features.cc b/www/ungoogled-chromium/files/patch-cc_base_features.cc index 69549b24374a..aceab501275c 100644 --- a/www/ungoogled-chromium/files/patch-cc_base_features.cc +++ b/www/ungoogled-chromium/files/patch-cc_base_features.cc @@ -1,6 +1,6 @@ ---- cc/base/features.cc.orig 2025-02-20 09:59:21 UTC +--- cc/base/features.cc.orig 2025-05-31 17:16:41 UTC +++ cc/base/features.cc -@@ -43,7 +43,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr +@@ -52,7 +52,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc index f65cc56173a4..d21d704a085e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/app/chrome_main_delegate.cc @@ -147,7 +147,7 @@ #include "components/webui/about/credit_utils.h" @@ -75,7 +75,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. -@@ -667,7 +667,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& +@@ -669,7 +669,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -84,7 +84,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -826,7 +826,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -828,7 +828,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -129,7 +129,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1532,13 +1532,13 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1532,13 +1532,13 @@ std::variant<int, content::MainFunctionParams> ChromeM #else #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn index 03464de697fc..b944132e4a46 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/BUILD.gn.orig 2025-06-17 07:21:45 UTC +++ chrome/browser/BUILD.gn -@@ -6788,6 +6788,13 @@ static_library("browser") { +@@ -6883,6 +6883,13 @@ static_library("browser") { [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ] } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc index 42eea16ff98a..41cd8aac5a4e 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/about_flags.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/about_flags.cc -@@ -259,7 +259,7 @@ +@@ -263,7 +263,7 @@ #include "extensions/common/extension_features.h" #endif @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -345,7 +345,7 @@ +@@ -353,7 +353,7 @@ #include "device/vr/public/cpp/switches.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -355,7 +355,7 @@ +@@ -363,7 +363,7 @@ #include "chrome/browser/win/mica_titlebar.h" #endif @@ -26,8 +26,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/contextual_cueing/contextual_cueing_features.h" // nogncheck #include "chrome/browser/enterprise/profile_management/profile_management_features.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -366,7 +366,7 @@ + #include "chrome/browser/enterprise/webstore/features.h" +@@ -375,7 +375,7 @@ #include "components/user_education/common/user_education_features.h" // nogncheck #endif @@ -36,7 +36,16 @@ #include "chrome/browser/ui/ui_features.h" #include "ui/base/ui_base_features.h" #endif -@@ -521,7 +521,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -427,7 +427,7 @@ const FeatureEntry::Choice kPullToRefreshChoices[] = { + #endif // USE_AURA + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + + const FeatureEntry::FeatureParam kLocalNetworkAccessChecksBlock[] = { + {"LocalNetworkAccessChecksWarn", "false"}}; +@@ -543,7 +543,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -45,7 +54,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -822,6 +822,26 @@ const FeatureEntry::FeatureVariation +@@ -900,6 +900,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -72,8 +81,8 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1185,7 +1205,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot - }; +@@ -1275,7 +1295,7 @@ constexpr FeatureEntry::FeatureVariation + #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -81,7 +90,7 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1223,7 +1243,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada +@@ -1313,7 +1333,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -89,8 +98,8 @@ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // A limited number of combinations of the rich autocompletion params. - const FeatureEntry::FeatureParam -@@ -3583,7 +3603,7 @@ const FeatureEntry::FeatureVariation + const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = { +@@ -3721,7 +3741,7 @@ const FeatureEntry::FeatureVariation kAndroidThemeModu #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -99,7 +108,7 @@ const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] = {{"link_capturing_state", "on_by_default"}}; const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] = -@@ -4089,7 +4109,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari +@@ -4180,7 +4200,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr}, }; @@ -108,7 +117,7 @@ const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = { {"TranslationAPIAcceptLanguagesCheck", "false"}, {"TranslationAPILimitLanguagePackCount", "false"}}; -@@ -4155,7 +4175,7 @@ const FeatureEntry::FeatureVariation +@@ -4246,7 +4266,7 @@ const FeatureEntry::FeatureVariation 1, nullptr}, }; @@ -117,7 +126,7 @@ const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = { {"BackoffTime", "0h"}, {"BackoffMultiplierBase", "0.0"}, -@@ -5006,7 +5026,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5184,7 +5204,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_WIN) @@ -126,7 +135,7 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5295,7 +5315,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5476,7 +5496,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableIsolatedWebAppDevModeName, flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)}, @@ -135,7 +144,7 @@ {"enable-iwa-key-distribution-component", flag_descriptions::kEnableIwaKeyDistributionComponentName, flag_descriptions::kEnableIwaKeyDistributionComponentDescription, -@@ -5554,7 +5574,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5698,7 +5718,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -144,10 +153,10 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5590,6 +5610,16 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWaylandLinuxDrmSyncobjName, - flag_descriptions::kWaylandLinuxDrmSyncobjDescription, kOsLinux, - FEATURE_VALUE_TYPE(features::kWaylandLinuxDrmSyncobj)}, +@@ -5739,6 +5759,16 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kWaylandSessionManagementName, + flag_descriptions::kWaylandSessionManagementDescription, kOsLinux, + FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)}, + +#if BUILDFLAG(IS_BSD) + {"audio-backend", @@ -161,25 +170,25 @@ #endif // BUILDFLAG(IS_LINUX) #if BUILDFLAG(ENABLE_VR) -@@ -6470,7 +6500,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6638,7 +6668,7 @@ const FeatureEntry kFeatureEntries[] = { "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - {"omnibox-domain-suggestions", - flag_descriptions::kOmniboxDomainSuggestionsName, - flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6683,7 +6713,7 @@ const FeatureEntry kFeatureEntries[] = { - "OrganicRepeatableQueries")}, - + {"omnibox-contextual-search-actions-at-top", + flag_descriptions::kOmniboxContextualSearchActionsAtTopName, + flag_descriptions::kOmniboxContextualSearchActionsAtTopDescription, +@@ -6942,7 +6972,7 @@ const FeatureEntry kFeatureEntries[] = { + kNumSrpZpsRelatedSearches, + "PowerTools")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7180,7 +7210,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7430,7 +7460,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -188,7 +197,7 @@ {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -7445,7 +7475,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7700,7 +7730,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)}, @@ -197,7 +206,7 @@ {"wasm-tts-component-updater-enabled", flag_descriptions::kWasmTtsComponentUpdaterEnabledName, flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop, -@@ -8101,7 +8131,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8382,7 +8412,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)}, #endif // !BUILDFLAG(IS_CHROMEOS) @@ -206,7 +215,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8782,7 +8812,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9046,7 +9076,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -215,7 +224,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)}, -@@ -8807,7 +8837,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9071,7 +9101,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)}, @@ -224,8 +233,8 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9274,7 +9304,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)}, +@@ -9551,7 +9581,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) @@ -233,7 +242,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -9912,7 +9942,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10223,7 +10253,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -242,7 +251,7 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10036,7 +10066,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10347,7 +10377,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)}, #endif @@ -251,7 +260,7 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10071,7 +10101,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10376,7 +10406,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -260,16 +269,16 @@ {"enable-user-navigation-capturing-pwa", flag_descriptions::kPwaNavigationCapturingName, flag_descriptions::kPwaNavigationCapturingDescription, -@@ -10832,7 +10862,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11094,7 +11124,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCanvasHibernationDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)}, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {"sync-enable-bookmarks-in-transport-mode", - flag_descriptions::kSyncEnableBookmarksInTransportModeName, - flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, -@@ -10948,7 +10978,7 @@ const FeatureEntry kFeatureEntries[] = { + {"enable-history-sync-optin", + flag_descriptions::kEnableHistorySyncOptinName, + flag_descriptions::kEnableHistorySyncOptinDescription, +@@ -11196,7 +11226,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)}, #endif // BUILDFLAG(IS_ANDROID) @@ -278,7 +287,7 @@ {"supervised-profile-safe-search", flag_descriptions::kSupervisedProfileSafeSearchName, flag_descriptions::kSupervisedProfileSafeSearchDescription, -@@ -11195,7 +11225,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11444,7 +11474,7 @@ const FeatureEntry kFeatureEntries[] = { segmentation_platform::features::kSegmentationSurveyPage)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -287,7 +296,7 @@ {"autofill-enable-buy-now-pay-later", flag_descriptions::kAutofillEnableBuyNowPayLaterName, flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop, -@@ -11315,7 +11345,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11545,7 +11575,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)}, @@ -296,7 +305,7 @@ {"translation-api", flag_descriptions::kTranslationAPIName, flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux, FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI, -@@ -11352,7 +11382,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11582,7 +11612,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( password_manager::features::kPasswordFormClientsideClassifier)}, @@ -305,7 +314,7 @@ {"contextual-cueing", flag_descriptions::kContextualCueingName, flag_descriptions::kContextualCueingDescription, kOsLinux | kOsMac | kOsWin, -@@ -11671,7 +11701,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11913,7 +11943,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)}, #endif // !BUILDFLAG(IS_ANDROID) @@ -314,7 +323,7 @@ {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName, flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux, FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)}, -@@ -11721,7 +11751,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11963,7 +11993,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -323,7 +332,7 @@ {"autofill-enable-amount-extraction-desktop", flag_descriptions::kAutofillEnableAmountExtractionDesktopName, flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription, -@@ -11741,7 +11771,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11983,7 +12013,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -332,3 +341,39 @@ {"autofill-enable-amount-extraction-allowlist-desktop", flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName, flag_descriptions:: +@@ -12101,7 +12131,7 @@ const FeatureEntry kFeatureEntries[] = { + apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)}, + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"chrome-web-store-navigation-throttle", + flag_descriptions::kChromeWebStoreNavigationThrottleName, + flag_descriptions::kChromeWebStoreNavigationThrottleDescription, +@@ -12137,7 +12167,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"autofill-enable-amount-extraction-desktop-logging", + flag_descriptions::kAutofillEnableAmountExtractionDesktopLoggingName, + flag_descriptions:: +@@ -12160,7 +12190,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableWebAppUpdateTokenParsingDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kWebAppEnableUpdateTokenParsing)}, + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"root-scrollbar-follows-browser-theme", + flag_descriptions::kRootScrollbarFollowsTheme, + flag_descriptions::kRootScrollbarFollowsThemeDescription, +@@ -12189,7 +12219,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"local-network-access-check", + flag_descriptions::kLocalNetworkAccessChecksName, + flag_descriptions::kLocalNetworkAccessChecksDescription, kOsDesktop, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc b/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc index db9e3a2e1747..c068a22245f4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/background/glic/glic_status_icon.cc -@@ -83,7 +83,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control +@@ -86,7 +86,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control if (!status_icon_) { return; } @@ -9,8 +9,8 @@ // Set a vector icon for proper themeing on Linux. status_icon_->SetIcon( GlicVectorIconManager::GetVectorIcon(IDR_GLIC_BUTTON_VECTOR_ICON)); -@@ -113,7 +113,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control - GlicStatusIcon::~GlicStatusIcon() { +@@ -128,7 +128,7 @@ GlicStatusIcon::~GlicStatusIcon() { + context_menu_ = nullptr; if (status_icon_) { -#if !BUILDFLAG(IS_LINUX) @@ -18,12 +18,21 @@ status_icon_->RemoveObserver(this); #endif std::unique_ptr<StatusIcon> removed_icon = -@@ -201,7 +201,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C - menu->AddItem( - IDC_GLIC_STATUS_ICON_MENU_REMOVE_ICON, - l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_REMOVE_ICON)); +@@ -234,7 +234,7 @@ void GlicStatusIcon::UpdateHotkey(const ui::Accelerato + } + + void GlicStatusIcon::UpdateVisibilityOfExitInContextMenu() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (context_menu_) { + const bool is_visible = BrowserList::GetInstance()->empty(); + const std::optional<size_t> index = +@@ -284,7 +284,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C + menu->AddItem(IDC_GLIC_STATUS_ICON_MENU_SETTINGS, + l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_SETTINGS)); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + menu->AddSeparator(ui::NORMAL_SEPARATOR); menu->AddItem(IDC_GLIC_STATUS_ICON_MENU_EXIT, l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_EXIT)); - #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc index f3e67b642295..3a7f59c641fd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc @@ -1,15 +1,15 @@ ---- chrome/browser/browser_features.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/browser_features.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/browser_features.cc -@@ -81,7 +81,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode, - "ContentUsesBrowserThemeColorMode", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -75,7 +75,7 @@ BASE_FEATURE(kClearUserDataUponProfileDestruction, + "ClearUserDataUponProfileDestruction", + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables usage of os_crypt_async::SecretPortalKeyProvider. Once // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be // disabled without losing data. -@@ -100,7 +100,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider, +@@ -94,7 +94,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider, // the browser exits. BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -233,7 +233,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -227,7 +227,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, "SandboxExternalProtocolBlockedWarning", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h index ac6e2b158fa5..d58d0ac2c48a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h @@ -1,15 +1,15 @@ ---- chrome/browser/browser_features.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/browser_features.h.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/browser_features.h -@@ -39,7 +39,7 @@ BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); - - BASE_DECLARE_FEATURE(kContentUsesBrowserThemeColorMode); +@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore + BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); + BASE_DECLARE_FEATURE(kClearUserDataUponProfileDestruction); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kDbusSecretPortal); BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProvider); #endif -@@ -101,7 +101,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed +@@ -100,7 +100,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked); BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc index bb0ceeaab926..786961db18c5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/browser_process_impl.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/browser_process_impl.cc -@@ -261,7 +261,7 @@ +@@ -262,7 +262,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/browser_features.h" #include "components/os_crypt/async/browser/fallback_linux_key_provider.h" #include "components/os_crypt/async/browser/freedesktop_secret_key_provider.h" -@@ -273,7 +273,7 @@ +@@ -274,7 +274,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #endif @@ -18,7 +18,7 @@ // How often to check if the persistent instance of Chrome needs to restart // to install an update. static const int kUpdateCheckIntervalHours = 6; -@@ -1147,7 +1147,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim +@@ -1181,7 +1181,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim GoogleUpdateSettings::GetCollectStatsConsent()); registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true); @@ -27,7 +27,7 @@ os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry); #endif } -@@ -1412,7 +1412,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1446,7 +1446,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { local_state()))); #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) != "basic") { -@@ -1681,7 +1681,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1730,7 +1730,7 @@ void BrowserProcessImpl::Unpin() { } // Mac is currently not supported. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h index 3da6acfbceb9..77d13ff22904 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/browser_process_impl.h.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/browser_process_impl.h -@@ -405,7 +405,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -413,7 +413,7 @@ class BrowserProcessImpl : public BrowserProcess, std::unique_ptr<BatteryMetrics> battery_metrics_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc index b9c6fa8e6780..dfa4a9448c3d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_field_trials.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/chrome_browser_field_trials.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/chrome_browser_field_trials.cc -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #include "chromeos/ash/services/multidevice_setup/public/cpp/first_run_field_trial.h" #endif @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #include "ui/base/ui_base_features.h" #endif // BUILDFLAG(IS_LINUX) -@@ -117,7 +117,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials +@@ -118,7 +118,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials #endif // BUILDFLAG(IS_ANDROID) } 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 index 543f1facd4ef..3622e35e3c4b 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -77,7 +77,7 @@ +@@ -81,7 +81,7 @@ #endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #endif -@@ -477,7 +477,7 @@ void PopulateChromeFrameBinders( +@@ -497,7 +497,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc index 02d567d5edd0..d90d27bd63f7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/chrome_browser_interface_binders_webui.cc -@@ -46,7 +46,7 @@ +@@ -48,20 +48,20 @@ #include "content/public/browser/web_ui_controller_interface_binder.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -8,17 +8,23 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h" #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" - #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -55,7 +55,7 @@ #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) + #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" + #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/ui/webui/app_settings/web_app_settings_ui.h" #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h" - #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" -@@ -440,7 +440,7 @@ void PopulateChromeWebUIFrameBinders( + #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin.mojom.h" +@@ -452,7 +452,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +33,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -451,7 +451,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -463,7 +463,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -36,9 +42,9 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); -@@ -544,14 +544,14 @@ void PopulateChromeWebUIFrameBinders( - page_image_service::mojom::PageImageServiceHandler, HistoryUI, - HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); +@@ -593,14 +593,14 @@ void PopulateChromeWebUIFrameBinders( + HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); + } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -53,12 +59,12 @@ WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1084,7 +1084,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1133,7 +1133,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider, DiscardsUI>(map); 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 index 90623ebf28c8..ca6f23e29656 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -149,7 +149,7 @@ +@@ -150,7 +150,7 @@ #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "sql/database.h" #endif -@@ -175,11 +175,11 @@ +@@ -176,11 +176,11 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif // BUILDFLAG(IS_CHROMEOS) @@ -23,7 +23,7 @@ #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" -@@ -190,7 +190,7 @@ +@@ -191,7 +191,7 @@ #include "ui/gfx/switches.h" #endif @@ -32,7 +32,7 @@ #include "chrome/browser/first_run/upgrade_util.h" #endif -@@ -268,7 +268,7 @@ +@@ -269,7 +269,7 @@ #include "chrome/browser/chrome_process_singleton.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" @@ -41,7 +41,7 @@ #include "base/nix/xdg_util.h" #endif #endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON) -@@ -291,7 +291,7 @@ +@@ -292,7 +292,7 @@ namespace { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ @@ -50,7 +50,7 @@ constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] = FILE_PATH_LITERAL("Media History"); -@@ -442,7 +442,7 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -443,7 +443,7 @@ void ProcessSingletonNotificationCallbackImpl( } #endif @@ -59,7 +59,7 @@ // Set the global activation token sent as a command line switch by another // browser process. This also removes the switch after use to prevent any side // effects of leaving it in the command line after this point. -@@ -1017,7 +1017,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1022,7 +1022,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -68,7 +68,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 . -@@ -1062,7 +1062,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1067,7 +1067,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { #endif // BUILDFLAG(IS_MAC) @@ -77,7 +77,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1258,7 +1258,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1263,7 +1263,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ @@ -86,7 +86,7 @@ // Delete the media history database if it still exists. // TODO(crbug.com/40177301): Remove this. base::ThreadPool::PostTask( -@@ -1306,7 +1306,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1311,7 +1311,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif @@ -95,7 +95,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1415,7 +1415,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1420,7 +1420,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -104,7 +104,7 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -1955,7 +1955,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -1960,7 +1960,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat // Drop the request if headless mode is in effect or the request is from // a headless Chrome process. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc index 84f7c0df2507..650997d0596a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc -@@ -58,7 +58,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar +@@ -60,7 +60,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar // static void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* const command_line = base::CommandLine::ForCurrentProcess(); - auto env = base::Environment::Create(); - std::string desktop_startup_id; + base::CommandLine* const command_line = + base::CommandLine::ForCurrentProcess(); + std::unique_ptr<base::Environment> env = base::Environment::Create(); 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 index 8718db5d53b0..23189a88a969 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -503,7 +503,7 @@ +@@ -505,7 +505,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #elif BUILDFLAG(IS_ANDROID) -@@ -617,11 +617,11 @@ +@@ -620,11 +620,11 @@ #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h" #endif // !BUILDFLAG(IS_ANDROID) @@ -23,7 +23,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -632,7 +632,7 @@ +@@ -635,7 +635,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif @@ -32,16 +32,16 @@ #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h" #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" -@@ -641,7 +641,7 @@ +@@ -646,7 +646,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" + #include "chrome/browser/enterprise/incognito/incognito_navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || - // BUILDFLAG(IS_CHROMEOS) -@@ -650,7 +650,7 @@ +@@ -656,7 +656,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -50,7 +50,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" -@@ -1547,7 +1547,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1561,7 +1561,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -59,7 +59,16 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1755,7 +1755,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1654,7 +1654,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( + policy::policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, false); + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + registry->RegisterListPref(prefs::kMandatoryExtensionsForIncognitoNavigation); + #endif + +@@ -1778,7 +1778,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS) main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>( is_integration_test, &startup_data_); @@ -68,7 +77,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1784,7 +1784,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1807,7 +1807,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -77,7 +86,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1801,7 +1801,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1824,7 +1824,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>()); #endif @@ -86,7 +95,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1820,7 +1820,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1843,7 +1843,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -95,7 +104,7 @@ main_parts->AddParts( std::make_unique< enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2703,7 +2703,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( +@@ -2747,7 +2747,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, int child_process_id) { @@ -105,7 +114,7 @@ #if BUILDFLAG(IS_MAC) std::unique_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -3054,7 +3056,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3102,7 +3104,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -114,7 +123,25 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4896,7 +4898,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4052,7 +4054,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr + return old_preferred_color_scheme != web_prefs->preferred_color_scheme; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Sets the `root_scrollbar_theme_color` web pref if the user has enabled a + // custom colored frame for the UI. + void UpdateRootScrollbarThemeColor(Profile* profile, +@@ -4682,7 +4684,7 @@ void ChromeContentBrowserClient::OverrideWebPreference + + UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(), + web_contents, GetWebTheme()); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) + +@@ -5002,7 +5004,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -123,7 +150,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5404,7 +5406,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5510,7 +5512,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -132,7 +159,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5421,7 +5423,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5534,7 +5536,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -141,7 +168,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5462,7 +5464,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5575,7 +5577,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif @@ -150,7 +177,16 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7400,7 +7402,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -5697,7 +5699,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + &throttles); + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (profile && profile->IsIncognitoProfile() && profile->IsOffTheRecord()) { + MaybeAddThrottle(enterprise_incognito::IncognitoNavigationThrottle:: + MaybeCreateThrottleFor(handle), +@@ -7525,7 +7527,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 621c7a19d20d..51c90372c406 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -552,7 +552,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -560,7 +560,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc index c2e9d78ad7d9..e787171510d3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc -@@ -100,7 +100,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo +@@ -102,7 +102,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo // This configuration object allows us to control platform specific behavior. MessagingBackendConfiguration configuration; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc index 1b508ae5b911..8030bfb22f89 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/component_updater/iwa_key_distribution_component_installer.cc -@@ -56,7 +56,7 @@ void OnDemandUpdateCompleted(update_client::Error err) +@@ -77,7 +77,7 @@ bool IsOnDemandUpdateSupported() { namespace component_updater { @@ -9,7 +9,7 @@ BASE_FEATURE(kIwaKeyDistributionComponent, "IwaKeyDistributionComponent", #if BUILDFLAG(IS_CHROMEOS) -@@ -81,7 +81,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup +@@ -102,7 +102,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup // the main IWA feature. #if BUILDFLAG(IS_WIN) return base::FeatureList::IsEnabled(features::kIsolatedWebApps); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc index 6814afa448e7..903d61472230 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc @@ -1,15 +1,24 @@ ---- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/component_updater/wasm_tts_engine_component_installer.cc -@@ -8,7 +8,7 @@ - #include "base/functional/callback.h" +@@ -9,7 +9,7 @@ #include "base/logging.h" + #include "content/public/browser/browser_thread.h" -#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/accessibility/embedded_a11y_extension_loader.h" #include "chrome/common/extensions/extension_constants.h" - #include "components/crx_file/id_util.h" -@@ -70,7 +70,7 @@ void WasmTtsEngineComponentInstallerPolicy::ComponentR + #include "ui/accessibility/accessibility_features.h" +@@ -41,7 +41,7 @@ constexpr std::array<uint8_t, 32> kWasmTtsEnginePublic + + const char kWasmTtsEngineManifestName[] = "WASM TTS Engine"; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class WasmTTSEngineDirectory { + public: + static WasmTTSEngineDirectory* Get() { +@@ -111,7 +111,7 @@ void WasmTtsEngineComponentInstallerPolicy::ComponentR VLOG(1) << "Component ready, version " << version.GetString() << " in " << install_dir.value(); @@ -17,13 +26,13 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (features::IsWasmTtsComponentUpdaterEnabled() && !features::IsWasmTtsEngineAutoInstallDisabled()) { - EmbeddedA11yExtensionLoader::GetInstance()->Init(); -@@ -121,7 +121,7 @@ void RegisterWasmTtsEngineComponent(ComponentUpdateSer - installer->Register(cus, base::OnceClosure()); - } + // Instead of installing the component extension as soon as it is ready, +@@ -166,7 +166,7 @@ void RegisterWasmTtsEngineComponent(ComponentUpdateSer + void WasmTtsEngineComponentInstallerPolicy::GetWasmTTSEngineDirectory( + base::OnceCallback<void(const base::FilePath&)> callback) { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::string WasmTtsEngineComponentInstallerPolicy::GetId() { - return crx_file::id_util::GenerateIdFromHash((kWasmTtsEnginePublicKeySHA256)); - } + WasmTTSEngineDirectory* wasm_directory = WasmTTSEngineDirectory::Get(); + wasm_directory->Get(std::move(callback)); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h deleted file mode 100644 index 4656ce0a4bc3..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/component_updater/wasm_tts_engine_component_installer.h.orig 2025-04-15 08:30:07 UTC -+++ chrome/browser/component_updater/wasm_tts_engine_component_installer.h -@@ -27,7 +27,7 @@ class WasmTtsEngineComponentInstallerPolicy : public C - WasmTtsEngineComponentInstallerPolicy& operator=( - const WasmTtsEngineComponentInstallerPolicy&) = delete; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - static std::string GetId(); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.cc new file mode 100644 index 000000000000..8b955d410997 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.cc @@ -0,0 +1,11 @@ +--- chrome/browser/devtools/features.cc.orig 2025-05-31 17:16:41 UTC ++++ chrome/browser/devtools/features.cc +@@ -164,7 +164,7 @@ BASE_FEATURE(kDevToolsNewPermissionDialog, + "DevToolsNewPermissionDialog", + base::FEATURE_ENABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If enabled, DevTools does not accept remote debugging connections unless + // using a non-default user data dir via the --user-data-dir switch. + BASE_FEATURE(kDevToolsDebuggingRestrictions, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.h b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.h new file mode 100644 index 000000000000..f79616c4aece --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.h @@ -0,0 +1,11 @@ +--- chrome/browser/devtools/features.h.orig 2025-05-31 17:16:41 UTC ++++ chrome/browser/devtools/features.h +@@ -92,7 +92,7 @@ BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabel + + BASE_DECLARE_FEATURE(kDevToolsNewPermissionDialog); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kDevToolsDebuggingRestrictions); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc new file mode 100644 index 000000000000..60149d8304f2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc @@ -0,0 +1,11 @@ +--- chrome/browser/devtools/remote_debugging_server.cc.orig 2025-05-06 12:23:00 UTC ++++ chrome/browser/devtools/remote_debugging_server.cc +@@ -109,7 +109,7 @@ IsRemoteDebuggingAllowed(const std::optional<bool>& is + RemoteDebuggingServer::NotStartedReason::kDisabledByPolicy); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kDevToolsDebuggingRestrictions) && + is_default_user_data_dir.value_or(true)) { + return base::unexpected( 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 index a19fddf62747..ac549473ac48 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1862,7 +1862,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1887,7 +1887,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile( 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(); } -@@ -1969,7 +1969,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1994,7 +1994,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) || \ @@ -18,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -2051,7 +2051,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -2076,7 +2076,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 index f2f79e408020..d7ce300c1e7b 100644 --- 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,4 +1,4 @@ ---- chrome/browser/download/download_item_model.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/download/download_item_model.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/download/download_item_model.cc @@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1215,7 +1215,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1210,7 +1210,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc new file mode 100644 index 000000000000..fc4825a166d0 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc @@ -0,0 +1,38 @@ +--- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig 2025-05-31 17:16:41 UTC ++++ chrome/browser/enterprise/browser_management/browser_management_service.cc +@@ -50,7 +50,7 @@ GetManagementStatusProviders(Profile* profile) { + + BrowserManagementService::BrowserManagementService(Profile* profile) + : ManagementService(GetManagementStatusProviders(profile)) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::SequencedTaskRunner::GetCurrentDefault()->PostTask( + FROM_HERE, + base::BindOnce(&BrowserManagementService::UpdateManagementIconForProfile, +@@ -70,7 +70,7 @@ BrowserManagementService::BrowserManagementService(Pro + } + + ui::ImageModel* BrowserManagementService::GetManagementIconForProfile() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) | BUILDFLAG(IS_BSD) + return management_icon_for_profile_.IsEmpty() ? nullptr + : &management_icon_for_profile_; + #else +@@ -83,7 +83,7 @@ void BrowserManagementService::TriggerPolicyStatusChan + OnPolicyStatusChanged(); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void BrowserManagementService::StartListeningToPrefChanges(Profile* profile) { + pref_change_registrar_.Init(profile->GetPrefs()); + pref_change_registrar_.Add( +@@ -126,7 +126,7 @@ void BrowserManagementService::SetManagementIconForPro + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + + void BrowserManagementService::OnPolicyStatusChanged() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + NotifyEnterpriseLabelUpdated(); + #endif + } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h new file mode 100644 index 000000000000..1a603666d950 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h @@ -0,0 +1,11 @@ +--- chrome/browser/enterprise/browser_management/browser_management_service.h.orig 2025-05-31 17:16:41 UTC ++++ chrome/browser/enterprise/browser_management/browser_management_service.h +@@ -44,7 +44,7 @@ class BrowserManagementService : public ManagementServ + // PolicyStatusProvider::Observer: + void OnPolicyStatusChanged() override; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Starts listening to changes to policies that affect the enterprise label + // and pill. + void StartListeningToPrefChanges(Profile* profile); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc index 11db4ffa0d65..8913b28c9c82 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/common.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/enterprise/connectors/common.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/enterprise/connectors/common.cc -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #include "components/user_manager/user.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/prefs/pref_service.h" #endif -@@ -191,7 +191,7 @@ std::string GetProfileEmail(Profile* profile) { +@@ -192,7 +192,7 @@ std::string GetProfileEmail(Profile* profile) { std::string email = GetProfileEmail(IdentityManagerFactory::GetForProfile(profile)); 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 index b4749bda167a..6069ad484ed2 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -469,7 +469,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope( +@@ -475,7 +475,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope( bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); 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 index d010b0277043..c0749a140bd0 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-10-01 07:26:23 UTC +--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc -@@ -20,7 +20,7 @@ +@@ -24,7 +24,7 @@ namespace enterprise_connectors { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc index 5d088d6a641d..bccf86e994bd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -55,7 +55,7 @@ +@@ -52,7 +52,7 @@ #include "base/strings/utf_string_conversions.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/signals_aggregator.h" -@@ -160,7 +160,7 @@ void RealtimeReportingClient::ReportPastEvent(const st +@@ -157,7 +157,7 @@ void RealtimeReportingClient::ReportPastEvent(const st /*include_profile_user_name=*/false); } @@ -18,7 +18,7 @@ void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -235,7 +235,7 @@ std::string RealtimeReportingClient::GetBrowserClientI +@@ -232,7 +232,7 @@ std::string RealtimeReportingClient::GetBrowserClientI return client_id; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h index 055bd798d6f2..ba5ad477c3ee 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h @@ -19,7 +19,7 @@ #include "components/keyed_service/core/keyed_service.h" @@ -9,7 +9,7 @@ #include "components/device_signals/core/browser/signals_types.h" #endif -@@ -118,7 +118,7 @@ class RealtimeReportingClient : public RealtimeReporti +@@ -113,7 +113,7 @@ class RealtimeReportingClient : public RealtimeReporti const std::string& dm_token) override; #endif @@ -18,7 +18,7 @@ // DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...). void MaybeCollectDeviceSignalsAndReportEventDeprecated( base::Value::Dict event, -@@ -168,7 +168,7 @@ class RealtimeReportingClient : public RealtimeReporti +@@ -163,7 +163,7 @@ class RealtimeReportingClient : public RealtimeReporti base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this}; }; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_reporting_cloud__profile__reporting__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_reporting_cloud__profile__reporting__service.cc new file mode 100644 index 000000000000..69a5e7afde3a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_reporting_cloud__profile__reporting__service.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/reporting/cloud_profile_reporting_service.cc.orig 2025-05-31 17:16:41 UTC ++++ chrome/browser/enterprise/reporting/cloud_profile_reporting_service.cc +@@ -34,7 +34,7 @@ + #include "extensions/buildflags/buildflags.h" + #include "services/network/public/cpp/shared_url_loader_factory.h" + +-#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/enterprise/signals/signals_aggregator_factory.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -113,7 +113,7 @@ void CloudProfileReportingService::CreateReportSchedul + params.profile_request_generator = + std::make_unique<ChromeProfileRequestGenerator>( + profile_->GetPath(), &delegate_factory, +-#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::GetForProfile( + profile_)); + #else diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_reporting_cloud__profile__reporting__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_reporting_cloud__profile__reporting__service__factory.cc new file mode 100644 index 000000000000..4723d3454ac5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_reporting_cloud__profile__reporting__service__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/reporting/cloud_profile_reporting_service_factory.cc.orig 2025-05-31 17:16:41 UTC ++++ chrome/browser/enterprise/reporting/cloud_profile_reporting_service_factory.cc +@@ -10,7 +10,7 @@ + #include "components/enterprise/browser/reporting/report_scheduler.h" + #include "services/network/public/cpp/shared_url_loader_factory.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 "chrome/browser/enterprise/signals/signals_aggregator_factory.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + +@@ -47,7 +47,7 @@ CloudProfileReportingServiceFactory::CloudProfileRepor + ProfileSelections::BuildForRegularProfile()) { + DependsOn(enterprise::ProfileIdServiceFactory::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 because + // `CloudProfileReportingService.profile_request_generator_` has a dependency + // on it. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc new file mode 100644 index 000000000000..e8e5ffc13d4c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig 2025-05-31 17:16:41 UTC ++++ chrome/browser/enterprise/signals/context_info_fetcher.cc +@@ -176,6 +176,8 @@ std::vector<std::string> ContextInfoFetcher::GetOnSecu + SettingValue ContextInfoFetcher::GetOSFirewall() { + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + return device_signals::GetOSFirewall(); ++#elif BUILDFLAG(IS_OPENBSD) ++ return SettingValue::ENABLED; + #elif BUILDFLAG(IS_CHROMEOS) + return GetChromeosFirewall(); + #else +@@ -195,7 +197,7 @@ ScopedUfwConfigPathForTesting::~ScopedUfwConfigPathFor + #endif // BUILDFLAG(IS_LINUX) + + std::vector<std::string> ContextInfoFetcher::GetDnsServers() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + return device_signals::GetSystemDnsServers(); + #else + return std::vector<std::string>(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc index 68cf65f1be75..21f131352378 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher.cc @@ -10,7 +10,7 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h" #endif -@@ -74,7 +74,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: +@@ -76,7 +76,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: return CreateInstanceInternal(); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc index 7d15d08d5ab8..5e6b16a10da5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_util_managed__browser__utils.cc @@ -1,11 +1,20 @@ ---- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/enterprise/util/managed_browser_utils.cc -@@ -224,7 +224,7 @@ void SetUserAcceptedAccountManagement(Profile* profile +@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile + profile_manager->GetProfileAttributesStorage() .GetProfileAttributesWithPath(profile->GetPath()); if (entry) { - entry->SetUserAcceptedAccountManagement(accepted); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - entry->SetEnterpriseProfileLabel(GetEnterpriseLabel(profile)); + SetEnterpriseProfileLabel(profile); #endif - } + entry->SetUserAcceptedAccountManagement(accepted); +@@ -341,7 +341,7 @@ bool CanShowEnterpriseProfileUI(Profile* profile) { + } + + bool CanShowEnterpriseBadgingForNTPFooter(Profile* profile) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + auto* management_service = + policy::ManagementServiceFactory::GetForProfile(profile); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn index cff5d63b8f6b..dab6f39ae8ac 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1435,6 +1435,10 @@ source_set("extensions") { +@@ -1467,6 +1467,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc index 21a210163251..2f38f51cfb9a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -24,7 +24,7 @@ #include "base/win/registry.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -255,7 +255,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -264,7 +264,7 @@ base::FilePath GetEndpointVerificationDir() { bool got_path = false; #if BUILDFLAG(IS_WIN) got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path); @@ -18,7 +18,7 @@ std::unique_ptr<base::Environment> env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -266,7 +266,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -275,7 +275,7 @@ base::FilePath GetEndpointVerificationDir() { if (!got_path) return path; 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 index 934d2bb31006..9effb07552cc 100644 --- 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 2025-03-09 21:38:10 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc @@ -40,7 +40,7 @@ #include "components/reporting/util/statusor.h" @@ -9,7 +9,7 @@ #include <optional> #include "base/strings/string_util.h" -@@ -115,7 +115,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -114,7 +114,7 @@ api::enterprise_reporting_private::ContextInfo ToConte } bool AllowClientCertificateReportingForUsers() { @@ -18,7 +18,7 @@ return base::FeatureList::IsEnabled( enterprise_signals::features::kAllowClientCertificateReportingForUsers); #else -@@ -128,7 +128,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin +@@ -127,7 +127,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin return pref && pref->IsManaged(); } @@ -27,7 +27,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( device_signals::SignalName signal_name) { -@@ -190,7 +190,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -189,7 +189,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -36,7 +36,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -630,7 +630,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -629,7 +629,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc deleted file mode 100644 index 3efb2a11c8d0..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2025-04-15 08:30:07 UTC -+++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc -@@ -409,7 +409,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel - apps::LaunchContainer launch_container = - GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); - Profile* profile = Profile::FromBrowserContext(context); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (extensions::IsExtensionUnsupportedDeprecatedApp(profile, - extension->id())) { - return false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 04daac619833..108efe0ddef2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -293,7 +293,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -288,7 +288,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { 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 index 328ae08cde8f..b80dd74723c1 100644 --- 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,15 +1,15 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -189,7 +189,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] = settings_api::PrefType::kBoolean; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] = - settings_api::PrefType::kBoolean; (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] = -@@ -209,7 +209,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + settings_api::PrefType::kBoolean; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -212,7 +212,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; @@ -18,7 +18,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -221,7 +221,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -226,7 +226,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; 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 index 2bdadce6fa72..3155e2fe6330 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -931,7 +931,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -945,7 +945,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // created as minimized. // TODO(crbug.com/40254339): Remove this workaround when linux is fixed. // TODO(crbug.com/40254339): Find a fix for wayland as well. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index fd5b98d600f1..ccb2cad59ad3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -904,7 +904,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -902,7 +902,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: #if BUILDFLAG(IS_CHROMEOS) RequestExtensionApproval(contents); return; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 320c677e9aa9..5eb494721148 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -795,7 +795,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders( #endif // BUILDFLAG(IS_CHROMEOS) if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -823,7 +823,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -856,7 +856,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc index 1b130a5673a2..cbd91e709415 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc @@ -1,6 +1,6 @@ ---- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc -@@ -38,7 +38,7 @@ +@@ -37,7 +37,7 @@ #include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h" #endif -@@ -85,7 +85,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content +@@ -84,7 +84,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content fetcher->AddSource(std::make_unique<KeyboardInfoLogSource>()); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc index 321138c478f8..a48340647d8f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc @@ -1,6 +1,6 @@ ---- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc -@@ -45,7 +45,7 @@ +@@ -44,7 +44,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h" #endif -@@ -102,7 +102,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil +@@ -101,7 +101,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil fetcher->AddSource(std::make_unique<UiHierarchyLogSource>(scrub_data)); #endif 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 index 5c889cba40ee..e7461b518baf 100644 --- 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,11 +1,11 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -357,7 +357,7 @@ const struct { - FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), - kDontBlockChildren}, +@@ -341,7 +341,7 @@ GenerateBlockedPath() { + FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), + BlockType::kDontBlockChildren}, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // On Linux also block access to devices via /dev. - {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren}, - // And security sensitive data in /proc and /sys. + // On Linux also block access to devices via /dev. + {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), BlockType::kBlockAllChildren}, + // And security sensitive data in /proc and /sys. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc index 9ffda1ce73dc..91c32ea1838f 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/flag_descriptions.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/flag_descriptions.cc -@@ -562,7 +562,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB +@@ -617,7 +617,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB "Autofill suggestions on the allowlisted merchant websites."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kAutofillEnableAmountExtractionAllowlistDesktopName[] = "Enable loading and querying the checkout amount extraction allowlist on " "Chrome Desktop"; -@@ -580,7 +580,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr +@@ -641,7 +641,7 @@ const char kAutofillEnableAmountExtractionDesktopLoggi // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ const char kAutofillEnableBuyNowPayLaterName[] = "Enable buy now pay later on Autofill"; const char kAutofillEnableBuyNowPayLaterDescription[] = -@@ -992,7 +992,7 @@ const char kDevicePostureDescription[] = +@@ -1064,7 +1064,7 @@ const char kDevicePostureDescription[] = "Enables Device Posture API (foldable devices)"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -27,16 +27,16 @@ const char kDocumentPictureInPictureAnimateResizeName[] = "Document Picture-in-Picture Animate Resize"; const char kDocumentPictureInPictureAnimateResizeDescription[] = -@@ -1077,7 +1077,7 @@ const char kCompressionDictionaryTransportRequireKnown - "when the connection is using a well known root cert or when the server is " - "a localhost."; +@@ -1178,7 +1178,7 @@ const char kContextMenuEmptySpaceDescription[] = + "space, a context menu containing page-related items will be shown."; + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const char kContextualCueingName[] = "Contextual cueing"; const char kContextualCueingDescription[] = - "Enables the contextual cueing system to support showing actions"; -@@ -1496,7 +1496,7 @@ const char kEnableIsolatedWebAppDevModeName[] = + "Enables the contextual cueing system to support showing actions."; +@@ -1604,7 +1604,7 @@ const char kEnableIsolatedWebAppDevModeName[] = const char kEnableIsolatedWebAppDevModeDescription[] = "Enables the installation of unverified Isolated Web Apps"; @@ -45,7 +45,16 @@ const char kEnableIwaKeyDistributionComponentName[] = "Enable the Iwa Key Distribution component"; const char kEnableIwaKeyDistributionComponentDescription[] = -@@ -3498,7 +3498,7 @@ const char kDefaultSiteInstanceGroupsDescription[] = +@@ -3540,7 +3540,7 @@ const char kRetainOmniboxOnFocusDescription[] = + "exhibit a change in behavior."; + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kRootScrollbarFollowsTheme[] = "Make scrollbar follow theme"; + const char kRootScrollbarFollowsThemeDescription[] = + "If enabled makes the root scrollbar follow the browser's theme color."; +@@ -3778,7 +3778,7 @@ const char kDefaultSiteInstanceGroupsDescription[] = "SiteInstance."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,25 +63,25 @@ const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing"; const char kPwaNavigationCapturingDescription[] = "Enables opening links from Chrome in an installed PWA. Currently under " -@@ -3733,7 +3733,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ +@@ -3994,7 +3994,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ "Force the Translate Triggering on English pages experiment to be enabled " "with the selected language model active."; -#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 kTranslationAPIName[] = "Experimental translation API"; - const char kTranslationAPIDescription[] = - "Enables the on-device language translation API. " -@@ -5356,7 +5356,7 @@ const char kUserDisplayModeSyncStandaloneMitigationDes - "Enables a mitigation during web app install on CrOS for syncing " - "user_display_mode: kStandalone to non-CrOS devices."; + const char kEnableHistorySyncOptinName[] = "History Sync Opt-in"; + const char kEnableHistorySyncOptinDescription[] = + "Enables the History Sync Opt-in screen on Desktop platforms. The screen " +@@ -5654,7 +5654,7 @@ const char kTranslateOpenSettingsDescription[] = + "Add an option to the translate bubble menu to open language settings."; + #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const char kWasmTtsComponentUpdaterEnabledName[] = "Enable Wasm TTS Extension Component"; const char kWasmTtsComponentUpdaterEnabledDescription[] = -@@ -7354,7 +7354,7 @@ const char kTetheringExperimentalFunctionalityDescript +@@ -7685,7 +7685,7 @@ const char kTetheringExperimentalFunctionalityDescript #endif // BUILDFLAG(IS_CHROMEOS) @@ -81,7 +90,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7584,7 +7584,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b +@@ -7914,7 +7914,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b // Linux ----------------------------------------------------------------------- @@ -90,7 +99,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7630,6 +7630,18 @@ const char kWaylandUiScalingDescription[] = +@@ -7964,6 +7964,18 @@ const char kWaylandUiScalingDescription[] = "Enable experimental support for text scaling in the Wayland backend " "backed by full UI scaling. Requires #wayland-per-window-scaling to be " "enabled too."; @@ -109,7 +118,7 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -7642,7 +7654,7 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -7976,7 +7988,7 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -118,16 +127,16 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7675,7 +7687,7 @@ const char kTaskManagerDesktopRefreshDescription[] = - "Enables a refreshed design for the Task Manager on Desktop platforms."; - #endif // BUILDFLAG(IS_ANDROID) +@@ -8019,7 +8031,7 @@ const char kGroupPromoPrototypeName[] = "Group Promo P + const char kGroupPromoPrototypeDescription[] = + "Enables prototype for group promo."; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7707,7 +7719,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -8047,7 +8059,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -136,7 +145,7 @@ #if BUILDFLAG(ENABLE_PRINTING) const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend"; const char kCupsIppPrintingBackendDescription[] = -@@ -7852,7 +7864,7 @@ const char kElementCaptureDescription[] = +@@ -8190,7 +8202,7 @@ const char kElementCaptureDescription[] = "media track into a track capturing just a specific DOM element."; #endif // !BUILDFLAG(IS_ANDROID) @@ -145,7 +154,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7908,7 +7920,7 @@ const char kComposeUpfrontInputModesDescription[] = +@@ -8241,7 +8253,7 @@ const char kComposeUpfrontInputModesDescription[] = "Enables upfront input modes in the Compose dialog"; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -154,9 +163,9 @@ const char kThirdPartyProfileManagementName[] = "Third party profile management"; const char kThirdPartyProfileManagementDescription[] = -@@ -8052,7 +8064,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] = - "Enable the OS settings for overlay scrollbars on ChromeOS."; - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -8379,7 +8391,7 @@ const char kSupervisedUserBlockInterstitialV3Name[] = + const char kSupervisedUserBlockInterstitialV3Description[] = + "Enables URL filter interstitial V3 for Family Link users."; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h index ed1e614e231c..73913b706dbb 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/flag_descriptions.h.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/flag_descriptions.h -@@ -356,7 +356,7 @@ extern const char +@@ -383,7 +383,7 @@ extern const char kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[]; extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[]; extern const char kAutofillEnableAmountExtractionDesktopName[]; -@@ -365,7 +365,7 @@ extern const char kAutofillEnableAmountExtractionDeskt +@@ -394,7 +394,7 @@ extern const char kAutofillEnableAmountExtractionDeskt // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,16 +18,16 @@ extern const char kAutofillEnableBuyNowPayLaterName[]; extern const char kAutofillEnableBuyNowPayLaterDescription[]; -@@ -581,7 +581,7 @@ extern const char kCrossTabRegionCaptureName[]; - extern const char kCrossTabRegionCaptureDescription[]; - #endif // !BUILDFLAG(IS_ANDROID) +@@ -620,7 +620,7 @@ extern const char kContextMenuEmptySpaceName[]; + extern const char kContextMenuEmptySpaceDescription[]; + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kContextualCueingName[]; extern const char kContextualCueingDescription[]; - #endif // #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -753,7 +753,7 @@ extern const char kDevicePostureName[]; + extern const char kGlicZeroStateSuggestionsName[]; +@@ -813,7 +813,7 @@ extern const char kDevicePostureName[]; extern const char kDevicePostureDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ extern const char kDocumentPictureInPictureAnimateResizeName[]; extern const char kDocumentPictureInPictureAnimateResizeDescription[]; -@@ -915,7 +915,7 @@ extern const char kEnableIsolatedWebAppManagedGuestSes +@@ -975,7 +975,7 @@ extern const char kEnableIsolatedWebAppAllowlistDescri extern const char kEnableIsolatedWebAppDevModeName[]; extern const char kEnableIsolatedWebAppDevModeDescription[]; @@ -45,7 +45,16 @@ extern const char kEnableIwaKeyDistributionComponentName[]; extern const char kEnableIwaKeyDistributionComponentDescription[]; #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -2020,7 +2020,7 @@ extern const char kDefaultSiteInstanceGroupsName[]; +@@ -2026,7 +2026,7 @@ extern const char kRetainOmniboxOnFocusName[]; + extern const char kRetainOmniboxOnFocusDescription[]; + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kRootScrollbarFollowsTheme[]; + extern const char kRootScrollbarFollowsThemeDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +@@ -2164,7 +2164,7 @@ extern const char kDefaultSiteInstanceGroupsName[]; extern const char kDefaultSiteInstanceGroupsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,25 +63,25 @@ extern const char kPwaNavigationCapturingName[]; extern const char kPwaNavigationCapturingDescription[]; #endif -@@ -2180,7 +2180,7 @@ extern const char kTouchTextEditingRedesignDescription +@@ -2311,7 +2311,7 @@ extern const char kTouchTextEditingRedesignDescription extern const char kTranslateForceTriggerOnEnglishName[]; extern const char kTranslateForceTriggerOnEnglishDescription[]; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kTranslationAPIName[]; - extern const char kTranslationAPIDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -3147,7 +3147,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio - extern const char kUserDisplayModeSyncStandaloneMitigationName[]; - extern const char kUserDisplayModeSyncStandaloneMitigationDescription[]; + extern const char kEnableHistorySyncOptinName[]; + extern const char kEnableHistorySyncOptinDescription[]; + +@@ -3316,7 +3316,7 @@ extern const char kTranslateOpenSettingsName[]; + extern const char kTranslateOpenSettingsDescription[]; + #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kWasmTtsComponentUpdaterEnabledName[]; extern const char kWasmTtsComponentUpdaterEnabledDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -4328,7 +4328,7 @@ extern const char kTetheringExperimentalFunctionalityD +@@ -4522,7 +4522,7 @@ extern const char kTetheringExperimentalFunctionalityD #endif // #if BUILDFLAG(IS_CHROMEOS) @@ -81,7 +90,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4463,7 +4463,7 @@ extern const char kEnableArmHwdrmDescription[]; +@@ -4657,7 +4657,7 @@ extern const char kEnableArmHwdrmDescription[]; // Linux --------------------------------------------------------------------- @@ -90,7 +99,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4491,6 +4491,9 @@ extern const char kWaylandTextInputV3Description[]; +@@ -4688,6 +4688,9 @@ extern const char kWaylandTextInputV3Description[]; extern const char kWaylandUiScalingName[]; extern const char kWaylandUiScalingDescription[]; @@ -100,7 +109,7 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -4510,7 +4513,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4707,7 +4710,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -109,7 +118,7 @@ #if BUILDFLAG(ENABLE_PRINTING) extern const char kCupsIppPrintingBackendName[]; extern const char kCupsIppPrintingBackendDescription[]; -@@ -4523,7 +4526,7 @@ extern const char kScreenlockReauthCardDescription[]; +@@ -4720,7 +4723,7 @@ extern const char kScreenlockReauthCardDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -117,8 +126,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4537,7 +4540,7 @@ extern const char kTaskManagerDesktopRefreshName[]; + +@@ -4737,7 +4740,7 @@ extern const char kTaskManagerDesktopRefreshName[]; extern const char kTaskManagerDesktopRefreshDescription[]; #endif // BUILDFLAG(IS_ANDROID) @@ -127,7 +136,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4632,7 +4635,7 @@ extern const char kElementCaptureName[]; +@@ -4829,7 +4832,7 @@ extern const char kElementCaptureName[]; extern const char kElementCaptureDescription[]; #endif // !BUILDFLAG(IS_ANDROID) @@ -136,7 +145,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4674,7 +4677,7 @@ extern const char kComposeUpfrontInputModesName[]; +@@ -4868,7 +4871,7 @@ extern const char kComposeUpfrontInputModesName[]; extern const char kComposeUpfrontInputModesDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -145,9 +154,9 @@ extern const char kThirdPartyProfileManagementName[]; extern const char kThirdPartyProfileManagementDescription[]; -@@ -4759,7 +4762,7 @@ extern const char kEnablePolicyPromotionBannerName[]; - extern const char kEnablePolicyPromotionBannerDescription[]; - #endif // !BUILDFLAG(IS_ANDROID) +@@ -4951,7 +4954,7 @@ extern const char kEnablePolicyPromotionBannerDescript + extern const char kSupervisedUserBlockInterstitialV3Name[]; + extern const char kSupervisedUserBlockInterstitialV3Description[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc index e9cc0f7ca963..ac165f6428e5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc @@ -1,7 +1,7 @@ ---- chrome/browser/global_features.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/global_features.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/global_features.cc -@@ -21,7 +21,7 @@ - #include "chrome/browser/glic/glic_profile_manager.h" // nogncheck +@@ -23,7 +23,7 @@ + #include "chrome/browser/glic/host/glic_synthetic_trial_manager.h" // nogncheck #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ // This causes a gn error on Android builds, because gn does not understand // buildflags, so we include it only on platforms where it is used. #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h" -@@ -60,7 +60,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting( +@@ -62,7 +62,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting( void GlobalFeatures::Init() { system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle(); @@ -18,7 +18,7 @@ whats_new_registry_ = CreateWhatsNewRegistry(); #endif -@@ -88,7 +88,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( +@@ -96,7 +96,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( return system_permission_settings::PlatformHandle::Create(); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h index c7d6b1f3500d..b0c6bb40a7a8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h @@ -1,4 +1,4 @@ ---- chrome/browser/global_features.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/global_features.h.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/global_features.h @@ -14,7 +14,7 @@ namespace system_permission_settings { @@ -9,7 +9,7 @@ namespace whats_new { class WhatsNewRegistry; } // namespace whats_new -@@ -55,7 +55,7 @@ class GlobalFeatures { +@@ -58,7 +58,7 @@ class GlobalFeatures { system_permissions_platform_handle() { return system_permissions_platform_handle_.get(); } @@ -18,7 +18,7 @@ whats_new::WhatsNewRegistry* whats_new_registry() { return whats_new_registry_.get(); } -@@ -80,7 +80,7 @@ class GlobalFeatures { +@@ -91,7 +91,7 @@ class GlobalFeatures { virtual std::unique_ptr<system_permission_settings::PlatformHandle> CreateSystemPermissionsPlatformHandle(); @@ -27,7 +27,7 @@ virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry(); #endif -@@ -90,7 +90,7 @@ class GlobalFeatures { +@@ -101,7 +101,7 @@ class GlobalFeatures { std::unique_ptr<system_permission_settings::PlatformHandle> system_permissions_platform_handle_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 787dfa3c643d..4b30ff5f497b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -583,7 +583,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 3c7fe034a111..d3432940a8d1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -86,7 +86,7 @@ +@@ -85,7 +85,7 @@ #include "chrome/browser/flags/android/chrome_session_state.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #if defined(__GLIBC__) #include <gnu/libc-version.h> #endif // defined(__GLIBC__) -@@ -111,7 +111,7 @@ +@@ -110,7 +110,7 @@ #include "chrome/installer/util/taskbar_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -120,7 +120,7 @@ +@@ -119,7 +119,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS) @@ -27,7 +27,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -872,7 +872,7 @@ void RecordStartupMetrics() { +@@ -898,7 +898,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -36,7 +36,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1183,11 +1183,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1211,11 +1211,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt std::make_unique<web_app::SamplingMetricsProvider>(); #endif // !BUILDFLAG(IS_ANDROID) 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 index 56f3576638c1..2b8ea5852d71 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -196,11 +196,11 @@ +@@ -201,11 +201,11 @@ #include "chrome/browser/metrics/google_update_metrics_provider_mac.h" #endif @@ -14,7 +14,7 @@ #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h" #endif -@@ -233,7 +233,7 @@ const int kMaxHistogramGatheringWaitDuration = 60000; +@@ -237,7 +237,7 @@ const int kMaxHistogramGatheringWaitDuration = 60000; // Needs to be kept in sync with the writer in // third_party/crashpad/crashpad/handler/handler_main.cc. const char kCrashpadHistogramAllocatorName[] = "CrashpadMetrics"; @@ -23,7 +23,7 @@ base::LazyInstance<ChromeMetricsServiceCrashReporter>::Leaky g_crash_reporter = LAZY_INSTANCE_INITIALIZER; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -@@ -537,7 +537,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg +@@ -541,7 +541,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -32,7 +32,7 @@ metrics::structured::StructuredMetricsService::RegisterPrefs(registry); #if !BUILDFLAG(IS_CHROMEOS) -@@ -619,7 +619,7 @@ std::string ChromeMetricsServiceClient::GetVersionStri +@@ -623,7 +623,7 @@ std::string ChromeMetricsServiceClient::GetVersionStri void ChromeMetricsServiceClient::OnEnvironmentUpdate(std::string* environment) { // TODO(https://bugs.ch40m1um.qjz9zk/p/crashpad/issues/detail?id=135): call this // on Mac when the Crashpad API supports it. @@ -41,7 +41,7 @@ // Register the environment with the crash reporter. Note that there is a // window from startup to this point during which crash reports will not have // an environment set. -@@ -724,7 +724,7 @@ void ChromeMetricsServiceClient::Initialize() { +@@ -725,7 +725,7 @@ void ChromeMetricsServiceClient::Initialize() { std::make_unique<metrics::dwa::DwaService>(this, local_state); } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -50,7 +50,7 @@ metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( base::SequencedTaskRunner::GetCurrentDefault()); #endif -@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -785,7 +785,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -59,7 +59,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -873,7 +873,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -874,7 +874,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<GoogleUpdateMetricsProviderMac>()); #endif @@ -68,7 +68,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -974,7 +974,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -978,7 +978,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -77,7 +77,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1160,7 +1160,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1169,7 +1169,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif @@ -86,7 +86,7 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1509,7 +1509,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1518,7 +1518,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>( cros_system_profile_provider_.get()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc index f26c88c7059f..405219a9ba03 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc -@@ -145,7 +145,7 @@ CPUIdentity GetCPUIdentity() { +@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() { result.release = #if BUILDFLAG(IS_CHROMEOS) base::SysInfo::KernelVersion(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc index 24ccd554f6e3..b7f01aaa7b18 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -1,15 +1,15 @@ ---- chrome/browser/net/profile_network_context_service.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/net/profile_network_context_service.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/net/profile_network_context_service.cc -@@ -133,7 +133,7 @@ +@@ -134,7 +134,7 @@ #include "extensions/common/constants.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/enterprise/client_certificates/certificate_provisioning_service_factory.h" - #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" - #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -260,7 +260,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet + #include "chrome/browser/policy/chrome_browser_policy_connector.h" + #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" +@@ -275,7 +275,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet }); } @@ -18,7 +18,7 @@ std::unique_ptr<net::ClientCertStore> GetWrappedCertStore( Profile* profile, std::unique_ptr<net::ClientCertStore> platform_store) { -@@ -1201,7 +1201,7 @@ ProfileNetworkContextService::CreateClientCertStore() +@@ -1223,7 +1223,7 @@ ProfileNetworkContextService::CreateClientCertStore() std::make_unique<net::ClientCertStoreNSS>( base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate, kCryptoModulePasswordClientAuth)); 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 index 3feab4e1303e..3228fb96aa42 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -134,7 +134,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; @@ -9,7 +9,7 @@ // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -142,7 +142,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; @@ -18,7 +18,7 @@ prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -188,7 +188,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -27,7 +27,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -203,7 +203,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) @@ -36,7 +36,7 @@ auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -213,7 +213,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -45,7 +45,7 @@ // The kerberos library is incompatible with the network service sandbox, so // if library loading is now enabled, the network service needs to be // restarted. It will be restarted unsandboxed because is -@@ -255,11 +255,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -59,7 +59,7 @@ // The network service sandbox and the kerberos library are incompatible. // If kerberos is enabled by policy, disable the network service sandbox. if (g_network_service_will_allow_gssapi_library_load || -@@ -275,7 +275,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -68,7 +68,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -519,7 +519,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -522,7 +522,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -77,7 +77,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -577,7 +577,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -86,7 +86,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -591,7 +591,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -594,7 +594,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -95,7 +95,7 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -656,7 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -659,7 +659,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); @@ -104,7 +104,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -681,11 +681,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -684,11 +684,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -118,7 +118,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -738,7 +738,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -739,7 +739,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 3c7994bac7e1..b089a6fbce42 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -642,7 +642,7 @@ void ChromePasswordManagerClient:: +@@ -664,7 +664,7 @@ void ChromePasswordManagerClient:: bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired( device_reauth::DeviceAuthenticator* authenticator) { #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { return false; } -@@ -920,7 +920,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -942,7 +942,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index c0042f8767d5..b63b7d749774 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr +@@ -128,7 +128,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr // Prepare password hash data for reuse detection. reuse_manager->PreparePasswordHashData(GetSignInStateForMetrics(profile)); 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 index d56b9ffbfc05..b047a49a9b21 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -252,19 +252,19 @@ +@@ -253,19 +253,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -23,7 +23,7 @@ #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -278,13 +278,13 @@ +@@ -279,13 +279,13 @@ #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -39,23 +39,25 @@ #include "components/search_engines/enterprise/search_aggregator_policy_handler.h" #include "components/search_engines/enterprise/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -577,7 +577,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - { key::kDefaultDirectSocketsSetting, - prefs::kManagedDefaultDirectSocketsSetting, +@@ -579,7 +579,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kManagedDefaultSmartCardConnectSetting, base::Value::Type::INTEGER }, + #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kDeletingUndecryptablePasswordsEnabled, password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, base::Value::Type::BOOLEAN }, -@@ -936,13 +936,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -934,7 +934,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ - || BUILDFLAG(IS_MAC) + || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - { key::kRequireOnlineRevocationChecksForLocalAnchors, - prefs::kCertRevocationCheckingRequiredLocalAnchors, + { key::kMandatoryExtensionsForIncognitoNavigation, + prefs::kMandatoryExtensionsForIncognitoNavigation, + base::Value::Type::LIST }, +@@ -943,7 +943,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -64,7 +66,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1788,7 +1788,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1819,7 +1819,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -73,7 +75,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1847,7 +1847,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1878,7 +1878,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -82,7 +84,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1867,12 +1867,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1898,12 +1898,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -97,7 +99,7 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1880,7 +1880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1911,7 +1911,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kLiveTranslateEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -106,7 +108,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1892,7 +1892,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1923,7 +1923,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -115,7 +117,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1990,7 +1990,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2021,7 +2021,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -124,8 +126,8 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2092,7 +2092,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::LIST }, +@@ -2122,7 +2122,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) @@ -133,7 +135,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2163,7 +2163,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2193,7 +2193,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -142,7 +144,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2192,7 +2192,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2222,7 +2222,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -151,7 +153,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2229,7 +2229,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2259,7 +2259,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -160,7 +162,7 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2255,7 +2255,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2282,7 +2282,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kTabCompareSettings, optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed, base::Value::Type::INTEGER}, @@ -169,7 +171,16 @@ { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2439,7 +2439,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2352,7 +2352,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + policy_prefs::kBuiltInAIAPIsEnabled, + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + { key::kNTPFooterThemeAttributionEnabled, + prefs::kNTPFooterThemeAttributionEnabled, + base::Value::Type::BOOLEAN }, +@@ -2485,7 +2485,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -178,7 +189,7 @@ handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2666,7 +2666,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2705,7 +2705,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -187,7 +198,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2719,7 +2719,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2764,7 +2764,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -196,7 +207,7 @@ handlers->AddHandler(std::make_unique<GuestModePolicyHandler>()); handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); -@@ -3145,7 +3145,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3201,7 +3201,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -205,7 +216,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -3153,7 +3153,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3209,7 +3209,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -214,7 +225,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -3171,7 +3171,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3227,7 +3227,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -223,7 +234,7 @@ handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3194,7 +3194,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3250,7 +3250,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -232,7 +243,7 @@ handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -3212,7 +3212,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3268,7 +3268,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails> gen_ai_default_policies; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index 918f475c571a..c3ea30ac0518 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,15 +1,15 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -309,7 +309,7 @@ - #include "components/ntp_tiles/custom_links_manager_impl.h" - #endif // BUILDFLAG(IS_ANDROID) +@@ -320,7 +320,7 @@ + #include "chrome/browser/devtools/devtools_window.h" + #endif // BUILDFLAG(ENABLE_DEVTOOLS_FRONTEND) -#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/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -478,11 +478,11 @@ +@@ -491,11 +491,11 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -23,7 +23,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -510,7 +510,7 @@ +@@ -523,7 +523,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -32,7 +32,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1659,7 +1659,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1675,7 +1675,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) on_device_translation::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) @@ -41,7 +41,7 @@ WhatsNewUI::RegisterLocalStatePrefs(registry); #endif -@@ -1815,7 +1815,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1829,7 +1829,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -50,7 +50,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2167,12 +2167,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2191,12 +2191,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_printing_printer__query.cc b/www/ungoogled-chromium/files/patch-chrome_browser_printing_printer__query.cc index 6ee1b2033231..6bb55c955c82 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_printing_printer__query.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_printing_printer__query.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/printer_query.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/browser/printing/printer_query.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/printing/printer_query.cc -@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di +@@ -342,7 +342,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( printer_name, print_backend->GetPrinterDriverInfo(printer_name)); 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 index 4a51cf65a1c4..bfcf514075c3 100644 --- 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,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -348,7 +348,7 @@ +@@ -360,7 +360,7 @@ #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/idle/idle_service_factory.h" #endif -@@ -390,7 +390,7 @@ +@@ -402,7 +402,7 @@ #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ #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" #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" -@@ -398,7 +398,7 @@ +@@ -410,7 +410,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -406,7 +406,7 @@ +@@ -418,7 +418,7 @@ #include "chrome/browser/history_embeddings/history_embeddings_service_factory.h" #endif @@ -36,7 +36,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" -@@ -720,7 +720,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -736,7 +736,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif #endif @@ -45,7 +45,14 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -777,7 +777,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -791,13 +791,13 @@ void ChromeBrowserMainExtraPartsProfiles:: + collaboration::CollaborationServiceFactory::GetInstance(); + collaboration::messaging::MessagingBackendServiceFactory::GetInstance(); + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + tab_groups::CollaborationMessagingObserverFactory::GetInstance(); + #endif commerce::ShoppingServiceFactory::GetInstance(); ConsentAuditorFactory::GetInstance(); ContentIndexProviderFactory::GetInstance(); @@ -54,7 +61,7 @@ contextual_cueing::ContextualCueingServiceFactory::GetInstance(); #endif CookieControlsServiceFactory::GetInstance(); -@@ -832,31 +832,31 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -856,31 +856,31 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -92,7 +99,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -983,7 +983,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1011,7 +1011,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_ANDROID) MerchantViewerDataManagerFactory::GetInstance(); #endif @@ -101,7 +108,7 @@ metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1095,7 +1095,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1126,7 +1126,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -110,7 +117,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1134,7 +1134,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1165,7 +1165,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) ProfileStatisticsFactory::GetInstance(); #endif @@ -119,7 +126,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1154,7 +1154,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1185,7 +1185,7 @@ void ChromeBrowserMainExtraPartsProfiles:: ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance(); @@ -128,12 +135,3 @@ reporting::ManualTestHeartbeatEventFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1334,7 +1334,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - WebDataServiceFactory::GetInstance(); - webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (tab_groups::SavedTabGroupUtils::SupportsSharedTabGroups()) { - tab_groups::CollaborationMessagingObserverFactory::GetInstance(); - } 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 index dc60f38769c3..7cdc8cbf483e 100644 --- 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,4 +1,4 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/profiles/profile_impl.cc @@ -269,6 +269,10 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -873,7 +877,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -871,7 +875,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc index 4aa6e9ee3ca4..c04de2596278 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc @@ -1,24 +1,6 @@ ---- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/regional_capabilities/regional_capabilities_service_client.cc -@@ -8,7 +8,7 @@ - #include "base/strings/string_util.h" - #include "components/country_codes/country_codes.h" - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "components/variations/service/variations_service.h" - #endif - -@@ -20,7 +20,7 @@ - #endif - - namespace regional_capabilities { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - RegionalCapabilitiesServiceClient::RegionalCapabilitiesServiceClient( - variations::VariationsService* variations_service) -@@ -56,7 +56,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId +@@ -107,7 +107,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId base::android::AttachCurrentThread(), reinterpret_cast<intptr_t>(heap_callback.release())); } @@ -26,4 +8,4 @@ +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void RegionalCapabilitiesServiceClient::FetchCountryId( CountryIdCallback on_country_id_fetched) { - std::move(on_country_id_fetched).Run(variations_country_id_); + std::move(on_country_id_fetched).Run(variations_latest_country_id_); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h deleted file mode 100644 index 50b5fb75075e..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.h +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/regional_capabilities/regional_capabilities_service_client.h.orig 2025-03-09 21:38:10 UTC -+++ chrome/browser/regional_capabilities/regional_capabilities_service_client.h -@@ -21,7 +21,7 @@ namespace regional_capabilities { - class RegionalCapabilitiesServiceClient - : public RegionalCapabilitiesService::Client { - public: --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - explicit RegionalCapabilitiesServiceClient( - variations::VariationsService* variations_service); - #else -@@ -35,7 +35,7 @@ class RegionalCapabilitiesServiceClient - void FetchCountryId(CountryIdCallback country_id_fetched_callback) override; - - private: --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const int variations_country_id_; - #endif - }; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc deleted file mode 100644 index fed04ed2a2e5..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc.orig 2025-03-09 21:38:10 UTC -+++ chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc -@@ -12,7 +12,7 @@ - #include "chrome/browser/regional_capabilities/regional_capabilities_service_client.h" - #include "components/regional_capabilities/regional_capabilities_service.h" - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "components/variations/service/variations_service.h" - #endif - -@@ -57,7 +57,7 @@ RegionalCapabilitiesServiceFactory::BuildServiceInstan - Profile* profile = Profile::FromBrowserContext(context); - auto regional_capabilities_service_client = - std::make_unique<RegionalCapabilitiesServiceClient>( --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - g_browser_process->variations_service() - #endif - ); 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 index 6882e77eee89..4ad8927e2a71 100644 --- 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 2025-03-09 21:38:10 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -41,7 +41,7 @@ +@@ -40,7 +40,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" -@@ -181,7 +181,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -180,7 +180,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()) { -@@ -204,7 +204,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -203,7 +203,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_safe__browsing_chrome__password__protection__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc index 38992e3c3b11..6c9c0abc3fa6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -1250,7 +1250,7 @@ std::string ChromePasswordProtectionService::GetOrgani +@@ -1268,7 +1268,7 @@ std::string ChromePasswordProtectionService::GetOrgani ReusedPasswordAccountType password_type) const { if (base::FeatureList::IsEnabled( safe_browsing::kEnterprisePasswordReuseUiRefresh)) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index d0e21ef0681c..87b745588d11 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,8 +1,8 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -20,7 +20,7 @@ + #include "components/safe_browsing/core/common/safebrowsing_switches.h" #include "net/base/url_util.h" - #include "third_party/abseil-cpp/absl/types/variant.h" -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc index f85f837ec982..10cf513889de 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/screen_ai/screen_ai_service_router.cc -@@ -316,7 +316,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -405,7 +405,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { base::FilePath binary_path = state_instance->get_component_binary_path(); #if BUILDFLAG(IS_WIN) std::vector<base::FilePath> preload_libraries = {binary_path}; @@ -9,7 +9,7 @@ std::vector<std::string> extra_switches = { base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), binary_path.MaybeAsASCII().c_str())}; -@@ -330,7 +330,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -419,7 +419,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { .WithPreloadedLibraries( preload_libraries, content::ServiceProcessHostPreloadLibraries::GetPassKey()) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc deleted file mode 100644 index 1c41fbc94a62..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2024-06-22 08:49:42 UTC -+++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc -@@ -15,7 +15,7 @@ - #include "components/send_tab_to_self/features.h" - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" - #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" - #endif -@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController* - ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile( - Profile* profile) { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - for (const std::unique_ptr<ReceivingUiHandler>& handler : - applicable_handlers_) { - auto* button_controller = diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc deleted file mode 100644 index ce0f2343ed90..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2024-03-22 14:16:19 UTC -+++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc -@@ -16,7 +16,7 @@ - #include "components/send_tab_to_self/send_tab_to_self_model.h" - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" - #endif - -@@ -50,7 +50,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely( - const std::vector<const SendTabToSelfEntry*>& new_entries) { - for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Only respond to notifications corresponding to this service's profile - // for these OSes; mobile does not have a Profile. - // Cast note: on desktop, handlers are guaranteed to be the derived class diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc index 415a8318e7d9..d16cdf97b33f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/supervised_user/classify_url_navigation_throttle.cc @@ -68,7 +68,7 @@ std::ostream& operator<<(std::ostream& stream, } @@ -9,7 +9,7 @@ bool ShouldShowReAuthInterstitial( content::NavigationHandle& navigation_handle) { Profile* profile = Profile::FromBrowserContext( -@@ -230,7 +230,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu +@@ -229,7 +229,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu } case InterstitialResultCallbackActions::kCancelWithInterstitial: { CHECK(navigation_handle()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc index 28d223d7c139..f376ff09f047 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/supervised_user/supervised_user_browser_utils.cc @@ -40,7 +40,7 @@ #include "chrome/browser/ash/profiles/profile_helper.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h" -@@ -165,7 +165,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool +@@ -158,7 +158,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool #endif } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc index ade7492f9f66..5acd2fbf03a1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc -@@ -196,7 +196,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte +@@ -197,7 +197,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte return; } } @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) CHECK(contents.value()); content::WebContents* web_contents = contents.value().get(); - if (supervised_user:: + // Always invoke the parent permission dialog. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc index 65611193f818..f0262112d4cc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc -@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager:: +@@ -348,7 +348,7 @@ void SupervisedUserExtensionsManager:: ActivateManagementPolicyAndUpdateRegistration() { SetActiveForSupervisedUsers(); UpdateManagementPolicyRegistration(); @@ -9,7 +9,7 @@ MaybeMarkExtensionsLocallyParentApproved(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) } -@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten +@@ -448,7 +448,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten return false; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc index acef88499f62..a4996e31a185 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc -@@ -34,12 +34,12 @@ +@@ -33,12 +33,12 @@ #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "ui/android/view_android.h" @@ -15,7 +15,7 @@ namespace { bool IsYouTubeInfrastructureSubframe(content::NavigationHandle* handle) { if (handle->GetNavigatingFrameType() != content::FrameType::kSubframe) { -@@ -161,7 +161,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc +@@ -160,7 +160,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc return content::NavigationThrottle::DEFER; } 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 index 5b92f6b0d67a..6e22fde5aa97 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -108,7 +108,7 @@ +@@ -110,7 +110,7 @@ #endif // BUILDFLAG(IS_CHROMEOS) #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" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" -@@ -135,7 +135,7 @@ namespace { +@@ -137,7 +137,7 @@ namespace { tab_groups::TabGroupSyncService* GetTabGroupSyncService(Profile* profile) { CHECK(profile); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ tab_groups::TabGroupSyncService* service = tab_groups::SavedTabGroupUtils::GetServiceForProfile(profile); CHECK(service); -@@ -377,7 +377,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -381,7 +381,7 @@ std::unique_ptr<KeyedService> BuildSyncService( bool local_sync_backend_enabled = false; // Only check the local sync backend pref on the supported platforms of // Windows, Mac and Linux. @@ -27,7 +27,7 @@ syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); base::UmaHistogramBoolean("Sync.Local.Enabled2", local_sync_backend_enabled); -@@ -512,7 +512,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -520,7 +520,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index c4bf85182724..faf1daa38076 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -227,7 +227,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -235,7 +235,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc index 43182bde880e..2bd6f55e6169 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/themes/theme_service.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/themes/theme_service.cc -@@ -71,7 +71,7 @@ +@@ -72,7 +72,7 @@ #include "extensions/browser/extension_registry_observer.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" // nogncheck #endif -@@ -331,7 +331,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -332,7 +332,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index 3374df28fe1c..ffc036031a8d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -495,7 +495,7 @@ +@@ -501,7 +501,7 @@ #if BUILDFLAG(IS_CHROMEOS) #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \ E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc index f6060d1a6a1f..811e33cb603f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc -@@ -57,7 +57,7 @@ gfx::Rect GetPopupSizeForBnpl() { +@@ -58,7 +58,7 @@ gfx::Rect GetPopupSizeForBnpl() { DesktopPaymentsWindowManager::DesktopPaymentsWindowManager( ContentAutofillClient* client) : client_(CHECK_DEREF(client)) { @@ -9,7 +9,7 @@ scoped_observation_.Observe(BrowserList::GetInstance()); #endif // BUILDFLAG(IS_LINUX) } -@@ -142,7 +142,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye +@@ -144,7 +144,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h index dca8f7acedd8..1f6069ca9b60 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h @@ -14,7 +14,7 @@ #include "components/autofill/core/browser/payments/payments_window_manager.h" @@ -27,7 +27,7 @@ // BrowserListObserver: void OnBrowserSetLastActive(Browser* browser) override; #endif // BUILDFLAG(IS_LINUX) -@@ -161,7 +161,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi +@@ -165,7 +165,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi // Used in tests to notify the test infrastructure that the pop-up has closed. base::RepeatingClosure popup_closed_closure_for_testing_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h index 0f1604ea2288..a5ec284f388e 100644 --- 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 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/browser.h.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/browser.h -@@ -301,7 +301,7 @@ class Browser : public TabStripModelObserver, +@@ -302,7 +302,7 @@ class Browser : public TabStripModelObserver, std::optional<int64_t> display_id; #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 index 8ecd1c9060b0..0ffaa5ba47f6 100644 --- 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,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -126,7 +126,7 @@ #include "components/user_manager/user_manager.h" @@ -6,10 +6,10 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/base/ime/text_edit_commands.h" #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" - #endif -@@ -135,7 +135,7 @@ +@@ -136,7 +136,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h" #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -328,7 +328,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -348,7 +348,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -27,7 +27,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(); -@@ -580,7 +580,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -611,7 +611,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -36,7 +36,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -800,7 +800,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -828,7 +828,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; case IDC_CREATE_SHORTCUT: base::RecordAction(base::UserMetricsAction("CreateShortcut")); @@ -45,7 +45,7 @@ chrome::CreateDesktopShortcutForActiveWebContents(browser_); #else web_app::CreateWebAppFromCurrentWebContents( -@@ -967,7 +967,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -994,7 +994,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) case IDC_CHROME_WHATS_NEW: #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \ @@ -54,7 +54,7 @@ ShowChromeWhatsNew(browser_); break; #else -@@ -1283,7 +1283,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1371,7 +1371,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true); #endif @@ -63,7 +63,7 @@ command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); -@@ -1640,7 +1640,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1728,7 +1728,7 @@ void BrowserCommandController::UpdateCommandsForTabSta bool can_create_web_app = web_app::CanCreateWebApp(browser_); command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc index a7b688927243..34d0c55b1246 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_commands.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -1985,7 +1985,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -2084,7 +2084,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); } else { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc index 35344fa4a319..4ede5ae48786 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/browser_ui_prefs.cc -@@ -71,7 +71,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry - registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0); - registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime, - base::Time()); +@@ -64,7 +64,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry + registry->RegisterTimePref(prefs::kPdfInfoBarLastShown, base::Time()); + registry->RegisterIntegerPref(prefs::kPdfInfoBarTimesShown, 0); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser, std::string()); registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser, -@@ -184,7 +184,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry +@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); 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 index d1874cb7b511..33a4b07dca6d 100644 --- 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 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -84,7 +84,7 @@ +@@ -83,7 +83,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -378,7 +378,7 @@ void ShowChromeTips(Browser* browser) { +@@ -380,7 +380,7 @@ void ShowChromeTips(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeTipsURL)); } @@ -18,7 +18,7 @@ void ShowChromeWhatsNew(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); } -@@ -701,7 +701,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -698,7 +698,7 @@ void ShowShortcutCustomizationApp(Profile* profile, } #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index 04d33b6f4adc..a33401176c2f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc -@@ -102,7 +102,7 @@ namespace { +@@ -104,7 +104,7 @@ namespace { using Logger = autofill::SavePasswordProgressLogger; @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -549,7 +549,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -562,7 +562,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc new file mode 100644 index 000000000000..b372ef74be9f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/prefs/prefs_tab_helper.cc.orig 2025-05-06 12:23:00 UTC ++++ chrome/browser/ui/prefs/prefs_tab_helper.cc +@@ -66,7 +66,7 @@ + #include <windows.h> + #endif + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If a font name in prefs default values starts with a comma, consider it's a + // comma-separated font list and resolve it to the first available font. + #define PREFS_FONT_LIST 1 diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index 32f5c64e8e9b..35016fe78c37 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc -@@ -418,7 +418,7 @@ void SigninViewController::ShowModalSyncConfirmationDi +@@ -434,7 +434,7 @@ void SigninViewController::ShowModalSyncConfirmationDi void SigninViewController::ShowModalManagedUserNoticeDialog( std::unique_ptr<signin::EnterpriseProfileCreationDialogParams> create_param) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 2a0a2653bc88..4aa02f013698 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -93,7 +93,7 @@ const char* const kBadFlags[] = { +@@ -94,7 +94,7 @@ const char* const kBadFlags[] = { extensions::switches::kExtensionsOnChromeURLs, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index 8e4ca648d30d..407f7f1cd8d4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -76,7 +76,7 @@ #include "components/app_restore/full_restore_utils.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -207,7 +207,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -208,7 +208,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; @@ -18,7 +18,7 @@ params.startup_id = command_line_->GetSwitchValueASCII("desktop-startup-id"); #endif -@@ -237,7 +237,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -238,7 +238,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( continue; } 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 index b3262346e2c9..4d920c167a68 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2025-06-17 07:21:45 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -216,7 +216,7 @@ +@@ -220,7 +220,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" -@@ -689,12 +689,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -707,12 +707,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con webapps::PreRedirectionURLObserver::CreateForWebContents(web_contents); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc index e2d47349a50d..419dc7a56c17 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tabs/features.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/tabs/features.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/tabs/features.cc -@@ -48,7 +48,7 @@ bool CanShowTabSearchPositionSetting() { +@@ -51,7 +51,7 @@ bool CanShowTabSearchPositionSetting() { } // Mac and other platforms will always have the tab search position in the // correct location, cros/linux/win git the user the option to change. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__features.cc new file mode 100644 index 000000000000..e5da9a16a833 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__features.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/tabs/tab_features.cc.orig 2025-05-31 17:16:41 UTC ++++ chrome/browser/ui/tabs/tab_features.cc +@@ -311,7 +311,7 @@ void TabFeatures::Init(TabInterface& tab, Profile* pro + task_manager::WebContentsTags::CreateForTabContents(tab.GetContents()); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + inactive_window_mouse_event_controller_ = + std::make_unique<InactiveWindowMouseEventController>(); + #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index f17d7fefc78c..631dd1ed9d0b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,6 +1,15 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -530,7 +530,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r +@@ -423,7 +423,7 @@ TaskManagerTableModel::~TaskManagerTableModel() { + // Note: system_total_time_ is used for both since there is no functional + // difference between browser & system (they are essentially the same tab). + // Instead, the data is routed to the platform appropriate bucket. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + task_manager::RecordTabSwitchEvent(CategoryRecord::kBrowser, + system_total_time_); + #elif BUILDFLAG(IS_CHROMEOS) +@@ -564,7 +564,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -9,7 +18,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) -@@ -693,7 +693,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, +@@ -727,7 +727,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -18,7 +27,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -935,7 +935,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -1044,7 +1044,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc index c49776a877cb..c6b7eb9621a1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/ui_features.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/ui_features.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/ui_features.cc -@@ -67,7 +67,7 @@ bool IsExtensionMenuInRootAppMenu() { - return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu); - } +@@ -35,7 +35,7 @@ BASE_FEATURE(kCloseOmniboxPopupOnInactiveAreaClick, + "CloseOmniboxPopupOnInactiveAreaClick", + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -333,7 +333,7 @@ BASE_FEATURE(kViewsJSAppModalDialog, +@@ -339,7 +339,7 @@ BASE_FEATURE(kViewsJSAppModalDialog, base::FEATURE_DISABLED_BY_DEFAULT); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h index 38c0f89a3f2f..1c3a9a173c81 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,15 +1,15 @@ ---- chrome/browser/ui/ui_features.h.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/ui_features.h.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/ui_features.h -@@ -47,7 +47,7 @@ extern const base::FeatureParam<int> kMaxPromptCount; - BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu); - bool IsExtensionMenuInRootAppMenu(); +@@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kAllowEyeDropperWGCScreenCapture) + + BASE_DECLARE_FEATURE(kCloseOmniboxPopupOnInactiveAreaClick); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -211,7 +211,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); +@@ -214,7 +214,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 4623677d2841..3d74bbd92c71 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -67,11 +67,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -69,11 +69,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -14,7 +14,7 @@ {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_PREVIOUS}, -@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -101,7 +101,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -23,7 +23,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -151,7 +151,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -153,7 +153,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index 10e4fdc50e67..c35c663d108f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc @@ -39,7 +39,7 @@ #include "ui/wm/core/wm_state.h" @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -135,7 +135,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -143,7 +143,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( return controller; })); 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 index e2787dd09660..60f51993b18a 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -52,7 +52,7 @@ #include "ui/aura/window.h" @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -182,7 +182,7 @@ void BrowserFrame::InitBrowserFrame() { +@@ -185,7 +185,7 @@ void BrowserFrame::InitBrowserFrame() { Init(std::move(params)); @@ -27,7 +27,7 @@ SelectNativeTheme(); #else SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi()); -@@ -368,7 +368,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -371,7 +371,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -36,7 +36,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() -@@ -566,7 +566,7 @@ void BrowserFrame::OnMenuClosed() { +@@ -569,7 +569,7 @@ void BrowserFrame::OnMenuClosed() { } void BrowserFrame::SelectNativeTheme() { @@ -45,7 +45,7 @@ // Use the regular NativeTheme instance if running incognito mode, regardless // of system theme (gtk, qt etc). ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); -@@ -607,7 +607,7 @@ void BrowserFrame::OnTouchUiChanged() { +@@ -610,7 +610,7 @@ void BrowserFrame::OnTouchUiChanged() { 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__frame__view__layout__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc index 29cbb3a06c9e..6214246c827b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig 2024-10-01 07:26:23 UTC +--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc -@@ -54,7 +54,7 @@ gfx::Insets BrowserFrameViewLayoutLinux::RestoredFrame +@@ -55,7 +55,7 @@ gfx::Insets BrowserFrameViewLayoutLinux::RestoredFrame OpaqueBrowserFrameViewLayout::RestoredFrameBorderInsets()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index 99d85805c5f9..f37cf4fc730e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc @@ -15,7 +15,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_win.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h" #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h" #include "chrome/browser/ui/views/frame/browser_frame_view_linux_native.h" -@@ -32,7 +32,7 @@ namespace { +@@ -33,7 +33,7 @@ namespace { std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( BrowserFrame* frame, BrowserView* browser_view) { @@ -18,3 +18,12 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); +@@ -83,7 +83,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows + BrowserFrame* frame, + BrowserView* browser_view) { + if (browser_view->browser()->is_type_picture_in_picture()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return std::make_unique<PictureInPictureBrowserFrameViewLinux>( + frame, browser_view); + #else 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 index b97f07ec1c8c..5eae58ae3471 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-06-17 07:21:45 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2523,7 +2523,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating +@@ -2639,7 +2639,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating } void BrowserView::TabDraggingStatusChanged(bool is_dragging) { @@ -9,7 +9,7 @@ GetContentsWebView()->SetFastResize(is_dragging); if (multi_contents_view_) { multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging); -@@ -5563,7 +5563,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() { +@@ -5969,7 +5969,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() { } void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() { 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 index 76d0bb181d0e..ade6fd2f03ff 100644 --- 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,92 +1,11 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -62,7 +62,7 @@ - #include "ui/aura/window.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/browser/themes/theme_service.h" - #include "chrome/browser/themes/theme_service_factory.h" - #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" -@@ -83,7 +83,7 @@ constexpr int kContentSettingIconSize = 16; - // The height of the controls bar at the top of the window. - constexpr int kTopControlsHeight = 34; +@@ -67,7 +67,7 @@ + // Windows, Mac and CrOS do not clip child widgets to their parents, so we + // don't have to worry about resizing quite as much. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Frame border when window shadow is not drawn. - constexpr int kFrameBorderThickness = 4; + #define PLATFORM_CLIPS_CHILD_WINDOWS #endif -@@ -178,7 +178,7 @@ class WindowEventObserver : public ui::EventObserver { - - gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Calculate input bounds for Linux. This is needed because the input bounds - // is not necessary the same as the local bounds on Linux. - if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -618,7 +618,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow - AddChildView(std::move(auto_pip_setting_overlay)); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* profile = browser_view->browser()->profile(); - auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); - auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -843,7 +843,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( - view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); - } - --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // On Linux the top bar background will be drawn in OnPaint(). - top_bar_container_view_->SetBackground(views::CreateSolidBackground( - color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -932,7 +932,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg - BrowserNonClientFrameView::RemovedFromWidget(); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - gfx::Insets - PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const { - auto border = FrameBorderInsets(); -@@ -1223,7 +1223,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre - // views::View implementations: - void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Draw the PiP window frame borders and shadows, including the top bar - // background. - if (window_frame_provider_) { -@@ -1378,7 +1378,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie - } - - gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (window_frame_provider_) { - const auto insets = window_frame_provider_->GetFrameThicknessDip(); - const bool tiled = frame()->tiled(); -@@ -1396,7 +1396,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor - } - - gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return FrameBorderInsets(); - #elif !BUILDFLAG(IS_CHROMEOS) - return gfx::Insets(kResizeBorder); -@@ -1417,7 +1417,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie - top_height + border_thickness.bottom()); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool PictureInPictureBrowserFrameView::ShouldDrawFrameShadow() const { - return static_cast<DesktopBrowserFrameAuraLinux*>( - frame()->native_browser_frame()) 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 deleted file mode 100644 index 9d428fa100f7..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ /dev/null @@ -1,38 +0,0 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2025-03-09 21:38:10 UTC -+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h -@@ -30,7 +30,7 @@ - #include "ui/views/layout/flex_layout_view.h" - #include "ui/views/widget/widget_observer.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/linux/window_frame_provider.h" - #endif - -@@ -90,7 +90,7 @@ class PictureInPictureBrowserFrameView - void Layout(PassKey) override; - void AddedToWidget() override; - void RemovedFromWidget() override; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - gfx::Insets RestoredMirroredFrameBorderInsets() const override; - gfx::Insets GetInputInsets() const override; - SkRRect GetRestoredClipRegion() const override; -@@ -182,7 +182,7 @@ class PictureInPictureBrowserFrameView - // Returns true if there's an overlay view that's currently shown. - bool IsOverlayViewVisible() const; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Returns whether a client-side shadow should be drawn for the window. - bool ShouldDrawFrameShadow() const; - -@@ -391,7 +391,7 @@ class PictureInPictureBrowserFrameView - // `top_bar_color_animation_`. - std::optional<SkColor> current_foreground_color_; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Used to draw window frame borders and shadow on Linux when GTK theme is - // enabled. - raw_ptr<ui::WindowFrameProvider> window_frame_provider_ = nullptr; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 05f6d106478b..4f979c2bbb17 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -74,7 +74,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM +@@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( ui::SimpleMenuModel* model) { @@ -9,7 +9,7 @@ model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -92,7 +92,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -101,7 +101,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER_CONTEXT_MENU, IDS_TASK_MANAGER); } @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) -@@ -166,7 +166,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -175,7 +175,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index 63e84db4c660..a16859be6fda 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc @@ -20,7 +20,7 @@ #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h" @@ -18,7 +18,7 @@ if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); -@@ -59,7 +59,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c +@@ -65,7 +65,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c } bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index 7383c465ef8f..501c86f811d4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -419,7 +419,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -452,7 +452,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index b07b18b45ff6..8d813f0feeb6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -2064,7 +2064,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -2090,7 +2090,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h index adac57190842..bb322b11cab8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/avatar_toolbar_button.h.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/profiles/avatar_toolbar_button.h.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/profiles/avatar_toolbar_button.h -@@ -84,7 +84,7 @@ class AvatarToolbarButton : public ToolbarButton { +@@ -88,7 +88,7 @@ class AvatarToolbarButton : public ToolbarButton { // Attempts showing the In-Produce-Help for profile Switching. void MaybeShowProfileSwitchIPH(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc index 24516caa8538..faaea0f844b4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/profiles/profile_menu_coordinator.cc -@@ -50,7 +50,7 @@ void ProfileMenuCoordinator::Show(bool is_source_accel +@@ -52,7 +52,7 @@ void ProfileMenuCoordinator::Show( browser.window()->NotifyFeaturePromoFeatureUsed( feature_engagement::kIPHProfileSwitchFeature, FeaturePromoFeatureUsedAction::kClosePromoIfPresent); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc index 93c0be38c612..9a976e038fd2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -90,7 +90,7 @@ +@@ -91,7 +91,7 @@ #include "ui/strings/grit/ui_strings.h" #include "ui/views/accessibility/view_accessibility.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -549,7 +549,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { +@@ -494,7 +494,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { case signin_util::SignedInState::kSignedOut: case signin_util::SignedInState::kWebOnlySignedIn: { std::string profile_user_display_name, profile_user_email; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 642737a16d19..98b4910a65e0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -650,7 +650,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( - ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder, +@@ -415,7 +415,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( + kIdentityImageBorder, /*has_dotted_ring=*/false); -#if BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 14b3a5264b3e..9e64d9f2594b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -65,7 +65,7 @@ +@@ -66,7 +66,7 @@ namespace { const int kModalDialogWidth = 448; @@ -9,7 +9,7 @@ const int kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 780; -@@ -197,7 +197,7 @@ SigninViewControllerDelegateViews::CreateSignoutConfir +@@ -198,7 +198,7 @@ SigninViewControllerDelegateViews::CreateSignoutConfir } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -382,7 +382,7 @@ SigninViewControllerDelegateViews::SigninViewControlle +@@ -383,7 +383,7 @@ SigninViewControllerDelegateViews::SigninViewControlle SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone)); @@ -27,7 +27,7 @@ // On the local profile creation dialog, cancelling the dialog (for instance // through the VKEY_ESCAPE accelerator) should delete the profile. if (delete_profile_on_cancel) { -@@ -472,7 +472,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -475,7 +475,7 @@ void SigninViewControllerDelegateViews::DisplayModal() content_view_->RequestFocus(); } @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -553,7 +553,7 @@ SigninViewControllerDelegate::CreateSignoutConfirmatio +@@ -556,7 +556,7 @@ SigninViewControllerDelegate::CreateSignoutConfirmatio } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc index 70debee602ea..6be10d2826fa 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc -@@ -189,7 +189,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -190,7 +190,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -9,7 +9,7 @@ VLOG(1) << __func__ << " image size=" << image.size().ToString(); aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); -@@ -392,7 +392,7 @@ TabDragController::Liveness TabDragController::Init( +@@ -381,7 +381,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -18,7 +18,7 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -954,7 +954,7 @@ TabDragController::Liveness TabDragController::DragBro +@@ -889,7 +889,7 @@ TabDragController::Liveness TabDragController::DragBro CHECK_EQ(SetCapture(target_context), Liveness::ALIVE); } @@ -27,7 +27,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. -@@ -2097,7 +2097,7 @@ void TabDragController::CompleteDrag() { +@@ -1922,7 +1922,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -36,7 +36,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 -@@ -2527,7 +2527,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2339,7 +2339,7 @@ TabDragController::Liveness TabDragController::GetLoca } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index d979fec9c712..ec8a60289482 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -644,7 +644,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -645,7 +645,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index cebfab21257b..0b32aee73a91 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -379,7 +379,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -380,7 +380,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc index ebe502ff31ef..d70bfd5b06b5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc -@@ -96,7 +96,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow +@@ -97,7 +97,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged, base::Unretained(this)))); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc index 9ff5a9530999..81411f693419 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -511,7 +511,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con +@@ -563,7 +563,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con if (!IsHoverAnimationActive()) { return base_opacity; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc index a84148d9b910..208b575738b8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -917,7 +917,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -1010,7 +1010,7 @@ void MaybeRegisterChromeFeaturePromos( "Triggered when a shared tab becomes the active tab."))); } @@ -9,7 +9,7 @@ // kIPHSupervisedUserProfileSigninFeature registry.RegisterFeature(std::move( FeaturePromoSpecification::CreateForCustomAction( -@@ -1171,7 +1171,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -1289,7 +1289,7 @@ void MaybeRegisterChromeFeaturePromos( "Triggered to inform users of the availability of the " "new translate screen feature on the Lens Overlay."))); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc index 4b768ca988cf..ea87cd6465ce 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc -@@ -518,7 +518,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun +@@ -519,7 +519,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun Browser* browser, Profile* profile, const std::string& app_id) { @@ -9,7 +9,7 @@ WebAppProvider* provider = WebAppProvider::GetForWebApps(profile); CHECK(provider); -@@ -747,7 +747,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( +@@ -748,7 +748,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( } } 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 index fc8576c124b9..94896ba51498 100644 --- 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,6 +1,6 @@ ---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-10-01 07:26:23 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -62,7 +62,7 @@ +@@ -61,7 +61,7 @@ #include "ui/base/window_open_disposition_utils.h" #include "url/gurl.h" diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc index 6277e5619548..e528728e1016 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc @@ -54,7 +54,7 @@ #include "net/ssl/client_cert_store_mac.h" @@ -6,10 +6,10 @@ -#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_process.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" - #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" - #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -174,7 +174,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto + #include "chrome/browser/policy/chrome_browser_policy_connector.h" +@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto }; #endif @@ -18,7 +18,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformClientCertLoader( Profile* profile) { #if BUILDFLAG(IS_WIN) -@@ -189,7 +189,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC +@@ -192,7 +192,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC } #endif @@ -27,7 +27,7 @@ // ClientCertStore implementation that always returns an empty list. The // CertificateProvisioningService implementation expects to wrap a platform // cert store, but here we only want to get results from the provisioning -@@ -347,7 +347,7 @@ class ClientCertSource : public CertificateManagerPage +@@ -368,7 +368,7 @@ class ClientCertSource : public CertificateManagerPage std::optional<net::CertificateList> certs_; }; @@ -36,7 +36,7 @@ // ChromeOS currently can use either Kcer or NSS for listing client certs, and // Linux uses NSS only. This interface provides an abstraction to hide that // from WritableClientCertSource. Currently this class only handles reading -@@ -1078,7 +1078,7 @@ CreatePlatformClientCertSource( +@@ -1099,7 +1099,7 @@ CreatePlatformClientCertSource( mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>* remote_client, Profile* profile) { @@ -45,7 +45,7 @@ return std::make_unique<WritableClientCertSource>(remote_client, profile); #else return std::make_unique<ClientCertSource>( -@@ -1086,7 +1086,7 @@ CreatePlatformClientCertSource( +@@ -1107,7 +1107,7 @@ CreatePlatformClientCertSource( #endif } @@ -54,7 +54,7 @@ std::unique_ptr<CertificateManagerPageHandler::CertSource> CreateProvisionedClientCertSource(Profile* profile) { return std::make_unique<ClientCertSource>( -@@ -1135,7 +1135,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow +@@ -1156,7 +1156,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow return client_cert_policy_ == ClientCertificateManagementPermission::kAll; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc index 53a75d1aeda1..d603de3391eb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -137,26 +137,26 @@ +@@ -141,7 +141,7 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif // BUILDFLAG(IS_WIN) @@ -8,7 +8,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "chrome/browser/ui/webui/browser_switch/browser_switch_ui.h" - #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" + #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin_ui.h" +@@ -149,19 +149,19 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -26,12 +27,12 @@ // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) -@@ -184,7 +184,7 @@ + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) +@@ -189,7 +189,7 @@ #include "chrome/browser/ui/webui/signin/signin_error_ui.h" #endif // !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) @@ -40,7 +41,7 @@ #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -322,7 +322,7 @@ void RegisterChromeWebUIConfigs() { +@@ -331,7 +331,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>()); #endif // BUILDFLAG(IS_ANDROID) @@ -49,16 +50,16 @@ map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_OPENBSD) -@@ -347,7 +347,7 @@ void RegisterChromeWebUIConfigs() { +@@ -356,7 +356,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>()); #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) map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>()); - map.AddWebUIConfig(std::make_unique<WebAppSettingsUIConfig>()); - map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>()); -@@ -355,13 +355,13 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig(std::make_unique<HistorySyncOptinUIConfig>()); + map.AddWebUIConfig(std::make_unique<OnDeviceTranslationInternalsUIConfig>()); +@@ -365,20 +365,20 @@ void RegisterChromeWebUIConfigs() { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -73,4 +74,12 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) map.AddWebUIConfig( std::make_unique<enterprise_connectors::ConnectorsInternalsUIConfig>()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) map.AddWebUIConfig(std::make_unique<DiscardsUIConfig>()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) 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 index 75b3d665dfe5..aa715bce6a3c 100644 --- 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 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -114,16 +114,16 @@ +@@ -118,16 +118,16 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -20,7 +20,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -404,7 +404,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -411,7 +411,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: return NewTabPageUI::GetFaviconResourceBytes(scale_factor); } @@ -29,7 +29,7 @@ if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) { return WhatsNewUI::GetFaviconResourceBytes(scale_factor); } -@@ -438,7 +438,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -450,7 +450,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_connectors__internals__page__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_connectors__internals__page__handler.cc new file mode 100644 index 000000000000..9ffdf27fc7d3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_connectors__internals__page__handler.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/webui/connectors_internals/connectors_internals_page_handler.cc.orig 2025-05-31 17:16:41 UTC ++++ chrome/browser/ui/webui/connectors_internals/connectors_internals_page_handler.cc +@@ -81,7 +81,7 @@ connectors_internals::mojom::ClientIdentityPtr GetIden + } + #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::string GetStringFromTimestamp(base::Time timestamp) { + return (timestamp == base::Time()) ? std::string() + : base::UnlocalizedTimeFormatWithPattern( +@@ -190,7 +190,7 @@ void ConnectorsInternalsPageHandler::GetClientCertific + + void ConnectorsInternalsPageHandler::GetSignalsReportingState( + GetSignalsReportingStateCallback callback) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* profile_prefs = profile_->GetPrefs(); + + std::string last_upload_attempt_time_string = diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc index d2026c6ee834..1887e891213d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -74,7 +74,7 @@ +@@ -77,7 +77,7 @@ #include "components/security_interstitials/content/captive_portal_blocking_page.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h" -@@ -420,7 +420,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa +@@ -424,7 +424,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa } #endif @@ -18,7 +18,7 @@ std::unique_ptr<SupervisedUserVerificationPageForYouTube> CreateSupervisedUserVerificationPageForYouTube( content::WebContents* web_contents, -@@ -647,7 +647,7 @@ void InterstitialHTMLSource::StartDataRequest( +@@ -651,7 +651,7 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateInsecureFormPage(web_contents); } else if (path_without_query == "/https_only") { interstitial_delegate = CreateHttpsOnlyModePage(web_contents); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc index add8f3aa34d2..588e163af429 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/webui/management/management_ui.cc -@@ -175,11 +175,11 @@ void ManagementUI::GetLocalizedStrings( +@@ -181,11 +181,11 @@ void ManagementUI::GetLocalizedStrings( IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, {kManagementReportFileEvents, IDS_MANAGEMENT_REPORT_FILE_EVENTS}, #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc index f0d03b696c92..b35fe49343d1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc -@@ -111,7 +111,7 @@ const char* kMacShareIconResourceName = +@@ -118,7 +118,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) const char* kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share.svg"; @@ -9,7 +9,7 @@ const char* kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share.svg"; #else -@@ -171,7 +171,7 @@ static void DefineChromeRefreshRealboxIcons() { +@@ -178,7 +178,7 @@ static void DefineChromeRefreshRealboxIcons() { #elif BUILDFLAG(IS_WIN) kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share_cr23.svg"; @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -607,7 +607,7 @@ std::string SearchboxHandler::ActionVectorIconToResour +@@ -622,7 +622,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } 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 index 4ea2b5adf418..9e1e48981290 100644 --- 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,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -137,7 +137,7 @@ +@@ -138,7 +138,7 @@ #include "chrome/browser/ui/webui/settings/system_handler.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -156,7 +156,7 @@ +@@ -157,7 +157,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,16 +18,16 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -281,7 +281,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou - {"focusHighlightLabel", - IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, +@@ -286,7 +286,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou + {"toastAlertLevelDescription", + IDS_SETTINGS_ACCESSIBILITY_TOAST_FREQUENCY_DESCRIPTION}, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -570,7 +570,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -577,7 +577,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT}, {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT}, {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT}, @@ -36,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -578,7 +578,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif @@ -45,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -600,7 +600,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -607,7 +607,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht html_source->AddBoolean("tabSearchIsRightAlignedAtStartup", tabs::GetTabSearchTrailingTabstrip(profile)); @@ -54,7 +54,7 @@ bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations; -@@ -1478,7 +1478,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource* +@@ -1504,7 +1504,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource* g_browser_process->GetApplicationLocale()) .spec(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc index d9d9c40b7bcd..22d4ed0b763f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc -@@ -164,7 +164,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr +@@ -165,7 +165,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name); if (AccountInfo::IsManaged(entry->GetHostedDomain())) { profile_entry.Set("avatarBadge", "cr:domain"); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc index bcd5d665d83d..0a5c57d0074b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc -@@ -50,7 +50,7 @@ +@@ -45,7 +45,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/resource_path.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator_params.h" #include "net/base/url_util.h" -@@ -90,7 +90,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( +@@ -85,7 +85,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( } whats_new::WhatsNewRegistry* GetWhatsNewRegistry() { @@ -18,7 +18,7 @@ return g_browser_process->GetFeatures()->whats_new_registry(); #else return nullptr; -@@ -794,7 +794,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats +@@ -823,7 +823,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats } void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc index d26cf46b6892..401ba747db20 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/upgrade_detector/version_history_client.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/upgrade_detector/version_history_client.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/upgrade_detector/version_history_client.cc -@@ -50,7 +50,7 @@ GURL GetVersionReleasesUrl(base::Version version) { +@@ -175,7 +175,7 @@ GURL GetVersionReleasesUrl(base::Version version) { #define CURRENT_PLATFORM "win" #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc index b73e98984ed2..ca7df842a71c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-10-27 06:40:35 UTC +--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #include "components/visited_url_ranking/public/visited_url_ranking_service.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h" #elif BUILDFLAG(IS_ANDROID) #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h" -@@ -118,7 +118,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF +@@ -119,7 +119,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index 913b881978a2..702bd8f4effb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2024-10-01 07:26:23 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc -@@ -25,7 +25,7 @@ namespace { +@@ -26,7 +26,7 @@ namespace { const char* g_preinstalled_app_for_testing = nullptr; @@ -9,7 +9,7 @@ // TODO(b/268221237): Remove this allow-list. const char kDefaultAllowedExtensionIds[] = "alhngdkjgnedakdlnamimgfihgkmenbh," -@@ -107,7 +107,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo +@@ -105,7 +105,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo return prefs && prefs->IsExternalExtensionUninstalled(extension_id); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc index e971b5f826a8..1ce23a5d7079 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc -@@ -660,7 +660,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu +@@ -662,7 +662,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc index d280b4f425bf..504976002256 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig 2023-09-17 07:59:53 UTC +--- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc -@@ -54,7 +54,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT +@@ -54,7 +54,7 @@ proto::os_state::RunOnOsLogin::Mode ConvertWebAppRunOn // different from other platforms, see web_app_run_on_os_login_manager.h for // more info. bool DoesRunOnOsLoginRequireExecution() { 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 index a29b91e2cccd..59ba3193eea3 100644 --- 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,4 +1,4 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h @@ -22,7 +22,7 @@ #include "ui/gfx/image/image_family.h" @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -75,7 +75,7 @@ struct ShortcutInfo { +@@ -77,7 +77,7 @@ struct ShortcutInfo { // the installed PWA experience and thus the icons are not designed to be // displayed on an OS dock. bool is_diy_app = false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc index 18867498ec0e..30047a32057d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc -@@ -105,7 +105,7 @@ namespace web_app { +@@ -108,7 +108,7 @@ namespace web_app { BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration, "DesktopPWAsForceUnregisterOSIntegration", 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 index c00447aea71d..eb915ea0a7f6 100644 --- 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,4 +1,4 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc @@ -574,7 +574,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc index 81c8f174a3b4..7706443af13e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -1,20 +1,20 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -711,7 +711,7 @@ base::flat_set<GaiaId> GetGaiaIDs( +@@ -686,7 +686,7 @@ base::flat_set<GaiaId> GetGaiaIDs( std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return label; #else return std::string("placeholder"); -@@ -721,7 +721,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer +@@ -696,7 +696,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString( std::string saved_label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return saved_label; #else return std::nullopt; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc new file mode 100644 index 000000000000..9f86f648e356 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc @@ -0,0 +1,11 @@ +--- chrome/browser/webauthn/password_credential_controller.cc.orig 2025-05-06 12:23:00 UTC ++++ chrome/browser/webauthn/password_credential_controller.cc +@@ -46,7 +46,7 @@ password_manager::PasswordManagerClient* GetPasswordMa + } + + std::u16string GetAuthenticationMessage(std::string_view rp_id) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return u""; + #else + return l10n_util::GetStringFUTF16(IDS_PASSWORD_MANAGER_FILLING_REAUTH, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc index 4c8958afc45a..04ca94782363 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc @@ -1,11 +1,11 @@ ---- chrome/browser/webauthn/unexportable_key_utils.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/webauthn/unexportable_key_utils.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/browser/webauthn/unexportable_key_utils.cc -@@ -34,7 +34,7 @@ GetWebAuthnUnexportableKeyProvider() { +@@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() { // If there is a scoped UnexportableKeyProvider configured, we always use // that so that tests can still override the key provider. const bool use_software_provider = --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) !crypto::internal::HasScopedUnexportableKeyProvider(); #else false; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_channel__info__posix.cc b/www/ungoogled-chromium/files/patch-chrome_common_channel__info__posix.cc index 07eb8b4c647d..4ae6cba1a674 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,6 +1,6 @@ ---- chrome/common/channel_info_posix.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/common/channel_info_posix.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/common/channel_info_posix.cc -@@ -94,7 +94,7 @@ std::string GetChannelSuffixForDataDir() { +@@ -95,7 +95,7 @@ std::string GetChannelSuffixForDataDir() { } } @@ -9,7 +9,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) const auto channel_state = GetChannelImpl(); -@@ -120,7 +120,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() +@@ -121,7 +121,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc index 2716f1a091b0..10b9c4ff6d01 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/common/chrome_features.cc.orig 2025-06-17 07:21:45 UTC +++ chrome/common/chrome_features.cc -@@ -80,7 +80,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, +@@ -81,7 +81,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -98,7 +98,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -99,7 +99,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -233,7 +233,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -231,7 +231,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,16 +27,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -259,7 +259,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, - "DesktopPWAsTabStripSettings", +@@ -264,7 +264,7 @@ BASE_FEATURE(kDisplayEdgeToEdgeFullscreen, base::FEATURE_DISABLED_BY_DEFAULT); + #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -834,7 +834,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -1001,7 +1001,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -847,7 +847,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -1014,7 +1014,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__features.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h index ad55aa5943fe..074a8823b85f 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/common/chrome_features.h.orig 2025-05-31 17:16:41 UTC +++ chrome/common/chrome_features.h @@ -50,13 +50,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -146,7 +146,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -148,7 +148,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -494,7 +494,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -581,7 +581,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -502,7 +502,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -589,7 +589,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__paths.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc index d7d651300121..5514b73f57b9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/common/chrome_paths.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/common/chrome_paths.cc -@@ -30,7 +30,7 @@ +@@ -32,7 +32,7 @@ #include "base/apple/foundation_util.h" #endif @@ -9,9 +9,9 @@ #include "components/policy/core/common/policy_paths.h" #endif -@@ -44,14 +44,14 @@ +@@ -48,14 +48,14 @@ namespace { - namespace { + std::optional<bool> g_override_using_default_data_directory_for_testing; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -27,7 +27,7 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -208,7 +208,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -212,7 +212,7 @@ bool PathProvider(int key, base::FilePath* result) { } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -36,7 +36,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -500,13 +500,13 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -504,13 +504,13 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -52,7 +52,7 @@ (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { -@@ -516,7 +516,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -520,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -61,7 +61,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -554,7 +554,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -558,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #if BUILDFLAG(ENABLE_EXTENSIONS) && \ @@ -70,7 +70,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -568,9 +568,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -572,9 +572,12 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath( FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts")); diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__internal.h index 13df0b208176..fea526827d3c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths_internal.h.orig 2023-06-05 19:39:05 UTC +--- chrome/common/chrome_paths_internal.h.orig 2025-05-06 12:23:00 UTC +++ chrome/common/chrome_paths_internal.h -@@ -43,7 +43,7 @@ void GetUserCacheDirectory(const base::FilePath& profi +@@ -53,7 +53,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__linux.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__linux.cc index 261e8700538b..cc08b4c59c2f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__linux.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths_linux.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/common/chrome_paths_linux.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/common/chrome_paths_linux.cc -@@ -93,7 +93,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul +@@ -95,7 +95,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul #elif BUILDFLAG(GOOGLE_CHROME_BRANDING) std::string data_dir_basename = "google-chrome"; #else diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc index 241fc6dd06b7..84eaca91dd9f 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/common/chrome_switches.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/common/chrome_switches.cc -@@ -874,7 +874,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -884,7 +884,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,8 +9,8 @@ const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; // Causes the browser to launch directly in guest mode. -@@ -897,7 +897,7 @@ const char kGlicAllowedOrigins[] = "glic-webui-allowed - const char kGlicDev[] = "glic-dev"; +@@ -913,7 +913,7 @@ const char kGlicDev[] = "glic-dev"; + const char kGlicHostLogging[] = "glic-host-logging"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h index d6b22f9c3fa2..b4252967f47f 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/common/chrome_switches.h.orig 2025-05-31 17:16:41 UTC +++ chrome/common/chrome_switches.h -@@ -271,7 +271,7 @@ extern const char kAllowNaClSocketAPI[]; +@@ -273,7 +273,7 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,8 +9,8 @@ extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; extern const char kForceNtpMobilePromo[]; -@@ -286,7 +286,7 @@ extern const char kGlicAllowedOrigins[]; - extern const char kGlicDev[]; +@@ -291,7 +291,7 @@ extern const char kGlicDev[]; + extern const char kGlicHostLogging[]; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h index bc65a2c65055..0d3fbda5e3ba 100644 --- 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,15 @@ ---- chrome/common/pref_names.h.orig 2025-04-15 08:30:07 UTC +--- chrome/common/pref_names.h.orig 2025-05-31 17:16:41 UTC +++ chrome/common/pref_names.h -@@ -1325,7 +1325,7 @@ inline constexpr char kGeminiSettings[] = "browser.gem +@@ -451,7 +451,7 @@ inline constexpr char kPreinstalledAppsInstallState[] + "default_apps_install_state"; + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // A list of extensions ids that have to be allowed to run in Incognito by the + // user in order to use Incognito mode. + inline constexpr char kMandatoryExtensionsForIncognitoNavigation[] = +@@ -1334,7 +1334,7 @@ inline constexpr char kGeminiSettings[] = "browser.gem inline constexpr char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; @@ -9,7 +18,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1502,7 +1502,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1511,7 +1511,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +27,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). inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -2120,7 +2120,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2156,7 +2156,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +36,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2613,14 +2613,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2651,14 +2651,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +53,7 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2712,7 +2712,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ +@@ -2750,7 +2750,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ inline constexpr char kIsolatedWebAppPendingInitializationCount[] = "profile.isolated_web_app.install.pending_initialization_count"; @@ -53,7 +62,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3236,7 +3236,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3269,7 +3269,7 @@ inline constexpr char kKioskChromeAppsForceAllowed[] = #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -62,7 +71,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3764,7 +3764,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo +@@ -3795,7 +3795,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,7 +80,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3960,7 +3960,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = +@@ -3991,7 +3991,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = "policy.lens_desktop_ntp_search_enabled"; #endif @@ -80,7 +89,7 @@ // A dict mapping the edition name with the major version it was shown. inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used"; // A list containing the features of each module in order of when they -@@ -4057,7 +4057,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4088,7 +4088,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ "printing.oauth2_authorization_servers"; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h index e0dc0f0f735d..6f0986d2a68d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2025-04-15 08:30:07 UTC +--- chrome/common/url_constants.h.orig 2025-05-31 17:16:41 UTC +++ chrome/common/url_constants.h -@@ -981,7 +981,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -992,7 +992,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.9oo91e.qjz9zk/chromebook?p=multidevice"; 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 index 10a6cdbbc4aa..1b7d234b86c3 100644 --- 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,12 +1,16 @@ ---- chrome/common/webui_url_constants.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/common/webui_url_constants.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/common/webui_url_constants.cc -@@ -192,18 +192,18 @@ base::span<const base::cstring_view> ChromeURLHosts() +@@ -193,21 +193,21 @@ base::span<const base::cstring_view> ChromeURLHosts() kChromeUIAssistantOptInHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) kChromeUIConnectorsInternalsHost, + #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) kChromeUIDiscardsHost, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) 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 index a46f2331ca38..4511ac3534f7 100644 --- 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 2025-04-15 08:30:07 UTC +--- chrome/common/webui_url_constants.h.orig 2025-05-31 17:16:41 UTC +++ chrome/common/webui_url_constants.h -@@ -509,18 +509,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome +@@ -524,18 +524,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -11,8 +11,8 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) inline constexpr char kChromeUIDiscardsHost[] = "discards"; inline constexpr char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif @@ -22,7 +22,7 @@ inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; -@@ -532,11 +532,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] +@@ -547,11 +547,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -36,8 +36,8 @@ inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser"; -@@ -558,7 +558,7 @@ inline constexpr char kChromeUIProfilePickerGlicQuery[ - inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; +@@ -576,7 +576,7 @@ inline constexpr char kChromeUIHistorySyncOptinURL[] = + "chrome://history-sync-optin/"; #endif -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ diff --git a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_event__logger.cc b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_event__logger.cc index 9858a5607892..2c3c74c87254 100644 --- a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_event__logger.cc +++ b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_event__logger.cc @@ -1,6 +1,6 @@ ---- chrome/enterprise_companion/event_logger.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/enterprise_companion/event_logger.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/enterprise_companion/event_logger.cc -@@ -124,7 +124,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() { +@@ -126,7 +126,7 @@ proto::EnterpriseCompanionMetadata GetMetadata() { metadata.set_application_arch(proto::ARM64); #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 index 7c9af90c064a..314e0c795959 100644 --- 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,6 +1,6 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -50,7 +50,7 @@ +@@ -49,7 +49,7 @@ #include "printing/backend/cups_connection_pool.h" #endif @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate_stub.h" -@@ -77,7 +77,7 @@ namespace printing { +@@ -76,7 +76,7 @@ namespace printing { namespace { @@ -18,7 +18,7 @@ void InstantiateLinuxUiDelegate() { // TODO(crbug.com/40561724) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -86,7 +86,7 @@ void InstantiateLinuxUiDelegate() { +@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() { #endif scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() { @@ -27,7 +27,7 @@ // Use task runner associated with equivalent of UI thread. Needed for calls // made through `PrintDialogLinuxInterface` to properly execute. CHECK(base::SequencedTaskRunner::HasCurrentDefault()); -@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init( +@@ -468,7 +468,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -36,7 +36,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`. -@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -689,7 +689,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/ungoogled-chromium/files/patch-chrome_test_base_scoped__channel__override__posix.cc b/www/ungoogled-chromium/files/patch-chrome_test_base_scoped__channel__override__posix.cc index b2d8cf2a62b9..5b27e398a8b8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_base_scoped__channel__override__posix.cc +++ b/www/ungoogled-chromium/files/patch-chrome_test_base_scoped__channel__override__posix.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/scoped_channel_override_posix.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/test/base/scoped_channel_override_posix.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/test/base/scoped_channel_override_posix.cc -@@ -45,7 +45,7 @@ std::string GetVersionExtra(ScopedChannelOverride::Cha +@@ -43,7 +43,7 @@ std::string GetVersionExtra(ScopedChannelOverride::Cha return "beta"; case ScopedChannelOverride::Channel::kDev: return "unstable"; diff --git a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index bc1ef57596ed..f3d2e1257897 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -58,7 +58,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l +@@ -59,7 +59,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } @@ -9,7 +9,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) { // TODO: Respect users' PATH variables. // Until then, we use an approximation of the most common defaults. -@@ -125,7 +125,7 @@ std::vector<base::FilePath> GetChromeProgramNames() { +@@ -126,7 +126,7 @@ std::vector<base::FilePath> GetChromeProgramNames() { chrome::kGoogleChromeForTestingBrowserProcessExecutablePath), base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath), base::FilePath(chrome::kChromiumBrowserProcessExecutablePath), @@ -18,7 +18,7 @@ base::FilePath(chrome::kBrowserProcessExecutablePath), base::FilePath("chrome"), // Chrome for Testing or Google Chrome base::FilePath("google-chrome"), base::FilePath("chromium"), -@@ -141,7 +141,7 @@ std::vector<base::FilePath> GetHeadlessShellProgramNam +@@ -142,7 +142,7 @@ std::vector<base::FilePath> GetHeadlessShellProgramNam return { #if BUILDFLAG(IS_WIN) base::FilePath(FILE_PATH_LITERAL("chrome-headless-shell.exe")), diff --git a/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc b/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc index 2e16f768ed28..26d2d4cd43ea 100644 --- a/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc +++ b/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc @@ -1,6 +1,6 @@ ---- chrome/updater/app/app_uninstall.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/updater/app/app_uninstall.cc.orig 2025-05-31 17:16:41 UTC +++ chrome/updater/app/app_uninstall.cc -@@ -157,7 +157,7 @@ void UninstallInThreadPool(UpdaterScope scope, +@@ -172,7 +172,7 @@ void UninstallInThreadPool(UpdaterScope scope, } if (int result = UninstallOtherVersions(scope); result != kErrorOk) { diff --git a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc index d90eaa0770fe..cc6d15cb6153 100644 --- a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc @@ -1,6 +1,6 @@ ---- chrome/utility/services.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/utility/services.cc.orig 2025-05-06 12:23:00 UTC +++ chrome/utility/services.cc -@@ -49,7 +49,7 @@ +@@ -48,7 +48,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -207,7 +207,7 @@ auto RunMacNotificationService( +@@ -203,7 +203,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -476,7 +476,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -470,7 +470,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-components_BUILD.gn b/www/ungoogled-chromium/files/patch-components_BUILD.gn index bb60ef7b091c..c88bf6e2968b 100644 --- a/www/ungoogled-chromium/files/patch-components_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_BUILD.gn @@ -1,6 +1,6 @@ ---- components/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- components/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ components/BUILD.gn -@@ -208,7 +208,6 @@ test("components_unittests") { +@@ -210,7 +210,6 @@ test("components_unittests") { "//components/content_settings/core/browser:unit_tests", "//components/content_settings/core/common:unit_tests", "//components/country_codes:unit_tests", @@ -8,7 +8,7 @@ "//components/cross_device/logging:unit_tests", "//components/crx_file:unit_tests", "//components/data_sharing:unit_tests", -@@ -607,7 +606,7 @@ test("components_unittests") { +@@ -613,7 +612,7 @@ test("components_unittests") { deps += [ "//components/cast:unit_tests" ] } @@ -17,7 +17,7 @@ deps += [ "//components/crash/content/browser:unit_tests", "//components/crash/core/app:unit_tests", -@@ -765,7 +764,7 @@ test("components_unittests") { +@@ -773,7 +772,7 @@ test("components_unittests") { deps += [ "//components/constrained_window:unit_tests" ] } diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc index 2826767e2dd6..3aeba03e70ae 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc @@ -1,6 +1,24 @@ ---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-04-15 08:30:07 UTC +--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-05-31 17:16:41 UTC +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc -@@ -1003,7 +1003,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() { +@@ -466,7 +466,7 @@ void PaymentsDataManager::OnWebDataServiceRequestDone( + + bool PaymentsDataManager::ShouldShowBnplSettings() const { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Check `kAutofillEnableBuyNowPayLater` only if the user has seen a BNPL + // suggestion before, or there are already linked issuers present, to avoid + // unnecessary feature flag checks. The linked issuer check is due to the fact +@@ -971,7 +971,7 @@ void PaymentsDataManager::SetPrefService(PrefService* + &PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange, + base::Unretained(this))); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + pref_registrar_.Add( + prefs::kAutofillBnplEnabled, + base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange, +@@ -1047,7 +1047,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() { } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,21 +27,21 @@ bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const { return prefs::HasSeenBnpl(pref_service_); } -@@ -1172,7 +1172,7 @@ bool PaymentsDataManager::IsServerCard(const CreditCar - bool PaymentsDataManager::ShouldShowCardsFromAccountOption() const { - // The feature is only for Linux, Windows, Mac, and Fuchsia. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // This option should only be shown for users that have not enabled the Sync - // Feature and that have server credit cards available. - // TODO(crbug.com/40066949): Simplify once ConsentLevel::kSync and -@@ -2026,7 +2026,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( +@@ -2029,7 +2029,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( bool PaymentsDataManager::AreBnplIssuersSupported() const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return app_locale_ == "en-US" && + return app_locale_ == "en-US" && GetCountryCodeForExperimentGroup() == "US" && base::FeatureList::IsEnabled( features::kAutofillEnableBuyNowPayLaterSyncing); +@@ -2062,7 +2062,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits() + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void PaymentsDataManager::OnBnplEnabledPrefChange() { + // On pref change to `false`, clearing BNPL issuers is implicitly handled by + // `GetBnplIssuers()`, since it returns an empty vector when diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h index cd82b447e235..9b0bb3499d79 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2025-04-15 08:30:07 UTC +--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2025-05-31 17:16:41 UTC +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h -@@ -354,7 +354,7 @@ class PaymentsDataManager : public AutofillWebDataServ +@@ -360,7 +360,7 @@ class PaymentsDataManager : public AutofillWebDataServ void SetAutofillHasSeenIban(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,3 +9,12 @@ // Returns the value of the kAutofillHasSeenBnpl pref. bool IsAutofillHasSeenBnplPrefEnabled() const; +@@ -680,7 +680,7 @@ class PaymentsDataManager : public AutofillWebDataServ + void ClearAllCreditCardBenefits(); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Monitors the `kAutofillBnplEnabled` preference for changes and controls the + // clearing/loading of payment instruments accordingly. Will also log the + // `Autofill.SettingsPage.BnplToggled` metric. diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_foundations_browser__autofill__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_foundations_browser__autofill__manager.cc new file mode 100644 index 000000000000..de2f0c65701c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_foundations_browser__autofill__manager.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/browser/foundations/browser_autofill_manager.cc.orig 2025-05-31 17:16:41 UTC ++++ components/autofill/core/browser/foundations/browser_autofill_manager.cc +@@ -728,7 +728,7 @@ BrowserAutofillManager::GetCreditCardAccessManager() c + + payments::BnplManager* BrowserAutofillManager::GetPaymentsBnplManager() { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (!bnpl_manager_) { + bnpl_manager_ = std::make_unique<payments::BnplManager>(this); + } diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc deleted file mode 100644 index a518053e21a9..000000000000 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/browser/integrators/autofill_optimization_guide.cc.orig 2025-04-15 08:30:07 UTC -+++ components/autofill/core/browser/integrators/autofill_optimization_guide.cc -@@ -231,7 +231,7 @@ void AutofillOptimizationGuide::OnDidParseForm( - } - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - auto bnpl_issuer_allowlist_can_be_loaded = - [&payments_data_manager](std::string_view issuer_id) { - return base::Contains(payments_data_manager.GetBnplIssuers(), issuer_id, diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_optimization__guide_autofill__optimization__guide.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_optimization__guide_autofill__optimization__guide.cc new file mode 100644 index 000000000000..db9e122e1a0d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_optimization__guide_autofill__optimization__guide.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide.cc.orig 2025-05-31 17:16:41 UTC ++++ components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide.cc +@@ -232,7 +232,7 @@ void AutofillOptimizationGuide::OnDidParseForm( + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + auto bnpl_issuer_allowlist_can_be_loaded = + [&payments_data_manager](BnplIssuer::IssuerId issuer_id) { + return base::Contains(payments_data_manager.GetBnplIssuers(), issuer_id, diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_amount__extraction__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_amount__extraction__manager.cc new file mode 100644 index 000000000000..23ad36aa3016 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_amount__extraction__manager.cc @@ -0,0 +1,38 @@ +--- components/autofill/core/browser/payments/amount_extraction_manager.cc.orig 2025-05-31 17:16:41 UTC ++++ components/autofill/core/browser/payments/amount_extraction_manager.cc +@@ -109,7 +109,7 @@ bool AmountExtractionManager::ShouldTriggerAmountExtra + } + + if constexpr (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +- BUILDFLAG(IS_CHROMEOS)) { ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { + if (base::FeatureList::IsEnabled( + ::autofill::features:: + kAutofillEnableAmountExtractionDesktopLogging)) { +@@ -123,7 +123,7 @@ bool AmountExtractionManager::ShouldTriggerAmountExtra + } + + if constexpr (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +- BUILDFLAG(IS_CHROMEOS)) { ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { + return base::FeatureList::IsEnabled( + ::autofill::features::kAutofillEnableAmountExtractionDesktop); + } else { +@@ -190,7 +190,7 @@ void AmountExtractionManager::OnCheckoutAmountReceived + bnpl_manager->OnAmountExtractionReturned(parsed_extracted_amount); + } + if constexpr (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +- BUILDFLAG(IS_CHROMEOS)) { ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { + if (base::FeatureList::IsEnabled( + ::autofill::features:: + kAutofillEnableAmountExtractionDesktopLogging)) { +@@ -214,7 +214,7 @@ void AmountExtractionManager::OnTimeoutReached() { + autofill_metrics::AmountExtractionResult::kTimeout); + // TODO(crbug.com/378517983): Add BNPL flow action logic here. + if constexpr (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +- BUILDFLAG(IS_CHROMEOS)) { ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { + if (base::FeatureList::IsEnabled( + ::autofill::features:: + kAutofillEnableAmountExtractionDesktopLogging)) { diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc index 35ef522509ff..ffedcfff6be8 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc @@ -1,16 +1,7 @@ ---- components/autofill/core/browser/payments/bnpl_manager.cc.orig 2025-04-15 08:30:07 UTC +--- components/autofill/core/browser/payments/bnpl_manager.cc.orig 2025-05-31 17:16:41 UTC +++ components/autofill/core/browser/payments/bnpl_manager.cc -@@ -109,7 +109,7 @@ void BnplManager::OnAmountExtractionReturned( - - bool BnplManager::ShouldShowBnplSettings() const { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const PaymentsDataManager& payments_data_manager = - payments_autofill_client().GetPaymentsDataManager(); - -@@ -223,7 +223,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl( - .Run(update_suggestions_result.suggestions, trigger_source); +@@ -466,7 +466,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl( + .OnBnplSuggestionShown(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_webdata_payments_payments__sync__bridge__util.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_webdata_payments_payments__sync__bridge__util.cc new file mode 100644 index 000000000000..4dd99c4f25b7 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_webdata_payments_payments__sync__bridge__util.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.cc.orig 2025-05-31 17:16:41 UTC ++++ components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.cc +@@ -1226,7 +1226,7 @@ bool AreMaskedBankAccountSupported() { + + bool IsBnplIssuerSupported() { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled( + features::kAutofillEnableBuyNowPayLaterSyncing); + #else 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 index 92ac14a5d76d..fa41f742fbfe 100644 --- 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 2025-04-15 08:30:07 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2025-05-31 17:16:41 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -269,7 +269,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -297,7 +297,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, #endif // BUILDFLAG(IS_ANDROID) bool ShouldShowImprovedUserConsentForCreditCardSave() { diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.cc index 652d9742ed54..7261e4fd8981 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.cc @@ -1,15 +1,15 @@ ---- components/autofill/core/common/autofill_prefs.cc.orig 2025-04-15 08:30:07 UTC +--- components/autofill/core/common/autofill_prefs.cc.orig 2025-05-31 17:16:41 UTC +++ components/autofill/core/common/autofill_prefs.cc -@@ -102,7 +102,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -99,7 +99,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled, - false); registry->RegisterBooleanPref( -@@ -297,7 +297,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer + kAutofillBnplEnabled, true, + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); +@@ -278,7 +278,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool value) { prefs->SetBoolean(kAutofillBnplEnabled, value); } -@@ -306,7 +306,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v +@@ -287,7 +287,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v bool IsAutofillBnplEnabled(const PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ return prefs->GetBoolean(kAutofillBnplEnabled); #else return false; -@@ -315,7 +315,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) { +@@ -296,7 +296,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) { } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h index 7dd2765ac095..f26541037752 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h @@ -1,24 +1,15 @@ ---- components/autofill/core/common/autofill_prefs.h.orig 2025-04-15 08:30:07 UTC +--- components/autofill/core/common/autofill_prefs.h.orig 2025-05-31 17:16:41 UTC +++ components/autofill/core/common/autofill_prefs.h -@@ -26,7 +26,7 @@ namespace autofill::prefs { - inline constexpr std::string_view kAutofillAblationSeedPref = - "autofill.ablation_seed"; +@@ -32,7 +32,7 @@ inline constexpr std::string_view kAutofillAblationSee + inline constexpr char kAutofillAiOptInStatus[] = + "autofill.autofill_ai.opt_in_status"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Boolean that is true if BNPL on Autofill is enabled. inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled"; // Boolean that is true if the user has ever seen a BNPL suggestion. -@@ -82,7 +82,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] = - inline constexpr char kAutofillPaymentCardBenefits[] = - "autofill.payment_card_benefits"; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Boolean that controls improved autofill filling predictions. When enabled, - // the autofill functionality is enhanced with adopting user data to - // the form being filled in, which is triggered by the user via an extra -@@ -237,7 +237,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs, +@@ -214,7 +214,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs, bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +18,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool value); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -245,7 +245,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v +@@ -222,7 +222,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v bool IsAutofillBnplEnabled(const PrefService* prefs); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc index 88d7a271dac3..0937797e84e4 100644 --- a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc +++ b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc @@ -1,24 +1,25 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2025-04-15 08:30:07 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2025-05-06 12:23:00 UTC +++ components/commerce/core/commerce_feature_list.cc -@@ -156,7 +156,7 @@ BASE_FEATURE(kPriceAnnotationsRegionLaunched, - BASE_FEATURE(kPriceInsights, +@@ -156,7 +156,8 @@ BASE_FEATURE(kPriceInsights, "PriceInsights", base::FEATURE_DISABLED_BY_DEFAULT); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) || \ ++ BUILDFLAG(IS_BSD) BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", -@@ -222,7 +222,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -227,7 +228,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) const base::FeatureParam<bool> kDiscountOnShoppyPage{ &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true}; #else -@@ -231,7 +231,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ +@@ -236,7 +237,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +28,7 @@ BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, "EnableDiscountInfoApiRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -246,7 +246,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi +@@ -251,7 +252,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,13 +37,3 @@ BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting, "DiscountDialogAutoPopupBehaviorSetting", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -287,7 +287,8 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl - - BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || \ -+ BUILDFLAG(IS_BSD) - BASE_FEATURE(kShoppingListRegionLaunched, - "ShoppingListRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc index c520f8f7a1a5..777951adf851 100644 --- a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,6 +1,6 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2025-03-09 21:38:10 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2025-05-31 17:16:41 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -375,7 +375,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -385,7 +385,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { diff --git a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn index 6b0af9eed8c3..4020853e1566 100644 --- a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/app/BUILD.gn.orig 2025-02-20 09:59:21 UTC +--- components/crash/core/app/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ components/crash/core/app/BUILD.gn @@ -70,6 +70,10 @@ static_library("app") { ] @@ -20,7 +20,7 @@ sources += [ "crashpad_linux.cc" ] data_deps = [ ":chrome_crashpad_handler" ] } -@@ -103,7 +107,7 @@ static_library("app") { +@@ -105,7 +109,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -235,11 +239,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -237,11 +241,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h new file mode 100644 index 000000000000..72d5ee8cb5e3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h @@ -0,0 +1,20 @@ +--- components/device_signals/core/browser/browser_utils.h.orig 2025-05-31 17:16:41 UTC ++++ components/device_signals/core/browser/browser_utils.h +@@ -29,7 +29,7 @@ bool GetSiteIsolationEnabled(); + // Returns the hostname of the current machine. + std::string GetHostName(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Returns the hostname of the current machine. + std::vector<std::string> GetSystemDnsServers(); + +@@ -37,7 +37,7 @@ std::vector<std::string> GetSystemDnsServers(); + SettingValue GetOSFirewall(); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Returns the path to the ufw configuration file. + const char** GetUfwConfigPath(); + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc index e0ffaa6ceb46..3cb759466241 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc @@ -1,8 +1,8 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2025-03-09 21:38:10 UTC -+++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc +--- components/device_signals/core/common/linux/platform_utils_linux.cc.orig 2025-05-31 17:16:41 UTC ++++ components/device_signals/core/common/linux/platform_utils_linux.cc @@ -4,12 +4,23 @@ - #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h" + #include "components/device_signals/core/common/platform_utils.h" +#include "build/build_config.h" + @@ -22,17 +22,17 @@ +#endif + #include <algorithm> + #include <optional> #include <string> - -@@ -117,6 +128,7 @@ SettingValue GetScreenlockSecured() { +@@ -98,6 +109,7 @@ SettingValue GetScreenlockSecured() { // Implements the logic from the native host installation script. First find the // root device identifier, then locate its parent and get its type. SettingValue GetDiskEncrypted() { +#if !BUILDFLAG(IS_BSD) struct stat info; // First figure out the device identifier. Fail fast if this fails. - if (stat("/", &info) != 0) -@@ -138,11 +150,35 @@ SettingValue GetDiskEncrypted() { + if (stat("/", &info) != 0) { +@@ -120,11 +132,35 @@ SettingValue GetDiskEncrypted() { } return SettingValue::UNKNOWN; } @@ -66,9 +66,9 @@ + } +#else base::DirReaderPosix reader("/sys/class/net"); - if (!reader.IsValid()) + if (!reader.IsValid()) { return result; -@@ -165,6 +201,7 @@ std::vector<std::string> GetMacAddresses() { +@@ -149,6 +185,7 @@ std::vector<std::string> GetMacAddresses() { &address); result.push_back(address); } diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc index 45d04b6d186d..18d6f7b0b785 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc @@ -1,6 +1,6 @@ ---- components/device_signals/core/common/signals_features.cc.orig 2025-04-15 08:30:07 UTC +--- components/device_signals/core/common/signals_features.cc.orig 2025-05-31 17:16:41 UTC +++ components/device_signals/core/common/signals_features.cc -@@ -31,7 +31,7 @@ bool IsBrowserSignalsReportingEnabled() { +@@ -43,7 +43,7 @@ bool IsBrowserSignalsReportingEnabled() { } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h index 03487a4a22f1..a67e2b5cadbb 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h @@ -1,6 +1,6 @@ ---- components/device_signals/core/common/signals_features.h.orig 2025-04-15 08:30:07 UTC +--- components/device_signals/core/common/signals_features.h.orig 2025-05-31 17:16:41 UTC +++ components/device_signals/core/common/signals_features.h -@@ -24,7 +24,7 @@ bool IsProfileSignalsReportingEnabled(); +@@ -29,7 +29,7 @@ bool IsProfileSignalsReportingEnabled(); bool IsBrowserSignalsReportingEnabled(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils.cc b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils.cc index f37b6c2c755b..3bad002f3c2a 100644 --- a/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils.cc +++ b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils.cc @@ -1,12 +1,56 @@ ---- components/embedder_support/user_agent_utils.cc.orig 2025-04-15 08:30:07 UTC +--- components/embedder_support/user_agent_utils.cc.orig 2025-05-31 17:16:41 UTC +++ components/embedder_support/user_agent_utils.cc -@@ -439,6 +439,9 @@ std::string GetPlatformForUAMetadata() { - # else +@@ -322,7 +322,7 @@ std::string GetUserAgentPlatform() { + return ""; + #elif BUILDFLAG(IS_MAC) + return "Macintosh; "; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return "X11; "; // strange, but that's what Firefox uses + #elif BUILDFLAG(IS_ANDROID) + return "Linux; "; +@@ -348,7 +348,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"; + #elif BUILDFLAG(IS_IOS) + if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { +@@ -605,6 +605,9 @@ std::string GetPlatformForUAMetadata() { + #else return "Chromium OS"; - # endif + #endif +#elif BUILDFLAG(IS_BSD) + // The internet is weird... + return "Linux"; #else return std::string(version_info::GetOSType()); #endif +@@ -666,7 +669,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(const Pr + base::StringPrintf("%d.%d.%d", major, minor, bugfix); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40245146): Remove this Blink feature + if (base::FeatureList::IsEnabled( + blink::features::kReduceUserAgentDataLinuxPlatformVersion)) { +@@ -827,6 +830,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons + "Android %s", os_version.c_str() + #elif BUILDFLAG(IS_FUCHSIA) + "Fuchsia" ++#elif BUILDFLAG(IS_BSD) ++#if defined(__x86_64__) ++ "Linux x86_64; %s %s", ++#elif defined(__aarch64__) ++ "Linux aarch64; %s %s", ++#else ++ "Linux i686; %s %s", ++#endif ++ unixinfo.sysname, // e.g. Linux ++ cpu_type.c_str() // e.g. i686 + #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-components_embedder__support_user__agent__utils__unittest.cc b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc index ec3584ad0dd4..3dd2232254e9 100644 --- a/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc @@ -1,6 +1,6 @@ ---- components/embedder_support/user_agent_utils_unittest.cc.orig 2025-04-15 08:30:07 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2025-05-31 17:16:41 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -151,7 +151,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -148,7 +148,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) ASSERT_EQ("CrOS", pieces[0]); ASSERT_EQ("x86_64", pieces[1]); ASSERT_EQ("14541.0.0", pieces[2]); @@ -9,7 +9,7 @@ // Post-UA Reduction there is a single <unifiedPlatform> value for Linux: // X11; Linux x86_64 ASSERT_EQ(2u, pieces.size()); -@@ -339,7 +339,7 @@ class UserAgentUtilsTest : public testing::Test, +@@ -336,7 +336,7 @@ class UserAgentUtilsTest : public testing::Test, "X11; CrOS x86_64 14541.0.0"; #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia"; @@ -18,7 +18,7 @@ "X11; Linux x86_64"; #elif BUILDFLAG(IS_MAC) "Macintosh; Intel Mac OS X 10_15_7"; -@@ -699,7 +699,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) { +@@ -716,7 +716,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) { #endif #elif BUILDFLAG(IS_ANDROID) EXPECT_EQ(metadata.platform, "Android"); diff --git a/www/ungoogled-chromium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc b/www/ungoogled-chromium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc index 19b3c1bdbf2e..3addd9d49efd 100644 --- a/www/ungoogled-chromium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc +++ b/www/ungoogled-chromium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc @@ -1,6 +1,6 @@ ---- components/enterprise/connectors/core/realtime_reporting_client_base.cc.orig 2025-04-15 08:30:07 UTC +--- components/enterprise/connectors/core/realtime_reporting_client_base.cc.orig 2025-05-31 17:16:41 UTC +++ components/enterprise/connectors/core/realtime_reporting_client_base.cc -@@ -190,7 +190,7 @@ void RealtimeReportingClientBase::ReportEvent( +@@ -191,7 +191,7 @@ void RealtimeReportingClientBase::ReportEvent( event.mutable_time()->set_nanos((timestamp_millis % 1000) * 1000000); } @@ -9,7 +9,7 @@ MaybeCollectDeviceSignalsAndReportEvent(std::move(event), client, settings); #else // Regardless of collecting device signals or not, upload the security event -@@ -239,7 +239,7 @@ void RealtimeReportingClientBase::ReportEventWithTimes +@@ -240,7 +240,7 @@ void RealtimeReportingClientBase::ReportEventWithTimes if (include_profile_user_name) { event.Set(kKeyProfileUserName, GetProfileUserName()); } diff --git a/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc b/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc index f7cce0aa83ba..d81bd659aa84 100644 --- a/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc +++ b/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc @@ -1,8 +1,8 @@ ---- components/eye_dropper/eye_dropper_view.cc.orig 2025-03-09 21:38:10 UTC +--- components/eye_dropper/eye_dropper_view.cc.orig 2025-05-31 17:16:41 UTC +++ components/eye_dropper/eye_dropper_view.cc -@@ -208,7 +208,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, +@@ -206,7 +206,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, // EyeDropper/WidgetDelegate. - set_owned_by_client(); + set_owned_by_client(OwnedByClientPassKey()); SetPreferredSize(GetSize()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 index 01610238afd1..b253bc60e0cc 100644 --- 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,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2025-04-15 08:30:07 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2025-05-31 17:16:41 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -100,7 +100,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro @@ -18,7 +18,7 @@ if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { FeatureConfig config; config.valid = true; -@@ -1722,7 +1722,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -1851,7 +1851,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -27,4 +27,4 @@ + BUILDFLAG(IS_BSD) if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) { - // Credit card benefit IPH is shown: + // The credit card benefit IPH appears up to three times over 10 years and 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 index 2f7a14c43b69..cdf52c249530 100644 --- 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 2025-04-15 08:30:07 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2025-05-31 17:16:41 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,16 +9,16 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", -@@ -682,7 +682,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -759,7 +759,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) - BASE_FEATURE(kIPHAutofillCardInfoRetrievalSuggestionFeature, - "IPH_AutofillCardInfoRetrievalSuggestion", -@@ -823,7 +823,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, + BASE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature, + "IPH_AutofillBnplAffirmOrZipSuggestion", +@@ -909,7 +909,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif 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 index aadb775060b4..b6b8f07ffcd9 100644 --- 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 2025-04-15 08:30:07 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2025-05-31 17:16:41 UTC +++ components/feature_engagement/public/feature_constants.h @@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode); FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature); @@ -9,16 +9,16 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); #endif -@@ -303,7 +303,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg +@@ -336,7 +336,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg #endif // BUILDFLAG(IS_IOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature); FEATURE_CONSTANTS_DECLARE_FEATURE( - kIPHAutofillCardInfoRetrievalSuggestionFeature); -@@ -359,7 +359,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA +@@ -397,7 +397,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif 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 index 7df2bb1f757e..ff393bc05983 100644 --- 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 2025-04-15 08:30:07 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2025-05-31 17:16:41 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -170,7 +170,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature, +@@ -186,7 +186,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSWelcomeBackFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,16 +9,16 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) &kEsbDownloadRowPromoFeature, #endif -@@ -241,7 +241,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -261,7 +261,7 @@ const base::Feature* const kAllFeatures[] = { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) - &kIPHAutofillCardInfoRetrievalSuggestionFeature, - &kIPHAutofillCreditCardBenefitFeature, -@@ -294,7 +294,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHAutofillAiOptInFeature, + &kIPHAutofillBnplAffirmOrZipSuggestionFeature, +@@ -316,7 +316,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS) 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 index ecadc91dd219..75c40182c784 100644 --- 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 2025-04-15 08:30:07 UTC +--- components/feature_engagement/public/feature_list.h.orig 2025-05-31 17:16:41 UTC +++ components/feature_engagement/public/feature_list.h -@@ -302,7 +302,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDownloadAutoDeletionFeat +@@ -332,7 +332,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSWelcomeBackFeature, "IPH #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,17 +9,17 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); #endif -@@ -415,7 +415,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF +@@ -453,7 +453,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) - DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, - "IPH_AutofillCreditCardBenefit"); - -@@ -509,7 +510,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF + DEFINE_VARIATION_PARAM(kIPHAutofillAiOptInFeature, "IPH_AutofillAiOptIn"); + DEFINE_VARIATION_PARAM(kIPHAutofillBnplAffirmOrZipSuggestionFeature, + "IPH_AutofillBnplAffirmOrZipSuggestion"); +@@ -549,7 +550,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS) @@ -28,26 +28,26 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab, -@@ -682,7 +683,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat - kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature), +@@ -735,7 +736,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat VARIATION_ENTRY(kIPHiOSDownloadAutoDeletionFeature), + VARIATION_ENTRY(kIPHiOSWelcomeBackFeature), #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(kIPHAutofillEnableLoyaltyCardsFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), - VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -743,7 +744,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -798,7 +799,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) + VARIATION_ENTRY(kIPHAutofillAiOptInFeature), VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature), - VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature), -@@ -795,7 +797,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -851,7 +853,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn b/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn index f081b6ad7220..d30161072fd1 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn @@ -1,11 +1,11 @@ ---- components/gwp_asan/BUILD.gn.orig 2022-12-02 17:56:32 UTC +--- components/gwp_asan/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ components/gwp_asan/BUILD.gn @@ -15,7 +15,7 @@ test("gwp_asan_unittests") { "//testing/gtest", "//third_party/boringssl", ] -- if (is_win || is_mac || is_linux || is_chromeos || is_android) { -+ if ((is_win || is_mac || is_linux || is_chromeos || is_android) && !is_bsd) { +- if (is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) { ++ if ((is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) && !is_bsd) { deps += [ "//components/gwp_asan/client:unit_tests", "//components/gwp_asan/crash_handler:unit_tests", diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni b/www/ungoogled-chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni index ece4723996c3..efe14ed420b8 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni @@ -1,11 +1,11 @@ ---- components/gwp_asan/buildflags/buildflags.gni.orig 2025-04-15 08:30:07 UTC +--- components/gwp_asan/buildflags/buildflags.gni.orig 2025-05-06 12:23:00 UTC +++ components/gwp_asan/buildflags/buildflags.gni @@ -10,10 +10,7 @@ import("//build/config/compiler/compiler.gni") # Android component builds are disabled due to https://crbug.com/976399 # Android requires frame pointers for unwinding, unwind tables aren't shipped in # official builds. -supported_platform = -- is_linux || is_chromeos || is_mac || +- is_linux || is_chromeos || is_mac || is_ios || - (is_win && (current_cpu == "x64" || current_cpu == "arm64")) || - (is_android && !is_component_build && enable_frame_pointers) +supported_platform = false diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc index 38b8a1d9a432..2f99e0f47c9d 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc @@ -1,6 +1,6 @@ ---- components/gwp_asan/client/gwp_asan.cc.orig 2024-06-22 08:49:42 UTC +--- components/gwp_asan/client/gwp_asan.cc.orig 2025-05-06 12:23:00 UTC +++ components/gwp_asan/client/gwp_asan.cc -@@ -75,7 +75,7 @@ namespace { +@@ -76,7 +76,7 @@ namespace { // ProcessSamplingBoost is the multiplier to increase the // ProcessSamplingProbability in scenarios where we want to perform additional // testing (e.g., on canary/dev builds). diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc index 5c8c2dee2645..1bb0e3f5915e 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc @@ -1,4 +1,4 @@ ---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2024-10-01 07:26:23 UTC +--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2025-05-06 12:23:00 UTC +++ components/gwp_asan/crash_handler/crash_analyzer.cc @@ -35,7 +35,7 @@ #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h" @@ -9,7 +9,7 @@ #include <signal.h> #elif BUILDFLAG(IS_APPLE) #include <mach/exception_types.h> -@@ -95,7 +95,7 @@ bool CrashAnalyzer::GetExceptionInfo( +@@ -113,7 +113,7 @@ bool CrashAnalyzer::GetExceptionInfo( crashpad::VMAddress CrashAnalyzer::GetAccessAddress( const crashpad::ExceptionSnapshot& exception) { diff --git a/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.cc b/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.cc index eead7e00dc1b..47e26202f90c 100644 --- a/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.cc +++ b/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.cc @@ -1,6 +1,6 @@ ---- components/live_caption/caption_util.cc.orig 2025-02-20 09:59:21 UTC +--- components/live_caption/caption_util.cc.orig 2025-05-31 17:16:41 UTC +++ components/live_caption/caption_util.cc -@@ -136,7 +136,7 @@ bool IsLiveCaptionFeatureSupported() { +@@ -141,7 +141,7 @@ bool IsHeadlessCaptionFeatureSupported() { std::string GetCaptionSettingsUrl() { #if BUILDFLAG(IS_CHROMEOS) return "chrome://os-settings/audioAndCaptions"; diff --git a/www/ungoogled-chromium/files/patch-components_media__router_common_media__source.cc b/www/ungoogled-chromium/files/patch-components_media__router_common_media__source.cc index f49e23e612a4..1a3700223500 100644 --- a/www/ungoogled-chromium/files/patch-components_media__router_common_media__source.cc +++ b/www/ungoogled-chromium/files/patch-components_media__router_common_media__source.cc @@ -1,6 +1,6 @@ ---- components/media_router/common/media_source.cc.orig 2025-03-09 21:38:10 UTC +--- components/media_router/common/media_source.cc.orig 2025-05-31 17:16:41 UTC +++ components/media_router/common/media_source.cc -@@ -62,7 +62,7 @@ bool IsSystemAudioCaptureSupported() { +@@ -58,7 +58,7 @@ bool IsSystemAudioCaptureSupported() { if (!media::IsSystemLoopbackCaptureSupported()) { return false; } diff --git a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider.cc b/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider.cc index 6b979c5ca215..86be2f816fa4 100644 --- a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider.cc +++ b/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider.cc @@ -1,9 +1,18 @@ ---- components/metrics/drive_metrics_provider.cc.orig 2025-03-09 21:38:10 UTC +--- components/metrics/drive_metrics_provider.cc.orig 2025-05-06 12:23:00 UTC +++ components/metrics/drive_metrics_provider.cc -@@ -113,7 +113,7 @@ void DriveMetricsProvider::FillDriveMetrics( - response.has_seek_penalty); - RecordTriStateMetric("UMA.SeekPenaltyResult.Base", - response.has_seek_penalty_base); +@@ -21,7 +21,7 @@ + namespace metrics { + + namespace { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void RecordTriStateMetric(const char* name, std::optional<bool> sample) { + base::UmaHistogramEnumeration( + name, !sample.has_value() +@@ -106,7 +106,7 @@ void DriveMetricsProvider::FillDriveMetrics( + drive->set_has_seek_penalty(*response.has_seek_penalty); + } + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) RecordTriStateMetric("UMA.DriveIsRemovableResult", response.is_removable); diff --git a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc deleted file mode 100644 index cdcf556242e0..000000000000 --- a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- components/metrics/drive_metrics_provider_linux.cc.orig 2023-09-17 07:59:53 UTC -+++ components/metrics/drive_metrics_provider_linux.cc -@@ -4,7 +4,13 @@ - - #include "components/metrics/drive_metrics_provider.h" - -+#if BUILDFLAG(IS_BSD) -+#include <sys/types.h> -+#define MAJOR(dev) major(dev) -+#define MINOR(dev) minor(dev) -+#else - #include <linux/kdev_t.h> // For MAJOR()/MINOR(). -+#endif - #include <sys/stat.h> - #include <string> - diff --git a/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc b/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc index 01c74febb710..a80e7d59fb38 100644 --- a/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2025-04-15 08:30:07 UTC +--- components/metrics/metrics_log.cc.orig 2025-05-06 12:23:00 UTC +++ components/metrics/metrics_log.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "base/win/current_module.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -157,7 +157,7 @@ void RecordCurrentTime( +@@ -158,7 +158,7 @@ void RecordCurrentTime( } } diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc index 9726f6009fde..bcb1fd0ebe86 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2025-04-15 08:30:07 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2025-05-31 17:16:41 UTC +++ components/password_manager/core/browser/features/password_features.cc @@ -40,7 +40,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -112,7 +112,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, +@@ -116,7 +116,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, "ReuseDetectionBasedOnPasswordHashes", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h index f4c43db32ef0..ed2ff70dfa7b 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2025-03-09 21:38:10 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2025-05-31 17:16:41 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -108,7 +108,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable) +@@ -114,7 +114,7 @@ BASE_DECLARE_FEATURE(kPostponeOnLoginSuccessful); // Detects password reuse based on hashed password values. BASE_DECLARE_FEATURE(kReuseDetectionBasedOnPasswordHashes); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__filling.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__filling.cc new file mode 100644 index 000000000000..82e8d914847e --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__filling.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_form_filling.cc.orig 2025-05-31 17:16:41 UTC ++++ components/password_manager/core/browser/password_form_filling.cc +@@ -165,7 +165,7 @@ LikelyFormFilling SendFillInformationToRenderer( + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (!should_show_popup_without_passwords) { + client->MaybeShowSavePasswordPrimingPromo(observed_form.url); + } diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc index fcde0596a03d..1564edf65d76 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2025-04-15 08:30:07 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2025-05-06 12:23:00 UTC +++ components/password_manager/core/browser/password_form_manager.cc -@@ -63,7 +63,7 @@ +@@ -64,7 +64,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" #endif -@@ -239,7 +239,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest +@@ -240,7 +240,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest return false; } @@ -18,7 +18,7 @@ bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -898,7 +898,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -913,7 +913,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc index 3d4eb29b30ef..efc68b1d2582 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc @@ -1,15 +1,15 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2025-04-15 08:30:07 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2025-05-31 17:16:41 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -492,7 +492,7 @@ void PasswordManager::RegisterProfilePrefs( - false); - #endif +@@ -509,7 +509,7 @@ void PasswordManager::RegisterProfilePrefs( + prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); + #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif -@@ -505,7 +505,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -522,7 +522,7 @@ void PasswordManager::RegisterProfilePrefs( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h index 3a4f0c0f9f62..54b1f695d9a3 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manager_client.h.orig 2025-04-15 08:30:07 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2025-05-06 12:23:00 UTC +++ components/password_manager/core/browser/password_manager_client.h @@ -31,7 +31,7 @@ #include "net/cert/cert_status_flags.h" @@ -9,8 +9,8 @@ #include "base/i18n/rtl.h" #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #include "ui/gfx/geometry/rect_f.h" -@@ -550,7 +550,7 @@ class PasswordManagerClient { - CredentialsCallback callback); +@@ -533,7 +533,7 @@ class PasswordManagerClient { + virtual void TriggerSignIn(signin_metrics::AccessPoint access_point) const; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc index d8271baa9a54..d97512352c44 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2025-03-09 21:38:10 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2025-05-31 17:16:41 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc -@@ -45,7 +45,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri +@@ -46,7 +46,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ // Returns the password form corresponding to the `payload` data. In most // cases there is only one such form stored, but having more than one or no // forms is also possible. If there is more than one form, showing any of them -@@ -294,7 +294,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( +@@ -297,7 +297,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( } case autofill::SuggestionType::kViewPasswordDetails: { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ std::optional<password_manager::PasswordForm> credentials = GetCorrespondingPasswordForm( suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(), -@@ -429,7 +429,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass +@@ -427,7 +427,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass const Suggestion::PasswordSuggestionDetails& payload, base::OnceClosure on_allowed) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h index 5d130519829b..c0427ad5c7bc 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-10-27 06:40:35 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2025-05-06 12:23:00 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.h -@@ -17,7 +17,7 @@ +@@ -19,7 +19,7 @@ #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_CHROMEOS) -@@ -178,7 +178,7 @@ class PasswordManualFallbackFlow : public autofill::Au +@@ -180,7 +180,7 @@ class PasswordManualFallbackFlow : public autofill::Au std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc index 51172f3f396e..9895885e9365 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-10-27 06:40:35 UTC +--- components/password_manager/core/browser/password_store/login_database.cc.orig 2025-05-06 12:23:00 UTC +++ components/password_manager/core/browser/password_store/login_database.cc @@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords( bool is_user_data_dir_policy_set, @@ -6,10 +6,10 @@ IsAccountStore is_account_store) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::string user_data_dir_string; std::unique_ptr<base::Environment> environment(base::Environment::Create()); // On Linux user data directory ca be specified using an env variable. If it -@@ -1049,7 +1049,7 @@ bool ShouldDeleteUndecryptablePasswords( + // exists, passwords shouldn't be deleted. +@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords( return false; } diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc index 4aff5abfc31d..4d456cb4961e 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2025-02-20 09:59:21 UTC +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2025-05-31 17:16:41 UTC +++ components/password_manager/core/browser/password_store/login_database_unittest.cc -@@ -2257,7 +2257,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, +@@ -2303,7 +2303,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, testing::Bool())); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc index 85739afd5ff0..9537ecd17537 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2025-04-15 08:30:07 UTC +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2025-05-31 17:16:41 UTC +++ components/password_manager/core/browser/stub_password_manager_client.cc -@@ -201,7 +201,7 @@ version_info::Channel StubPasswordManagerClient::GetCh +@@ -206,7 +206,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -8,4 +8,4 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void StubPasswordManagerClient::OpenPasswordDetailsBubble( const password_manager::PasswordForm& form) {} - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || + void StubPasswordManagerClient::MaybeShowSavePasswordPrimingPromo( diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h index 476972632e77..08229d8d9ca1 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/stub_password_manager_client.h.orig 2025-03-09 21:38:10 UTC +--- components/password_manager/core/browser/stub_password_manager_client.h.orig 2025-05-31 17:16:41 UTC +++ components/password_manager/core/browser/stub_password_manager_client.h @@ -77,7 +77,7 @@ class StubPasswordManagerClient : public PasswordManag MockPasswordFeatureManager* GetPasswordFeatureManager(); @@ -8,4 +8,4 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void OpenPasswordDetailsBubble( const password_manager::PasswordForm& form) override; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || + void MaybeShowSavePasswordPrimingPromo(const GURL& current_url) override; diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h index 83460e7f493f..74d6acbc8ffc 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-04-15 08:30:07 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-05-31 17:16:41 UTC +++ components/password_manager/core/common/password_manager_pref_names.h @@ -59,7 +59,7 @@ inline constexpr char kCredentialProviderEnabledOnStar #endif @@ -9,7 +9,7 @@ // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. // If set to false it blocks deleting undecryptable passwords, otherwise the // deletion can happen. -@@ -357,7 +357,7 @@ inline constexpr char kPasswordChangeFlowNoticeAgreeme +@@ -350,7 +350,7 @@ inline constexpr char kAutofillableCredentialsAccountS inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h b/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h index b6dc484647de..7bdcbf5730b0 100644 --- a/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h +++ b/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h @@ -1,6 +1,6 @@ ---- components/performance_manager/public/features.h.orig 2025-03-09 21:38:10 UTC +--- components/performance_manager/public/features.h.orig 2025-05-06 12:23:00 UTC +++ components/performance_manager/public/features.h -@@ -17,7 +17,7 @@ namespace performance_manager::features { +@@ -19,7 +19,7 @@ namespace performance_manager::features { #if !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index 826c86ecac53..32fa08dca343 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,7 +1,7 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2025-04-15 08:30:07 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2025-05-06 12:23:00 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -413,7 +413,7 @@ class PolicyTestCase { - const std::string os("chromeos_ash"); +@@ -432,7 +432,7 @@ class PolicyTestCase { + const std::string os("chromeos"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); -#elif BUILDFLAG(IS_LINUX) 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 index 225fa85225f4..fd18814e9aed 100644 --- 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 2025-04-15 08:30:07 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2025-05-06 12:23:00 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -741,7 +741,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -742,7 +742,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 863e660c95de..c0c11d553a66 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2025-02-20 09:59:21 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2025-05-06 12:23:00 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #include "base/win/wincred_shim.h" #endif @@ -9,7 +9,7 @@ #include <pwd.h> #include <sys/types.h> #include <unistd.h> -@@ -35,10 +35,15 @@ +@@ -36,10 +36,15 @@ #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> #endif @@ -26,7 +26,7 @@ #include <algorithm> #include <utility> -@@ -83,7 +88,7 @@ namespace policy { +@@ -84,7 +89,7 @@ namespace policy { namespace em = enterprise_management; std::string GetMachineName() { @@ -35,7 +35,7 @@ char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -139,7 +144,7 @@ std::string GetMachineName() { +@@ -140,7 +145,7 @@ std::string GetMachineName() { std::string GetOSVersion() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ @@ -44,7 +44,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -161,7 +166,7 @@ std::string GetOSArchitecture() { +@@ -162,7 +167,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__utils.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__utils.cc deleted file mode 100644 index e44c04c28d29..000000000000 --- a/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__utils.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/policy/core/common/policy_utils.cc.orig 2024-10-27 06:40:35 UTC -+++ components/policy/core/common/policy_utils.cc -@@ -22,7 +22,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service, - return true; - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - if (channel == version_info::Channel::DEV) { - return true; - } diff --git a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc index 5282e2b964ff..f51b5ca787f9 100644 --- a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc +++ b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc @@ -1,11 +1,11 @@ ---- components/regional_capabilities/regional_capabilities_service.cc.orig 2025-03-09 21:38:10 UTC +--- components/regional_capabilities/regional_capabilities_service.cc.orig 2025-05-31 17:16:41 UTC +++ components/regional_capabilities/regional_capabilities_service.cc -@@ -85,7 +85,7 @@ void RegionalCapabilitiesService::InitializeCountryIdC - base::UmaHistogramEnumeration(kUnknownCountryIdStored, - UnknownCountryIdStored::kValidCountryId); - } else { +@@ -235,7 +235,7 @@ std::optional<CountryId> RegionalCapabilitiesService:: + return persisted_country_id; + } + -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) { - profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall); - country_id.reset(); + if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) { + profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall); + base::UmaHistogramEnumeration(kUnknownCountryIdStored, diff --git a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc index 998300ab25e6..35c2c92bd5d8 100644 --- a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc +++ b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc @@ -1,4 +1,4 @@ ---- components/regional_capabilities/regional_capabilities_switches.cc.orig 2025-03-09 21:38:10 UTC +--- components/regional_capabilities/regional_capabilities_switches.cc.orig 2025-05-06 12:23:00 UTC +++ components/regional_capabilities/regional_capabilities_switches.cc @@ -6,7 +6,7 @@ @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_FEATURE(kClearPrefForUnknownCountry, "ClearCountryPrefForStoredUnknownCountry", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h index 0135f9a646c8..f86426bd5762 100644 --- a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h +++ b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h @@ -1,4 +1,4 @@ ---- components/regional_capabilities/regional_capabilities_switches.h.orig 2025-03-09 21:38:10 UTC +--- components/regional_capabilities/regional_capabilities_switches.h.orig 2025-05-06 12:23:00 UTC +++ components/regional_capabilities/regional_capabilities_switches.h @@ -25,7 +25,7 @@ inline constexpr char kSearchEngineChoiceCountry[] = inline constexpr char kDefaultListCountryOverride[] = "DEFAULT_EEA"; @@ -6,6 +6,6 @@ -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // When the `country_codes::kCountryIDUnknown` is stored in prefs and this + // When an invalid `country_codes::CountryId` is stored in prefs and this // feature is enabled the pref will be cleared allowing a valid country to be // set again. diff --git a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc index 5759e53f23cd..09906f9ea066 100644 --- a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc +++ b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2025-04-15 08:30:07 UTC +--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2025-05-31 17:16:41 UTC +++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -110,7 +110,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { +@@ -112,7 +112,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { return RTLookupRequest::OS_TYPE_CHROME_OS; #elif BUILDFLAG(IS_IOS) return RTLookupRequest::OS_TYPE_IOS; diff --git a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc index 2e99678dc7d1..c650d8515017 100644 --- a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc +++ b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/template_url_service.cc.orig 2025-04-15 08:30:07 UTC +--- components/search_engines/template_url_service.cc.orig 2025-05-31 17:16:41 UTC +++ components/search_engines/template_url_service.cc -@@ -3426,7 +3426,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3572,7 +3572,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr<EnterpriseSearchManager> TemplateURLService::GetEnterpriseSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc new file mode 100644 index 000000000000..61b57e31b3a9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc @@ -0,0 +1,11 @@ +--- components/signin/public/base/signin_switches.cc.orig 2025-05-31 17:16:41 UTC ++++ components/signin/public/base/signin_switches.cc +@@ -61,7 +61,7 @@ BASE_FEATURE(kUseHostedDomainForManagementCheckOnSigni + base::FEATURE_DISABLED_BY_DEFAULT); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables the History Sync Opt-in on Desktop. + BASE_FEATURE(kEnableHistorySyncOptin, + "EnableHistorySyncOptin", diff --git a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h new file mode 100644 index 000000000000..fa71d2b20fa4 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h @@ -0,0 +1,11 @@ +--- components/signin/public/base/signin_switches.h.orig 2025-05-31 17:16:41 UTC ++++ components/signin/public/base/signin_switches.h +@@ -55,7 +55,7 @@ COMPONENT_EXPORT(SIGNIN_SWITCHES) + BASE_DECLARE_FEATURE(kUseHostedDomainForManagementCheckOnSignin); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(SIGNIN_SWITCHES) + BASE_DECLARE_FEATURE(kEnableHistorySyncOptin); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc b/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc index 9e1052a1394e..ea58b63942d2 100644 --- a/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc +++ b/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc @@ -1,6 +1,6 @@ ---- components/soda/soda_util.cc.orig 2025-02-20 09:59:21 UTC +--- components/soda/soda_util.cc.orig 2025-05-06 12:23:00 UTC +++ components/soda/soda_util.cc -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "base/win/windows_version.h" #endif @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -38,7 +38,7 @@ bool IsSupportedChromeOS() { +@@ -39,7 +39,7 @@ bool IsSupportedChromeOS() { } #endif // BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ bool IsSupportedLinux() { #if defined(ARCH_CPU_X86_FAMILY) // Check if the CPU has the required instruction set to run the Speech -@@ -69,7 +69,7 @@ bool IsSupportedWin() { +@@ -70,7 +70,7 @@ bool IsSupportedWin() { bool IsOnDeviceSpeechRecognitionSupported() { #if BUILDFLAG(IS_CHROMEOS) return IsSupportedChromeOS(); diff --git a/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn b/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn index 6890d043898b..4de9dcd13638 100644 --- a/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn @@ -1,6 +1,6 @@ ---- components/storage_monitor/BUILD.gn.orig 2025-02-20 09:59:21 UTC +--- components/storage_monitor/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ components/storage_monitor/BUILD.gn -@@ -71,7 +71,7 @@ static_library("storage_monitor") { +@@ -73,7 +73,7 @@ component("storage_monitor") { deps += [ "//services/device/public/mojom" ] } } else if (is_linux) { @@ -9,7 +9,7 @@ sources += [ "mtab_watcher_linux.cc", "mtab_watcher_linux.h", -@@ -177,7 +177,7 @@ source_set("unit_tests") { +@@ -182,7 +182,7 @@ source_set("unit_tests") { "storage_monitor_chromeos_unittest.cc", ] } diff --git a/www/ungoogled-chromium/files/patch-components_storage__monitor_removable__device__constants.h b/www/ungoogled-chromium/files/patch-components_storage__monitor_removable__device__constants.h index 4cc5ace87c78..6e658d4e353d 100644 --- a/www/ungoogled-chromium/files/patch-components_storage__monitor_removable__device__constants.h +++ b/www/ungoogled-chromium/files/patch-components_storage__monitor_removable__device__constants.h @@ -1,11 +1,11 @@ ---- components/storage_monitor/removable_device_constants.h.orig 2022-10-01 07:40:07 UTC +--- components/storage_monitor/removable_device_constants.h.orig 2025-05-06 12:23:00 UTC +++ components/storage_monitor/removable_device_constants.h -@@ -14,7 +14,7 @@ namespace storage_monitor { - extern const char kFSUniqueIdPrefix[]; - extern const char kVendorModelSerialPrefix[]; +@@ -15,7 +15,7 @@ namespace storage_monitor { + extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kFSUniqueIdPrefix[]; + extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kVendorModelSerialPrefix[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kVendorModelVolumeStoragePrefix[]; + extern COMPONENT_EXPORT(STORAGE_MONITOR) const + char kVendorModelVolumeStoragePrefix[]; #endif - diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc index e9c388963fb2..1be04444c84d 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2025-02-20 09:59:21 UTC +--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2025-05-06 12:23:00 UTC +++ components/supervised_user/core/browser/supervised_user_preferences.cc -@@ -144,7 +144,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry +@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false); registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string()); #if BUILDFLAG(ENABLE_EXTENSIONS) && \ diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc index 740dfb6cfa24..9b03524bc7fe 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/common/features.cc.orig 2025-04-15 08:30:07 UTC +--- components/supervised_user/core/common/features.cc.orig 2025-05-31 17:16:41 UTC +++ components/supervised_user/core/common/features.cc -@@ -36,7 +36,7 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals, +@@ -37,7 +37,7 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals, #endif #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,34 +9,25 @@ const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000; const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs{ -@@ -83,7 +83,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt - "UpdatedSupervisedUserExtensionApprovalStrings", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -46,7 +46,7 @@ const base::FeatureParam<int> kLocalWebApprovalBottomS + #endif // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, - "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", + BASE_FEATURE(kEnableLocalWebApprovalErrorDialog, + "EnableLocalWebApprovalErrorDialog", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -98,7 +98,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens - #if BUILDFLAG(IS_CHROMEOS) - return base::FeatureList::IsEnabled( - kEnableSupervisedUserSkipParentApprovalToInstallExtensions); --#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( - kEnableSupervisedUserSkipParentApprovalToInstallExtensions); - bool permissionExtensionsForSupervisedUsersEnabled = -@@ -115,7 +115,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens +@@ -89,7 +89,7 @@ bool IsLocalWebApprovalsEnabledForSubframes() { + return base::FeatureList::IsEnabled(kAllowSubframeLocalWebApprovals); } - #endif // BUILDFLAG(ENABLE_EXTENSIONS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kCustomProfileStringsForSupervisedUsers, "CustomProfileStringsForSupervisedUsers", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -127,13 +127,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, +@@ -101,13 +101,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers, "ForceSafeSearchForUnauthenticatedSupervisedUsers", @@ -52,7 +43,7 @@ BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog, "EnableSupervisedUserVersionSignOutDialog", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -155,7 +155,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking, +@@ -119,7 +119,7 @@ BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog // platform #defines. BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers, "UncredentialedFilteringFallbackForSupervisedUsers", diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h index e7cebb7bd825..4679c15a31cf 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h @@ -1,6 +1,6 @@ ---- components/supervised_user/core/common/features.h.orig 2025-04-15 08:30:07 UTC +--- components/supervised_user/core/common/features.h.orig 2025-05-31 17:16:41 UTC +++ components/supervised_user/core/common/features.h -@@ -19,7 +19,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals); +@@ -20,12 +20,12 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals); BASE_DECLARE_FEATURE(kAllowSubframeLocalWebApprovals); #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,25 +9,22 @@ extern const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs; #endif // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_WIN) -@@ -36,7 +36,7 @@ BASE_DECLARE_FEATURE( - // Applies new informative strings during the parental extension approval flow. - BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); - #endif - -@@ -54,7 +54,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE - bool IsSupervisedUserSkipParentApprovalToInstallExtensionsEnabled(); - #endif // BUILDFLAG(ENABLE_EXTENSIONS) + // Whether we show an error screen in case of failure of a local web approval. + BASE_DECLARE_FEATURE(kEnableLocalWebApprovalErrorDialog); + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +@@ -37,7 +37,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovalsWidgetSupportsU + // Whether supervised users see an updated URL filter interstitial. + BASE_DECLARE_FEATURE(kSupervisedUserBlockInterstitialV3); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Enable different web sign in interception behaviour for supervised users: // // 1. Supervised user signs in to existing signed out Profile: show modal -@@ -72,7 +72,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); +@@ -55,7 +55,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); // unauthenticated (e.g. signed out of the content area) account. BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); @@ -35,4 +32,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Uses supervised user strings on the signout dialog. BASE_DECLARE_FEATURE(kEnableSupervisedUserVersionSignOutDialog); - + #endif diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_pref__names.h b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_pref__names.h index c29b9046c8a6..508fc6e8af74 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_pref__names.h +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_pref__names.h @@ -1,9 +1,9 @@ ---- components/supervised_user/core/common/pref_names.h.orig 2025-01-25 09:34:31 UTC +--- components/supervised_user/core/common/pref_names.h.orig 2025-05-31 17:16:41 UTC +++ components/supervised_user/core/common/pref_names.h @@ -129,7 +129,7 @@ inline constexpr char kDefaultSupervisedUserFilteringB "profile.managed.default_filtering_behavior"; - #if BUILDFLAG(ENABLE_EXTENSIONS) + #if BUILDFLAG(ENABLE_EXTENSIONS_CORE) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // An integer pref that stores the current state of the local extension diff --git a/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc b/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc index 6b4433b74202..91136cc8b3b9 100644 --- a/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc +++ b/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc @@ -1,6 +1,6 @@ ---- components/sync_preferences/common_syncable_prefs_database.cc.orig 2025-04-15 08:30:07 UTC +--- components/sync_preferences/common_syncable_prefs_database.cc.orig 2025-05-31 17:16:41 UTC +++ components/sync_preferences/common_syncable_prefs_database.cc -@@ -319,7 +319,7 @@ constexpr auto kCommonSyncablePrefsAllowlist = +@@ -326,7 +326,7 @@ constexpr auto kCommonSyncablePrefsAllowlist = PrefSensitivity::kNone, MergeBehavior::kNone}}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc index f8324e3f515c..b015ae9bedee 100644 --- a/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc @@ -1,6 +1,6 @@ ---- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2024-10-27 06:40:35 UTC +--- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2025-05-06 12:23:00 UTC +++ components/trusted_vault/trusted_vault_connection_impl.cc -@@ -102,7 +102,7 @@ GetLocalPhysicalDeviceType() { +@@ -103,7 +103,7 @@ GetLocalPhysicalDeviceType() { // currently used or even built on all platforms. #if BUILDFLAG(IS_CHROMEOS) return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS; diff --git a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc index 4ec2e6084eef..d1b739f4933a 100644 --- a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2025-04-15 08:30:07 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2025-05-06 12:23:00 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -299,7 +299,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, +@@ -268,7 +268,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, // TODO(https://crbug.com/382611284): Temporarily handle the case when the // primary window is minimized by closing the help bubble. Remove this code when // the issue is solved at the Views framework level. @@ -9,7 +9,7 @@ class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver { public: explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble) -@@ -774,7 +774,7 @@ HelpBubbleView::HelpBubbleView( +@@ -743,7 +743,7 @@ HelpBubbleView::HelpBubbleView( event_relay_->Init(this); } @@ -18,7 +18,7 @@ primary_widget_observer_ = std::make_unique<PrimaryWidgetObserver>(*this); #endif -@@ -886,7 +886,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -855,7 +855,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.h b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.h index b024e9468d99..cbbfe388ee4b 100644 --- a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.h +++ b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.h @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.h.orig 2025-02-20 09:59:21 UTC +--- components/user_education/views/help_bubble_view.h.orig 2025-05-06 12:23:00 UTC +++ components/user_education/views/help_bubble_view.h -@@ -162,7 +162,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg +@@ -160,7 +160,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg // work around this problem by closing the bubble if the widget is minimized. // When the underlying issue is fixed at the framework level, this can be // removed. diff --git a/www/ungoogled-chromium/files/patch-components_variations_net_variations__command__line.cc b/www/ungoogled-chromium/files/patch-components_variations_net_variations__command__line.cc new file mode 100644 index 000000000000..9c1bcb32525b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_variations_net_variations__command__line.cc @@ -0,0 +1,11 @@ +--- components/variations/net/variations_command_line.cc.orig 2025-05-31 17:16:41 UTC ++++ components/variations/net/variations_command_line.cc +@@ -50,7 +50,7 @@ void ExitWithMessage(const std::string& message) { + namespace variations { + + #if !BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kFeedbackIncludeVariations, + "FeedbackIncludeVariations", + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc b/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc index 50bc3fede639..9dc674728fa5 100644 --- a/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc +++ b/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc @@ -1,6 +1,6 @@ ---- components/visited_url_ranking/public/url_visit_util.cc.orig 2024-10-27 06:40:35 UTC +--- components/visited_url_ranking/public/url_visit_util.cc.orig 2025-05-31 17:16:41 UTC +++ components/visited_url_ranking/public/url_visit_util.cc -@@ -66,7 +66,7 @@ PlatformType GetPlatformInput() { +@@ -68,7 +68,7 @@ PlatformType GetPlatformInput() { return PlatformType::kWindows; #elif BUILDFLAG(IS_MAC) return PlatformType::kMac; diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 56192c662443..03568af7a14c 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2025-03-09 21:38:10 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2025-05-31 17:16:41 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1505,7 +1505,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1500,7 +1500,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, si_format, yuv_color_space, ycbcr_info); diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc index fcff9d467d4d..41db9dac86c1 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2025-04-15 08:30:07 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2025-05-31 17:16:41 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1383,7 +1383,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1384,7 +1384,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index d49f4b3322aa..b7be54342e50 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2025-04-15 08:30:07 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2025-05-31 17:16:41 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -123,7 +123,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -141,7 +141,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -858,7 +858,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -934,7 +934,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 436d126ae865..a4040e5c6948 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,8 +1,8 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2025-03-09 21:38:10 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2025-05-31 17:16:41 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -228,7 +228,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl - // See comments on `EvictionHandler`. - EvictionHandler eviction_handler_; +@@ -234,7 +234,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl + base::TimeDelta preferred_frame_interval_ = + FrameRateDecider::UnspecifiedFrameInterval(); -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) diff --git a/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc b/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc index 5c4f3c3b75d4..369e49e751b3 100644 --- a/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc +++ b/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc @@ -1,6 +1,6 @@ ---- components/webui/flags/flags_state.cc.orig 2025-04-15 08:30:07 UTC +--- components/webui/flags/flags_state.cc.orig 2025-05-06 12:23:00 UTC +++ components/webui/flags/flags_state.cc -@@ -787,7 +787,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -792,7 +792,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsWin; #elif BUILDFLAG(IS_CHROMEOS) return kOsCrOS; diff --git a/www/ungoogled-chromium/files/patch-content_app_BUILD.gn b/www/ungoogled-chromium/files/patch-content_app_BUILD.gn index a976cbb603a1..fd1566ad8463 100644 --- a/www/ungoogled-chromium/files/patch-content_app_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_app_BUILD.gn @@ -1,6 +1,6 @@ ---- content/app/BUILD.gn.orig 2025-02-20 09:59:21 UTC +--- content/app/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ content/app/BUILD.gn -@@ -89,9 +89,9 @@ source_set("content_main_runner_app") { +@@ -90,9 +90,9 @@ source_set("content_main_runner_app") { "//third_party/tflite:buildflags", "//tools/v8_context_snapshot:buildflags", ] 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 index f4cfef4e90d3..e5799371ebb4 100644 --- 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,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2025-04-15 08:30:07 UTC +--- content/app/content_main_runner_impl.cc.orig 2025-05-31 17:16:41 UTC +++ content/app/content_main_runner_impl.cc -@@ -144,18 +144,20 @@ +@@ -148,18 +148,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -23,7 +23,7 @@ #include "third_party/boringssl/src/include/openssl/crypto.h" #include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck -@@ -184,6 +186,10 @@ +@@ -188,6 +190,10 @@ #include "media/base/media_switches.h" #endif @@ -34,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -382,7 +388,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -386,7 +392,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -420,7 +426,10 @@ void PreloadLibraryCdms() { +@@ -424,7 +430,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -432,9 +441,16 @@ void PreSandboxInit() { +@@ -436,9 +445,16 @@ void PreSandboxInit() { // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,7 +71,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -748,7 +764,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( +@@ -752,7 +768,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( unregister_thread_closure = base::HangWatcher::RegisterThread( base::HangWatcher::ThreadType::kMainThread); bool start_hang_watcher_now; @@ -80,7 +80,7 @@ // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is // initialized, because the sandbox can't be started with multiple threads. // TODO(mpdenton): start the HangWatcher after the sandbox is initialized. -@@ -861,11 +877,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -865,11 +881,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -94,13 +94,13 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1046,10 +1061,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1050,10 +1065,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } +#elif BUILDFLAG(IS_BSD) + PreSandboxInit(); - #elif BUILDFLAG(IS_IOS) + #elif BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_IOS_TVOS) ChildProcessEnterSandbox(); #endif @@ -117,7 +117,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1146,6 +1173,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { +@@ -1150,6 +1177,11 @@ NO_STACK_PROTECTOR int 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 index 0af3aa1f1e01..e8b5d7d37fd8 100644 --- 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 2025-04-15 08:30:07 UTC +--- content/browser/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ content/browser/BUILD.gn -@@ -2543,6 +2543,14 @@ source_set("browser") { +@@ -2572,6 +2572,14 @@ source_set("browser") { ] } @@ -15,10 +15,10 @@ if (is_linux || is_chromeos) { sources -= [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ] -@@ -2588,6 +2596,15 @@ source_set("browser") { +@@ -2617,6 +2625,15 @@ source_set("browser") { if (allow_oop_video_decoder) { - sources += [ "media/stable_video_decoder_factory.cc" ] - deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] + sources += [ "media/oop_video_decoder_factory.cc" ] + deps += [ "//media/mojo/mojom" ] + } + + if (is_bsd) { diff --git a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc index 35a04d276f0c..9379b5bfb8fa 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/accessibility/browser_accessibility_state_impl.cc.orig 2025-04-15 08:30:07 UTC +--- content/browser/accessibility/browser_accessibility_state_impl.cc.orig 2025-05-31 17:16:41 UTC +++ content/browser/accessibility/browser_accessibility_state_impl.cc -@@ -192,7 +192,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta +@@ -181,7 +181,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta // On Android, Mac, Windows and Linux there are platform-specific subclasses. #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_MAC) && \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc index 0f0945fde500..a5648d07b660 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc @@ -1,6 +1,6 @@ ---- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig 2025-04-15 08:30:07 UTC +--- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig 2025-05-06 12:23:00 UTC +++ content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc -@@ -31,7 +31,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al +@@ -32,7 +32,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al std::string cmdline; std::stringstream ss(cmdline_all); while (std::getline(ss, cmdline, '\0')) { @@ -12,22 +12,22 @@ if (re2::RE2::PartialMatch(cmdline, orca_regex)) { return true; // Orca was found } -@@ -57,7 +61,9 @@ class BrowserAccessibilityStateImplAuralinux +@@ -42,6 +46,10 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al - void BrowserAccessibilityStateImplAuralinux::UpdateHistogramsOnOtherThread() { - BrowserAccessibilityStateImpl::UpdateHistogramsOnOtherThread(); -- + // Returns true if Orca is active. + bool DiscoverOrca() { +#if BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); ++ return false; +#else // NOTE: this method is run from another thread to reduce jank, since - // there's no guarantee these system calls will return quickly. Code that - // needs to run in the UI thread can be run in -@@ -105,6 +111,7 @@ void BrowserAccessibilityStateImplAuralinux::UpdateHis - } else { - base::debug::ClearCrashKeyString(ax_orca_crash_key); + // there's no guarantee these system calls will return quickly. + std::unique_ptr<DIR, decltype(&CloseDir)> proc_dir(opendir("/proc"), +@@ -79,6 +87,7 @@ bool DiscoverOrca() { } + + return is_orca_active; +#endif } - void BrowserAccessibilityStateImplAuralinux::UpdateUniqueUserHistograms() { + } // namespace diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 6956486c992f..2a10eced5328 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2025-03-09 21:38:10 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2025-05-31 17:16:41 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -326,6 +326,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -327,6 +327,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kLogBestEffortTasks, switches::kPerfettoDisableInterning, switches::kTraceToConsole, @@ -8,7 +8,7 @@ }; cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); -@@ -690,7 +691,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() +@@ -697,7 +698,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc index fbdbacb253bd..aad063681942 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2025-02-20 09:59:21 UTC +--- content/browser/browser_main_loop.cc.orig 2025-05-06 12:23:00 UTC +++ content/browser/browser_main_loop.cc -@@ -247,6 +247,12 @@ +@@ -249,6 +249,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -541,6 +547,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -573,7 +585,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() { base::ThreadType::kDisplayCritical); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index c5fca68899cf..06172f1f158a 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2025-03-09 21:38:10 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2025-05-06 12:23:00 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc index 12aa03618c88..5a93489ed499 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/compositor_util.cc.orig 2025-04-15 08:30:07 UTC +--- content/browser/gpu/compositor_util.cc.orig 2025-05-06 12:23:00 UTC +++ content/browser/gpu/compositor_util.cc -@@ -147,7 +147,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -142,7 +142,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_decode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE, @@ -9,7 +9,7 @@ !base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), -@@ -159,7 +159,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_encode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE, diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc index 5da1a9643438..ee1d9ee35e51 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.cc.orig 2024-08-26 14:40:28 UTC +--- content/browser/gpu/gpu_data_manager_impl.cc.orig 2025-05-06 12:23:00 UTC +++ content/browser/gpu/gpu_data_manager_impl.cc -@@ -402,7 +402,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( +@@ -412,7 +412,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( private_->OnDisplayMetricsChanged(display, changed_metrics); } diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h index e7ffbeb7b39e..93de1465289c 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.h.orig 2024-08-26 14:40:28 UTC +--- content/browser/gpu/gpu_data_manager_impl.h.orig 2025-05-06 12:23:00 UTC +++ content/browser/gpu/gpu_data_manager_impl.h -@@ -220,7 +220,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -225,7 +225,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index 3dedba683db4..738ad34633bd 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-04-15 08:30:07 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-05-31 17:16:41 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1667,7 +1667,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1697,7 +1697,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index f963975cf5e5..f3db2ccc056d 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-11-16 12:20:41 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2025-05-06 12:23:00 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h -@@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics); @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -311,7 +311,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -313,7 +313,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool is_gpu_memory_buffer_NV12_supported_ = false; #endif // BUILDFLAG(IS_LINUX) - }; + 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 index 56736c71b6f7..e8e339be3711 100644 --- 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,4 +1,4 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2025-04-15 08:30:07 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2025-05-31 17:16:41 UTC +++ content/browser/gpu/gpu_process_host.cc @@ -275,6 +275,7 @@ static const char* const kSwitchNames[] = { switches::kDisableSkiaGraphite, @@ -8,7 +8,7 @@ switches::kProfilingAtStart, switches::kProfilingFile, switches::kProfilingFlush, -@@ -304,7 +305,7 @@ static const char* const kSwitchNames[] = { +@@ -303,7 +304,7 @@ static const char* const kSwitchNames[] = { switches::kEnableNativeGpuMemoryBuffers, switches::kRenderNodeOverride, #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/ungoogled-chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h index 3ee2b481f1fd..88b09e0a51ba 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h +++ b/www/ungoogled-chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h @@ -1,4 +1,4 @@ ---- content/browser/media/frameless_media_interface_proxy.h.orig 2024-05-23 20:04:36 UTC +--- content/browser/media/frameless_media_interface_proxy.h.orig 2025-05-31 17:16:41 UTC +++ content/browser/media/frameless_media_interface_proxy.h @@ -19,7 +19,7 @@ #include "mojo/public/cpp/bindings/receiver_set.h" @@ -6,15 +6,15 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" + #include "media/mojo/mojom/video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -105,7 +105,7 @@ class FramelessMediaInterfaceProxy final +@@ -98,7 +98,7 @@ class FramelessMediaInterfaceProxy final // Connections to the renderer. mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Connection to the StableVideoDecoderFactory that lives in a utility - // process. This is only used for out-of-process video decoding and only when - // the FramelessMediaInterfaceProxy is created without a RenderProcessHost + // Connection to the InterfaceFactory that lives in a utility process. + // This is only used for out-of-process video decoding and only when the + // FramelessMediaInterfaceProxy is created without a RenderProcessHost diff --git a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc index 9796b1b8afa8..d8a2c201ce0b 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/network_service_instance_impl.cc.orig 2025-02-20 09:59:21 UTC +--- content/browser/network_service_instance_impl.cc.orig 2025-05-31 17:16:41 UTC +++ content/browser/network_service_instance_impl.cc -@@ -84,7 +84,7 @@ +@@ -85,7 +85,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -367,7 +367,7 @@ void CreateInProcessNetworkService( +@@ -343,7 +343,7 @@ void CreateInProcessNetworkService( std::move(receiver))); } @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -436,7 +436,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -411,7 +411,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index f4f694e350d6..cdf547f3c0a4 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2025-03-09 21:38:10 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2025-05-06 12:23:00 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -334,7 +334,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -333,7 +333,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { 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 index fb0d4b229e59..a89c7ca96337 100644 --- 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,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2025-04-15 08:30:07 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2025-05-31 17:16:41 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -225,7 +225,7 @@ +@@ -223,7 +223,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1090,7 +1090,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1121,7 +1121,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1258,7 +1258,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost +@@ -1328,7 +1328,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost void RenderProcessHostImpl::IOThreadHostImpl::SetPid( base::ProcessId child_pid) { @@ -27,7 +27,7 @@ child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -3329,7 +3329,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3409,7 +3409,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -36,7 +36,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3385,6 +3385,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3464,6 +3464,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -44,7 +44,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -5224,7 +5225,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr +@@ -5317,7 +5318,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr // - Win: https://crbug.com/707022 . uint64_t total_size = 0; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 4cd9a115ca2f..aa3ebc6ef1bf 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2025-04-15 08:30:07 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2025-05-31 17:16:41 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -102,7 +102,7 @@ +@@ -101,7 +101,7 @@ #include "media/fuchsia_media_codec_provider_impl.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #include "media/mojo/mojom/video_encode_accelerator.mojom.h" #endif -@@ -988,7 +988,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -985,7 +985,7 @@ class CONTENT_EXPORT RenderProcessHostImpl std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -18,7 +18,7 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -1237,7 +1237,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1230,7 +1230,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // if the request isn't handled on the IO thread. void OnBindHostReceiver(mojo::GenericPendingReceiver receiver); diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc index 3f9a792800f5..b5c2e80966c2 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc @@ -1,7 +1,7 @@ ---- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig 2025-03-09 21:38:10 UTC +--- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig 2025-05-31 17:16:41 UTC +++ content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc -@@ -52,7 +52,7 @@ - #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h" +@@ -50,7 +50,7 @@ + #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #include "content/browser/media/video_encode_accelerator_provider_launcher.h" -@@ -343,7 +343,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost +@@ -332,7 +332,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost } #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 95bbb3548e65..68e449399c1c 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,9 +1,9 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2025-03-09 21:38:10 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2025-05-31 17:16:41 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -275,7 +275,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( - display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); +@@ -273,7 +273,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( + display::win::GetScreenWin()->GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = - display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); + display::win::GetScreenWin()->GetSystemMetricsInDIP(SM_CXHSCROLL); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 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 index b8fec059f51c..e4ac9a5f760e 100644 --- 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 2025-03-09 21:38:10 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2025-05-06 12:23:00 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" @@ -18,7 +18,7 @@ ui::BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1867,7 +1867,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1882,7 +1882,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2843,7 +2843,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2858,7 +2858,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,12 +36,12 @@ return NeedsInputGrab(); #else return false; -@@ -3027,7 +3027,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -3042,7 +3042,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* linux_ui = ui::LinuxUi::instance(); - std::vector<ui::TextEditCommandAuraLinux> commands; - if (!event.skip_if_unhandled && linux_ui && event.os_event && + if (!event.skip_if_unhandled && linux_ui && event.os_event) { + const auto command = linux_ui->GetTextEditCommandForEvent( diff --git a/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc index d4b09fc10209..f90fa1cf27cc 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/service_host/utility_process_host.cc.orig 2025-04-15 08:30:07 UTC +--- content/browser/service_host/utility_process_host.cc.orig 2025-05-06 12:23:00 UTC +++ content/browser/service_host/utility_process_host.cc -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ #include "content/browser/v8_snapshot_files.h" #endif @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/pickle.h" -@@ -95,7 +95,7 @@ namespace content { +@@ -96,7 +96,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector<base::FilePath> network_context_parent_dirs) { base::Pickle pickle; -@@ -425,7 +425,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -427,7 +427,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -27,7 +27,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -442,7 +442,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -444,7 +444,7 @@ bool UtilityProcessHost::StartProcess() { if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { bool pass_gpu_buffer_flag = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); diff --git a/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc index e17e5e5e100b..273da85f6b28 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc @@ -1,9 +1,9 @@ ---- content/browser/v8_snapshot_files.cc.orig 2024-06-22 08:49:42 UTC +--- content/browser/v8_snapshot_files.cc.orig 2025-05-06 12:23:00 UTC +++ content/browser/v8_snapshot_files.cc -@@ -17,7 +17,7 @@ namespace content { - std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> +@@ -19,7 +19,7 @@ namespace content { + std::map<std::string, std::variant<base::FilePath, base::ScopedFD>> GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) { - std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files; + std::map<std::string, std::variant<base::FilePath, base::ScopedFD>> files; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT) diff --git a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn index fad0ed35e546..f301e9df9341 100644 --- 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 2025-02-20 09:59:21 UTC +--- content/common/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ content/common/BUILD.gn -@@ -384,19 +384,28 @@ source_set("common") { +@@ -382,19 +382,28 @@ source_set("common") { } if (is_linux || is_chromeos) { diff --git a/www/ungoogled-chromium/files/patch-content_common_features.cc b/www/ungoogled-chromium/files/patch-content_common_features.cc index 08bbde5d7d61..3b19f33cc587 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.cc +++ b/www/ungoogled-chromium/files/patch-content_common_features.cc @@ -1,6 +1,6 @@ ---- content/common/features.cc.orig 2025-03-09 21:38:10 UTC +--- content/common/features.cc.orig 2025-05-31 17:16:41 UTC +++ content/common/features.cc -@@ -125,7 +125,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, +@@ -163,7 +163,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, base::FEATURE_DISABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host diff --git a/www/ungoogled-chromium/files/patch-content_common_features.h b/www/ungoogled-chromium/files/patch-content_common_features.h index d27068778482..1f26ffc7970d 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.h +++ b/www/ungoogled-chromium/files/patch-content_common_features.h @@ -1,6 +1,6 @@ ---- content/common/features.h.orig 2025-03-09 21:38:10 UTC +--- content/common/features.h.orig 2025-05-31 17:16:41 UTC +++ content/common/features.h -@@ -28,7 +28,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn +@@ -59,7 +59,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking); CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint); CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation); diff --git a/www/ungoogled-chromium/files/patch-content_common_user__agent.cc b/www/ungoogled-chromium/files/patch-content_common_user__agent.cc deleted file mode 100644 index c4cee4be8d64..000000000000 --- a/www/ungoogled-chromium/files/patch-content_common_user__agent.cc +++ /dev/null @@ -1,37 +0,0 @@ ---- content/common/user_agent.cc.orig 2025-04-15 08:30:07 UTC -+++ content/common/user_agent.cc -@@ -50,7 +50,7 @@ std::string GetUserAgentPlatform() { - return ""; - #elif BUILDFLAG(IS_MAC) - return "Macintosh; "; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return "X11; "; // strange, but that's what Firefox uses - #elif BUILDFLAG(IS_ANDROID) - return "Linux; "; -@@ -76,7 +76,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"; - #elif BUILDFLAG(IS_IOS) - if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { -@@ -305,6 +305,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons - "Android %s", os_version.c_str() - #elif BUILDFLAG(IS_FUCHSIA) - "Fuchsia" -+#elif BUILDFLAG(IS_BSD) -+#if defined(__x86_64__) -+ "Linux x86_64; %s %s", -+#elif defined(__aarch64__) -+ "Linux aarch64; %s %s", -+#else -+ "Linux i686; %s %s", -+#endif -+ unixinfo.sysname, // e.g. Linux -+ cpu_type.c_str() // e.g. i686 - #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 index c236e7de6f5c..1f139c1f642c 100644 --- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2025-04-15 08:30:07 UTC +--- content/gpu/gpu_main.cc.orig 2025-05-31 17:16:41 UTC +++ content/gpu/gpu_main.cc @@ -95,10 +95,14 @@ #include "sandbox/win/src/sandbox.h" @@ -16,7 +16,7 @@ #include "sandbox/policy/sandbox_type.h" #endif -@@ -117,7 +121,7 @@ namespace content { +@@ -116,7 +120,7 @@ namespace content { namespace { @@ -25,7 +25,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -177,7 +181,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -176,7 +180,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { GPU_STARTUP_TRACE_EVENT("gpu_main::EnsureSandboxInitialized"); @@ -34,7 +34,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -303,7 +307,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -289,7 +293,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -43,7 +43,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -329,7 +333,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -315,7 +319,8 @@ int GpuMain(MainFunctionParams parameters) { base::PlatformThread::SetName("CrGpuMain"); mojo::InterfaceEndpointClient::SetThreadNameSuffixForMetrics("GpuMain"); @@ -53,7 +53,7 @@ // Thread type delegate of the process should be registered before // thread type change below for the main thread and for thread pool in // ChildProcess constructor. -@@ -462,7 +467,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -448,7 +453,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -62,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -502,7 +507,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -488,7 +493,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc index 79dbdf6e4c5d..5113433fbdb6 100644 --- a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- content/public/browser/content_browser_client.cc.orig 2025-04-15 08:30:07 UTC +--- content/public/browser/content_browser_client.cc.orig 2025-05-31 17:16:41 UTC +++ content/public/browser/content_browser_client.cc -@@ -1376,7 +1376,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1394,7 +1394,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. 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 index dda59592dbda..336c83abc060 100644 --- 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,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2025-04-15 08:30:07 UTC +--- content/public/common/content_features.cc.orig 2025-05-31 17:16:41 UTC +++ content/public/common/content_features.cc -@@ -75,7 +75,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, +@@ -80,7 +80,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, // Runs the audio service in a separate process. BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1274,9 +1274,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1275,9 +1275,9 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -21,7 +21,7 @@ defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -1329,7 +1329,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, +@@ -1334,7 +1334,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, // 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.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc index 286963208eb9..fa7d88f89f89 100644 --- 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 2025-04-15 08:30:07 UTC +--- content/public/common/content_switches.cc.orig 2025-05-31 17:16:41 UTC +++ content/public/common/content_switches.cc -@@ -342,6 +342,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -345,6 +345,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -949,7 +951,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -952,7 +954,7 @@ const char kPreventResizingContentsForTesting[] = "prevent-resizing-contents-for-testing"; #endif 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 index 6fc2b1d1a865..db3bb84483e1 100644 --- 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,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2025-04-15 08:30:07 UTC +--- content/public/common/content_switches.h.orig 2025-05-31 17:16:41 UTC +++ content/public/common/content_switches.h @@ -108,6 +108,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; 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 index e2c953494f32..dc2fdf143513 100644 --- 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,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2025-04-15 08:30:07 UTC +--- content/renderer/render_thread_impl.cc.orig 2025-05-06 12:23:00 UTC +++ content/renderer/render_thread_impl.cc -@@ -212,6 +212,8 @@ +@@ -207,6 +207,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1050,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1059,7 +1061,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::kAcceleratedVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1855,7 +1857,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory( +@@ -1870,7 +1872,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory( 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.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 98d7a34e32a9..d62bba2a0752 100644 --- 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 2025-04-15 08:30:07 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2025-05-06 12:23:00 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -129,7 +129,7 @@ +@@ -124,7 +124,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" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -192,13 +192,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -228,7 +228,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -292,7 +292,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -296,7 +296,7 @@ RendererBlinkPlatformImpl::GetWebUIBundledCodeCacheRes blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 index 8df00216e00a..554841fc009c 100644 --- 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,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2025-03-09 21:38:10 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2025-05-31 17:16:41 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -266,7 +266,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const gpu::GPUInfo& gpu_info) const; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn index 8b16760558d8..437d682bebf2 100644 --- 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 2025-04-15 08:30:07 UTC +--- content/shell/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ content/shell/BUILD.gn -@@ -1089,7 +1089,7 @@ group("content_shell_crash_test") { +@@ -1107,7 +1107,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_browser_shell__platform__delegate__views.cc b/www/ungoogled-chromium/files/patch-content_shell_browser_shell__platform__delegate__views.cc new file mode 100644 index 000000000000..ef8c4b07db5d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_shell_browser_shell__platform__delegate__views.cc @@ -0,0 +1,11 @@ +--- content/shell/browser/shell_platform_delegate_views.cc.orig 2025-05-06 12:23:00 UTC ++++ content/shell/browser/shell_platform_delegate_views.cc +@@ -373,7 +373,7 @@ void ShellPlatformDelegate::CreatePlatformWindow( + views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET); + params.bounds = gfx::Rect(initial_size); + params.delegate = delegate.release(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + params.wm_class_class = "chromium-content_shell"; + params.wm_class_name = params.wm_class_class; + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-content_utility_services.cc b/www/ungoogled-chromium/files/patch-content_utility_services.cc index 18482e6924a8..ebb0b933c815 100644 --- 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 2025-02-20 09:59:21 UTC +--- content/utility/services.cc.orig 2025-05-06 12:23:00 UTC +++ content/utility/services.cc @@ -73,7 +73,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -17,7 +17,7 @@ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "content/common/features.h" - #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck + #include "media/mojo/services/oop_video_decoder_factory_process_service.h" // nogncheck @@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -34,9 +34,9 @@ -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - auto RunStableVideoDecoderFactoryProcessService( - mojo::PendingReceiver< -@@ -392,7 +392,7 @@ auto RunStableVideoDecoderFactoryProcessService( + auto RunOOPVideoDecoderFactoryProcessService( + mojo::PendingReceiver<media::mojom::VideoDecoderFactoryProcess> receiver) { +@@ -391,7 +391,7 @@ auto RunOOPVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -45,16 +45,16 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -415,7 +415,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -414,7 +414,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - services.Add(RunStableVideoDecoderFactoryProcessService); + services.Add(RunOOPVideoDecoderFactoryProcessService); #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && -@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS) && \ // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc index d7e0ea775597..037cf07e4035 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2025-02-20 09:59:21 UTC +--- content/utility/utility_main.cc.orig 2025-05-06 12:23:00 UTC +++ content/utility/utility_main.cc @@ -36,18 +36,22 @@ #include "services/tracing/public/cpp/trace_startup.h" @@ -28,15 +28,15 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#include "content/common/gpu_pre_sandbox_hook_bsd.h" +#endif + -+#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "services/video_effects/video_effects_sandbox_hook_linux.h" // nogncheck - #endif // BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) @@ -101,7 +110,7 @@ sandbox::TargetServices* g_utility_target_services = nullptr; diff --git a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc index 11b7b1af047b..49281b99fe33 100644 --- a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- content/zygote/zygote_linux.cc.orig 2025-02-20 09:59:21 UTC +--- content/zygote/zygote_linux.cc.orig 2025-05-06 12:23:00 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -6,9 +6,9 @@ // found in the LICENSE file. +#if 0 - #ifdef UNSAFE_BUFFERS_BUILD - // TODO(crbug.com/342213636): Remove this and spanify to fix the errors. -@@ -709,3 +710,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi + #include "content/zygote/zygote_linux.h" + +@@ -705,3 +706,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content 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 index 4e906786053a..6999f1048eb8 100644 --- 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 2025-02-20 09:59:21 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2025-05-06 12:23:00 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc @@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt + MediaPerceptionAPIManager::GetFactoryInstance(); #endif - MessageService::GetFactoryInstance(); #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_management_management__api.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc index c3e284d8c150..a7e0e87a033c 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc @@ -1,11 +1,11 @@ ---- extensions/browser/api/management/management_api.cc.orig 2024-08-26 14:40:28 UTC +--- extensions/browser/api/management/management_api.cc.orig 2025-05-31 17:16:41 UTC +++ extensions/browser/api/management/management_api.cc -@@ -285,7 +285,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { - #if BUILDFLAG(IS_CHROMEOS) - // ChromeOS devices have this feature already shipped. +@@ -284,7 +284,7 @@ void AddExtensionInfo(const Extension* source_extensio + + bool PlatformSupportsApprovalFlowForExtensions() { + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return true; --#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - return base::FeatureList::IsEnabled( - supervised_user::kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #else + return false; 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 index ff235bc82fff..c8bb0e021cee 100644 --- 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,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2025-04-15 08:30:07 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2025-05-06 12:23:00 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -77,7 +77,7 @@ namespace { +@@ -81,7 +81,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -667,7 +667,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -673,7 +673,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc index df9c9c54dab9..a1bbe5cc7505 100644 --- a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc +++ b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc @@ -1,15 +1,15 @@ ---- extensions/shell/browser/shell_extensions_api_client.cc.orig 2025-01-25 09:34:31 UTC +--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2025-05-31 17:16:41 UTC +++ extensions/shell/browser/shell_extensions_api_client.cc @@ -18,7 +18,7 @@ + #include "extensions/shell/browser/shell_extension_web_contents_observer.h" #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h" - #include "extensions/shell/browser/shell_web_view_guest_delegate.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h" #endif -@@ -54,7 +54,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() +@@ -76,7 +76,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() return std::make_unique<ShellDisplayInfoProvider>(); } diff --git a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h index 2288500e1e2e..6f600877d028 100644 --- a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h +++ b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h @@ -1,6 +1,6 @@ ---- extensions/shell/browser/shell_extensions_api_client.h.orig 2025-01-25 09:34:31 UTC +--- extensions/shell/browser/shell_extensions_api_client.h.orig 2025-05-31 17:16:41 UTC +++ extensions/shell/browser/shell_extensions_api_client.h -@@ -34,14 +34,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC +@@ -42,14 +42,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC content::BrowserContext* browser_context) const override; std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider() const override; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index ee70cbcde6d4..f96be0eedc9c 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2025-03-09 21:38:10 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2025-05-31 17:16:41 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -341,7 +341,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -383,7 +383,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; 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 index 7cc0175357dd..6a3c72e56d15 100644 --- 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 @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2025-03-09 21:38:10 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2025-05-31 17:16:41 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2862,7 +2862,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2863,7 +2863,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc index e4d7b15855c0..ea5dcea0b705 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_context_state.cc.orig 2025-04-15 08:30:07 UTC +--- gpu/command_buffer/service/shared_context_state.cc.orig 2025-05-31 17:16:41 UTC +++ gpu/command_buffer/service/shared_context_state.cc -@@ -65,7 +65,7 @@ +@@ -64,7 +64,7 @@ #include "gpu/vulkan/vulkan_implementation.h" #include "gpu/vulkan/vulkan_util.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/external_semaphore_pool.h" #endif -@@ -334,7 +334,7 @@ SharedContextState::SharedContextState( +@@ -348,7 +348,7 @@ SharedContextState::SharedContextState( if (gr_context_type_ == GrContextType::kVulkan) { if (vk_context_provider_) { #if BUILDFLAG(ENABLE_VULKAN) && \ @@ -18,7 +18,7 @@ external_semaphore_pool_ = std::make_unique<ExternalSemaphorePool>(this); #endif use_virtualized_gl_contexts_ = false; -@@ -371,7 +371,7 @@ SharedContextState::~SharedContextState() { +@@ -385,7 +385,7 @@ SharedContextState::~SharedContextState() { } #if BUILDFLAG(ENABLE_VULKAN) && \ diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.h b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.h index 182a0253ca6e..ec60cc5fbe31 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.h +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.h @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_context_state.h.orig 2025-04-15 08:30:07 UTC +--- gpu/command_buffer/service/shared_context_state.h.orig 2025-05-31 17:16:41 UTC +++ gpu/command_buffer/service/shared_context_state.h -@@ -236,7 +236,7 @@ class GPU_GLES2_EXPORT SharedContextState +@@ -238,7 +238,7 @@ class GPU_GLES2_EXPORT SharedContextState return &memory_type_tracker_; } #if BUILDFLAG(ENABLE_VULKAN) && \ @@ -9,7 +9,7 @@ ExternalSemaphorePool* external_semaphore_pool() { return external_semaphore_pool_.get(); } -@@ -449,7 +449,7 @@ class GPU_GLES2_EXPORT SharedContextState +@@ -455,7 +455,7 @@ class GPU_GLES2_EXPORT SharedContextState bool disable_check_reset_status_throttling_for_test_ = false; #if BUILDFLAG(ENABLE_VULKAN) && \ 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 index eba5e3a7e0e9..762e3899798f 100644 --- 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,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-08-26 14:40:28 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2025-05-06 12:23:00 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc @@ -20,7 +20,7 @@ namespace { // TODO(penghuang): verify the scanout is the right usage for video playback. @@ -9,3 +9,12 @@ SHARED_IMAGE_USAGE_SCANOUT | #endif SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE | +@@ -121,7 +121,7 @@ bool AngleVulkanImageBackingFactory::IsGMBSupported( + switch (gmb_type) { + case gfx::EMPTY_BUFFER: + return true; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + case gfx::NATIVE_PIXMAP: { + auto* vulkan_implementation = + context_state_->vk_context_provider()->GetVulkanImplementation(); diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index e9163798d689..c34f3a755f7f 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-04-15 08:30:07 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-05-06 12:23:00 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc @@ -48,7 +48,7 @@ #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h" @@ -9,7 +9,16 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" #endif -@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -102,7 +102,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t + case gfx::IO_SURFACE_BUFFER: + return "platform"; + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + case gfx::NATIVE_PIXMAP: + return "platform"; + #endif +@@ -123,7 +123,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; @@ -18,7 +27,7 @@ return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; -@@ -315,7 +315,7 @@ SharedImageFactory::SharedImageFactory( +@@ -326,7 +326,7 @@ SharedImageFactory::SharedImageFactory( context_state_, workarounds_); factories_.push_back(std::move(ozone_factory)); } 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 index b48e74735aca..5f25a100384e 100644 --- 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 2025-03-09 21:38:10 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2025-05-31 17:16:41 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1752,7 +1752,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte +@@ -1787,7 +1787,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte backend_types = {wgpu::BackendType::D3D12}; #elif BUILDFLAG(IS_MAC) backend_types = {wgpu::BackendType::Metal}; @@ -9,7 +9,7 @@ if (shared_context_state_->GrContextIsVulkan() || shared_context_state_->IsGraphiteDawnVulkan()) { backend_types = {wgpu::BackendType::Vulkan}; -@@ -1994,7 +1994,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -2029,7 +2029,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ 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 index d0ff85c827a4..1a70dcd04455 100644 --- 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,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2024-10-01 07:26:23 UTC +--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2025-05-31 17:16:41 UTC +++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include "ui/gfx/half_float.h" #include "ui/gl/test/gl_test_support.h" @@ -9,7 +9,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" #endif -@@ -75,7 +75,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa +@@ -76,7 +76,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa GLManager gl_; }; diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc index b09f99361b61..bf531ff3d418 100644 --- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc +++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_info_collector.cc.orig 2025-04-15 08:30:07 UTC +--- gpu/config/gpu_info_collector.cc.orig 2025-05-31 17:16:41 UTC +++ gpu/config/gpu_info_collector.cc -@@ -347,7 +347,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance +@@ -364,7 +364,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { static BASE_FEATURE(kCollectWebGPUSupportMetrics, "CollectWebGPUSupportMetrics", 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 index 1dcd87c967dd..20b3542f552d 100644 --- 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 2025-04-15 08:30:07 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2025-05-31 17:16:41 UTC +++ gpu/ipc/service/gpu_init.cc @@ -153,7 +153,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in @@ -9,7 +9,7 @@ if (gpu_info.gpu.vendor_id != 0x10de || // NVIDIA gpu_info.gpu.driver_vendor != "NVIDIA") return true; -@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -18,7 +18,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -431,7 +431,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -427,7 +427,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -27,7 +27,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -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 -@@ -590,7 +590,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -582,7 +582,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; -@@ -758,7 +758,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -750,7 +750,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL ->GetSupportedFormatsForGLNativePixmapImport(); #endif // BUILDFLAG(IS_OZONE) @@ -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. -@@ -810,7 +810,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -802,7 +802,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -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 -@@ -1014,7 +1014,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1004,7 +1004,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 -@@ -1069,7 +1069,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1059,7 +1059,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc index 2c02f63be740..53f19b268601 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2025-03-09 21:38:10 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2025-05-31 17:16:41 UTC +++ gpu/vulkan/vulkan_device_queue.cc -@@ -156,7 +156,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -145,7 +145,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,7 +9,7 @@ // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -303,7 +303,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -292,7 +292,7 @@ bool VulkanDeviceQueue::Initialize( // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler // support. #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 2098cf89a04b..f173831d49e9 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2024-06-22 08:49:42 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2025-05-06 12:23:00 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -322,7 +322,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -391,7 +391,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; @@ -9,7 +9,7 @@ VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT> vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1336,7 +1336,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1405,7 +1405,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -18,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1346,4 +1346,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1415,4 +1415,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-headless_BUILD.gn b/www/ungoogled-chromium/files/patch-headless_BUILD.gn index 322d21d524db..6a83631d2bc9 100644 --- a/www/ungoogled-chromium/files/patch-headless_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-headless_BUILD.gn @@ -1,6 +1,6 @@ ---- headless/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- headless/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ headless/BUILD.gn -@@ -474,7 +474,7 @@ component("headless_non_renderer") { +@@ -475,7 +475,7 @@ component("headless_non_renderer") { } } 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 index 51ee9b1d4e27..7874c1c7cd29 100644 --- 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 2025-03-09 21:38:10 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2025-05-31 17:16:41 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -408,7 +408,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -406,7 +406,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-ipc_ipc__message__utils.h b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h index 2fd3ab2f904c..b3cbea09ed4f 100644 --- a/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2025-03-09 21:38:10 UTC +--- ipc/ipc_message_utils.h.orig 2025-05-06 12:23:00 UTC +++ ipc/ipc_message_utils.h -@@ -215,7 +215,7 @@ struct ParamTraits<unsigned int> { +@@ -216,7 +216,7 @@ struct ParamTraits<unsigned int> { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-media_BUILD.gn b/www/ungoogled-chromium/files/patch-media_BUILD.gn index bc71fcc0a801..0c367931c10d 100644 --- 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 2025-03-09 21:38:10 UTC +--- media/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ media/BUILD.gn -@@ -100,6 +100,9 @@ config("media_config") { +@@ -105,6 +105,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 index bffce70d8e9c..b9329b1da15d 100644 --- 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 2025-04-15 08:30:07 UTC +--- media/audio/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ media/audio/BUILD.gn -@@ -271,9 +271,23 @@ source_set("audio") { +@@ -275,9 +275,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } diff --git a/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc index 4929858bccfd..5b95ad01901e 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -1,4 +1,4 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2025-03-09 21:38:10 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2025-05-31 17:16:41 UTC +++ media/audio/alsa/audio_manager_alsa.cc @@ -106,7 +106,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; @@ -7,7 +7,7 @@ +#if !BUILDFLAG(IS_BSD) while (!wrapper_->CardNext(&card) && card >= 0) { +#endif - void** hints = NULL; + void** hints = nullptr; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { @@ -118,7 +120,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType @@ -20,7 +20,7 @@ } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -201,7 +205,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( +@@ -202,7 +206,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? @@ -32,7 +32,7 @@ return strncmp(kDeviceTypeDesired, device_name, std::size(kDeviceTypeDesired) - 1) == 0; } -@@ -253,7 +261,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -254,7 +262,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is an access violation // inside this ALSA API with libasound.so.2.0.0. @@ -41,8 +41,8 @@ +#endif int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { - for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -277,7 +287,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( + for (void** hint_iter = hints; *hint_iter != nullptr; hint_iter++) { +@@ -279,7 +289,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc index 938b3b65e9d4..ecdebb290982 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2025-04-15 08:30:07 UTC +--- media/base/media_switches.cc.orig 2025-05-31 17:16:41 UTC +++ media/base/media_switches.cc @@ -19,7 +19,7 @@ #include "ui/gl/gl_features.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -358,8 +358,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, +@@ -366,8 +366,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, "UseSCContentSharingPicker", base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_MAC) @@ -20,7 +20,7 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -369,6 +369,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, +@@ -377,6 +377,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, BASE_FEATURE(kPulseaudioLoopbackForScreenShare, "PulseaudioLoopbackForScreenShare", base::FEATURE_DISABLED_BY_DEFAULT); @@ -49,7 +49,7 @@ #endif // BUILDFLAG(IS_LINUX) // When enabled, MediaCapabilities will check with GPU Video Accelerator -@@ -611,7 +633,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, +@@ -658,7 +680,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -58,7 +58,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -634,7 +656,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -681,7 +703,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -67,7 +67,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -646,7 +668,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -693,7 +715,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -76,7 +76,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -675,7 +697,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -722,7 +744,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -85,7 +85,7 @@ // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default // on chromeos, but needs an experiment on linux. BASE_FEATURE(kAcceleratedVideoDecodeLinux, -@@ -775,7 +797,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, +@@ -795,7 +817,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, "VSyncMjpegDecoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -94,8 +94,8 @@ // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS. BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding, "V4L2H264TemporalLayerHWEncoding", -@@ -1347,7 +1369,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -1340,7 +1362,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, + ); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -103,7 +103,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1429,7 +1451,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1422,7 +1444,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.h b/www/ungoogled-chromium/files/patch-media_base_media__switches.h index 93ccd40ee936..313aa1c7a307 100644 --- 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 2025-04-15 08:30:07 UTC +--- media/base/media_switches.h.orig 2025-05-31 17:16:41 UTC +++ media/base/media_switches.h -@@ -321,13 +321,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu +@@ -334,13 +334,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -28,7 +28,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -341,7 +353,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); +@@ -354,7 +366,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); @@ -37,7 +37,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux); -@@ -363,7 +375,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay +@@ -370,7 +382,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -46,8 +46,8 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); -@@ -493,7 +505,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); +@@ -490,7 +502,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackgroundListening + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc index 87897d6641b1..6e95b1801758 100644 --- 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 2025-04-17 14:09:48 UTC +--- media/base/video_frame.cc.orig 2025-05-31 17:16:41 UTC +++ media/base/video_frame.cc @@ -92,7 +92,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -27,7 +27,7 @@ bool is_native_buffer = gpu_memory_buffer ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) -@@ -938,7 +938,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -890,7 +890,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -36,7 +36,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1625,7 +1625,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1577,7 +1577,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_; } diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.h b/www/ungoogled-chromium/files/patch-media_base_video__frame.h index 0078e98c31a8..5d617f871f07 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.h +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2025-04-17 14:09:48 UTC +--- media/base/video_frame.h.orig 2025-05-31 17:16:41 UTC +++ media/base/video_frame.h @@ -42,7 +42,7 @@ #include "ui/gfx/geometry/size.h" @@ -18,7 +18,7 @@ STORAGE_DMABUFS = 5, // Each plane is stored into a DmaBuf. #endif STORAGE_GPU_MEMORY_BUFFER = 6, -@@ -435,7 +435,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -420,7 +420,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 -@@ -748,7 +748,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -733,7 +733,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // wait for the included sync point. scoped_refptr<gpu::ClientSharedImage> shared_image() const; @@ -36,7 +36,7 @@ // The number of 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 // remaining planes. Should be > 0 for STORAGE_DMABUFS. -@@ -988,7 +988,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -973,7 +973,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. bool is_mappable_si_enabled_ = false; 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 index 8bdfbbffc748..4256be6bc849 100644 --- 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,6 +1,6 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2024-06-22 08:49:42 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2025-05-31 17:16:41 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -231,7 +231,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( +@@ -228,7 +228,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( int entry_index = 0; for (const auto& entry : devices_config_) { VideoCaptureApi api = diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h index 25e677decf6d..f5c60041b707 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h +++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__device.h @@ -1,7 +1,7 @@ ---- media/capture/video/linux/v4l2_capture_device.h.orig 2022-10-01 07:40:07 UTC +--- media/capture/video/linux/v4l2_capture_device.h.orig 2025-05-06 12:23:00 UTC +++ media/capture/video/linux/v4l2_capture_device.h -@@ -21,7 +21,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice - public: +@@ -23,7 +23,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice + virtual int open(const char* device_name, int flags) = 0; virtual int close(int fd) = 0; - virtual int ioctl(int fd, int request, void* argp) = 0; diff --git a/www/ungoogled-chromium/files/patch-media_gpu_buffer__validation.cc b/www/ungoogled-chromium/files/patch-media_gpu_buffer__validation.cc deleted file mode 100644 index 54798293a8cd..000000000000 --- a/www/ungoogled-chromium/files/patch-media_gpu_buffer__validation.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- media/gpu/buffer_validation.cc.orig 2024-11-16 12:20:41 UTC -+++ media/gpu/buffer_validation.cc -@@ -15,7 +15,7 @@ - #include "ui/gfx/geometry/size.h" - #include "ui/gfx/gpu_memory_buffer.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include <sys/types.h> - #include <unistd.h> - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -23,7 +23,7 @@ - namespace media { - - bool GetFileSize(const int fd, size_t* size) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (fd < 0) { - VLOG(1) << "Invalid file descriptor"; - return false; -@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle( - VLOG(1) << "Unsupported: " << pixel_format; - return false; - } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format); - if (num_planes != gmb_handle.native_pixmap_handle.planes.size() || - num_planes == 0) { diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc index 243bc9fdcd05..f77ead67c04a 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-10-01 07:26:23 UTC +--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2025-05-06 12:23:00 UTC +++ media/gpu/chromeos/mailbox_video_frame_converter.cc -@@ -67,7 +67,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe +@@ -68,7 +68,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe << static_cast<int>(buffer_format); NOTREACHED(); } 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 index 52f906ef3ce2..6e8a5c2e170e 100644 --- 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,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2025-04-15 08:30:07 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2025-05-31 17:16:41 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1121,7 +1121,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1128,7 +1128,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } #endif @@ -9,7 +9,7 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -1130,7 +1130,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1137,7 +1137,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( *allocator, VideoFrame::STORAGE_DMABUFS); @@ -18,7 +18,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1304,7 +1304,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1311,7 +1311,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc index 6b017f5c4f57..7df6b27afa87 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- media/gpu/gpu_video_decode_accelerator_factory.cc.orig 2025-04-15 08:30:07 UTC +--- media/gpu/gpu_video_decode_accelerator_factory.cc.orig 2025-05-06 12:23:00 UTC +++ media/gpu/gpu_video_decode_accelerator_factory.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "media/gpu/media_gpu_export.h" #include "media/media_buildflags.h" @@ -9,7 +9,7 @@ #include "media/gpu/v4l2/legacy/v4l2_video_decode_accelerator.h" #include "media/gpu/v4l2/v4l2_device.h" #endif -@@ -28,7 +28,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA( +@@ -29,7 +29,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA( if (gpu_preferences.disable_accelerated_video_decode) return nullptr; @@ -17,4 +17,4 @@ +#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) std::unique_ptr<VideoDecodeAccelerator> vda; - vda.reset(new V4L2VideoDecodeAccelerator(new V4L2Device())); + vda.reset(new V4L2VideoDecodeAccelerator(base::MakeRefCounted<V4L2Device>())); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index 1dc87aad9a5e..3e61a33b6310 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,20 +1,20 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2025-04-15 08:30:07 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2025-05-06 12:23:00 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -150,7 +150,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions - return vea_factory_functions; +@@ -160,7 +160,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions + } #if BUILDFLAG(USE_VAAPI) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { - vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA)); + vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA)); } -@@ -158,7 +158,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions - vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA)); +@@ -168,7 +168,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions + vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA)); #endif #elif BUILDFLAG(USE_V4L2_CODEC) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { - vea_factory_functions.push_back(base::BindRepeating(&CreateV4L2VEA)); + vea_factory_functions->push_back(base::BindRepeating(&CreateV4L2VEA)); } diff --git a/www/ungoogled-chromium/files/patch-media_gpu_test_raw__video.cc b/www/ungoogled-chromium/files/patch-media_gpu_test_raw__video.cc index f74574bd61ab..0aa2aad23aa7 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_test_raw__video.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_test_raw__video.cc @@ -1,6 +1,6 @@ ---- media/gpu/test/raw_video.cc.orig 2025-01-25 09:34:31 UTC +--- media/gpu/test/raw_video.cc.orig 2025-05-31 17:16:41 UTC +++ media/gpu/test/raw_video.cc -@@ -61,7 +61,7 @@ std::unique_ptr<base::MemoryMappedFile> CreateMemoryMa +@@ -63,7 +63,7 @@ std::unique_ptr<base::MemoryMappedFile> CreateMemoryMa base::File::FLAG_READ | base::File::FLAG_WRITE // On Windows FLAG_CREATE_ALWAYS will require FLAG_WRITE, and FLAG_APPEND // must not be specified. 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 index ee76795c144a..b7d80eb60bdd 100644 --- 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 2025-04-15 08:30:07 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2025-05-06 12:23:00 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -780,7 +780,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -784,7 +784,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_gpu_vaapi_vaapi__wrapper.cc b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index 400b3176bcc8..ec3707cf46a8 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2025-04-15 08:30:07 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2025-05-31 17:16:41 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -79,7 +79,7 @@ +@@ -82,7 +82,7 @@ using media_gpu_vaapi::kModuleVa_prot; #endif diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-media_mojo_mojom_BUILD.gn new file mode 100644 index 000000000000..0b2386c92552 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_BUILD.gn @@ -0,0 +1,11 @@ +--- media/mojo/mojom/BUILD.gn.orig 2025-05-31 17:16:41 UTC ++++ media/mojo/mojom/BUILD.gn +@@ -971,7 +971,7 @@ source_set("test_support") { + sources = [] + deps = [] + +- if (is_linux || is_chromeos) { ++ if (!is_bsd && (is_linux || is_chromeos)) { + sources += [ + "buffer_handle_test_util.cc", + "buffer_handle_test_util.h", diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_BUILD.gn b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_BUILD.gn deleted file mode 100644 index 0cb7e98ca652..000000000000 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- media/mojo/mojom/stable/BUILD.gn.orig 2025-04-15 08:30:07 UTC -+++ media/mojo/mojom/stable/BUILD.gn -@@ -191,7 +191,7 @@ source_set("unit_tests") { - } else if (use_v4l2_codec) { - deps += [ "//media/gpu/v4l2:v4l2_status" ] - } -- if (is_linux || is_chromeos) { -+ if (!is_bsd && (is_linux || is_chromeos)) { - sources += [ - "mojom_traits_test_util.cc", - "mojom_traits_test_util.h", 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 deleted file mode 100644 index d2221e05065d..000000000000 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2025-03-09 21:38:10 UTC -+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -861,7 +861,7 @@ const gfx::GpuMemoryBufferId& StructTraits< - return input.id; - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // static - gfx::NativePixmapHandle StructTraits< - media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -882,7 +882,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor - - output->type = gfx::NATIVE_PIXMAP; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (!data.ReadPlatformHandle(&output->native_pixmap_handle)) - return false; - return true; diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h deleted file mode 100644 index c408d761a5d2..000000000000 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ /dev/null @@ -1,11 +0,0 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2025-02-20 09:59:21 UTC -+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -704,7 +704,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem - static const gfx::GpuMemoryBufferId& id( - const gfx::GpuMemoryBufferHandle& input); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - static gfx::NativePixmapHandle platform_handle( - gfx::GpuMemoryBufferHandle& input); - #else diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index db711494f7db..c0cccf6c9d10 100644 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,4 +1,4 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2025-04-15 08:30:07 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2025-05-06 12:23:00 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc @@ -24,7 +24,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" @@ -7,5 +7,32 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/posix/eintr_wrapper.h" + #include "media/gpu/buffer_validation.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -166,7 +166,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( + media::mojom::OpaqueVideoFrameData::New()); + } +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { + // Duplicates the DMA buffer FDs to a new vector since this cannot take + // ownership of the FDs in |input| due to constness. +@@ -197,7 +197,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( + + } // namespace + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // static + bool StructTraits< + media::mojom::ColorPlaneLayoutDataView, +@@ -436,7 +436,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, + frame = media::VideoFrame::WrapTrackingToken( + format, *metadata.tracking_token, coded_size, visible_rect, + natural_size, timestamp); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + } else if (data.is_dmabuf_data()) { + media::mojom::DmabufVideoFrameDataDataView dmabuf_data; + data.GetDmabufDataDataView(&dmabuf_data); diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h new file mode 100644 index 000000000000..8987e00a7730 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.h @@ -0,0 +1,11 @@ +--- media/mojo/mojom/video_frame_mojom_traits.h.orig 2025-05-06 12:23:00 UTC ++++ media/mojo/mojom/video_frame_mojom_traits.h +@@ -21,7 +21,7 @@ + + namespace mojo { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + template <> + struct StructTraits<media::mojom::ColorPlaneLayoutDataView, + media::ColorPlaneLayout> { diff --git a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc index 726ea8e45117..309a340d55c9 100644 --- a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,6 +1,6 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2025-04-15 08:30:07 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2025-05-31 17:16:41 UTC +++ media/video/fake_gpu_memory_buffer.cc -@@ -14,7 +14,7 @@ +@@ -15,7 +15,7 @@ #include "media/base/format_utils.h" #include "media/base/video_frame.h" @@ -9,7 +9,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -29,7 +29,7 @@ namespace media { +@@ -30,7 +30,7 @@ namespace media { namespace { @@ -18,21 +18,12 @@ base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -84,7 +84,7 @@ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTestin - static base::AtomicSequenceNumber buffer_id_generator; - handle.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); +@@ -74,7 +74,7 @@ static base::AtomicSequenceNumber buffer_id_generator; + + } // namespace -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - for (size_t i = 0; i < VideoFrame::NumPlanes(*video_pixel_format); i++) { - const gfx::Size plane_size_in_bytes = - VideoFrame::PlaneSize(*video_pixel_format, i, size); -@@ -187,7 +187,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH - gfx::GpuMemoryBufferHandle handle; - handle.type = gfx::NATIVE_PIXMAP; - handle.id = handle_.id; --#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 = - gfx::CloneHandleForIPC(handle_.native_pixmap_handle); - #endif + gfx::GpuMemoryBufferHandle CreatePixmapHandleForTesting( + const gfx::Size& size, + gfx::BufferFormat format, diff --git a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.h b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.h index 5b51515e4933..94d1e5cf5b1b 100644 --- a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.h +++ b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.h @@ -1,6 +1,6 @@ ---- media/video/fake_gpu_memory_buffer.h.orig 2025-04-15 08:30:07 UTC +--- media/video/fake_gpu_memory_buffer.h.orig 2025-05-31 17:16:41 UTC +++ media/video/fake_gpu_memory_buffer.h -@@ -13,7 +13,7 @@ +@@ -12,7 +12,7 @@ namespace media { diff --git a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 532021e6c64f..990f8ae0e232 100644 --- a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2025-03-09 21:38:10 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2025-05-06 12:23:00 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -644,7 +644,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -647,7 +647,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasSharedImage(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1054,7 +1054,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1057,7 +1057,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = handle.native_pixmap_handle.supports_zero_copy_webgpu_import; #endif -@@ -1225,7 +1225,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr +@@ -1228,7 +1228,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT; } 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 index 6eae74307e6e..397534a78801 100644 --- 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 2025-03-09 21:38:10 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2025-05-06 12:23:00 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -463,7 +463,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele +@@ -468,7 +468,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele auto format = PIXEL_FORMAT_I420; auto storage_type = VideoEncodeAccelerator::Config::StorageType::kShmem; diff --git a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc index 0c5a1249586f..068574946c4f 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2025-04-15 08:30:07 UTC +--- media/webrtc/audio_processor.cc.orig 2025-05-31 17:16:41 UTC +++ media/webrtc/audio_processor.cc -@@ -507,7 +507,7 @@ std::optional<double> AudioProcessor::ProcessData( +@@ -512,7 +512,7 @@ std::optional<double> AudioProcessor::ProcessData( // controller. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); diff --git a/www/ungoogled-chromium/files/patch-media_webrtc_helpers.cc b/www/ungoogled-chromium/files/patch-media_webrtc_helpers.cc index 2106a27cf244..4d06986c9989 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_helpers.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_helpers.cc @@ -1,6 +1,6 @@ ---- media/webrtc/helpers.cc.orig 2025-01-25 09:34:31 UTC +--- media/webrtc/helpers.cc.orig 2025-05-31 17:16:41 UTC +++ media/webrtc/helpers.cc -@@ -43,14 +43,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS +@@ -46,14 +46,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS return; } 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 index 0fc591191cb0..2c4c084993d9 100644 --- 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,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2025-04-15 08:30:07 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2025-05-06 12:23:00 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -782,6 +782,16 @@ template("mojom") { +@@ -774,6 +774,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } diff --git a/www/ungoogled-chromium/files/patch-net_BUILD.gn b/www/ungoogled-chromium/files/patch-net_BUILD.gn index bcb5a0d9716b..4bfc385294ff 100644 --- 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 2025-04-15 08:30:07 UTC +--- net/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ net/BUILD.gn -@@ -125,7 +125,7 @@ net_configs = [ +@@ -126,7 +126,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1314,6 +1314,19 @@ component("net") { +@@ -1336,6 +1336,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1477,7 +1490,7 @@ component("net") { +@@ -1499,7 +1512,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2176,7 +2189,7 @@ static_library("test_support") { +@@ -2209,7 +2222,7 @@ static_library("test_support") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_test_util.cc", "base/address_tracker_linux_test_util.h", -@@ -2987,14 +3000,14 @@ target(_test_target_type, "net_unittests") { +@@ -3032,14 +3045,14 @@ target(_test_target_type, "net_unittests") { ] } @@ -64,7 +64,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -3088,6 +3101,10 @@ target(_test_target_type, "net_unittests") { +@@ -3137,6 +3150,10 @@ target(_test_target_type, "net_unittests") { ] } @@ -75,7 +75,7 @@ if (enable_websockets) { sources += [ "server/http_connection_unittest.cc", -@@ -3154,7 +3171,7 @@ target(_test_target_type, "net_unittests") { +@@ -3202,7 +3219,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -84,7 +84,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3293,7 +3310,7 @@ target(_test_target_type, "net_unittests") { +@@ -3341,7 +3358,7 @@ target(_test_target_type, "net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/files/patch-net_base_features.cc b/www/ungoogled-chromium/files/patch-net_base_features.cc index 51d4ab9fa2f2..90556d8a4408 100644 --- a/www/ungoogled-chromium/files/patch-net_base_features.cc +++ b/www/ungoogled-chromium/files/patch-net_base_features.cc @@ -1,6 +1,6 @@ ---- net/base/features.cc.orig 2025-03-09 21:38:10 UTC +--- net/base/features.cc.orig 2025-05-31 17:16:41 UTC +++ net/base/features.cc -@@ -28,7 +28,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, +@@ -29,7 +29,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, "AsyncDns", #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ @@ -9,16 +9,3 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -551,7 +551,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, - "SpdyHeadersToHttpResponseUseBuilder", - base::FEATURE_DISABLED_BY_DEFAULT); - -+#if BUILDFLAG(IS_OPENBSD) -+// No IP_RECVTOS support -+BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); -+#else - BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_ENABLED_BY_DEFAULT); -+#endif - - BASE_FEATURE(kUseNewAlpsCodepointHttp2, - "UseNewAlpsCodepointHttp2", diff --git a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc index aee7a1b15bac..cb9f7e9f795c 100644 --- a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier.cc.orig 2025-04-15 08:30:07 UTC +--- net/base/network_change_notifier.cc.orig 2025-05-31 17:16:41 UTC +++ net/base/network_change_notifier.cc -@@ -36,7 +36,7 @@ +@@ -38,7 +38,7 @@ #include "net/base/network_change_notifier_linux.h" #elif BUILDFLAG(IS_APPLE) #include "net/base/network_change_notifier_apple.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_passive.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -323,6 +323,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -325,6 +325,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier__passive.cc b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier__passive.cc index f74fe5b2b169..48d6abfff2b3 100644 --- a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier__passive.cc +++ b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier__passive.cc @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier_passive.cc.orig 2025-04-15 08:30:07 UTC +--- net/base/network_change_notifier_passive.cc.orig 2025-05-31 17:16:41 UTC +++ net/base/network_change_notifier_passive.cc -@@ -106,7 +106,7 @@ NetworkChangeNotifierPassive::GetAddressMapOwnerIntern +@@ -107,7 +107,7 @@ NetworkChangeNotifierPassive::GetAddressMapOwnerIntern NetworkChangeNotifier::NetworkChangeCalculatorParams NetworkChangeNotifierPassive::NetworkChangeCalculatorParamsPassive() { NetworkChangeCalculatorParams params; 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 deleted file mode 100644 index b73c2bec35b9..000000000000 --- a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- net/cert/cert_verify_proc.h.orig 2024-11-16 12:20:41 UTC -+++ net/cert/cert_verify_proc.h -@@ -186,7 +186,7 @@ class NET_EXPORT CertVerifyProc - kMaxValue = kChainLengthOne - }; - --#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ -+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY)) - // Creates and returns a CertVerifyProc that uses the system verifier. - // |cert_net_fetcher| may not be used, depending on the implementation. diff --git a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__proc.cc b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__proc.cc index 880464558725..0d1f19c116b9 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__proc.cc @@ -1,6 +1,6 @@ ---- net/dns/host_resolver_proc.cc.orig 2022-12-02 17:56:32 UTC +--- net/dns/host_resolver_proc.cc.orig 2025-05-31 17:16:41 UTC +++ net/dns/host_resolver_proc.cc -@@ -15,10 +15,6 @@ +@@ -16,10 +16,6 @@ #include "net/base/net_errors.h" #include "net/dns/host_resolver_system_task.h" diff --git a/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc index 8ff8dfce2d27..15de3b82659e 100644 --- a/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,14 +1,13 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2024-07-31 14:19:23 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2025-05-06 12:23:00 UTC +++ net/http/http_auth_gssapi_posix.cc -@@ -375,8 +375,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib - static const char* const kDefaultLibraryNames[] = { +@@ -366,7 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib + } else { #if BUILDFLAG(IS_APPLE) - "/System/Library/Frameworks/GSS.framework/GSS" + library_names.emplace_back("/System/Library/Frameworks/GSS.framework/GSS"); -#elif BUILDFLAG(IS_OPENBSD) -- "libgssapi.so" // Heimdal - OpenBSD +#elif BUILDFLAG(IS_BSD) -+ "libgssapi_krb5.so.2", // MIT Kerberos - FreeBSD -+ "libgssapi.so" // Heimdal - OpenBSD, FreeBSD ++ // MIT Kerberos - FreeBSD ++ library_names.emplace_back("libgssapi_krb5.so.2"); + // Heimdal - OpenBSD + library_names.emplace_back("libgssapi.so"); #else - "libgssapi_krb5.so.2", // MIT Kerberos - FC, Suse10, Debian - "libgssapi.so.4", // Heimdal - Suse10, MDK diff --git a/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 94c8fad9de8a..8b324a33e2b1 100644 --- a/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2024-07-31 14:19:23 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2025-05-31 17:16:41 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -11,7 +11,9 @@ @@ -10,7 +10,7 @@ #include <unistd.h> #include <map> -@@ -510,6 +512,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -502,6 +504,7 @@ bool SettingGetterImplGSettings::CheckVersion() { } #endif // defined(USE_GIO) @@ -18,7 +18,7 @@ // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(std::string_view value, int default_value) { -@@ -1038,6 +1041,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1039,6 +1042,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr<base::SequencedTaskRunner> file_task_runner_; }; @@ -26,7 +26,7 @@ } // namespace -@@ -1256,9 +1260,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1258,9 +1262,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: case base::nix::DESKTOP_ENVIRONMENT_KDE6: 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 index 067a9f495b77..93e8513975bb 100644 --- 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 2024-10-27 06:40:35 UTC +--- net/socket/tcp_socket_posix.cc.orig 2025-05-31 17:16:41 UTC +++ net/socket/tcp_socket_posix.cc -@@ -98,6 +98,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 index 5b4d48cdfec6..74caa00a4502 100644 --- 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 2025-04-15 08:30:07 UTC +--- net/socket/udp_socket_posix.cc.orig 2025-05-31 17:16:41 UTC +++ net/socket/udp_socket_posix.cc -@@ -527,12 +527,17 @@ int UDPSocketPosix::SetRecvTos() { +@@ -530,12 +530,17 @@ int UDPSocketPosix::SetRecvTos() { #endif // BUILDFLAG(IS_APPLE) } @@ -19,7 +19,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -553,7 +558,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -556,7 +561,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -28,7 +28,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -891,7 +896,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -894,7 +899,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS) 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 index 49e3cbc54705..88a374702952 100644 --- 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 2025-04-15 08:30:07 UTC +--- net/socket/udp_socket_unittest.cc.orig 2025-05-31 17:16:41 UTC +++ net/socket/udp_socket_unittest.cc -@@ -371,7 +371,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -392,7 +392,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). -@@ -682,7 +682,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -703,7 +703,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = client.SetDoNotFragment(); @@ -18,7 +18,7 @@ // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #else -@@ -704,7 +704,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { +@@ -725,7 +725,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = server.SetDoNotFragment(); @@ -27,7 +27,7 @@ // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #else -@@ -763,7 +763,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -791,7 +791,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { // TODO(crbug.com/40620614): failing on device on iOS 12.2. // TODO(crbug.com/40189274): flaky on Mac 11. @@ -36,7 +36,7 @@ #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -817,7 +817,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -845,7 +845,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); diff --git a/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index b205cb3c4d48..2aa414debbc7 100644 --- a/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,4 +1,4 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-10-27 06:40:35 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2025-05-31 17:16:41 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -35,7 +35,7 @@ #include "third_party/boringssl/src/pki/trust_store.h" @@ -18,12 +18,3 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -580,7 +580,7 @@ int main(int argc, char** argv) { - std::string impls_str = command_line.GetSwitchValueASCII("impls"); - if (impls_str.empty()) { - // Default value. --#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ -+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY)) - impls_str = "platform,"; - #endif diff --git a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc index 6ad47778f738..c570a4fe6b92 100644 --- a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2025-04-15 08:30:07 UTC +--- net/url_request/url_request_context_builder.cc.orig 2025-05-31 17:16:41 UTC +++ net/url_request/url_request_context_builder.cc -@@ -441,7 +441,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -445,7 +445,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 00a25f5e45a4..63f739692f14 100644 --- a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2025-04-15 08:30:07 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2025-05-31 17:16:41 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -109,7 +109,7 @@ +@@ -112,7 +112,7 @@ #include "ui/accessibility/ax_features.mojom-features.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -565,7 +565,7 @@ void InitializeSDK(bool enable_v8, +@@ -568,7 +568,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); 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 index ae21ff42a942..082d133c6aeb 100644 --- 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-11-04 07:08:51 UTC +--- printing/mojom/printing_context_mojom_traits.cc.orig 2025-05-31 17:16:41 UTC +++ printing/mojom/printing_context_mojom_traits.cc @@ -19,7 +19,7 @@ #include "base/numerics/safe_conversions.h" @@ -9,7 +9,7 @@ #include "mojo/public/mojom/base/values.mojom.h" #endif -@@ -161,7 +161,7 @@ bool StructTraits< +@@ -162,7 +162,7 @@ bool StructTraits< } out->set_pages_per_sheet(data.pages_per_sheet()); @@ -18,7 +18,7 @@ DCHECK(out->advanced_settings().empty()); if (!data.ReadAdvancedSettings(&out->advanced_settings())) return false; -@@ -238,7 +238,7 @@ bool StructTraits< +@@ -239,7 +239,7 @@ bool StructTraits< if (system_print_dialog_data.size() != dictionary_entries) { return false; } diff --git a/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc b/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc index d1a5ac68beb9..913fbf8ed87e 100644 --- a/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc +++ b/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc @@ -1,4 +1,4 @@ ---- printing/mojom/printing_context_mojom_traits_unittest.cc.orig 2025-04-15 08:30:07 UTC +--- printing/mojom/printing_context_mojom_traits_unittest.cc.orig 2025-05-31 17:16:41 UTC +++ printing/mojom/printing_context_mojom_traits_unittest.cc @@ -79,7 +79,7 @@ base::Value::Dict GenerateSampleSystemPrintDialogData( data.Set(kMacSystemPrintDialogDataDestinationLocation, "/foo/bar.pdf"); @@ -9,16 +9,16 @@ data.Set(kLinuxSystemPrintDialogDataPrinter, "printer-name"); data.Set(kLinuxSystemPrintDialogDataPrintSettings, "print-settings-foo"); data.Set(kLinuxSystemPrintDialogDataPageSetup, "page-setup-bar"); -@@ -114,7 +114,7 @@ const PageMargins kPrintSettingsCustomMarginsInPoints( - /*top=*/30, - /*bottom=*/35); +@@ -116,7 +116,7 @@ const PageMargins kPrintSettingsCustomMarginsInMicrons + /*top=*/10583, + /*bottom=*/12347); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) PrintSettings::AdvancedSettings GenerateSampleAdvancedSettings() { PrintSettings::AdvancedSettings advanced_settings; advanced_settings.emplace("advanced-setting-A", base::Value("setting-A")); -@@ -207,7 +207,7 @@ PrintSettings GenerateSamplePrintSettingsCommon() { +@@ -209,7 +209,7 @@ PrintSettings GenerateSamplePrintSettingsCommon() { settings.set_device_name(kPrintSettingsDeviceName); settings.set_requested_media(kPrintSettingsRequestedMedia); @@ -27,7 +27,7 @@ PrintSettings::AdvancedSettings& advanced_settings = settings.advanced_settings(); for (const auto& item : kPrintSettingsAdvancedSettings) -@@ -545,7 +545,7 @@ TEST(PrintingContextMojomTraitsTest, +@@ -547,7 +547,7 @@ TEST(PrintingContextMojomTraitsTest, EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet1); @@ -36,8 +36,8 @@ EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings); #endif -@@ -598,7 +598,7 @@ TEST(PrintingContextMojomTraitsTest, - kPrintSettingsCustomMarginsInPoints)); +@@ -600,7 +600,7 @@ TEST(PrintingContextMojomTraitsTest, + kPrintSettingsCustomMarginsInMicrons)); EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet2); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -45,7 +45,7 @@ EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings); #endif -@@ -637,7 +637,7 @@ TEST(PrintingContextMojomTraitsTest, +@@ -639,7 +639,7 @@ TEST(PrintingContextMojomTraitsTest, EXPECT_EQ(output.page_setup_device_units(), kInput.page_setup_device_units()); } @@ -54,7 +54,7 @@ TEST(PrintingContextMojomTraitsTest, TestSerializeAndDeserializePrintSettingsEmptyAdvancedSettings) { PrintSettings input = GenerateSamplePrintSettingsDefaultMargins(); -@@ -835,7 +835,7 @@ TEST( +@@ -837,7 +837,7 @@ TEST( } #endif // BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-printing_print__settings.cc b/www/ungoogled-chromium/files/patch-printing_print__settings.cc index fbb78d471ea6..e5b2b84360de 100644 --- a/www/ungoogled-chromium/files/patch-printing_print__settings.cc +++ b/www/ungoogled-chromium/files/patch-printing_print__settings.cc @@ -1,4 +1,4 @@ ---- printing/print_settings.cc.orig 2024-11-16 12:20:41 UTC +--- printing/print_settings.cc.orig 2025-05-31 17:16:41 UTC +++ printing/print_settings.cc @@ -319,7 +319,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif @@ -11,7 +11,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -349,7 +349,7 @@ bool PrintSettings::operator==(const PrintSettings& ot #endif - is_modifiable_, requested_custom_margins_in_points_, + is_modifiable_, requested_custom_margins_in_microns_, pages_per_sheet_ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -20,7 +20,7 @@ #endif @@ -373,7 +373,7 @@ bool PrintSettings::operator==(const PrintSettings& ot other.is_modifiable_, - other.requested_custom_margins_in_points_, + other.requested_custom_margins_in_microns_, other.pages_per_sheet_ -#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-printing_print__settings.h b/www/ungoogled-chromium/files/patch-printing_print__settings.h index 87abcf55d21b..70567dcdffdf 100644 --- 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 2024-10-01 07:26:23 UTC +--- printing/print_settings.h.orig 2025-05-31 17:16:41 UTC +++ printing/print_settings.h @@ -25,7 +25,7 @@ #include "base/values.h" @@ -36,7 +36,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting +@@ -434,7 +434,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/ungoogled-chromium/files/patch-printing_print__settings__conversion.cc b/www/ungoogled-chromium/files/patch-printing_print__settings__conversion.cc index 763cb34ac7a3..ebf6c733331e 100644 --- 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 2024-04-23 07:42:17 UTC +--- printing/print_settings_conversion.cc.orig 2025-05-31 17:16:41 UTC +++ printing/print_settings_conversion.cc -@@ -285,7 +285,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -291,7 +291,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 index 1413673fdb01..8f9622510dc4 100644 --- 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 2024-11-16 12:20:41 UTC +--- printing/printing_context_linux.cc.orig 2025-05-31 17:16:41 UTC +++ printing/printing_context_linux.cc @@ -23,7 +23,7 @@ #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -66,7 +66,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett +@@ -69,7 +69,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett ResetSettings(); @@ -18,7 +18,7 @@ if (!ui::LinuxUi::instance()) return mojom::ResultCode::kSuccess; -@@ -82,7 +82,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett +@@ -85,7 +85,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett } gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() { @@ -27,7 +27,7 @@ if (ui::LinuxUi::instance()) return ui::LinuxUi::instance()->GetPdfPaperSize(this); #endif -@@ -95,7 +95,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS +@@ -98,7 +98,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS DCHECK(!printer_settings.show_system_dialog); DCHECK(!in_print_job_); diff --git a/www/ungoogled-chromium/files/patch-printing_printing__features.cc b/www/ungoogled-chromium/files/patch-printing_printing__features.cc index 1669ad7ff136..e1061b42f81c 100644 --- a/www/ungoogled-chromium/files/patch-printing_printing__features.cc +++ b/www/ungoogled-chromium/files/patch-printing_printing__features.cc @@ -1,7 +1,7 @@ ---- printing/printing_features.cc.orig 2025-02-20 09:59:21 UTC +--- printing/printing_features.cc.orig 2025-05-06 12:23:00 UTC +++ printing/printing_features.cc -@@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -26,12 +26,12 @@ BASE_FEATURE(kApiPrintingMarginsAndScale, + base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -15,7 +15,7 @@ base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT -@@ -69,7 +69,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, +@@ -81,7 +81,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, // out-of-process. BASE_FEATURE(kEnableOopPrintDrivers, "EnableOopPrintDrivers", diff --git a/www/ungoogled-chromium/files/patch-printing_printing__features.h b/www/ungoogled-chromium/files/patch-printing_printing__features.h index 0f57dcee81c5..d122be42d31b 100644 --- a/www/ungoogled-chromium/files/patch-printing_printing__features.h +++ b/www/ungoogled-chromium/files/patch-printing_printing__features.h @@ -1,7 +1,7 @@ ---- printing/printing_features.h.orig 2024-07-31 14:19:23 UTC +--- printing/printing_features.h.orig 2025-05-06 12:23:00 UTC +++ printing/printing_features.h -@@ -22,7 +22,7 @@ COMPONENT_EXPORT(PRINTING_BASE) - BASE_DECLARE_FEATURE(kAddPrinterViaPrintscanmgr); +@@ -24,7 +24,7 @@ COMPONENT_EXPORT(PRINTING_BASE) + BASE_DECLARE_FEATURE(kApiPrintingMarginsAndScale); #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-remoting_base_constants.h b/www/ungoogled-chromium/files/patch-remoting_base_constants.h new file mode 100644 index 000000000000..7e43e033f881 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_base_constants.h @@ -0,0 +1,11 @@ +--- remoting/base/constants.h.orig 2025-05-31 17:16:41 UTC ++++ remoting/base/constants.h +@@ -27,7 +27,7 @@ const int kDefaultDpi = 96; + // The video frame rate. + constexpr int kTargetFrameRate = 30; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + inline constexpr char kChromeRemoteDesktopSessionEnvVar[] = + "CHROME_REMOTE_DESKTOP_SESSION"; + #endif diff --git a/www/ungoogled-chromium/files/patch-remoting_host_base_desktop__environment__options.cc b/www/ungoogled-chromium/files/patch-remoting_host_base_desktop__environment__options.cc index baecf4dd070c..807ba1115578 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_base_desktop__environment__options.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_base_desktop__environment__options.cc @@ -1,6 +1,6 @@ ---- remoting/host/base/desktop_environment_options.cc.orig 2024-10-27 06:40:35 UTC +--- remoting/host/base/desktop_environment_options.cc.orig 2025-05-06 12:23:00 UTC +++ remoting/host/base/desktop_environment_options.cc -@@ -99,7 +99,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic +@@ -109,7 +109,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic // TODO(joedow): Determine whether we can migrate additional platforms to // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then // clean up DesktopCapturerProxy::Core::CreateCapturer(). diff --git a/www/ungoogled-chromium/files/patch-remoting_host_base_switches.cc b/www/ungoogled-chromium/files/patch-remoting_host_base_switches.cc index a52bcb1fb305..0c6380e20d51 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_base_switches.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_base_switches.cc @@ -1,4 +1,4 @@ ---- remoting/host/base/switches.cc.orig 2022-10-01 07:40:07 UTC +--- remoting/host/base/switches.cc.orig 2025-05-31 17:16:41 UTC +++ remoting/host/base/switches.cc @@ -23,13 +23,13 @@ const char kProcessTypeEvaluateCapability[] = "evaluat const char kProcessTypeFileChooser[] = "file_chooser"; @@ -13,6 +13,6 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kEnableUtempter[] = "enable-utempter"; + const char kEnableWtmpdb[] = "enable-wtmpdb"; #endif diff --git a/www/ungoogled-chromium/files/patch-remoting_host_base_switches.h b/www/ungoogled-chromium/files/patch-remoting_host_base_switches.h index e126c3b2a17d..eeeb25ece23c 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_base_switches.h +++ b/www/ungoogled-chromium/files/patch-remoting_host_base_switches.h @@ -1,4 +1,4 @@ ---- remoting/host/base/switches.h.orig 2022-10-01 07:40:07 UTC +--- remoting/host/base/switches.h.orig 2025-05-31 17:16:41 UTC +++ remoting/host/base/switches.h @@ -35,13 +35,13 @@ extern const char kProcessTypeRdpDesktopSession[]; extern const char kProcessTypeEvaluateCapability[]; @@ -13,6 +13,6 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Used to record client sessions to utmp/wtmp. - extern const char kEnableUtempter[]; + // Used to record client sessions to wtmpd. + extern const char kEnableWtmpdb[]; #endif diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc index 854354173b8f..c3fe87c18e71 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host.cc.orig 2025-01-25 09:34:31 UTC +--- remoting/host/chromoting_host.cc.orig 2025-05-06 12:23:00 UTC +++ remoting/host/chromoting_host.cc -@@ -135,7 +135,7 @@ void ChromotingHost::Start(const std::string& host_own +@@ -137,7 +137,7 @@ void ChromotingHost::Start(const std::string& host_own &ChromotingHost::OnIncomingSession, base::Unretained(this))); } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h index fd5b7354a505..14aaa2b4e26d 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h +++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h @@ -1,4 +1,4 @@ ---- remoting/host/chromoting_host.h.orig 2025-01-25 09:34:31 UTC +--- remoting/host/chromoting_host.h.orig 2025-05-06 12:23:00 UTC +++ remoting/host/chromoting_host.h @@ -36,7 +36,7 @@ #include "remoting/protocol/session_manager.h" @@ -18,7 +18,7 @@ // Starts running the ChromotingHostServices server and listening for incoming // IPC binding requests. // Currently only Linux runs the ChromotingHostServices server on the host -@@ -220,7 +220,7 @@ class ChromotingHost : public ClientSession::EventHand +@@ -222,7 +222,7 @@ class ChromotingHost : public ClientSession::EventHand // List of host extensions. std::vector<std::unique_ptr<HostExtension>> extensions_; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__services__client.cc b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__services__client.cc index a1b4dc491665..4a19789fdb15 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__services__client.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__services__client.cc @@ -1,15 +1,6 @@ ---- remoting/host/chromoting_host_services_client.cc.orig 2023-09-17 07:59:53 UTC +--- remoting/host/chromoting_host_services_client.cc.orig 2025-05-31 17:16:41 UTC +++ remoting/host/chromoting_host_services_client.cc -@@ -59,7 +59,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con - - } // namespace - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - // static - constexpr char -@@ -136,7 +136,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic +@@ -134,7 +134,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic if (session_services_remote_.is_bound()) { return true; } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc b/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc index 25d25b22d1db..fd4a1c23036a 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc @@ -1,6 +1,6 @@ ---- remoting/host/client_session.cc.orig 2025-04-15 08:30:07 UTC +--- remoting/host/client_session.cc.orig 2025-05-06 12:23:00 UTC +++ remoting/host/client_session.cc -@@ -187,7 +187,7 @@ void ClientSession::NotifyClientResolution( +@@ -188,7 +188,7 @@ void ClientSession::NotifyClientResolution( if (effective_policies_.curtain_required.value_or(false)) { dpi_vector.set(resolution.x_dpi(), resolution.y_dpi()); } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_host__attributes.cc b/www/ungoogled-chromium/files/patch-remoting_host_host__attributes.cc index 400aa104d65c..381e77a6eace 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_host__attributes.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_host__attributes.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_attributes.cc.orig 2024-06-22 08:49:42 UTC +--- remoting/host/host_attributes.cc.orig 2025-05-06 12:23:00 UTC +++ remoting/host/host_attributes.cc -@@ -105,7 +105,7 @@ std::string GetHostAttributes() { +@@ -103,7 +103,7 @@ std::string GetHostAttributes() { if (media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_mojo__caller__security__checker.cc b/www/ungoogled-chromium/files/patch-remoting_host_mojo__caller__security__checker.cc index f2657a35e653..729c2e702930 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_mojo__caller__security__checker.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_mojo__caller__security__checker.cc @@ -1,6 +1,6 @@ ---- remoting/host/mojo_caller_security_checker.cc.orig 2025-04-15 08:30:07 UTC +--- remoting/host/mojo_caller_security_checker.cc.orig 2025-05-31 17:16:41 UTC +++ remoting/host/mojo_caller_security_checker.cc -@@ -37,7 +37,7 @@ +@@ -32,7 +32,7 @@ namespace remoting { namespace { @@ -9,16 +9,16 @@ constexpr auto kAllowedCallerProgramNames = base::MakeFixedFlatSet<base::FilePath::StringViewType>({ "remote-open-url", -@@ -98,7 +98,7 @@ bool IsTrustedMojoEndpoint( - return true; - #endif - +@@ -60,7 +60,7 @@ bool IsTrustedMojoEndpoint( + const named_mojo_ipc_server::ConnectionInfo& caller) { + #if BUILDFLAG(IS_MAC) + return IsProcessTrusted(caller.audit_token, kAllowedIdentifiers); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // TODO: yuweih - see if it's possible to move away from PID-based security // checks, which might be susceptible of PID reuse attacks. -@@ -122,7 +122,7 @@ bool IsTrustedMojoEndpoint( +@@ -84,7 +84,7 @@ bool IsTrustedMojoEndpoint( base::FilePath::StringType program_name = caller_process_image_path.BaseName().value(); if (!kAllowedCallerProgramNames.contains(program_name)) { diff --git a/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc index 8f522597fe26..77eee563d8b5 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc @@ -1,8 +1,8 @@ ---- remoting/host/policy_watcher.cc.orig 2025-03-09 21:38:10 UTC +--- remoting/host/policy_watcher.cc.orig 2025-05-31 17:16:41 UTC +++ remoting/host/policy_watcher.cc -@@ -177,7 +177,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() - true); +@@ -182,7 +182,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false); + result.Set(key::kClassManagementEnabled, "disabled"); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc index 835e5d878401..93a589932a10 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2025-04-15 08:30:07 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2025-05-31 17:16:41 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -138,7 +138,7 @@ +@@ -140,7 +140,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> -@@ -148,7 +148,7 @@ +@@ -150,7 +150,7 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -18,16 +18,16 @@ #include "base/linux_util.h" #include "remoting/host/linux/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" -@@ -163,7 +163,7 @@ +@@ -165,7 +165,7 @@ #include "remoting/host/pairing_registry_delegate_win.h" #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "remoting/host/host_utmp_logger.h" + #include "remoting/host/host_wtmpdb_logger.h" #endif // BUILDFLAG(IS_LINUX) -@@ -196,7 +196,7 @@ const char kApplicationName[] = "chromoting"; +@@ -198,7 +198,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -36,7 +36,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -440,7 +440,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -447,7 +447,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_; #endif @@ -45,16 +45,16 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -505,7 +505,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -512,7 +512,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_; std::unique_ptr<HostEventLogger> host_event_logger_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::unique_ptr<HostUTMPLogger> host_utmp_logger_; + std::unique_ptr<HostWtmpdbLogger> host_wtmpdb_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -824,7 +824,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -839,7 +839,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -63,7 +63,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -901,7 +901,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -916,7 +916,7 @@ void HostProcess::CreateAuthenticatorFactory() { context_->create_client_cert_store_callback(), service_account_email_, oauth_refresh_token_)); @@ -72,7 +72,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -1043,7 +1043,7 @@ void HostProcess::StartOnUiThread() { +@@ -1058,7 +1058,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -81,7 +81,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1122,7 +1122,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1137,7 +1137,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -90,7 +90,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1130,7 +1130,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1145,7 +1145,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -99,34 +99,25 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1864,7 +1864,7 @@ void HostProcess::StartHost() { - corp_host_status_logger_->StartObserving(*session_manager); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_); - #endif - #if BUILDFLAG(IS_WIN) -@@ -1891,7 +1891,7 @@ void HostProcess::StartHost() { +@@ -1928,7 +1928,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); - if (cmd_line->HasSwitch(kEnableUtempter)) { - host_utmp_logger_ = -@@ -1927,7 +1927,7 @@ void HostProcess::StartHost() { + if (cmd_line->HasSwitch(kEnableWtmpdb)) { + host_wtmpdb_logger_ = +@@ -1964,7 +1964,7 @@ void HostProcess::StartHost() { // addresses. host_->Start(*host_owner_emails_.begin()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // For Windows, ChromotingHostServices connections are handled by the daemon - // process, then the message pipe is forwarded to the network process. + // For Windows and Mac, ChromotingHostServices connections are handled by + // another process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2072,7 +2072,7 @@ int HostProcessMain() { +@@ -2109,7 +2109,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -135,7 +126,7 @@ #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -2135,7 +2135,7 @@ int HostProcessMain() { +@@ -2172,7 +2172,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_session__policies__from__dict.cc b/www/ungoogled-chromium/files/patch-remoting_host_session__policies__from__dict.cc index 71c8fa9116d8..fa382ccebca4 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_session__policies__from__dict.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_session__policies__from__dict.cc @@ -1,11 +1,11 @@ ---- remoting/host/session_policies_from_dict.cc.orig 2025-01-25 09:34:31 UTC +--- remoting/host/session_policies_from_dict.cc.orig 2025-05-06 12:23:00 UTC +++ remoting/host/session_policies_from_dict.cc -@@ -76,7 +76,7 @@ std::optional<SessionPolicies> SessionPoliciesFromDict - .curtain_required = - dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain), +@@ -75,7 +75,7 @@ std::optional<SessionPolicies> SessionPoliciesFromDict + session_policies.curtain_required = + dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - .host_username_match_required = - dict.FindBool(policy::key::kRemoteAccessHostMatchUsername), + session_policies.host_username_match_required = + dict.FindBool(policy::key::kRemoteAccessHostMatchUsername); #endif diff --git a/www/ungoogled-chromium/files/patch-remoting_host_webauthn_desktop__session__type__util.cc b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_desktop__session__type__util.cc new file mode 100644 index 000000000000..788cd61eb559 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_desktop__session__type__util.cc @@ -0,0 +1,20 @@ +--- remoting/host/webauthn/desktop_session_type_util.cc.orig 2025-05-31 17:16:41 UTC ++++ remoting/host/webauthn/desktop_session_type_util.cc +@@ -11,7 +11,7 @@ + namespace remoting { + namespace { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + DesktopSessionType GetDesktopSessionTypeInternal( + std::unique_ptr<base::Environment> environment) { + // Currently on Linux, a desktop session is either remote-only or local-only. +@@ -29,7 +29,7 @@ DesktopSessionType GetDesktopSessionTypeInternal( + } // namespace + + DesktopSessionType GetDesktopSessionType() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + static const DesktopSessionType desktop_session_type = + GetDesktopSessionTypeInternal(base::Environment::Create()); + return desktop_session_type; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc index e726cf62fdb5..397f3f05f940 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc @@ -1,6 +1,6 @@ ---- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2025-04-15 08:30:07 UTC +--- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2025-05-31 17:16:41 UTC +++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc -@@ -10,7 +10,7 @@ +@@ -14,7 +14,7 @@ #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" @@ -8,8 +8,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "base/containers/fixed_flat_set.h" #include "base/files/file_path.h" - #include "base/process/process_handle.h" -@@ -38,7 +38,7 @@ namespace { + #include "remoting/host/base/process_util.h" +@@ -48,7 +48,7 @@ namespace { // No static variables needed for debug builds. @@ -18,7 +18,7 @@ constexpr auto kAllowedCallerPrograms = base::MakeFixedFlatSet<base::FilePath::StringViewType>({ -@@ -83,7 +83,7 @@ bool IsLaunchedByTrustedProcess() { +@@ -99,7 +99,7 @@ bool IsLaunchedByTrustedProcess() { #if !defined(NDEBUG) // Just return true on debug builds for the convenience of development. return true; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc index 9f482ad2f650..8024080fa1a3 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc @@ -1,6 +1,6 @@ ---- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2024-10-27 06:40:35 UTC +--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2025-05-31 17:16:41 UTC +++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "base/task/thread_pool.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "base/strings/string_util.h" -@@ -75,14 +75,14 @@ static constexpr char kExtensionWakeupFileContent[] = +@@ -76,14 +76,14 @@ static constexpr char kExtensionWakeupFileContent[] = // Caller should check if the directory exists before writing files to it. A // directory only exists if the corresponding Chrome version is installed. std::vector<base::FilePath> GetRemoteStateChangeDirPaths() { diff --git a/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn index 5191f3b3a910..9a3cd197d85b 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/linux/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- sandbox/linux/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ sandbox/linux/BUILD.gn @@ -12,11 +12,11 @@ if (is_android) { } @@ -15,7 +15,7 @@ # On Android, use plain GTest. use_base_test_suite = is_linux || is_chromeos -@@ -384,6 +384,17 @@ component("sandbox_services") { +@@ -377,6 +377,17 @@ component("sandbox_services") { "services/libc_interceptor.h", ] } diff --git a/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc index 342e5b806df5..dc9234b79f19 100644 --- a/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- services/audio/audio_sandbox_hook_linux.cc.orig 2024-06-22 08:49:42 UTC +--- services/audio/audio_sandbox_hook_linux.cc.orig 2025-05-31 17:16:41 UTC +++ services/audio/audio_sandbox_hook_linux.cc -@@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions( +@@ -147,6 +147,7 @@ void AddPulseAudioFilePermissions( } #endif @@ -8,7 +8,7 @@ std::vector<BrokerFilePermission> GetAudioFilePermissions() { std::vector<BrokerFilePermission> permissions{ BrokerFilePermission::ReadOnly("/dev/urandom"), -@@ -171,10 +172,12 @@ void LoadAudioLibraries() { +@@ -175,10 +176,12 @@ void LoadAudioLibraries() { } } } @@ -21,7 +21,7 @@ LoadAudioLibraries(); auto* instance = sandbox::policy::SandboxLinux::GetInstance(); instance->StartBrokerProcess(MakeBrokerCommandSet({ -@@ -192,6 +195,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux +@@ -196,6 +199,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux // TODO(crbug.com/40579955) enable namespace sandbox. Currently, if // enabled, connect() on pulse native socket fails with ENOENT (called from // pa_context_connect). diff --git a/www/ungoogled-chromium/files/patch-services_device_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_BUILD.gn index e876d1fdb20c..0c7d5e190dc8 100644 --- a/www/ungoogled-chromium/files/patch-services_device_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- services/device/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ services/device/BUILD.gn -@@ -13,7 +13,7 @@ if (is_android) { +@@ -17,7 +17,7 @@ if (is_ios) { } is_serial_enabled_platform = diff --git a/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc b/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc index 3bb45e0a7b79..cf8a2311b5e2 100644 --- a/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc +++ b/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc @@ -1,8 +1,8 @@ ---- services/device/geolocation/location_provider_manager.cc.orig 2025-02-20 09:59:21 UTC +--- services/device/geolocation/location_provider_manager.cc.orig 2025-05-06 12:23:00 UTC +++ services/device/geolocation/location_provider_manager.cc @@ -91,7 +91,7 @@ LocationProviderManager::LocationProviderManager( - #if BUILDFLAG(IS_ANDROID) - // On Android, default to using the platform location provider. + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) + // On Android and iOS, default to using the platform location provider. provider_manager_mode_ = kPlatformOnly; -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.cc b/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.cc index 7550313ddcfc..b1ed4e28a465 100644 --- a/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.cc +++ b/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.cc @@ -1,6 +1,6 @@ ---- services/device/public/cpp/device_features.cc.orig 2025-04-15 08:30:07 UTC +--- services/device/public/cpp/device_features.cc.orig 2025-05-31 17:16:41 UTC +++ services/device/public/cpp/device_features.cc -@@ -120,7 +120,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { +@@ -140,7 +140,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { // Controls whether Chrome will try to automatically detach kernel drivers when // a USB interface is busy. 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 index 05875dceb601..11e0a875ba46 100644 --- 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,6 +1,6 @@ ---- services/device/public/mojom/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- services/device/public/mojom/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ services/device/public/mojom/BUILD.gn -@@ -96,7 +96,7 @@ mojom("device_service") { +@@ -98,7 +98,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc new file mode 100644 index 000000000000..c9dd3f901b57 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc @@ -0,0 +1,38 @@ +--- services/device/usb/usb_device_handle_usbfs.cc.orig 2025-05-06 12:23:00 UTC ++++ services/device/usb/usb_device_handle_usbfs.cc +@@ -39,7 +39,7 @@ + #include "chromeos/dbus/permission_broker/permission_broker_client.h" + #endif + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "services/device/public/cpp/device_features.h" + #include "services/device/usb/usb_interface_detach_allowlist.h" + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +@@ -271,7 +271,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::R + return true; + } + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::DetachInterface( + int interface_number, + const CombinedInterfaceInfo& interface_info) { +@@ -599,7 +599,7 @@ void UsbDeviceHandleUsbfs::ClaimInterface(int interfac + return; + } + #endif +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) { + const mojom::UsbConfigurationInfo* config = + device_->GetActiveConfiguration(); +@@ -945,7 +945,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterfaceComplete(in + return; + } + #endif +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) { + helper_.AsyncCall(&BlockingTaskRunnerHelper::ReattachInterface) + .WithArgs(interface_number) diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.h b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.h new file mode 100644 index 000000000000..1d6b1f96603f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.h @@ -0,0 +1,38 @@ +--- services/device/usb/usb_device_handle_usbfs.h.orig 2025-05-06 12:23:00 UTC ++++ services/device/usb/usb_device_handle_usbfs.h +@@ -19,7 +19,7 @@ + #include "base/threading/sequence_bound.h" + #include "services/device/usb/usb_device_handle.h" + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/containers/flat_set.h" + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) + +@@ -215,7 +215,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper { + bool ClearHalt(uint8_t endpoint_address); + void DiscardUrb(Transfer* transfer); + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Detach the interface from a kernel driver before ClaimInterface + virtual bool DetachInterface(int interface_number, + const CombinedInterfaceInfo& interfaceInfo); +@@ -228,7 +228,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper { + // Called when |fd_| is writable without blocking. + void OnFileCanWriteWithoutBlocking(); + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Called from |DetachInterface|. + std::string GetKernelDriver(int interface_number) const; + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +@@ -240,7 +240,7 @@ class UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper { + std::unique_ptr<base::FileDescriptorWatcher::Controller> watch_controller_; + SEQUENCE_CHECKER(sequence_checker_); + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // All interfaces that have been detached from kernel drivers + base::flat_set<int> detached_interfaces_; + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index bf3918999620..df7ed1243bff 100644 --- 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 2025-04-15 08:30:07 UTC +--- services/network/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ services/network/BUILD.gn -@@ -397,7 +397,6 @@ if (is_linux || is_chromeos) { +@@ -413,7 +413,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.cc b/www/ungoogled-chromium/files/patch-services_network_network__context.cc index 61ae73cbeea2..46b20fca07a7 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2025-04-15 08:30:07 UTC +--- services/network/network_context.cc.orig 2025-05-31 17:16:41 UTC +++ services/network/network_context.cc -@@ -611,7 +611,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -612,7 +612,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2552,7 +2552,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2543,7 +2543,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.h b/www/ungoogled-chromium/files/patch-services_network_network__context.h index 0f20619fe638..cc0b4443a5d4 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.h +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.h @@ -1,6 +1,6 @@ ---- services/network/network_context.h.orig 2025-04-15 08:30:07 UTC +--- services/network/network_context.h.orig 2025-05-31 17:16:41 UTC +++ services/network/network_context.h -@@ -709,7 +709,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -723,7 +723,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.cc b/www/ungoogled-chromium/files/patch-services_network_network__service.cc index 0219fb2ad8e2..6d1e5059879f 100644 --- 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 2025-04-15 08:30:07 UTC +--- services/network/network_service.cc.orig 2025-05-31 17:16:41 UTC +++ services/network/network_service.cc -@@ -102,11 +102,11 @@ +@@ -103,11 +103,11 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -14,7 +14,7 @@ #include "services/network/network_change_notifier_passive_factory.h" #endif -@@ -999,7 +999,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -1043,7 +1043,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -23,7 +23,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1081,7 +1081,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1143,7 +1143,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.h b/www/ungoogled-chromium/files/patch-services_network_network__service.h index 2c6fe41a7536..6e1d87b76338 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__service.h +++ b/www/ungoogled-chromium/files/patch-services_network_network__service.h @@ -1,6 +1,6 @@ ---- services/network/network_service.h.orig 2025-04-15 08:30:07 UTC +--- services/network/network_service.h.orig 2025-05-31 17:16:41 UTC +++ services/network/network_service.h -@@ -249,7 +249,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -251,7 +251,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService const std::vector<ContentSettingPatternSource>& settings) override; void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override; @@ -9,7 +9,7 @@ void SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) override; -@@ -275,7 +275,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -292,7 +292,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory( NetworkContext* network_context); @@ -18,7 +18,7 @@ // This is called just before a GSSAPI library may be loaded. void OnBeforeGssapiLibraryLoad(); #endif // BUILDFLAG(IS_LINUX) -@@ -531,7 +531,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -550,7 +550,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService // leaking stale listeners between tests. std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_; diff --git a/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn index 92a4c5cec80c..96e2976e25ba 100644 --- a/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/cpp/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- services/network/public/cpp/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ services/network/public/cpp/BUILD.gn -@@ -572,7 +572,7 @@ component("cpp_base") { +@@ -641,7 +641,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/ungoogled-chromium/files/patch-services_network_public_cpp_features.cc b/www/ungoogled-chromium/files/patch-services_network_public_cpp_features.cc new file mode 100644 index 000000000000..e4e3148cc7f7 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_network_public_cpp_features.cc @@ -0,0 +1,11 @@ +--- services/network/public/cpp/features.cc.orig 2025-05-31 17:16:41 UTC ++++ services/network/public/cpp/features.cc +@@ -380,7 +380,7 @@ BASE_FEATURE(kAvoidResourceRequestCopies, + BASE_FEATURE(kDocumentIsolationPolicy, + "DocumentIsolationPolicy", + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn index 7888baf8c686..141011edc2e1 100644 --- a/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/mojom/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- services/network/public/mojom/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ services/network/public/mojom/BUILD.gn -@@ -600,11 +600,11 @@ mojom("url_loader_base") { +@@ -675,11 +675,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -14,7 +14,7 @@ # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1672,7 +1672,7 @@ mojom("mojom") { +@@ -1795,7 +1795,7 @@ mojom("mojom") { } } diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index e0ab844c9d3f..742a6293d20f 100644 --- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,4 +1,4 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2025-03-09 21:38:10 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2025-06-17 07:21:45 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc @@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { @@ -18,16 +18,16 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; os_dump->mappings_count = internal_os_dump.mappings_count; -@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -222,7 +222,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); - client->RequestOSMemoryDump(request->memory_map_option(), - {base::kNullProcessId}, -@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( + client->RequestOSMemoryDump( + request->memory_map_option(), request->memory_dump_flags(), +@@ -237,7 +237,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector<base::ProcessId> pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -284,7 +284,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -334,7 +334,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -395,7 +395,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index 2d37d3e78df1..e1e9624eff75 100644 --- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2025-02-20 09:59:21 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2025-06-17 07:21:45 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h -@@ -57,7 +57,7 @@ class COMPONENT_EXPORT( +@@ -65,7 +65,7 @@ class COMPONENT_EXPORT( static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps( base::ProcessHandle); @@ -9,7 +9,7 @@ static void SetProcSmapsForTesting(FILE*); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) -@@ -79,7 +79,7 @@ class COMPONENT_EXPORT( +@@ -87,7 +87,7 @@ class COMPONENT_EXPORT( GetMemoryInfo(base::ProcessHandle handle); #endif // !BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc index 6400f6a8a117..9ffd7f36ba44 100644 --- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc +++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig 2022-10-01 07:40:07 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig 2025-06-17 07:21:45 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc -@@ -0,0 +1,58 @@ +@@ -0,0 +1,59 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -26,6 +26,7 @@ + +// static +bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, ++ const MemDumpFlagSet& flags, + mojom::RawOSMemDump* dump) { + base::Process process = pid == base::kNullProcessId + ? base::Process::Current() diff --git a/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc b/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc index 1b33713148d0..2066b51e0ec9 100644 --- a/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc +++ b/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc @@ -1,6 +1,6 @@ ---- services/tracing/public/cpp/system_metrics_sampler.cc.orig 2025-02-20 09:59:21 UTC +--- services/tracing/public/cpp/system_metrics_sampler.cc.orig 2025-05-31 17:16:41 UTC +++ services/tracing/public/cpp/system_metrics_sampler.cc -@@ -176,8 +176,8 @@ void SystemMetricsSampler::ProcessSampler::SampleProce +@@ -166,8 +166,8 @@ void SystemMetricsSampler::ProcessSampler::SampleProce TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"), "PhysicalMemoryFootprint", memory_info->physical_footprint_bytes); diff --git a/www/ungoogled-chromium/files/patch-services_viz_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_viz_public_mojom_BUILD.gn index db9c058f440c..a0b196256824 100644 --- a/www/ungoogled-chromium/files/patch-services_viz_public_mojom_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_viz_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/viz/public/mojom/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- services/viz/public/mojom/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ services/viz/public/mojom/BUILD.gn -@@ -56,7 +56,7 @@ mojom("mojom") { +@@ -57,7 +57,7 @@ mojom("mojom") { # Used in thread.mojom enabled_features = [] diff --git a/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc b/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc index 61bb212fccf0..add310d05a4b 100644 --- a/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc +++ b/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc @@ -1,6 +1,6 @@ ---- skia/ext/font_utils.cc.orig 2025-04-15 08:30:07 UTC +--- skia/ext/font_utils.cc.orig 2025-05-06 12:23:00 UTC +++ skia/ext/font_utils.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h" #endif @@ -9,8 +9,8 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h" #include "third_party/skia/include/ports/SkFontScanner_Fontations.h" -@@ -62,7 +62,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() { - return SkFontMgr_New_Android(nullptr); +@@ -67,7 +67,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() { + } #elif BUILDFLAG(IS_APPLE) return SkFontMgr_New_CoreText(nullptr); -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h index f3190efef5a6..164a76ae85c0 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/base/config.h.orig 2025-04-15 08:30:07 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2025-05-06 12:23:00 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -411,7 +411,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -409,7 +409,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \ @@ -9,7 +9,7 @@ #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -426,7 +426,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -424,7 +424,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn index 26c4dcb45e7c..b60c702430de 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2025-02-20 09:59:21 UTC +--- third_party/angle/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ third_party/angle/BUILD.gn -@@ -355,7 +355,6 @@ config("extra_warnings") { +@@ -360,7 +360,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -532,7 +531,7 @@ template("angle_common_lib") { +@@ -537,7 +536,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -687,6 +686,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -692,6 +691,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform.h b/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform.h index 7d15d876227c..6a0e9a3d62ae 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform.h +++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/common/platform.h.orig 2022-10-01 07:40:07 UTC +--- third_party/angle/src/common/platform.h.orig 2025-05-06 12:23:00 UTC +++ third_party/angle/src/common/platform.h -@@ -26,7 +26,15 @@ +@@ -23,7 +23,15 @@ #elif defined(__linux__) || defined(EMSCRIPTEN) # define ANGLE_PLATFORM_LINUX 1 # define ANGLE_PLATFORM_POSIX 1 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 index bec88fc81b38..6fa5d5a5364d 100644 --- 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 2025-03-09 21:38:10 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2025-05-31 17:16:41 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -58,7 +58,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2139,7 +2139,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2136,7 +2136,7 @@ static ClientExtensions GenerateClientExtensions() extensions.platformWaylandEXT = true; #endif @@ -45,7 +45,7 @@ extensions.platformSurfacelessMESA = true; #endif -@@ -2186,7 +2186,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2183,7 +2183,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif 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 index bfc59b23709b..5cd27c48c54c 100644 --- 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,4 +1,4 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2025-04-15 08:30:07 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -82,12 +82,12 @@ #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h" @@ -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 -@@ -256,7 +256,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -24,8 +24,8 @@ binders.Add<mojom::blink::MemoryUsageMonitorLinux>( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -305,7 +305,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform - #endif +@@ -303,7 +303,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform + MemorySaverController::Initialize(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 5236211a9b57..33045f65aab3 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2025-03-09 21:38:10 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -133,15 +133,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -132,15 +132,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { 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 index 87b0b2290830..2e246ddea21e 100644 --- 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 2025-04-15 08:30:07 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -427,7 +427,7 @@ void RecordPrerenderActivationSignalDelay(const String +@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDelay(const String #if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -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' -@@ -3426,7 +3426,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3421,7 +3421,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE); WebFontRenderStyle::SetSubpixelPositioning( renderer_preferences_.use_subpixel_positioning); diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index a971301a28e8..6e696e7932a9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2025-04-15 08:30:07 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -51,7 +51,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 index 658ed237cc68..8ff4088d1d29 100644 --- 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,4 +1,4 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -74,7 +74,7 @@ #include "ui/display/screen_info.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -784,7 +784,7 @@ void LayoutView::LayoutRoot() { +@@ -785,7 +785,7 @@ void LayoutView::LayoutRoot() { intrinsic_logical_widths_ = LogicalWidth(); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc index e63f285c29e9..1f8eba516592 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig 2025-03-09 21:38:10 UTC +--- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/blink/renderer/core/loader/mixed_content_checker.cc -@@ -484,7 +484,7 @@ bool MixedContentChecker::ShouldBlockFetch( +@@ -485,7 +485,7 @@ bool MixedContentChecker::ShouldBlockFetch( switch (context_type) { case mojom::blink::MixedContentContextType::kOptionallyBlockable: diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc new file mode 100644 index 000000000000..af5817f40876 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/core/page/context_menu_controller.cc.orig 2025-05-06 12:23:00 UTC ++++ third_party/blink/renderer/core/page/context_menu_controller.cc +@@ -641,7 +641,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame + if (potential_image_node != nullptr && + IsA<HTMLCanvasElement>(potential_image_node)) { + data.media_type = mojom::blink::ContextMenuDataMediaType::kCanvas; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40902474): Support reading from the WebGPU front buffer + // on Linux and remove the below code, which results in "Copy Image" and + // "Save Image To" being grayed out in the context menu. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 545e82b24aca..cc4cc1c5db56 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -123,7 +123,7 @@ namespace blink { +@@ -124,7 +124,7 @@ namespace blink { namespace { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index 2d06ae0484fb..89c95969c8c7 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2025-01-25 09:34:31 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -873,7 +873,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -857,7 +857,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ 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 index 330b8288a452..98bb2d1e3a5d 100644 --- 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,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-10-27 06:40:35 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -304,7 +304,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -383,7 +383,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 5e0adb35543d..ed1eea02f20c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,8 +1,8 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-04-17 14:09:48 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6347,7 +6347,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid - constexpr bool kAllowZeroCopyImages = true; - #endif +@@ -6338,7 +6338,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid + // unmultiply has been requested or we need to never premultiply for Image + // creation from a VideoFrame. -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc new file mode 100644 index 000000000000..d0be9c7558de --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc.orig 2025-05-31 17:16:41 UTC ++++ third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc +@@ -218,7 +218,7 @@ bool GPUCanvasContext::PaintRenderingResultsToCanvas( + + scoped_refptr<WebGPUMailboxTexture> front_buffer_texture; + if (source_buffer == kFrontBuffer) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // By returning false here the canvas will show up as black in the scenarios + // that copy the front buffer, such as printing. + // TODO(crbug.com/40902474): Support concurrent SharedImage reads via Dawn 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 index 514ff654b65c..f39a57a3cf68 100644 --- 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,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2025-03-09 21:38:10 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -815,7 +815,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -814,7 +814,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. 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 index 2f480ca53b68..bd8d7ad33081 100644 --- 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 2025-04-15 08:30:07 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -2037,7 +2037,7 @@ static_library("test_support") { +@@ -2063,7 +2063,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__description.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 917cb6aa6876..31852a8cc873 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2025-04-15 08:30:07 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -279,7 +279,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -280,7 +280,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 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 index 4166c28f45bb..8db969bd610d 100644 --- 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 2023-08-18 10:26:52 UTC +--- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc -@@ -71,8 +71,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe +@@ -70,8 +70,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_gpu_image__layer__bridge.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc index 280a600e1e2d..bcfb45318a8f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc -@@ -48,7 +48,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated( +@@ -47,7 +47,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated( const auto paint_image = source->PaintImageForCurrentFrame(); const auto image_info = paint_image.GetSkImageInfo(); 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 index 9e08c935bf0a..c70b5e1e1e94 100644 --- 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 2025-03-09 21:38:10 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -421,7 +421,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -407,7 +407,7 @@ void VideoFrameSubmitter::OnBeginFrame( auto& details = timing_details.find(frame_token)->value; auto& feedback = details.presentation_feedback; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc index ed7f7b80a934..fd0ef7f23d36 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2025-04-15 08:30:07 UTC +--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -329,12 +329,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -324,12 +324,12 @@ SupportedFormats GetSupportedFormatsInternal( supported_formats.profiles.push_back(profile.profile); supported_formats.sdp_formats.push_back(std::move(*format)); diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 683bf416a01d..40feaf9b4d5a 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-04-15 08:30:07 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-06-17 07:21:45 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -424,7 +424,7 @@ +@@ -484,7 +484,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1683,7 +1683,7 @@ +@@ -1777,7 +1777,7 @@ name: "DocumentIsolationPolicy", status: "experimental", origin_trial_feature_name: "DocumentIsolationPolicy", @@ -18,7 +18,7 @@ base_feature: "none", }, { -@@ -1932,7 +1932,7 @@ +@@ -2017,7 +2017,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -27,7 +27,7 @@ origin_trial_allows_third_party: true, }, { -@@ -3344,7 +3344,7 @@ +@@ -3443,7 +3443,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", @@ -36,7 +36,7 @@ status: "experimental", public: true, base_feature_status: "enabled", -@@ -3468,7 +3468,7 @@ +@@ -3601,7 +3601,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -45,7 +45,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4589,7 +4589,7 @@ +@@ -4820,7 +4820,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -54,7 +54,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4762,7 +4762,7 @@ +@@ -5006,7 +5006,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -63,7 +63,7 @@ status: "experimental", base_feature: "none", }, -@@ -5030,7 +5030,7 @@ +@@ -5274,7 +5274,7 @@ { name: "WebIdentityDigitalCredentials", origin_trial_feature_name: "WebIdentityDigitalCredentials", diff --git a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni index 14fd8d8e1711..526a296ae144 100644 --- a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni +++ b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni @@ -1,7 +1,7 @@ ---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2023-09-17 07:59:53 UTC +--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2025-05-31 17:16:41 UTC +++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni -@@ -61,7 +61,7 @@ if (crashpad_is_in_chromium) { - crashpad_is_ios = is_ios +@@ -67,7 +67,7 @@ if (crashpad_is_in_chromium) { + crashpad_is_tvos = is_ios && target_platform == "tvos" crashpad_is_apple = is_apple crashpad_is_win = is_win - crashpad_is_linux = is_linux || is_chromeos diff --git a/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp index 7cd3cc1b9434..2b10a040b5b6 100644 --- a/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp @@ -1,6 +1,6 @@ ---- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2025-04-15 08:30:07 UTC +--- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2025-05-31 17:16:41 UTC +++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp -@@ -57,7 +57,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha +@@ -56,7 +56,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha #endif #if DAWN_PLATFORM_IS(LINUX) diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_BUILD.gn index 447f7489d7ce..a7bef9a5badf 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/BUILD.gn.orig 2024-10-27 06:40:35 UTC +--- third_party/ffmpeg/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ third_party/ffmpeg/BUILD.gn -@@ -350,7 +350,6 @@ target(link_target_type, "ffmpeg_internal") { +@@ -355,7 +355,6 @@ target(link_target_type, "ffmpeg_internal") { libs += [ "m", "z", diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure index 366734c08d37..ad7682855de7 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/configure.orig 2025-04-15 08:30:07 UTC +--- third_party/ffmpeg/configure.orig 2025-05-31 17:16:41 UTC +++ third_party/ffmpeg/configure -@@ -6855,8 +6855,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en +@@ -6873,8 +6873,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en if enabled pthread_np_h; then hdrs="$hdrs pthread_np.h" fi diff --git a/www/ungoogled-chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c b/www/ungoogled-chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c index 308d12606a64..ac5c3d17a074 100644 --- a/www/ungoogled-chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c +++ b/www/ungoogled-chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c @@ -1,11 +1,11 @@ ---- third_party/lzma_sdk/C/CpuArch.c.orig 2025-02-20 09:59:21 UTC +--- third_party/lzma_sdk/C/CpuArch.c.orig 2025-05-06 12:23:00 UTC +++ third_party/lzma_sdk/C/CpuArch.c -@@ -854,7 +854,35 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP +@@ -854,6 +854,34 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; } BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; } +#elif defined(__OpenBSD__) - ++ +#include <sys/param.h> +#include <sys/sysctl.h> +#include <machine/cpu.h> @@ -32,20 +32,6 @@ +MY_HWCAP_CHECK_FUNC (SHA1) +MY_HWCAP_CHECK_FUNC (SHA2) +MY_HWCAP_CHECK_FUNC (AES) -+ - #else // __APPLE__ - - #if defined(__GLIBC__) && (__GLIBC__ * 100 + __GLIBC_MINOR__ >= 216) -@@ -869,10 +897,12 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP - #endif - #endif -+#if !defined(__FreeBSD__) - #ifdef Z7_GETAUXV_AVAILABLE - // #pragma message("=== Z7_GETAUXV_AVAILABLE === ") - #include <sys/auxv.h> - #define USE_HWCAP -+#endif - #endif + #else // __APPLE__ - #ifdef USE_HWCAP diff --git a/www/ungoogled-chromium/files/patch-third__party_nasm_config_config-linux.h b/www/ungoogled-chromium/files/patch-third__party_nasm_config_config-linux.h index 485c736d2a87..317368099ae9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_nasm_config_config-linux.h +++ b/www/ungoogled-chromium/files/patch-third__party_nasm_config_config-linux.h @@ -1,27 +1,18 @@ ---- third_party/nasm/config/config-linux.h.orig 2023-01-13 08:56:02 UTC +--- third_party/nasm/config/config-linux.h.orig 2025-05-31 17:16:41 UTC +++ third_party/nasm/config/config-linux.h -@@ -160,7 +160,7 @@ - - /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you - don't. */ --#define HAVE_DECL_STRLCPY 0 -+#define HAVE_DECL_STRLCPY 1 - - /* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you - don't. */ -@@ -183,7 +183,7 @@ +@@ -209,7 +209,7 @@ #define HAVE_DECL_STRSEP 1 /* Define to 1 if you have the <endian.h> header file. */ -#define HAVE_ENDIAN_H 1 +/* #undef HAVE_ENDIAN_H */ - /* Define to 1 if you have the `faccessat' function. */ + /* Define to 1 if you have the 'faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,16 +327,16 @@ +@@ -351,13 +351,13 @@ #define HAVE_ISASCII 1 - /* Define to 1 if you have the `iscntrl' function. */ + /* Define to 1 if you have the 'iscntrl' function. */ -/* #undef HAVE_ISCNTRL */ +#define HAVE_ISCNTRL 1 @@ -29,16 +20,13 @@ -/* #undef HAVE_MACHINE_ENDIAN_H */ +#define HAVE_MACHINE_ENDIAN_H 1 - /* Define to 1 if you have the <memory.h> header file. */ - #define HAVE_MEMORY_H 1 - - /* Define to 1 if you have the `mempcpy' function. */ + /* Define to 1 if you have the 'mempcpy' function. */ -#define HAVE_MEMPCPY 1 +/* #undef HAVE_MEMPCPY */ - /* Define to 1 if you have a working `mmap' system call. */ - #define HAVE_MMAP 1 -@@ -357,7 +357,7 @@ + /* Define to 1 if you have the 'mempset' function. */ + /* #undef HAVE_MEMPSET */ +@@ -384,7 +384,7 @@ #define HAVE_STDARG_H 1 /* Define to 1 if stdbool.h conforms to C99. */ @@ -47,16 +35,16 @@ /* Define to 1 if your compiler supports C99 extern inline */ #define HAVE_STDC_INLINE 1 -@@ -384,7 +384,7 @@ +@@ -414,7 +414,7 @@ #define HAVE_STRING_H 1 - /* Define to 1 if you have the `strlcpy' function. */ --/* #undef HAVE_STRLCPY */ + /* Define to 1 if you have the 'strlcpy' function. */ +-/* #undef HAVE_STRLCPY */ // Shouldn\'t work with -std=c11, but configure still detects it. +#define HAVE_STRLCPY 1 - /* Define to 1 if you have the `strncasecmp' function. */ + /* Define to 1 if you have the 'strncasecmp' function. */ #define HAVE_STRNCASECMP 1 -@@ -411,7 +411,7 @@ +@@ -441,7 +441,7 @@ #define HAVE_SYSCONF 1 /* Define to 1 if you have the <sys/endian.h> header file. */ @@ -65,7 +53,7 @@ /* Define to 1 if you have the <sys/mman.h> header file. */ #define HAVE_SYS_MMAN_H 1 -@@ -486,13 +486,13 @@ +@@ -522,13 +522,13 @@ /* #undef HAVE__STATI64 */ /* Define to 1 if you have the `__bswap_16' intrinsic function. */ @@ -82,21 +70,3 @@ /* Define to 1 if you have the `__builtin_bswap16' intrinsic function. */ #define HAVE___BUILTIN_BSWAP16 1 -@@ -620,7 +620,7 @@ - /* Define to the equivalent of the C99 'restrict' keyword, or to - nothing if this is not supported. Do not define if restrict is - supported directly. */ --#define restrict __restrict -+#define restrict __restrict__ - /* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the -@@ -637,7 +637,7 @@ - /* Define if your snprintf function is not named snprintf. */ - /* #undef snprintf */ - --/* Define if your typeof operator is not named typeof. */ -+/* Define if your typeof operator is not named `typeof'. */ - #define typeof __typeof - - /* Define to the type of an unsigned integer type wide enough to hold a diff --git a/www/ungoogled-chromium/files/patch-third__party_node_node.gni b/www/ungoogled-chromium/files/patch-third__party_node_node.gni index d5338b0d33da..75af050680b9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_node_node.gni +++ b/www/ungoogled-chromium/files/patch-third__party_node_node.gni @@ -1,4 +1,4 @@ ---- third_party/node/node.gni.orig 2024-08-26 14:40:28 UTC +--- third_party/node/node.gni.orig 2025-05-06 12:23:00 UTC +++ third_party/node/node.gni @@ -22,7 +22,7 @@ template("node") { @@ -9,3 +9,21 @@ inputs += [ "//third_party/node/linux/node-linux-x64/bin/node" ] } if (is_win && host_os == "win") { +@@ -34,17 +34,6 @@ template("node") { + } else { + inputs += [ "//third_party/node/mac/node-darwin-x64/bin/node" ] + } +- } +- +- # Automatically add a dependency to ":check_version" to ensure NodeJS is +- # always running the expected version, except when the ':check_version' +- # target itself is running in which case it shouldn't depend on itself. +- if (get_label_info(":" + target_name, "label_no_toolchain") != +- "//third_party/node:check_version") { +- if (!defined(deps)) { +- deps = [] +- } +- deps += [ "//third_party/node:check_version" ] + } + } + } diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxcodec_png_png__decoder.cpp b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxcodec_png_png__decoder.cpp new file mode 100644 index 000000000000..827aedc58843 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxcodec_png_png__decoder.cpp @@ -0,0 +1,13 @@ +--- third_party/pdfium/core/fxcodec/png/png_decoder.cpp.orig 2025-05-31 17:16:41 UTC ++++ third_party/pdfium/core/fxcodec/png/png_decoder.cpp +@@ -52,8 +52,8 @@ void _png_load_bmp_attribute(png_structp png_ptr, + CFX_DIBAttribute* pAttribute) { + if (pAttribute) { + #if defined(PNG_pHYs_SUPPORTED) +- pAttribute->xdpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); +- pAttribute->ydpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); ++ pAttribute->x_dpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); ++ pAttribute->y_dpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); + png_uint_32 res_x, res_y; + int unit_type; + png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type); diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index d8c6cc517a76..8b9525b2a0d7 100644 --- a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,4 +1,4 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-08-26 14:40:28 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2025-05-31 17:16:41 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp @@ -20,7 +20,7 @@ #include "core/fxge/fx_font.h" @@ -9,7 +9,7 @@ #error "Included on the wrong platform" #endif -@@ -173,9 +173,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -180,9 +180,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/ungoogled-chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index 77ddfd3fee0f..33da36fb902c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,7 +1,7 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2024-05-23 20:04:36 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2025-05-31 17:16:41 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -39,6 +39,11 @@ double GetLocalTZA() { - return 0; +@@ -41,6 +41,11 @@ double GetLocalTZA() { + } time_t t = 0; FXSYS_time(&t); +#ifdef __FreeBSD__ @@ -12,7 +12,7 @@ FXSYS_localtime(&t); #if BUILDFLAG(IS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -47,6 +52,7 @@ double GetLocalTZA() { +@@ -49,6 +54,7 @@ double GetLocalTZA() { _get_timezone(&timezone); #endif return (double)(-(timezone * 1000)); diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_string__utils.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_string__utils.cc index 639c6a833477..5a785a629a6b 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_string__utils.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_string__utils.cc @@ -1,9 +1,9 @@ ---- third_party/perfetto/src/base/string_utils.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/perfetto/src/base/string_utils.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/perfetto/src/base/string_utils.cc @@ -39,7 +39,8 @@ namespace base { // Locale-independant as possible version of strtod. double StrToD(const char* nptr, char** endptr) { - #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ + #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ + (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc index 0752149d0161..ce05ede74ace 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/test/vm_test_utils.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/perfetto/src/base/test/vm_test_utils.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/perfetto/src/base/test/vm_test_utils.cc -@@ -91,7 +91,7 @@ bool IsMapped(void* start, size_t size) { +@@ -93,7 +93,7 @@ bool IsMapped(void* start, size_t size) { // Fuchsia doesn't yet support paging (b/119503290). ignore_result(page_size); return true; diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index a8768ffb411e..4f905de7f7dc 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2025-04-15 08:30:07 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/perfetto/src/base/unix_socket.cc @@ -45,7 +45,7 @@ #include <unistd.h> @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -977,9 +977,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -1031,9 +1031,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { int res = getpeereid(fd, &peer_uid_, nullptr); PERFETTO_CHECK(res == 0); // There is no pid when obtaining peer credentials for QNX diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc index 7860bcc258d7..bfdd26045d9a 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc @@ -1,10 +1,10 @@ ---- third_party/perfetto/src/tracing/ipc/memfd.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/perfetto/src/tracing/ipc/memfd.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/perfetto/src/tracing/ipc/memfd.cc @@ -20,7 +20,8 @@ #define PERFETTO_MEMFD_ENABLED() \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) +- PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) + (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) diff --git a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h index e49548bbb117..bb3b86cf4f6d 100644 --- a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h +++ b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h @@ -1,4 +1,4 @@ ---- third_party/speech-dispatcher/libspeechd_version.h.orig 2025-04-15 08:30:07 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2025-05-31 17:16:41 UTC +++ third_party/speech-dispatcher/libspeechd_version.h @@ -0,0 +1,29 @@ +/* @@ -19,7 +19,7 @@ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * -+ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.16 2025/04/15 06:38:26 robert Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.18 2025/05/31 13:44:44 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c index 7f786ddc4fe0..1bedf1f20c97 100644 --- a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c +++ b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig 2025-02-20 09:59:21 UTC +--- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig 2025-05-08 07:58:41 UTC +++ third_party/sqlite/src/amalgamation_dev/sqlite3.c -@@ -14187,7 +14187,7 @@ struct fts5_api { +@@ -14486,7 +14486,7 @@ struct fts5_api { ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit ** it. */ 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 index 9954be611b55..b3a019404b16 100644 --- 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 2024-10-27 06:40:35 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2025-05-08 07:58:41 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -14187,7 +14187,7 @@ struct fts5_api { +@@ -14486,7 +14486,7 @@ struct fts5_api { ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit ** it. */ @@ -9,7 +9,7 @@ # define _XOPEN_SOURCE 600 #endif -@@ -45183,7 +45183,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45387,7 +45387,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -22,7 +22,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -45198,6 +45203,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45402,6 +45407,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni b/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni index c117c05af498..0333b1bb3859 100644 --- a/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni +++ b/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni @@ -1,13 +1,11 @@ ---- third_party/tflite/features.gni.orig 2024-07-31 14:19:23 UTC +--- third_party/tflite/features.gni.orig 2025-05-31 17:16:41 UTC +++ third_party/tflite/features.gni -@@ -9,8 +9,8 @@ declare_args() { - # This enables building TFLite with XNNPACK. Currently only available for - # Linux, macOS and Windows arm64/x64/x86 targets and ChromeOS non-ARM targets. - build_tflite_with_xnnpack = -- (is_win || is_mac || is_linux || (is_chromeos && overlay_include_cbx)) && -- (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86") -+ ((is_win || is_mac || is_linux || (is_chromeos && overlay_include_cbx)) && -+ (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86")) && !is_bsd +@@ -8,7 +8,7 @@ import("//services/on_device_model/on_device_model.gni + + declare_args() { + # This enables building TFLite with XNNPACK. +- build_tflite_with_xnnpack = current_cpu != "arm" && !is_fuchsia ++ build_tflite_with_xnnpack = current_cpu != "arm" && !is_fuchsia && !is_bsd # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp. build_tflite_with_ruy = true diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc index 3606a669f405..4fd12d3b8ee5 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc @@ -1,18 +1,12 @@ ---- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig 2023-08-23 11:41:11 UTC +--- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig 2025-05-06 12:23:00 UTC +++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc -@@ -10,11 +10,15 @@ - +@@ -11,7 +11,9 @@ #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h" + #include <EGL/eglext.h> +#if !defined(WEBRTC_BSD) #include <asm/ioctl.h> +#endif #include <dlfcn.h> #include <fcntl.h> #include <libdrm/drm_fourcc.h> -+#if !defined(WEBRTC_BSD) - #include <linux/types.h> -+#endif - #include <spa/param/video/format-utils.h> - #include <unistd.h> - #include <xf86drm.h> diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc deleted file mode 100644 index 33afacfc84c5..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/webrtc/modules/video_capture/linux/pipewire_session.cc.orig 2025-03-24 05:49:20 UTC -+++ third_party/webrtc/modules/video_capture/linux/pipewire_session.cc -@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, - .param = OnNodeParam, - }; - -- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); -+ pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this); - } - - // static -@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_nod - uint32_t id = info->params[i].id; - if (id == SPA_PARAM_EnumFormat && - info->params[i].flags & SPA_PARAM_INFO_READ) { -- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); -+ pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); - break; - } - } diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__helpers.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__helpers.cc new file mode 100644 index 000000000000..19beb360d911 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__helpers.cc @@ -0,0 +1,10 @@ +--- third_party/webrtc/rtc_base/net_helpers.cc.orig 2025-05-31 17:16:41 UTC ++++ third_party/webrtc/rtc_base/net_helpers.cc +@@ -21,6 +21,7 @@ + #endif + #if defined(WEBRTC_POSIX) && !defined(__native_client__) + #include <arpa/inet.h> ++#include <sys/socket.h> + #endif // defined(WEBRTC_POSIX) && !defined(__native_client__) + + namespace webrtc { diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__test__helpers.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__test__helpers.cc deleted file mode 100644 index 0663f32162f7..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__test__helpers.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/webrtc/rtc_base/net_test_helpers.cc.orig 2023-09-17 07:59:53 UTC -+++ third_party/webrtc/rtc_base/net_test_helpers.cc -@@ -21,6 +21,7 @@ - #endif - #if defined(WEBRTC_POSIX) && !defined(__native_client__) - #include <arpa/inet.h> -+#include <sys/socket.h> - #if defined(WEBRTC_ANDROID) - #include "rtc_base/ifaddrs_android.h" - #else diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc index d2a77619930e..77166d5b5eb8 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,14 +1,14 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2024-06-22 08:49:42 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -290,7 +290,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -316,7 +316,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif +#if defined(WEBRTC_BSD) + // Treat all other network interface names as ethernet on BSD -+ return ADAPTER_TYPE_ETHERNET; ++ return webrtc::ADAPTER_TYPE_ETHERNET; +#else - return ADAPTER_TYPE_UNKNOWN; + return webrtc::ADAPTER_TYPE_UNKNOWN; +#endif } diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index ec23a37b64aa..34de482b2a55 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,15 +1,15 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2025-01-25 09:34:31 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -55,7 +55,7 @@ +@@ -65,7 +65,7 @@ + #include "rtc_base/synchronization/mutex.h" #include "rtc_base/time_utils.h" - #include "system_wrappers/include/field_trial.h" -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) #include <linux/sockios.h> #endif -@@ -75,7 +75,7 @@ typedef void* SockOptArg; +@@ -85,7 +85,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -330,7 +330,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -341,7 +341,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -359,7 +359,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -370,7 +370,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -390,7 +390,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -401,7 +401,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb), @@ -45,7 +45,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -419,7 +419,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -430,7 +430,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), @@ -54,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -699,7 +699,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -708,7 +708,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; @@ -63,7 +63,7 @@ RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; return -1; #elif defined(WEBRTC_POSIX) -@@ -748,7 +748,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -757,7 +757,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s return -1; #endif case OPT_RECV_ECN: @@ -72,7 +72,7 @@ if (family_ == AF_INET6) { *slevel = IPPROTO_IPV6; *sopt = IPV6_RECVTCLASS; -@@ -768,10 +768,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -777,10 +777,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *sopt = SO_KEEPALIVE; break; case OPT_TCP_KEEPCNT: @@ -92,7 +92,7 @@ *slevel = IPPROTO_TCP; #if !defined(WEBRTC_MAC) *sopt = TCP_KEEPIDLE; -@@ -779,12 +788,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -788,12 +797,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *sopt = TCP_KEEPALIVE; #endif break; diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h index b17e2638813a..54c2e7740f41 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2023-12-23 12:33:28 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2025-05-31 17:16:41 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.h -@@ -18,7 +18,7 @@ +@@ -21,7 +21,7 @@ #include "rtc_base/third_party/sigslot/sigslot.h" #if defined(WEBRTC_POSIX) diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index e96919d76b6e..844208d06dac 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,8 +1,8 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2023-02-11 09:11:04 UTC +--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2025-05-31 17:16:41 UTC +++ third_party/webrtc/rtc_base/platform_thread_types.cc -@@ -11,7 +11,9 @@ - #include "rtc_base/platform_thread_types.h" +@@ -12,7 +12,9 @@ + // IWYU pragma: begin_keep #if defined(WEBRTC_LINUX) +#if !defined(WEBRTC_BSD) #include <sys/prctl.h> @@ -10,7 +10,7 @@ #include <sys/syscall.h> #endif -@@ -44,6 +46,8 @@ PlatformThreadId CurrentThreadId() { +@@ -46,6 +48,8 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); @@ -19,7 +19,7 @@ #elif defined(WEBRTC_LINUX) return syscall(__NR_gettid); #elif defined(__EMSCRIPTEN__) -@@ -74,6 +78,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons +@@ -76,6 +80,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { @@ -27,7 +27,7 @@ #if defined(WEBRTC_WIN) // The SetThreadDescription API works even if no debugger is attached. // The names set with this API also show up in ETW traces. Very handy. -@@ -120,6 +125,7 @@ void SetCurrentThreadName(const char* name) { +@@ -122,6 +127,7 @@ void SetCurrentThreadName(const char* name) { zx_status_t status = zx_object_set_property(zx_thread_self(), ZX_PROP_NAME, name, strlen(name)); RTC_DCHECK_EQ(status, ZX_OK); diff --git a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py index 745b6c775530..3b86fbfee9c7 100644 --- a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py +++ b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py @@ -1,4 +1,4 @@ ---- tools/gn/build/gen.py.orig 2024-04-23 07:42:17 UTC +--- tools/gn/build/gen.py.orig 2025-05-31 17:16:41 UTC +++ tools/gn/build/gen.py @@ -94,6 +94,12 @@ class Platform(object): def is_solaris(self): @@ -13,7 +13,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity'] -@@ -304,7 +310,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -308,7 +314,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -539,6 +545,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -551,6 +557,9 @@ def WriteGNNinja(path, platform, host, options, args_l if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/ungoogled-chromium/files/patch-tools_grit_grit_node_base.py b/www/ungoogled-chromium/files/patch-tools_grit_grit_node_base.py index 9604b09959d6..f026d48f5971 100644 --- a/www/ungoogled-chromium/files/patch-tools_grit_grit_node_base.py +++ b/www/ungoogled-chromium/files/patch-tools_grit_grit_node_base.py @@ -1,6 +1,6 @@ ---- tools/grit/grit/node/base.py.orig 2025-04-15 08:30:07 UTC +--- tools/grit/grit/node/base.py.orig 2025-05-31 17:16:41 UTC +++ tools/grit/grit/node/base.py -@@ -496,7 +496,8 @@ class Node: +@@ -497,7 +497,8 @@ class Node: value = defs elif name == 'is_linux': diff --git a/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index d865475d5a7a..8b01af8af257 100644 --- a/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,6 +1,6 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn -@@ -61,7 +61,7 @@ group("telemetry_chrome_test") { +@@ -56,7 +56,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } @@ -9,7 +9,7 @@ data_deps += [ "//third_party/breakpad:dump_syms" ] # CrOS currently has issues with the locally compiled version of -@@ -215,7 +215,7 @@ group("telemetry_chrome_test_without_chrome") { +@@ -210,7 +210,7 @@ group("telemetry_chrome_test_without_chrome") { ] # Cr-Fuchsia doesn't support breakpad. diff --git a/www/ungoogled-chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py b/www/ungoogled-chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py index df12036df738..f876117ad5de 100644 --- a/www/ungoogled-chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py +++ b/www/ungoogled-chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py @@ -1,6 +1,6 @@ ---- tools/protoc_wrapper/protoc_wrapper.py.orig 2024-05-23 20:04:36 UTC +--- tools/protoc_wrapper/protoc_wrapper.py.orig 2025-05-31 17:16:41 UTC +++ tools/protoc_wrapper/protoc_wrapper.py -@@ -183,15 +183,19 @@ def main(argv): +@@ -188,15 +188,19 @@ def main(argv): if not options.exclude_imports: protoc_cmd += ["--include_imports"] diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc index 6def30e4a5ff..ab6cffb76a86 100644 --- a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc @@ -1,6 +1,6 @@ ---- ui/accessibility/accessibility_features.cc.orig 2025-04-15 08:30:07 UTC +--- ui/accessibility/accessibility_features.cc.orig 2025-05-31 17:16:41 UTC +++ ui/accessibility/accessibility_features.cc -@@ -440,7 +440,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled +@@ -473,7 +473,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled } #endif // BUILDFLAG(IS_MAC) @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_FEATURE(kWasmTtsComponentUpdaterEnabled, "WasmTtsComponentUpdaterEnabled", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h index dd799847960b..453f6705c7c8 100644 --- a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h @@ -1,6 +1,6 @@ ---- ui/accessibility/accessibility_features.h.orig 2025-04-15 08:30:07 UTC +--- ui/accessibility/accessibility_features.h.orig 2025-05-31 17:16:41 UTC +++ ui/accessibility/accessibility_features.h -@@ -306,7 +306,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc +@@ -322,7 +322,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc AX_BASE_EXPORT bool IsBlockRootWindowAccessibleNameChangeEventEnabled(); #endif // BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc new file mode 100644 index 000000000000..6fc6b44444d6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc @@ -0,0 +1,20 @@ +--- ui/accessibility/ax_node.cc.orig 2025-05-06 12:23:00 UTC ++++ ui/accessibility/ax_node.cc +@@ -1553,7 +1553,7 @@ AXNode::GetExtraMacNodes() const { + return &table_info->extra_mac_nodes; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + AXNode* AXNode::GetExtraAnnouncementNode( + ax::mojom::AriaNotificationPriority priority_property) const { + if (!tree_->extra_announcement_nodes()) { +@@ -1581,7 +1581,7 @@ bool AXNode::IsGenerated() const { + GetRole() == ax::mojom::Role::kColumn || + GetRole() == ax::mojom::Role::kTableHeaderContainer; + DCHECK_EQ(is_generated_node, is_extra_mac_node_role); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux, generated nodes are always children of the root. + if (GetParent() && GetParent()->GetManager()) { + DCHECK(GetParent()->GetManager()->IsRoot()); diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h new file mode 100644 index 000000000000..f157577df320 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h @@ -0,0 +1,11 @@ +--- ui/accessibility/ax_node.h.orig 2025-05-06 12:23:00 UTC ++++ ui/accessibility/ax_node.h +@@ -587,7 +587,7 @@ class AX_EXPORT AXNode final { + const std::vector<raw_ptr<AXNode, VectorExperimental>>* GetExtraMacNodes() + const; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + AXNode* GetExtraAnnouncementNode( + ax::mojom::AriaNotificationPriority priority_property) const; + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc new file mode 100644 index 000000000000..106242ab1739 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc @@ -0,0 +1,38 @@ +--- ui/accessibility/ax_tree.cc.orig 2025-05-31 17:16:41 UTC ++++ ui/accessibility/ax_tree.cc +@@ -824,7 +824,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged( + return old_node_is_ignored != new_node_is_ignored; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ExtraAnnouncementNodes::ExtraAnnouncementNodes(AXNode* root) { + assertive_node_ = CreateNode("assertive", root); + polite_node_ = CreateNode("polite", root); +@@ -917,7 +917,7 @@ AXNode* AXTree::GetFromId(AXNodeID id) const { + + void AXTree::Destroy() { + base::ElapsedThreadTimer timer; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ClearExtraAnnouncementNodes(); + #endif // BUILDFLAG(IS_LINUX) + +@@ -2109,7 +2109,7 @@ void AXTree::NotifyNodeAttributesWillChange( + new_data); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void AXTree::ClearExtraAnnouncementNodes() { + if (!extra_announcement_nodes_) { + return; +@@ -2498,7 +2498,7 @@ bool AXTree::CreateNewChildVector( + AXTreeUpdateState* update_state) { + DCHECK(GetTreeUpdateInProgressState()); + bool success = true; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If the root node has children added, clear the extra announcement nodes, + // which should always have their indices as the last two children of the root + // node. They will be recreated if needed, and given the correct indices. diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h new file mode 100644 index 000000000000..5d0219f9f423 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h @@ -0,0 +1,29 @@ +--- ui/accessibility/ax_tree.h.orig 2025-05-06 12:23:00 UTC ++++ ui/accessibility/ax_tree.h +@@ -62,7 +62,7 @@ enum class AXTreeUnserializeError { + }; + // LINT.ThenChange(/tools/metrics/histograms/metadata/accessibility/enums.xml:AccessibilityTreeUnserializeError) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // To support AriaNotify on older versions of ATK, we need to use the ATK + // signal "Text::text-insert". This signal requires a node that is a + // text type, and it needs to have aria-live properties set in order for +@@ -287,7 +287,7 @@ class AX_EXPORT AXTree { + + void NotifyChildTreeConnectionChanged(AXNode* node, AXTree* child_tree); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ClearExtraAnnouncementNodes(); + void CreateExtraAnnouncementNodes(); + ExtraAnnouncementNodes* extra_announcement_nodes() const { +@@ -544,7 +544,7 @@ class AX_EXPORT AXTree { + + std::unique_ptr<AXEvent> event_data_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<ExtraAnnouncementNodes> extra_announcement_nodes_ = nullptr; + #endif // BUILDFLAG(IS_LINUX) + }; diff --git a/www/ungoogled-chromium/files/patch-ui_base_accelerators_accelerator.cc b/www/ungoogled-chromium/files/patch-ui_base_accelerators_accelerator.cc index 578675b84082..7cfa97614429 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_accelerators_accelerator.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_accelerators_accelerator.cc @@ -1,11 +1,11 @@ ---- ui/base/accelerators/accelerator.cc.orig 2025-04-15 08:30:07 UTC +--- ui/base/accelerators/accelerator.cc.orig 2025-05-31 17:16:41 UTC +++ ui/base/accelerators/accelerator.cc -@@ -336,7 +336,7 @@ std::u16string Accelerator::ApplyLongFormModifiers( - result = ApplyModifierToAcceleratorString(result, IDS_APP_SEARCH_KEY); +@@ -331,7 +331,7 @@ std::vector<std::u16string> Accelerator::GetLongFormMo + modifiers.push_back(l10n_util::GetStringUTF16(IDS_APP_SEARCH_KEY)); #elif BUILDFLAG(IS_WIN) - result = ApplyModifierToAcceleratorString(result, IDS_APP_WINDOWS_KEY); + modifiers.push_back(l10n_util::GetStringUTF16(IDS_APP_WINDOWS_KEY)); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - result = ApplyModifierToAcceleratorString(result, IDS_APP_SUPER_KEY); + modifiers.push_back(l10n_util::GetStringUTF16(IDS_APP_SUPER_KEY)); #else NOTREACHED(); diff --git a/www/ungoogled-chromium/files/patch-ui_base_clipboard_clipboard__constants.cc b/www/ungoogled-chromium/files/patch-ui_base_clipboard_clipboard__constants.cc deleted file mode 100644 index 90663501f872..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_base_clipboard_clipboard__constants.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/base/clipboard/clipboard_constants.cc.orig 2025-02-20 09:59:21 UTC -+++ ui/base/clipboard/clipboard_constants.cc -@@ -25,7 +25,7 @@ const char kMimeTypeOctetStream[] = "application/octet - // Used for window dragging on some platforms. - const char kMimeTypeWindowDrag[] = "chromium/x-window-drag"; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const char kMimeTypeLinuxUtf8String[] = "UTF8_STRING"; - const char kMimeTypeLinuxString[] = "STRING"; - const char kMimeTypeLinuxText[] = "TEXT"; -@@ -33,7 +33,7 @@ const char kMimeTypeLinuxText[] = "TEXT"; - // BUILDFLAG(IS_FUCHSIA) - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - const char kMimeTypeSourceUrl[] = "chromium/x-source-url"; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || - // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-ui_base_clipboard_clipboard__constants.h b/www/ungoogled-chromium/files/patch-ui_base_clipboard_clipboard__constants.h index 81b9537cd89d..df4f989dbc1c 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_clipboard_clipboard__constants.h +++ b/www/ungoogled-chromium/files/patch-ui_base_clipboard_clipboard__constants.h @@ -1,20 +1,20 @@ ---- ui/base/clipboard/clipboard_constants.h.orig 2025-02-20 09:59:21 UTC +--- ui/base/clipboard/clipboard_constants.h.orig 2025-05-31 17:16:41 UTC +++ ui/base/clipboard/clipboard_constants.h -@@ -41,7 +41,7 @@ extern const char kMimeTypeWindowDrag[]; +@@ -44,7 +44,7 @@ inline constexpr char kMimeTypeWindowDrag[] = "chromiu // ----- LINUX & CHROMEOS & FUCHSIA MIME TYPES ----- -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) - extern const char kMimeTypeLinuxUtf8String[]; - COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) -@@ -53,7 +53,7 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) + inline constexpr char kMimeTypeLinuxUtf8String[] = "UTF8_STRING"; + inline constexpr char kMimeTypeLinuxString[] = "STRING"; + inline constexpr char kMimeTypeLinuxText[] = "TEXT"; +@@ -52,7 +52,7 @@ inline constexpr char kMimeTypeLinuxText[] = "TEXT"; // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - extern const char kMimeTypeSourceUrl[]; + inline constexpr char kMimeTypeSourceUrl[] = "chromium/x-source-url"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/ungoogled-chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc index b157bfb90fba..b6229d8fedd9 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -1,6 +1,6 @@ ---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2025-04-15 08:30:07 UTC +--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2025-05-06 12:23:00 UTC +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( +@@ -101,7 +101,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString() const { diff --git a/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc index 7bb896c6d1bd..7dd8cbf0c5c4 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2025-04-15 08:30:07 UTC +--- ui/base/resource/resource_bundle.cc.orig 2025-05-06 12:23:00 UTC +++ ui/base/resource/resource_bundle.cc -@@ -930,7 +930,7 @@ void ResourceBundle::ReloadFonts() { +@@ -929,7 +929,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h b/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h index e7376699d683..ff58757d2927 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h +++ b/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h @@ -1,6 +1,6 @@ ---- ui/base/test/ui_controls.h.orig 2025-01-25 09:34:31 UTC +--- ui/base/test/ui_controls.h.orig 2025-05-06 12:23:00 UTC +++ ui/base/test/ui_controls.h -@@ -184,7 +184,7 @@ bool SendTouchEventsNotifyWhenDone(int action, +@@ -191,7 +191,7 @@ bool SendTouchEventsNotifyWhenDone(int action, base::OnceClosure task); #endif diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc index 8dabb0898783..16aa9d2f1296 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc @@ -1,4 +1,4 @@ ---- ui/base/ui_base_features.cc.orig 2025-04-15 08:30:07 UTC +--- ui/base/ui_base_features.cc.orig 2025-05-31 17:16:41 UTC +++ ui/base/ui_base_features.cc @@ -119,7 +119,7 @@ BASE_FEATURE(kWaylandLinuxDrmSyncobj, // Controls whether support for Wayland's per-surface scaling is enabled. @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -138,7 +138,7 @@ BASE_FEATURE(kWaylandUiScale, +@@ -143,7 +143,7 @@ BASE_FEATURE(kWaylandSessionManagement, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_OZONE) @@ -18,7 +18,7 @@ // If this feature is enabled, users not specify --ozone-platform-hint switch // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220. COMPONENT_EXPORT(UI_BASE_FEATURES) -@@ -220,7 +220,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists, +@@ -231,7 +231,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists, // native apps on Windows. BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -296,7 +296,7 @@ bool IsForcedColorsEnabled() { +@@ -307,7 +307,7 @@ bool IsForcedColorsEnabled() { BASE_FEATURE(kEyeDropper, "EyeDropper", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h index a3aee56d3792..ac7fc8c6edb3 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h @@ -1,7 +1,7 @@ ---- ui/base/ui_base_features.h.orig 2025-02-20 09:59:21 UTC +--- ui/base/ui_base_features.h.orig 2025-05-06 12:23:00 UTC +++ ui/base/ui_base_features.h -@@ -124,7 +124,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) - BASE_DECLARE_FEATURE(kWaylandUiScale); +@@ -126,7 +126,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kWaylandSessionManagement); #endif // BUILDFLAG(IS_OZONE) -#if BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc index 367e6e0944fc..781c7c53085b 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2025-01-25 09:34:31 UTC +--- ui/base/webui/web_ui_util.cc.orig 2025-05-06 12:23:00 UTC +++ ui/base/webui/web_ui_util.cc -@@ -43,7 +43,7 @@ namespace { +@@ -46,7 +46,7 @@ namespace { constexpr float kMaxScaleFactor = 1000.0f; std::string GetFontFamilyMd() { @@ -9,7 +9,7 @@ return "Roboto, " + GetFontFamily(); #else return GetFontFamily(); -@@ -218,7 +218,7 @@ void AppendWebUiCssTextDefaults(std::string* html) { +@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::string* html) { std::string GetFontFamily() { std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY); diff --git a/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc index 1a257f37105b..9c5ecdd0c0e5 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2025-04-15 08:30:07 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2025-05-31 17:16:41 UTC +++ ui/base/x/x11_cursor_loader.cc @@ -42,7 +42,7 @@ #include "ui/gfx/x/connection.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -87,7 +87,11 @@ std::string CursorPathFromLibXcursor() { +@@ -84,7 +84,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -232,7 +236,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( +@@ -229,7 +233,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -30,7 +30,7 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -422,7 +426,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -419,7 +423,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; } diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__id.h b/www/ungoogled-chromium/files/patch-ui_color_color__id.h index 7a73ecff6f4d..9e89f3dc2c8a 100644 --- a/www/ungoogled-chromium/files/patch-ui_color_color__id.h +++ b/www/ungoogled-chromium/files/patch-ui_color_color__id.h @@ -1,11 +1,11 @@ ---- ui/color/color_id.h.orig 2025-04-15 08:30:07 UTC +--- ui/color/color_id.h.orig 2025-05-31 17:16:41 UTC +++ ui/color/color_id.h -@@ -622,7 +622,7 @@ +@@ -627,7 +627,7 @@ E_CPONLY(kColorCrosSysPositive) \ E_CPONLY(kColorCrosSysComplementVariant) \ E_CPONLY(kColorCrosSysInputFieldOnBase) -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define PLATFORM_SPECIFIC_COLOR_IDS \ - E_CPONLY(kColorNativeButtonBorder)\ + E_CPONLY(kColorNativeBoxFrameBorder)\ E_CPONLY(kColorNativeHeaderButtonBorderActive) \ diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc b/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc index 69cff86ed26d..247aa7f873f0 100644 --- a/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc +++ b/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- ui/color/color_provider_utils.cc.orig 2025-01-25 09:34:31 UTC +--- ui/color/color_provider_utils.cc.orig 2025-05-31 17:16:41 UTC +++ ui/color/color_provider_utils.cc -@@ -189,7 +189,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste +@@ -194,7 +194,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc index a0714c622634..d5d3f40e77f7 100644 --- 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 2025-04-15 08:30:07 UTC +--- ui/compositor/compositor.cc.orig 2025-05-31 17:16:41 UTC +++ ui/compositor/compositor.cc -@@ -940,7 +940,7 @@ void Compositor::OnResume() { +@@ -983,7 +983,7 @@ void Compositor::OnResume() { obs.ResetIfActive(); } diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h index 8361cc8af4c3..503f764c46ca 100644 --- 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 2025-04-15 08:30:07 UTC +--- ui/compositor/compositor.h.orig 2025-05-06 12:23:00 UTC +++ ui/compositor/compositor.h -@@ -467,7 +467,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -463,7 +463,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // base::PowerSuspendObserver: void OnResume() override; diff --git a/www/ungoogled-chromium/files/patch-ui_display_screen.cc b/www/ungoogled-chromium/files/patch-ui_display_screen.cc index bd305dd5d997..21037e7cb459 100644 --- a/www/ungoogled-chromium/files/patch-ui_display_screen.cc +++ b/www/ungoogled-chromium/files/patch-ui_display_screen.cc @@ -1,6 +1,6 @@ ---- ui/display/screen.cc.orig 2025-01-25 09:34:31 UTC +--- ui/display/screen.cc.orig 2025-05-31 17:16:41 UTC +++ ui/display/screen.cc -@@ -86,7 +86,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i +@@ -82,7 +82,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i display_id_for_new_windows_ = display_id; } diff --git a/www/ungoogled-chromium/files/patch-ui_display_screen.h b/www/ungoogled-chromium/files/patch-ui_display_screen.h index 3d2ba0be6c6a..e14ef6bd1447 100644 --- a/www/ungoogled-chromium/files/patch-ui_display_screen.h +++ b/www/ungoogled-chromium/files/patch-ui_display_screen.h @@ -1,4 +1,4 @@ ---- ui/display/screen.h.orig 2025-01-25 09:34:31 UTC +--- ui/display/screen.h.orig 2025-05-06 12:23:00 UTC +++ ui/display/screen.h @@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). @@ -9,7 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -243,7 +243,7 @@ class DISPLAY_EXPORT Screen { +@@ -246,7 +246,7 @@ class DISPLAY_EXPORT Screen { int64_t display_id_for_new_windows_; int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; diff --git a/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index 5080712fe48f..a3cbfcc8b6aa 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2024-10-01 07:26:23 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2025-05-31 17:16:41 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -849,6 +849,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -850,6 +850,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn index dd668bc501e6..2ddf4e26c5f4 100644 --- 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 2025-04-15 08:30:07 UTC +--- ui/gfx/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ ui/gfx/BUILD.gn -@@ -658,7 +658,7 @@ source_set("memory_buffer_sources") { +@@ -663,7 +663,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } 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 index e60fe5bb98ce..60a708f9307d 100644 --- 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,6 +1,6 @@ ---- ui/gfx/gpu_memory_buffer.cc.orig 2025-03-09 21:38:10 UTC +--- ui/gfx/gpu_memory_buffer.cc.orig 2025-05-31 17:16:41 UTC +++ ui/gfx/gpu_memory_buffer.cc -@@ -108,7 +108,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c +@@ -131,7 +131,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c handle.id = id; handle.offset = offset; handle.stride = stride; 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 index 1397136e942b..e0d504a323cd 100644 --- 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 2025-03-09 21:38:10 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2025-05-31 17:16:41 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -17,7 +17,7 @@ #include "ui/gfx/generic_shared_memory_id.h" @@ -9,7 +9,16 @@ #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_APPLE) #include "ui/gfx/mac/io_surface.h" -@@ -205,7 +205,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle { +@@ -58,7 +58,7 @@ enum GpuMemoryBufferType { + #if BUILDFLAG(IS_APPLE) + IO_SURFACE_BUFFER, + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + NATIVE_PIXMAP, + #endif + #if BUILDFLAG(IS_WIN) +@@ -210,7 +210,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle { uint32_t offset = 0; uint32_t stride = 0; diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc index 24f4c3f19460..b0dc1f04f9a7 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc @@ -1,4 +1,4 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2025-03-09 21:38:10 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2025-05-06 12:23:00 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc @@ -14,7 +14,7 @@ #include "ui/gfx/mac/io_surface.h" @@ -41,16 +41,16 @@ out->modifier = data.modifier(); out->supports_zero_copy_webgpu_import = data.supports_zero_copy_webgpu_import(); -@@ -190,7 +190,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag - NOTREACHED(); +@@ -187,7 +187,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag + case gfx::IO_SURFACE_BUFFER: + return Tag::kMachPort; #endif // BUILDFLAG(IS_APPLE) - case gfx::NATIVE_PIXMAP: -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) + case gfx::NATIVE_PIXMAP: return Tag::kNativePixmapHandle; - #else - NOTREACHED(); -@@ -259,7 +259,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) +@@ -251,7 +251,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa } return true; #endif // BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h b/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h index 91ed425a5a69..7eeb7d43219c 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h +++ b/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h @@ -1,6 +1,6 @@ ---- ui/gfx/native_widget_types.h.orig 2025-01-25 09:34:31 UTC +--- ui/gfx/native_widget_types.h.orig 2025-05-31 17:16:41 UTC +++ ui/gfx/native_widget_types.h -@@ -101,7 +101,7 @@ class ViewAndroid; +@@ -102,7 +102,7 @@ class ViewAndroid; #endif class SkBitmap; @@ -9,12 +9,12 @@ extern "C" { struct _AtkObject; using AtkObject = struct _AtkObject; -@@ -214,7 +214,7 @@ using NativeViewAccessible = id; - #else - using NativeViewAccessible = struct objc_object*; - #endif +@@ -186,7 +186,7 @@ using NativeViewAccessible = IAccessible*; + using NativeViewAccessible = base::apple::OwnedNSObject; + #elif BUILDFLAG(IS_MAC) + using NativeViewAccessible = base::apple::OwnedNSAccessibility; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Linux doesn't have a native font type. + // Linux doesn't have a native accessibility type. using NativeViewAccessible = AtkObject*; #else diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_x_atom__cache.cc b/www/ungoogled-chromium/files/patch-ui_gfx_x_atom__cache.cc index b4f192e5b8fb..68d72d364094 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_x_atom__cache.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_x_atom__cache.cc @@ -1,6 +1,6 @@ ---- ui/gfx/x/atom_cache.cc.orig 2025-04-15 08:30:07 UTC +--- ui/gfx/x/atom_cache.cc.orig 2025-05-06 12:23:00 UTC +++ ui/gfx/x/atom_cache.cc -@@ -156,6 +156,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha +@@ -157,6 +157,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha "application/octet-stream", "application/vnd.chromium.test", "chromium/filename", diff --git a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn index 155b7662c6f0..40c6a58c5579 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2025-03-09 21:38:10 UTC +--- ui/gl/BUILD.gn.orig 2025-05-06 12:23:00 UTC +++ ui/gl/BUILD.gn -@@ -169,7 +169,6 @@ component("gl") { +@@ -174,7 +174,6 @@ component("gl") { public_deps = [ ":gl_enums", "//base", @@ -8,7 +8,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -323,7 +322,6 @@ component("gl") { +@@ -328,7 +327,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -16,7 +16,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -548,7 +546,6 @@ test("gl_unittests") { +@@ -554,7 +552,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc index 3e3ac8577973..b4083842deb7 100644 --- 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 2025-01-25 09:34:31 UTC +--- ui/gl/gl_implementation.cc.orig 2025-05-06 12:23:00 UTC +++ ui/gl/gl_implementation.cc -@@ -252,7 +252,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -286,7 +286,7 @@ GetRequestedGLImplementationFromCommandLine( const base::CommandLine* command_line) { 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 index 18c54ea00338..01c054e2df5e 100644 --- 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 2025-03-09 21:38:10 UTC +--- ui/gl/gl_switches.cc.orig 2025-05-31 17:16:41 UTC +++ ui/gl/gl_switches.cc @@ -13,7 +13,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 -@@ -314,7 +314,7 @@ bool IsDefaultANGLEVulkan() { +@@ -319,7 +319,7 @@ bool IsDefaultANGLEVulkan() { return false; } #endif // BUILDFLAG(IS_ANDROID) @@ -18,7 +18,7 @@ angle::SystemInfo system_info; { GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan"); -@@ -367,7 +367,7 @@ bool IsDefaultANGLEVulkan() { +@@ -388,7 +388,7 @@ bool IsDefaultANGLEVulkan() { } #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc index cf75423fda7f..27079dba2e62 100644 --- a/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc +++ b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc @@ -1,6 +1,6 @@ ---- ui/gtk/gtk_compat.cc.orig 2025-04-15 08:30:07 UTC +--- ui/gtk/gtk_compat.cc.orig 2025-05-06 12:23:00 UTC +++ ui/gtk/gtk_compat.cc -@@ -64,27 +64,47 @@ auto DlCast(void* symbol) { +@@ -65,27 +65,47 @@ auto DlCast(void* symbol) { } void* GetLibGio() { diff --git a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index a12ae06defd6..5e2c11a6b43c 100644 --- a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2025-01-25 09:34:31 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2025-05-31 17:16:41 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -438,7 +438,7 @@ void PrintDialogGtk::ShowDialog( +@@ -456,7 +456,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__features.cc b/www/ungoogled-chromium/files/patch-ui_native__theme_features_native__theme__features.cc index 97c4b1d1e077..a7c97f0b75ed 100644 --- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_native__theme_features_native__theme__features.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_features.cc.orig 2025-03-09 21:38:10 UTC -+++ ui/native_theme/native_theme_features.cc -@@ -73,7 +73,7 @@ namespace ui { +--- ui/native_theme/features/native_theme_features.cc.orig 2025-05-06 12:23:00 UTC ++++ ui/native_theme/features/native_theme_features.cc +@@ -59,7 +59,7 @@ namespace ui { bool IsFluentOverlayScrollbarEnabled() { // Fluent scrollbars are only used for some OSes due to UI design guidelines. @@ -9,7 +9,7 @@ return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar); #else return false; -@@ -82,7 +82,7 @@ bool IsFluentOverlayScrollbarEnabled() { +@@ -68,7 +68,7 @@ bool IsFluentOverlayScrollbarEnabled() { bool IsFluentScrollbarEnabled() { // Fluent scrollbars are only used for some OSes due to UI design guidelines. diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h index 24aa14c5e0ef..25eb81ce12f7 100644 --- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2025-01-25 09:34:31 UTC +--- ui/native_theme/native_theme.h.orig 2025-05-06 12:23:00 UTC +++ ui/native_theme/native_theme.h -@@ -61,7 +61,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -61,7 +61,7 @@ class COMPONENT_EXPORT(NATIVE_THEME) NativeTheme { // The part to be painted / sized. enum Part { kCheckbox, diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc index c425565b6e5c..676224a4fd06 100644 --- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,11 +1,11 @@ ---- ui/native_theme/native_theme_base.cc.orig 2025-03-09 21:38:10 UTC +--- ui/native_theme/native_theme_base.cc.orig 2025-05-06 12:23:00 UTC +++ ui/native_theme/native_theme_base.cc -@@ -239,7 +239,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, - absl::get<ButtonExtraParams>(extra), color_scheme, +@@ -240,7 +240,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, + std::get<ButtonExtraParams>(extra), color_scheme, accent_color_opaque); break; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) case kFrameTopArea: PaintFrameTopArea(canvas, state, rect, - absl::get<FrameTopAreaExtraParams>(extra), + std::get<FrameTopAreaExtraParams>(extra), color_scheme); diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc index 667090dc5194..1a6199674a9f 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2024-04-04 19:16:34 UTC +--- ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2025-05-06 12:23:00 UTC +++ ui/ozone/platform/headless/ozone_platform_headless.cc -@@ -103,7 +103,7 @@ class OzonePlatformHeadless : public OzonePlatform { +@@ -108,7 +108,7 @@ class OzonePlatformHeadlessImpl : public OzonePlatform } // Desktop Linux, not CastOS. diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc new file mode 100644 index 000000000000..e106ca3408e3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc @@ -0,0 +1,13 @@ +--- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig 2025-05-13 08:59:54 UTC ++++ ui/ozone/platform/wayland/host/wayland_frame_manager.cc +@@ -461,8 +461,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC + surface->UpdateBufferDamageRegion( + gfx::ToEnclosingRectIgnoringError(surface_damage)); + ++#if !BUILDFLAG(IS_BSD) + if (!config.access_fence_handle.is_null()) + surface->set_acquire_fence(std::move(config.access_fence_handle)); ++#endif + + bool needs_commit = false; + diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc deleted file mode 100644 index f88f2222cd70..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2025-03-09 21:38:10 UTC -+++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc -@@ -261,6 +261,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( - // so if it exceeds 16 bits, it may be broken. - static constexpr size_t kSizeLimit = 60000; - if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) { -+#if defined(__FreeBSD_version) && __FreeBSD_version < 1300048 -+ PLOG(ERROR) << "memfd is not supported"; -+ return; -+#else - base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC)); - if (!memfd.get()) { - PLOG(ERROR) << "Failed to create memfd"; -@@ -273,6 +277,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( - zcr_extended_text_input_v1_set_large_surrounding_text( - extended_obj_.get(), memfd.get(), text.length(), - selection_range.start(), selection_range.end()); -+#endif - } else { - zwp_text_input_v1_set_surrounding_text(obj_.get(), text.c_str(), - selection_range.start(), diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc index 80425fe259c6..f59b32b50b5b 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/x11_window.cc.orig 2025-04-15 08:30:07 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2025-05-06 12:23:00 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1472,7 +1472,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1459,7 +1459,7 @@ void X11Window::OnXWindowStateChanged() { WindowTiledEdges tiled_state = GetTiledState(); if (tiled_state != tiled_state_) { tiled_state_ = tiled_state; 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 index 66f7d1855559..52fb13ff5381 100644 --- 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 2025-04-15 08:30:07 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2025-05-08 07:58:41 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -140,7 +140,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -144,7 +144,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__init__properties.h b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h index 3d659947b270..5eaa81e5a86d 100644 --- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h +++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -1,4 +1,4 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2024-06-22 08:49:42 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2025-05-06 12:23:00 UTC +++ ui/platform_window/platform_window_init_properties.h @@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate; class ScenicWindowDelegate; @@ -9,7 +9,7 @@ class X11ExtensionDelegate; #endif -@@ -121,7 +121,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo +@@ -120,7 +120,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault; diff --git a/www/ungoogled-chromium/files/patch-ui_qt_moc__wrapper.py b/www/ungoogled-chromium/files/patch-ui_qt_moc__wrapper.py new file mode 100644 index 000000000000..eba569cd99dc --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_qt_moc__wrapper.py @@ -0,0 +1,8 @@ +--- ui/qt/moc_wrapper.py.orig 2025-05-31 17:16:41 UTC ++++ ui/qt/moc_wrapper.py +@@ -20,4 +20,4 @@ args = parser.parse_args() + if args.path is None: + subprocess.check_call(["moc", args.input, "-o", args.output]) + else: +- subprocess.check_call([args.path + "/moc", args.input, "-o", args.output]) ++ subprocess.check_call([args.path, args.input, "-o", args.output]) diff --git a/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn index 5c866c1e8ebf..fe355765eb83 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/views/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- ui/views/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ ui/views/BUILD.gn -@@ -836,7 +836,6 @@ component("views") { +@@ -833,7 +833,6 @@ component("views") { sources += [ "accessibility/widget_ax_tree_id_map.cc" ] } deps += [ diff --git a/www/ungoogled-chromium/files/patch-ui_views_accessibility_view__accessibility.cc b/www/ungoogled-chromium/files/patch-ui_views_accessibility_view__accessibility.cc index 1fd5efc6f2ee..7a60bfd9bf1a 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_accessibility_view__accessibility.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_accessibility_view__accessibility.cc @@ -1,6 +1,6 @@ ---- ui/views/accessibility/view_accessibility.cc.orig 2025-04-15 08:30:07 UTC +--- ui/views/accessibility/view_accessibility.cc.orig 2025-05-06 12:23:00 UTC +++ ui/views/accessibility/view_accessibility.cc -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #include "ui/views/accessibility/view_ax_platform_node_delegate_win.h" #elif BUILDFLAG(IS_MAC) #include "ui/views/accessibility/view_ax_platform_node_delegate_mac.h" @@ -9,7 +9,7 @@ #include "ui/views/accessibility/view_ax_platform_node_delegate_auralinux.h" #endif -@@ -100,7 +100,7 @@ std::unique_ptr<ViewAccessibility> ViewAccessibility:: +@@ -101,7 +101,7 @@ std::unique_ptr<ViewAccessibility> ViewAccessibility:: return ViewAXPlatformNodeDelegateWin::CreatePlatformSpecific(view); #elif BUILDFLAG(IS_MAC) return ViewAXPlatformNodeDelegateMac::CreatePlatformSpecific(view); 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 index 2e1f3839002a..accd6c4d10ce 100644 --- 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 2025-04-15 08:30:07 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2025-05-06 12:23:00 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -86,7 +86,7 @@ +@@ -87,7 +87,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" -@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) { +@@ -184,7 +184,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,25 +18,25 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -790,7 +790,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -791,7 +791,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event return handled; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* linux_ui = ui::LinuxUi::instance(); - std::vector<ui::TextEditCommandAuraLinux> commands; - if (!handled && linux_ui && -@@ -975,7 +975,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo + if (!handled) { + if (auto* linux_ui = ui::LinuxUi::instance()) { + const auto command = +@@ -976,7 +976,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Skip any accelerator handling that conflicts with custom keybindings. - auto* linux_ui = ui::LinuxUi::instance(); - std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -2066,7 +2066,7 @@ bool Textfield::ShouldDoLearning() { + if (auto* linux_ui = ui::LinuxUi::instance()) { + if (IsTextEditCommandEnabled(linux_ui->GetTextEditCommandForEvent( +@@ -2062,7 +2062,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(crbug.com/41452689): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2584,7 +2584,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2580,7 +2580,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } @@ -54,7 +54,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift) { return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; -@@ -2592,7 +2592,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2588,7 +2588,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: diff --git a/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc index 3debb8b1ea81..c3eb92b1b7f7 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,6 +1,6 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2025-01-25 09:34:31 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2025-05-06 12:23:00 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -38,7 +38,7 @@ static constexpr int kTooltipMaxWidth = 800; +@@ -42,7 +42,7 @@ static constexpr int kTooltipMaxWidth = 800; // TODO(varkha): Update if native widget can be transparent on Linux. bool CanUseTranslucentTooltipWidget() { diff --git a/www/ungoogled-chromium/files/patch-ui_views_examples_widget__example.cc b/www/ungoogled-chromium/files/patch-ui_views_examples_widget__example.cc index da7d8d192b46..892ae9b31051 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- ui/views/examples/widget_example.cc.orig 2024-10-01 07:26:23 UTC +--- ui/views/examples/widget_example.cc.orig 2025-05-06 12:23:00 UTC +++ ui/views/examples/widget_example.cc -@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -51,7 +51,7 @@ void WidgetExample::CreateExampleView(View* container) modal_button->SetCallback( base::BindRepeating(&WidgetExample::CreateDialogWidget, base::Unretained(this), modal_button, true)); diff --git a/www/ungoogled-chromium/files/patch-ui_views_views__delegate.cc b/www/ungoogled-chromium/files/patch-ui_views_views__delegate.cc index c18b63469ca7..d546e86d02a9 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_views__delegate.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_views__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.cc.orig 2025-04-15 08:30:07 UTC +--- ui/views/views_delegate.cc.orig 2025-05-31 17:16:41 UTC +++ ui/views/views_delegate.cc -@@ -101,7 +101,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow +@@ -91,7 +91,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow return false; } #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/ungoogled-chromium/files/patch-ui_views_views__delegate.h b/www/ungoogled-chromium/files/patch-ui_views_views__delegate.h index 5eddd80f802d..52bf19a9254c 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_views__delegate.h +++ b/www/ungoogled-chromium/files/patch-ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.h.orig 2025-01-25 09:34:31 UTC +--- ui/views/views_delegate.h.orig 2025-05-31 17:16:41 UTC +++ ui/views/views_delegate.h -@@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -143,7 +143,7 @@ class VIEWS_EXPORT ViewsDelegate { // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ 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 index e18d9376ffb3..5b1c0f92f77e 100644 --- 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 2025-04-15 08:30:07 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2025-05-31 17:16:41 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -50,7 +50,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 -@@ -347,7 +347,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -356,7 +356,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1179,7 +1179,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1188,7 +1188,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // 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 index 83dc7d0b5004..0321c68eb909 100644 --- 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 2025-04-15 08:30:07 UTC +--- ui/views/widget/widget.cc.orig 2025-05-31 17:16:41 UTC +++ ui/views/widget/widget.cc @@ -63,7 +63,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2452,7 +2452,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2464,7 +2464,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const return parent_->GetNativeTheme(); } diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h new file mode 100644 index 000000000000..1865a479d173 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h @@ -0,0 +1,11 @@ +--- ui/views/widget/widget.h.orig 2025-05-06 12:23:00 UTC ++++ ui/views/widget/widget.h +@@ -487,7 +487,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid + bool force_system_menu_for_frameless = false; + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Only used by X11, for root level windows. Specifies the res_name and + // res_class fields, respectively, of the WM_CLASS window property. Controls + // window grouping and desktop file matching in Linux window managers. diff --git a/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc index 4dedbb551c39..3085517f6a00 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2025-03-09 21:38:10 UTC +--- ui/views/window/dialog_delegate.cc.orig 2025-05-31 17:16:41 UTC +++ ui/views/window/dialog_delegate.cc -@@ -105,7 +105,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -107,7 +107,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn index 59723a44d331..b6d26d60abce 100644 --- a/www/ungoogled-chromium/files/patch-v8_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2025-04-15 08:30:07 UTC +--- v8/BUILD.gn.orig 2025-05-31 17:16:41 UTC +++ v8/BUILD.gn -@@ -974,6 +974,8 @@ external_v8_defines = [ +@@ -999,6 +999,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -9,7 +9,7 @@ ] enabled_external_v8_defines = [ -@@ -1053,6 +1055,12 @@ if (target_os == "android") { +@@ -1075,6 +1077,12 @@ if (target_os == "android") { } else if (target_os == "chromeos") { enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -22,7 +22,7 @@ } disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines -@@ -2479,6 +2487,12 @@ template("run_mksnapshot") { +@@ -2545,6 +2553,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -35,7 +35,7 @@ } if (v8_enable_turboshaft_csa) { -@@ -6565,7 +6579,7 @@ v8_component("v8_libbase") { +@@ -6658,7 +6672,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6576,6 +6590,18 @@ v8_component("v8_libbase") { +@@ -6669,6 +6683,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/ungoogled-chromium/files/patch-v8_include_v8config.h b/www/ungoogled-chromium/files/patch-v8_include_v8config.h index 9442fff39a70..ea1a9ae03cd1 100644 --- a/www/ungoogled-chromium/files/patch-v8_include_v8config.h +++ b/www/ungoogled-chromium/files/patch-v8_include_v8config.h @@ -1,4 +1,4 @@ ---- v8/include/v8config.h.orig 2025-01-25 09:34:31 UTC +--- v8/include/v8config.h.orig 2025-05-06 12:23:00 UTC +++ v8/include/v8config.h @@ -201,6 +201,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ @@ -35,7 +35,7 @@ #ifdef V8_OS_MACOS # define V8_TARGET_OS_MACOS #endif -@@ -382,6 +396,7 @@ path. Add it with -I<path> to the command line +@@ -383,6 +397,7 @@ path. Add it with -I<path> to the command line #if (defined(_M_X64) || defined(__x86_64__) /* x64 (everywhere) */ \ || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */ \ && !defined(_WIN32))) /* not on windows */ \ diff --git a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc index 6826cc3a20bd..5e74d0d774c7 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc @@ -1,15 +1,15 @@ ---- v8/src/api/api.cc.orig 2025-04-15 08:30:07 UTC +--- v8/src/api/api.cc.orig 2025-05-31 17:16:41 UTC +++ v8/src/api/api.cc -@@ -153,7 +153,7 @@ - #include "src/wasm/wasm-serialization.h" - #endif // V8_ENABLE_WEBASSEMBLY +@@ -158,7 +158,7 @@ + #include "src/objects/intl-objects.h" + #endif // V8_INTL_SUPPORT -#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD +#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD || V8_OS_OPENBSD #include <signal.h> #include <unistd.h> -@@ -6476,7 +6476,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6472,7 +6472,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/ungoogled-chromium/files/patch-v8_src_diagnostics_perf-jit.cc b/www/ungoogled-chromium/files/patch-v8_src_diagnostics_perf-jit.cc index 9bad176e379e..654a43f76dd1 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_diagnostics_perf-jit.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_diagnostics_perf-jit.cc @@ -1,11 +1,11 @@ ---- v8/src/diagnostics/perf-jit.cc.orig 2023-10-13 13:20:35 UTC +--- v8/src/diagnostics/perf-jit.cc.orig 2025-05-31 17:16:41 UTC +++ v8/src/diagnostics/perf-jit.cc @@ -31,7 +31,7 @@ #include "src/flags/flags.h" - // Only compile the {LinuxPerfJitLogger} on Linux. --#if V8_OS_LINUX -+#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) + // Only compile the {PerfJitLogger} on Linux & Darwin. +-#if V8_OS_LINUX || V8_OS_DARWIN ++#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_BSD #include <fcntl.h> #include <sys/mman.h> diff --git a/www/ungoogled-chromium/files/patch-v8_src_diagnostics_perf-jit.h b/www/ungoogled-chromium/files/patch-v8_src_diagnostics_perf-jit.h index c7d1f6fc5c45..ee2b50ec5613 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_diagnostics_perf-jit.h +++ b/www/ungoogled-chromium/files/patch-v8_src_diagnostics_perf-jit.h @@ -1,11 +1,11 @@ ---- v8/src/diagnostics/perf-jit.h.orig 2022-10-01 07:40:07 UTC +--- v8/src/diagnostics/perf-jit.h.orig 2025-05-31 17:16:41 UTC +++ v8/src/diagnostics/perf-jit.h @@ -31,7 +31,7 @@ #include "include/v8config.h" - // {LinuxPerfJitLogger} is only implemented on Linux. --#if V8_OS_LINUX -+#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) + // {PerfJitLogger} is only implemented on Linux & Darwin. +-#if V8_OS_LINUX || V8_OS_DARWIN ++#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_BSD #include "src/logging/log.h" diff --git a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc index a92bea7568fd..c95284918686 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2025-04-15 08:30:07 UTC +--- v8/src/execution/isolate.cc.orig 2025-05-31 17:16:41 UTC +++ v8/src/execution/isolate.cc -@@ -172,6 +172,10 @@ +@@ -173,6 +173,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,7 +11,7 @@ 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_[]; -@@ -5062,6 +5066,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -5110,6 +5114,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/ungoogled-chromium/files/patch-v8_src_trap-handler_trap-handler.h b/www/ungoogled-chromium/files/patch-v8_src_trap-handler_trap-handler.h index 0f8d026b8d83..5267b847ba89 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_trap-handler_trap-handler.h +++ b/www/ungoogled-chromium/files/patch-v8_src_trap-handler_trap-handler.h @@ -1,4 +1,4 @@ ---- v8/src/trap-handler/trap-handler.h.orig 2025-02-20 09:59:21 UTC +--- v8/src/trap-handler/trap-handler.h.orig 2025-05-31 17:16:41 UTC +++ v8/src/trap-handler/trap-handler.h @@ -18,7 +18,7 @@ namespace v8::internal::trap_handler { // X64 on Linux, Windows, MacOS, FreeBSD. @@ -7,5 +7,5 @@ - V8_OS_FREEBSD) + V8_OS_FREEBSD || V8_OS_OPENBSD) #define V8_TRAP_HANDLER_SUPPORTED true - // Arm64 (non-simulator) on Linux, Windows, MacOS. + // Arm64 native on Linux, Windows, MacOS. #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && \ diff --git a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h index a400ad9e7ae2..7c5b8d93db06 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h +++ b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2025-04-15 08:30:07 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2025-05-06 12:23:00 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -575,7 +575,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -579,7 +579,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, @@ -9,7 +9,7 @@ LoadType type, uint32_t* protected_load_pc, bool /* is_load_mem */, bool /* i64_offset */, bool needs_shift) { -@@ -655,7 +655,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -659,7 +659,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -18,7 +18,7 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -734,7 +734,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -738,7 +738,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -27,7 +27,7 @@ LoadType type, LiftoffRegList /* pinned */, bool /* i64_offset */) { if (type.value() != LoadType::kI64Load) { -@@ -752,7 +752,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -756,7 +756,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned, bool /* i64_offset */) { DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -822,7 +822,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -826,7 +826,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -890,7 +890,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -894,7 +894,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble } inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -54,7 +54,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -1005,7 +1005,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -1009,7 +1009,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino } inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -63,7 +63,7 @@ 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 -@@ -1101,7 +1101,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1105,7 +1105,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1115,7 +1115,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1119,7 +1119,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1128,7 +1128,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1132,7 +1132,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1142,7 +1142,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1146,7 +1146,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -99,7 +99,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1156,7 +1156,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1160,7 +1160,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -108,7 +108,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1170,7 +1170,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1174,7 +1174,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -117,7 +117,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type, bool /* i64_offset */) { -@@ -1185,7 +1185,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1189,7 +1189,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( |