diff options
435 files changed, 2882 insertions, 2303 deletions
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 60436a5b6631..e291208e8cfd 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,6 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 134.0.6998.165 -PORTREVISION= 2 +PORTVERSION= 135.0.7049.84 PULSEMV= 16 PULSEV= ${PULSEMV}.1 UGVERSION= ${DISTVERSION}-1 diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 08700fb4f92b..f97439f4277f 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1742735381 -SHA256 (chromium-134.0.6998.165.tar.xz) = 6c2f2a4fca77f6428171215ffd688e68a09849b75fae43aed980a5f77eeb097d -SIZE (chromium-134.0.6998.165.tar.xz) = 7049324636 +TIMESTAMP = 1744706185 +SHA256 (chromium-135.0.7049.84.tar.xz) = 43fafda47b177c4aa89ab2849bfb8e9bf035be5281f9bb0e0cae41eabd53832e +SIZE (chromium-135.0.7049.84.tar.xz) = 7025887252 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-134.0.6998.165-testdata.tar.xz) = c130bacbf3443bf42ff49b717cd1727f6d0c4833bb672bf461cd92dc89b3d086 -SIZE (chromium-134.0.6998.165-testdata.tar.xz) = 653712584 -SHA256 (ungoogled-software-ungoogled-chromium-134.0.6998.165-134.0.6998.165-1_GH0.tar.gz) = b583f62da9e79722fb5be6044e00ab0bc79adc06c308d994b0c818b912205994 -SIZE (ungoogled-software-ungoogled-chromium-134.0.6998.165-134.0.6998.165-1_GH0.tar.gz) = 687546 +SHA256 (chromium-135.0.7049.84-testdata.tar.xz) = 9cd340ccdd821752506697cfda536afa82dcee6dcfb9914e6754d8a3decc7379 +SIZE (chromium-135.0.7049.84-testdata.tar.xz) = 646330872 +SHA256 (ungoogled-software-ungoogled-chromium-135.0.7049.84-135.0.7049.84-1_GH0.tar.gz) = 13d7c11a678ae1a729996d2f2906c079cca8e015ba28f2f62ff6ba26c89e165a +SIZE (ungoogled-software-ungoogled-chromium-135.0.7049.84-135.0.7049.84-1_GH0.tar.gz) = 630940 diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn index d3f2b43ac358..ebb9f69a85a7 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-03-09 21:38:10 UTC +--- BUILD.gn.orig 2025-04-15 08:30:07 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", -@@ -446,7 +445,7 @@ group("gn_all") { +@@ -448,7 +447,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -628,6 +627,15 @@ group("gn_all") { +@@ -630,6 +629,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", -@@ -676,7 +684,7 @@ group("gn_all") { +@@ -678,7 +686,7 @@ group("gn_all") { } } @@ -51,7 +51,16 @@ # 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 -@@ -1117,7 +1125,7 @@ if (use_blink && !is_cronet_build) { +@@ -713,7 +721,7 @@ group("gn_all") { + ] + } + +- if (is_mac || is_win || is_android || is_linux || is_chromeos) { ++ if (!is_bsd && (is_mac || is_win || is_android || is_linux || is_chromeos)) { + deps += [ + "//third_party/crashpad/crashpad:crashpad_tests", + "//third_party/crashpad/crashpad/handler:crashpad_handler", +@@ -1118,7 +1126,7 @@ if (use_blink && !is_cronet_build) { ] if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && @@ -60,7 +69,7 @@ deps += [ ":chrome_wpt_tests", ":headless_shell_wpt", -@@ -1267,7 +1275,7 @@ if (use_blink && !is_cronet_build) { +@@ -1265,7 +1273,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,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. -@@ -1281,7 +1289,7 @@ if (use_blink && !is_cronet_build) { +@@ -1279,7 +1287,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms" ] } @@ -78,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. -@@ -1752,7 +1760,7 @@ group("chromium_builder_perf") { +@@ -1749,7 +1757,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/ungoogled-chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/ungoogled-chromium/files/patch-apps_ui_views_app__window__frame__view.cc index 61dedc75a375..4ba1c7fd62a5 100644 --- a/www/ungoogled-chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,11 +1,11 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2024-08-26 14:40:28 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2025-04-15 08:30:07 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -149,7 +149,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient +@@ -146,7 +146,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() + gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( + const gfx::Rect& client_bounds) const { gfx::Rect window_bounds = client_bounds; - // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is - // complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Get the difference between the widget's client area bounds and window // bounds, and grow |window_bounds| by that amount. gfx::Insets native_frame_insets = diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn index 63450738dab5..86b846d1dee6 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-03-09 21:38:10 UTC +--- base/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ base/BUILD.gn -@@ -1088,11 +1088,26 @@ component("base") { +@@ -1094,11 +1094,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" ] -@@ -1112,7 +1127,7 @@ component("base") { +@@ -1118,7 +1133,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -37,7 +37,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2122,6 +2137,22 @@ component("base") { +@@ -2142,6 +2157,22 @@ component("base") { ] } @@ -60,7 +60,7 @@ # iOS if (is_ios) { sources += [ -@@ -2267,6 +2298,33 @@ component("base") { +@@ -2300,6 +2331,33 @@ component("base") { } } @@ -94,7 +94,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2617,7 +2675,7 @@ buildflag_header("protected_memory_buildflags") { +@@ -2649,7 +2707,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" ] -@@ -3096,7 +3154,7 @@ if (is_apple) { +@@ -3122,7 +3180,7 @@ if (is_apple) { } } @@ -112,7 +112,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3781,7 +3839,7 @@ test("base_unittests") { +@@ -3808,7 +3866,7 @@ test("base_unittests") { ] } @@ -121,7 +121,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3809,7 +3867,7 @@ test("base_unittests") { +@@ -3836,7 +3894,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", -@@ -3820,7 +3878,7 @@ test("base_unittests") { +@@ -3847,7 +3905,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -139,7 +139,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4008,7 +4066,7 @@ test("base_unittests") { +@@ -4037,7 +4095,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } 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 5071caf36bf1..c6d9ee6d9cf6 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-03-09 21:38:10 UTC +--- 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 -@@ -865,7 +865,7 @@ if (is_clang_or_gcc) { +@@ -884,7 +884,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 f176f6f99139..cd879deb5d17 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 2024-11-16 12:20:41 UTC +--- 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 -@@ -302,8 +302,12 @@ bool TryRecommitSystemPagesInternal( +@@ -309,8 +309,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_debug_stack__trace.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc index d5b6a54a3041..812d727d75df 100644 --- a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc +++ b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace.cc.orig 2025-03-09 21:38:10 UTC +--- base/debug/stack_trace.cc.orig 2025-04-15 08:30:07 UTC +++ base/debug/stack_trace.cc -@@ -267,7 +267,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { +@@ -268,7 +268,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { // Symbols are not expected to be reliable when gn args specifies // symbol_level=0. return false; @@ -9,7 +9,7 @@ // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // See https://crbug.com/706728 return false; -@@ -320,7 +320,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream +@@ -321,7 +321,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream } return; } @@ -19,7 +19,7 @@ } std::string StackTrace::ToString() const { -@@ -329,7 +331,7 @@ std::string StackTrace::ToString() const { +@@ -330,7 +332,7 @@ std::string StackTrace::ToString() const { std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; @@ -28,7 +28,7 @@ OutputToStreamWithPrefix(&stream, prefix_string); #endif return stream.str(); -@@ -353,7 +355,7 @@ bool StackTrace::ShouldSuppressOutput() { +@@ -354,7 +356,7 @@ bool StackTrace::ShouldSuppressOutput() { } std::ostream& operator<<(std::ostream& os, const StackTrace& s) { 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 5d9306f30f37..f9e68c8ca580 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,30 +1,29 @@ ---- base/files/file_util_posix.cc.orig 2025-03-09 21:38:10 UTC +--- base/files/file_util_posix.cc.orig 2025-04-15 08:30:07 UTC +++ base/files/file_util_posix.cc -@@ -902,36 +902,33 @@ bool CreateNewTempDirectory(const FilePath::StringType +@@ -902,6 +902,8 @@ 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("/"); - std::vector<FilePath> subpaths; - - // Collect a list of all parent directories. ++ + // Avoid checking subdirs if directory already exists. + if (DirectoryExists(full_path)) { + return true; +@@ -910,8 +912,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; -- subpaths.push_back(full_path); - for (FilePath path = full_path.DirName(); path.value() != last_path.value(); - path = path.DirName()) { -+ if (full_path != kFileSystemRoot) -+ subpaths.push_back(full_path); + for (FilePath path = full_path.DirName(); (path.value() != last_path.value() && + (path != kFileSystemRoot)); path = path.DirName()) { - subpaths.push_back(path); - last_path = path; - } + if (DirectoryExists(path)) { + break; + } +@@ -921,21 +923,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p - // Iterate through the parents and create the missing ones. - for (const FilePath& subpath : base::Reversed(subpaths)) { -- if (DirectoryExists(subpath)) { -- continue; -- } + // Iterate through the missing directories and create. + for (const FilePath& subpath : base::Reversed(missing_subpaths)) { - if (mkdir(subpath.value().c_str(), 0700) == 0) { - continue; - } @@ -35,21 +34,16 @@ - int saved_errno = errno; - if (!DirectoryExists(subpath)) { - if (error) { -- *error = File::OSErrorToFileError(saved_errno); -+ if (!PathExists(subpath)) { -+ if ((mkdir(subpath.value().c_str(), 0700) == -1) && -+ ((full_path != subpath) ? (errno != ENOENT) : (-1))) { -+ int saved_errno = errno; -+ if (error) -+ *error = File::OSErrorToFileError(saved_errno); -+ return false; - } ++ if ((mkdir(subpath.value().c_str(), 0700) == -1) && ++ ((full_path != subpath) ? (errno != ENOENT) : (-1))) { ++ int saved_errno = errno; ++ if (error) + *error = File::OSErrorToFileError(saved_errno); +- } - errno = saved_errno; -- return false; -+ } else if (!DirectoryExists(subpath)) { -+ if (error) -+ *error = File::OSErrorToFileError(ENOTDIR); -+ return false; + return false; } ++ errno = 0; } return true; + } diff --git a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc index 8ecbcc2fd7f8..31c1a0791ae0 100644 --- a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2025-03-09 21:38:10 UTC +--- base/files/file_util_unittest.cc.orig 2025-04-15 08:30:07 UTC +++ base/files/file_util_unittest.cc -@@ -3911,7 +3911,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3920,7 +3920,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,27 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4648,7 +4648,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4505,6 +4505,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnlyCheckMissingSu + + #endif // BUILDFLAG(IS_ANDROID) + ++#if BUILDFLAG(IS_OPENBSD) ++TEST_F(FileUtilTest, CreateDirectoryInUnveiledPath) { ++ FilePath dir = PathService::CheckedGet(DIR_GEN_TEST_DATA_ROOT); ++ dir = dir.Append(FILE_PATH_LITERAL("base")); ++ dir = dir.Append(FILE_PATH_LITERAL("test")); ++ dir = dir.Append(FILE_PATH_LITERAL("unveil")); ++ unveil(dir.value().c_str(), "rwc"); ++ EXPECT_TRUE(CreateDirectory(dir)); ++ dir = dir.Append(FILE_PATH_LITERAL("test")); ++ EXPECT_FALSE(CreateDirectory(dir)); ++} ++#endif ++ + #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) && \ + defined(ARCH_CPU_32_BITS) + // TODO(crbug.com/327582285): Re-enable these tests. They may be failing due to +@@ -4671,7 +4684,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/ungoogled-chromium/files/patch-base_linux__util.cc b/www/ungoogled-chromium/files/patch-base_linux__util.cc index 23f2d6e54024..2509dce26d35 100644 --- a/www/ungoogled-chromium/files/patch-base_linux__util.cc +++ b/www/ungoogled-chromium/files/patch-base_linux__util.cc @@ -1,6 +1,6 @@ ---- base/linux_util.cc.orig 2025-03-09 21:38:10 UTC +--- base/linux_util.cc.orig 2025-04-15 08:30:07 UTC +++ base/linux_util.cc -@@ -164,10 +164,14 @@ void SetLinuxDistro(const std::string& distro) { +@@ -163,10 +163,14 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { diff --git a/www/ungoogled-chromium/files/patch-base_logging__unittest.cc b/www/ungoogled-chromium/files/patch-base_logging__unittest.cc index ef52b30b4ec9..4fe12aa3b5ca 100644 --- a/www/ungoogled-chromium/files/patch-base_logging__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2025-02-20 09:59:21 UTC +--- base/logging_unittest.cc.orig 2025-04-15 08:30:07 UTC +++ base/logging_unittest.cc -@@ -41,7 +41,7 @@ +@@ -40,7 +40,7 @@ #include "base/posix/eintr_wrapper.h" #endif // BUILDFLAG(IS_POSIX) @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -589,14 +589,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -588,14 +588,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_message__loop_message__pump__glib.cc b/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__glib.cc index 80b15fef51b7..b0152cdc4f53 100644 --- a/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__glib.cc +++ b/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__glib.cc @@ -1,4 +1,4 @@ ---- base/message_loop/message_pump_glib.cc.orig 2025-02-20 09:59:21 UTC +--- base/message_loop/message_pump_glib.cc.orig 2025-04-15 08:30:07 UTC +++ base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include <glib.h> @@ -20,7 +20,7 @@ + return pthread_main_np(); +#else auto pid = getpid(); - auto tid = PlatformThread::CurrentId(); + auto tid = PlatformThread::CurrentId().raw(); return pid > 0 && tid > 0 && pid == tid; +#endif } diff --git a/www/ungoogled-chromium/files/patch-base_process_internal__linux.h b/www/ungoogled-chromium/files/patch-base_process_internal__linux.h index 18f550ddeba4..7fbc9e33fa37 100644 --- a/www/ungoogled-chromium/files/patch-base_process_internal__linux.h +++ b/www/ungoogled-chromium/files/patch-base_process_internal__linux.h @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 2025-03-09 21:38:10 UTC +--- base/process/internal_linux.h.orig 2025-04-15 08:30:07 UTC +++ base/process/internal_linux.h @@ -144,6 +144,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); // arguments to the lambda. @@ -10,7 +10,7 @@ // Iterate through the different threads tracked in /proc/<pid>/task. FilePath fd_path = GetProcPidDir(process).Append("task"); -@@ -166,6 +169,7 @@ void ForEachProcessTask(base::ProcessHandle process, L +@@ -167,6 +170,7 @@ void ForEachProcessTask(base::ProcessHandle process, L FilePath task_path = fd_path.Append(tid_str); lambda(tid, task_path); } diff --git a/www/ungoogled-chromium/files/patch-base_process_launch__posix.cc b/www/ungoogled-chromium/files/patch-base_process_launch__posix.cc index d6f3f56ac5d6..6e085b79eb95 100644 --- a/www/ungoogled-chromium/files/patch-base_process_launch__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_process_launch__posix.cc @@ -1,6 +1,6 @@ ---- base/process/launch_posix.cc.orig 2024-10-27 06:40:35 UTC +--- base/process/launch_posix.cc.orig 2025-04-15 08:30:07 UTC +++ base/process/launch_posix.cc -@@ -67,6 +67,9 @@ +@@ -62,6 +62,9 @@ #error "macOS should use launch_mac.cc" #endif diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics__unittest.cc b/www/ungoogled-chromium/files/patch-base_process_process__metrics__unittest.cc index d79827d81b7f..a4fe0cfff11f 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics__unittest.cc @@ -1,9 +1,9 @@ ---- base/process/process_metrics_unittest.cc.orig 2025-03-09 21:38:10 UTC +--- base/process/process_metrics_unittest.cc.orig 2025-04-15 08:30:07 UTC +++ base/process/process_metrics_unittest.cc -@@ -63,7 +63,8 @@ +@@ -61,7 +61,8 @@ + #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || \ + BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc index 630036dcceee..9a773ae6b120 100644 --- a/www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ b/www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -1,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2024-04-23 07:42:17 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2025-04-15 08:30:07 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -6,7 +6,7 @@ @@ -11,7 +11,7 @@ #include "base/profiler/stack_base_address_posix.h" @@ -18,7 +18,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent PlatformThreadId id = PlatformThread::CurrentId(); - #if BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) return {id, pthread_self()}; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.h index a1924283d37f..f1aa700fb38f 100644 --- a/www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.h +++ b/www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -1,8 +1,8 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2024-04-23 07:42:17 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2025-04-15 08:30:07 UTC +++ base/profiler/sampling_profiler_thread_token.h @@ -13,7 +13,7 @@ - #if BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) #include <pthread.h> -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -11,7 +11,7 @@ @@ -27,7 +27,7 @@ struct SamplingProfilerThreadToken { PlatformThreadId id; - #if BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) pthread_t pthread_id; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) 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 343c8aa11e43..ada93bec92ae 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,4 +1,4 @@ ---- base/profiler/stack_base_address_posix.cc.orig 2025-02-20 09:59:21 UTC +--- base/profiler/stack_base_address_posix.cc.orig 2025-04-15 08:30:07 UTC +++ base/profiler/stack_base_address_posix.cc @@ -17,6 +17,10 @@ #include "base/files/scoped_file.h" @@ -52,8 +52,8 @@ // trying to work around the problem. return std::nullopt; #else -- const bool is_main_thread = id == GetCurrentProcId(); -+ const bool is_main_thread = id == checked_cast<PlatformThreadId>(GetCurrentProcId()); +- const bool is_main_thread = id.raw() == GetCurrentProcId(); ++ const bool is_main_thread = id.raw() == (checked_cast<uint64_t>(GetCurrentProcId())); if (is_main_thread) { #if BUILDFLAG(IS_ANDROID) // The implementation of pthread_getattr_np() in Bionic reads proc/self/maps diff --git a/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index e19163425914..33711aee2f69 100644 --- a/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2025-02-20 09:59:21 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2025-04-15 08:30:07 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #include <intrin.h> #include <malloc.h> diff --git a/www/ungoogled-chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/ungoogled-chromium/files/patch-base_profiler_thread__delegate__posix.cc index a966e14c0344..85bb56e721bc 100644 --- a/www/ungoogled-chromium/files/patch-base_profiler_thread__delegate__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,6 +1,6 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2024-06-22 08:49:42 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2025-04-15 08:30:07 UTC +++ base/profiler/thread_delegate_posix.cc -@@ -19,7 +19,7 @@ +@@ -15,7 +15,7 @@ #include "base/process/process_handle.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "base/profiler/stack_base_address_posix.h" #endif -@@ -28,7 +28,7 @@ namespace base { +@@ -24,7 +24,7 @@ namespace base { std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create( SamplingProfilerThreadToken thread_token) { std::optional<uintptr_t> base_address; diff --git a/www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc b/www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc index 1785481b1e76..220f3760347e 100644 --- a/www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2025-03-09 21:38:10 UTC +--- base/test/launcher/test_launcher.cc.orig 2025-04-15 08:30:07 UTC +++ base/test/launcher/test_launcher.cc -@@ -74,6 +74,7 @@ +@@ -73,6 +73,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(IS_POSIX) diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread.h b/www/ungoogled-chromium/files/patch-base_threading_platform__thread.h index 63dcbe968939..74661eb8a80b 100644 --- a/www/ungoogled-chromium/files/patch-base_threading_platform__thread.h +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread.h @@ -1,11 +1,11 @@ ---- base/threading/platform_thread.h.orig 2025-02-20 09:59:21 UTC +--- base/threading/platform_thread.h.orig 2025-04-15 08:30:07 UTC +++ base/threading/platform_thread.h -@@ -48,6 +48,8 @@ typedef DWORD PlatformThreadId; - typedef zx_koid_t PlatformThreadId; +@@ -55,6 +55,8 @@ class BASE_EXPORT PlatformThreadId { + using UnderlyingType = zx_koid_t; #elif BUILDFLAG(IS_APPLE) - typedef mach_port_t PlatformThreadId; + using UnderlyingType = uint64_t; +#elif BUILDFLAG(IS_BSD) -+typedef uint64_t PlatformThreadId; ++ using UnderlyingType = uint64_t; #elif BUILDFLAG(IS_POSIX) - typedef pid_t PlatformThreadId; + using UnderlyingType = pid_t; #endif diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc index 74dde2d892b6..3af970da5906 100644 --- a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_posix.cc.orig 2025-02-20 09:59:21 UTC +--- base/threading/platform_thread_posix.cc.orig 2025-04-15 08:30:07 UTC +++ base/threading/platform_thread_posix.cc @@ -79,11 +79,11 @@ void* ThreadFunc(void* params) { base::DisallowSingleton(); @@ -14,16 +14,16 @@ #if BUILDFLAG(IS_APPLE) PlatformThread::SetCurrentThreadRealtimePeriodValue( delegate->GetRealtimePeriod()); -@@ -270,6 +270,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { - return reinterpret_cast<int32_t>(pthread_self()); +@@ -272,6 +272,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { + return PlatformThreadId(reinterpret_cast<int32_t>(pthread_self())); #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX) - return pthread_self(); + return PlatformThreadId(pthread_self()); +#elif BUILDFLAG(IS_BSD) -+ return reinterpret_cast<uint64_t>(pthread_self()); ++ return PlatformThreadId(reinterpret_cast<uint64_t>(pthread_self())); #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX) - return reinterpret_cast<int64_t>(pthread_self()); + return PlatformThreadId(reinterpret_cast<int64_t>(pthread_self())); #endif -@@ -363,7 +365,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t +@@ -365,7 +367,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t // static bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) { @@ -32,7 +32,7 @@ return false; #else if (from >= to) { -@@ -384,6 +386,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -386,6 +388,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) NOTIMPLEMENTED(); @@ -42,7 +42,7 @@ #else if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) { return; -@@ -407,7 +412,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -409,7 +414,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, // static ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() { diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__unittest.cc index 60a04909e66b..4d3724b1ec88 100644 --- a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2025-03-09 21:38:10 UTC +--- base/threading/platform_thread_unittest.cc.orig 2025-04-15 08:30:07 UTC +++ base/threading/platform_thread_unittest.cc @@ -36,7 +36,7 @@ #include "base/time/time.h" @@ -18,6 +18,15 @@ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level unless we are root (euid == 0). bool kCanIncreasePriority = false; +@@ -435,7 +435,7 @@ TEST(PlatformThreadTest, SetCurrentThreadTypeTest) { + #if BUILDFLAG(IS_APPLE) + TestPriorityResultingFromThreadType(ThreadType::kResourceEfficient, + ThreadPriorityForTest::kUtility); +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + TestPriorityResultingFromThreadType( + ThreadType::kResourceEfficient, + ThreadPriorityForTest::kResourceEfficient); @@ -624,12 +624,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) @@ -29,9 +38,9 @@ bool IsTidCacheCorrect() { +#if BUILDFLAG(IS_BSD) -+ return PlatformThread::CurrentId() == reinterpret_cast<int64_t>(pthread_self()); ++ return PlatformThread::CurrentId().raw() == reinterpret_cast<int64_t>(pthread_self()); +#else - return PlatformThread::CurrentId() == syscall(__NR_gettid); + return PlatformThread::CurrentId().raw() == syscall(__NR_gettid); +#endif } 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 aac97bf31685..2c4c4e0b3cfb 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-01-25 09:34:31 UTC +--- build/config/clang/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ build/config/clang/BUILD.gn -@@ -213,7 +213,12 @@ template("clang_lib") { +@@ -251,7 +251,12 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { 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 25184229d81e..ddbe826f5d08 100644 --- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2025-03-09 21:38:10 UTC +--- build/config/compiler/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ build/config/compiler/BUILD.gn @@ -198,7 +198,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -47,7 +47,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1234,7 +1241,7 @@ config("compiler_cpu_abi") { +@@ -1223,7 +1230,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +56,7 @@ cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -1249,7 +1256,7 @@ config("compiler_cpu_abi") { +@@ -1238,7 +1245,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" ] } -@@ -1583,7 +1590,7 @@ config("compiler_deterministic") { +@@ -1572,7 +1579,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -74,7 +74,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1641,7 +1648,7 @@ config("compiler_deterministic") { +@@ -1630,7 +1637,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,17 +83,23 @@ current_os != "zos") { update_args = [ "--print-revision", -@@ -1962,9 +1969,6 @@ config("default_warnings") { - cflags += [ - # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now. - "-Wno-cast-function-type", +@@ -1960,23 +1967,12 @@ 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/376641662): Fix and re-enable. +- "-Wno-nontrivial-memcall", +- ] +- cflags_cc += [ -@@ -1972,7 +1976,7 @@ config("default_warnings") { + # TODO(crbug.com/328490295): Fix and re-enable for C flags. "-Wenum-compare-conditional", ] @@ -102,7 +108,7 @@ cflags_cc += [ # TODO(crbug.com/41486292): Fix and re-enable. "-Wno-c++11-narrowing-const-reference", -@@ -2741,7 +2745,7 @@ config("afdo_optimize_size") { +@@ -2742,7 +2738,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") { @@ -111,7 +117,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2768,7 +2772,7 @@ config("afdo") { +@@ -2769,7 +2765,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -120,7 +126,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2945,7 +2949,7 @@ config("symbols") { +@@ -2946,7 +2942,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 89c9167c534a..fcc90adb1ba5 100644 --- a/www/ungoogled-chromium/files/patch-build_config_ozone.gni +++ b/www/ungoogled-chromium/files/patch-build_config_ozone.gni @@ -1,9 +1,9 @@ ---- build/config/ozone.gni.orig 2023-10-13 13:20:35 UTC +--- build/config/ozone.gni.orig 2025-04-15 08:30:07 UTC +++ build/config/ozone.gni -@@ -84,7 +84,15 @@ declare_args() { - } else if (is_chromeos_lacros) { - ozone_platform = "wayland" - ozone_platform_wayland = true +@@ -81,7 +81,15 @@ declare_args() { + ozone_platform = "x11" + ozone_platform_drm = true + ozone_platform_x11 = true - } else if (is_linux) { + } else if (is_linux && !is_bsd) { + ozone_platform = "x11" diff --git a/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni index a27ad6c8f680..cf41ecf39584 100644 --- a/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2025-02-20 09:59:21 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2025-04-15 08:30:07 UTC +++ build/toolchain/gcc_toolchain.gni @@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -888,22 +895,12 @@ template("gcc_toolchain") { +@@ -896,22 +903,12 @@ template("gcc_toolchain") { # actually just be doing a native compile. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni index 27f9c9d27b5c..6776361443e6 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-03-09 21:38:10 UTC +--- build/toolchain/toolchain.gni.orig 2025-04-15 08:30:07 UTC +++ build/toolchain/toolchain.gni -@@ -75,7 +75,7 @@ if (host_os == "mac") { +@@ -72,7 +72,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-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc index 1bb941975f11..f65cc56173a4 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,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -146,7 +146,7 @@ +@@ -147,7 +147,7 @@ #include "components/webui/about/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -187,17 +187,17 @@ +@@ -188,17 +188,17 @@ #include "v8/include/v8.h" #endif @@ -30,7 +30,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -315,7 +315,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -316,7 +316,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -39,7 +39,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -398,7 +398,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -399,7 +399,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -48,7 +48,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -410,7 +410,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -411,7 +411,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } #endif // BUILDFLAG(IS_LINUX) @@ -57,7 +57,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -492,7 +492,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -493,7 +493,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -66,7 +66,7 @@ // Read the xdg-activation token and set it in the command line for the // duration of the notification in order to ensure this is propagated to an // already running browser process if it exists. -@@ -570,7 +570,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -571,7 +571,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -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. -@@ -666,7 +666,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& +@@ -667,7 +667,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( -@@ -825,7 +825,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -826,7 +826,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -93,7 +93,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -973,7 +973,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -983,7 +983,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv const bool is_canary_dev = IsCanaryDev(); const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -102,7 +102,7 @@ is_canary_dev; #else false; -@@ -1120,7 +1120,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1131,7 +1131,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom return 0; // Got a --credits switch; exit with a success error code. } @@ -111,7 +111,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1145,7 +1145,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1156,7 +1156,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom ash::RegisterPathProvider(); chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -120,7 +120,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1433,7 +1433,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1444,7 +1444,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -129,7 +129,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1521,13 +1521,13 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1532,13 +1532,13 @@ absl::variant<int, content::MainFunctionParams> Chrome #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 b7ce53020a27..03464de697fc 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-03-09 21:38:10 UTC +--- chrome/browser/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/BUILD.gn -@@ -6709,6 +6709,13 @@ static_library("browser") { +@@ -6788,6 +6788,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 0c7160307b05..42eea16ff98a 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-03-14 15:54:34 UTC +--- chrome/browser/about_flags.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/about_flags.cc -@@ -257,7 +257,7 @@ +@@ -259,7 +259,7 @@ #include "extensions/common/extension_features.h" #endif @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -343,7 +343,7 @@ +@@ -345,7 +345,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) -@@ -353,7 +353,7 @@ +@@ -355,7 +355,7 @@ #include "chrome/browser/win/mica_titlebar.h" #endif @@ -27,7 +27,7 @@ #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) -@@ -364,7 +364,7 @@ +@@ -366,7 +366,7 @@ #include "components/user_education/common/user_education_features.h" // nogncheck #endif @@ -36,7 +36,7 @@ #include "chrome/browser/ui/ui_features.h" #include "ui/base/ui_base_features.h" #endif -@@ -519,7 +519,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -521,7 +521,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -45,7 +45,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -820,6 +820,26 @@ const FeatureEntry::FeatureVariation +@@ -822,6 +822,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -72,7 +72,7 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1224,7 +1244,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1185,7 +1205,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,7 +81,7 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1262,7 +1282,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada +@@ -1223,7 +1243,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -90,16 +90,7 @@ // A limited number of combinations of the rich autocompletion params. const FeatureEntry::FeatureParam -@@ -1802,7 +1822,7 @@ const FeatureEntry::FeatureVariation kTabScrollingVari - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const FeatureEntry::FeatureParam kTabstripDeclutterQuickModeParams[] = { - {"stale_threshold_duration", "10s"}, - {"declutter_timer_interval", "10s"}, -@@ -3594,7 +3614,7 @@ const FeatureEntry::FeatureVariation +@@ -3583,7 +3603,7 @@ const FeatureEntry::FeatureVariation #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -108,7 +99,7 @@ const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] = {{"link_capturing_state", "on_by_default"}}; const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] = -@@ -4108,7 +4128,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari +@@ -4089,7 +4109,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr}, }; @@ -117,7 +108,7 @@ const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = { {"TranslationAPIAcceptLanguagesCheck", "false"}, {"TranslationAPILimitLanguagePackCount", "false"}}; -@@ -4178,7 +4198,7 @@ const FeatureEntry::FeatureVariation +@@ -4155,7 +4175,7 @@ const FeatureEntry::FeatureVariation 1, nullptr}, }; @@ -126,7 +117,7 @@ const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = { {"BackoffTime", "0h"}, {"BackoffMultiplierBase", "0.0"}, -@@ -4971,7 +4991,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5006,7 +5026,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_WIN) @@ -135,7 +126,16 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5514,7 +5534,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5295,7 +5315,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableIsolatedWebAppDevModeName, + flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)}, +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"enable-iwa-key-distribution-component", + flag_descriptions::kEnableIwaKeyDistributionComponentName, + flag_descriptions::kEnableIwaKeyDistributionComponentDescription, +@@ -5554,7 +5574,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -144,7 +144,7 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5550,9 +5570,19 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5590,6 +5610,16 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWaylandLinuxDrmSyncobjName, flag_descriptions::kWaylandLinuxDrmSyncobjDescription, kOsLinux, FEATURE_VALUE_TYPE(features::kWaylandLinuxDrmSyncobj)}, @@ -160,12 +160,8 @@ +#endif #endif // BUILDFLAG(IS_LINUX) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - {"skip-undecryptable-passwords", - flag_descriptions::kSkipUndecryptablePasswordsName, - flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -6448,7 +6478,7 @@ const FeatureEntry kFeatureEntries[] = { + #if BUILDFLAG(ENABLE_VR) +@@ -6470,7 +6500,7 @@ const FeatureEntry kFeatureEntries[] = { "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -174,7 +170,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6646,7 +6676,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6683,7 +6713,7 @@ const FeatureEntry kFeatureEntries[] = { "OrganicRepeatableQueries")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -183,7 +179,7 @@ {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7185,7 +7215,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7180,7 +7210,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -192,7 +188,7 @@ {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -7453,7 +7483,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7445,7 +7475,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)}, @@ -201,7 +197,7 @@ {"wasm-tts-component-updater-enabled", flag_descriptions::kWasmTtsComponentUpdaterEnabledName, flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop, -@@ -8117,7 +8147,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8101,7 +8131,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)}, #endif // !BUILDFLAG(IS_CHROMEOS) @@ -210,7 +206,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8795,7 +8825,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8782,7 +8812,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -219,16 +215,16 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)}, -@@ -8822,7 +8852,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8807,7 +8837,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)}, - #if BUILDFLAG(IS_WIN) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9289,7 +9319,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9274,7 +9304,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -237,7 +233,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -9975,7 +10005,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9912,7 +9942,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -246,16 +242,7 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10001,7 +10031,7 @@ const FeatureEntry kFeatureEntries[] = { - "RenderDocument")}, - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"enable-search-aggregator-policy", - flag_descriptions::kEnableSearchAggregatorPolicyName, - flag_descriptions::kEnableSearchAggregatorPolicyDescription, -@@ -10108,7 +10138,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10036,7 +10066,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)}, #endif @@ -264,7 +251,7 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10143,7 +10173,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10071,7 +10101,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -273,7 +260,7 @@ {"enable-user-navigation-capturing-pwa", flag_descriptions::kPwaNavigationCapturingName, flag_descriptions::kPwaNavigationCapturingDescription, -@@ -10944,7 +10974,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10832,7 +10862,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCanvasHibernationDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)}, @@ -282,16 +269,7 @@ {"sync-enable-bookmarks-in-transport-mode", flag_descriptions::kSyncEnableBookmarksInTransportModeName, flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, -@@ -11035,7 +11065,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"tab-organization", flag_descriptions::kTabOrganizationName, - flag_descriptions::kTabOrganizationDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kTabOrganization)}, -@@ -11083,7 +11113,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10948,7 +10978,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)}, #endif // BUILDFLAG(IS_ANDROID) @@ -300,16 +278,16 @@ {"supervised-profile-safe-search", flag_descriptions::kSupervisedProfileSafeSearchName, flag_descriptions::kSupervisedProfileSafeSearchDescription, -@@ -11327,7 +11357,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11195,7 +11225,7 @@ const FeatureEntry kFeatureEntries[] = { segmentation_platform::features::kSegmentationSurveyPage)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"autofill-enable-buy-now-pay-later-for-affirm", - flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmName, - flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmDescription, -@@ -11456,7 +11486,7 @@ const FeatureEntry kFeatureEntries[] = { + {"autofill-enable-buy-now-pay-later", + flag_descriptions::kAutofillEnableBuyNowPayLaterName, + flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop, +@@ -11315,7 +11345,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)}, @@ -318,7 +296,7 @@ {"translation-api", flag_descriptions::kTranslationAPIName, flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux, FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI, -@@ -11493,7 +11523,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11352,7 +11382,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( password_manager::features::kPasswordFormClientsideClassifier)}, @@ -327,12 +305,30 @@ {"contextual-cueing", flag_descriptions::kContextualCueingName, flag_descriptions::kContextualCueingDescription, kOsLinux | kOsMac | kOsWin, -@@ -11787,7 +11817,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsMac | kOsWin | kOsLinux, - FEATURE_VALUE_TYPE(switches::kEnableSnackbarInSettings)}, +@@ -11671,7 +11701,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)}, + #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName, flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux, FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)}, +@@ -11721,7 +11751,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", + flag_descriptions::kAutofillEnableAmountExtractionDesktopName, + flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription, +@@ -11741,7 +11771,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)}, + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"autofill-enable-amount-extraction-allowlist-desktop", + flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName, + flag_descriptions:: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_after__startup__task__utils.cc index ae63397f37cb..c7179fd95151 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -117,7 +117,7 @@ void SetBrowserStartupIsComplete() { +@@ -112,7 +112,7 @@ void SetBrowserStartupIsComplete() { TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count); GetStartupCompleteFlag().Set(); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc index f8100616154e..b6075f9e96af 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc @@ -1,7 +1,7 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2024-04-23 07:42:17 UTC -+++ chrome/browser/background/background_mode_manager.cc -@@ -872,7 +872,7 @@ gfx::ImageSkia GetStatusTrayIcon() { - return gfx::ImageSkia(); +--- chrome/browser/background/extensions/background_mode_manager.cc.orig 2025-04-15 08:30:07 UTC ++++ chrome/browser/background/extensions/background_mode_manager.cc +@@ -893,7 +893,7 @@ gfx::ImageSkia GetStatusTrayIcon() { + } return family->CreateExact(size).AsImageSkia(); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__optimizer.cc index dcfb10c51377..10a41e72eeb6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__optimizer.cc @@ -1,5 +1,5 @@ ---- chrome/browser/background/background_mode_optimizer.cc.orig 2024-03-22 14:16:19 UTC -+++ chrome/browser/background/background_mode_optimizer.cc +--- chrome/browser/background/extensions/background_mode_optimizer.cc.orig 2025-04-15 08:30:07 UTC ++++ chrome/browser/background/extensions/background_mode_optimizer.cc @@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod return nullptr; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc b/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc index aedd3d1f804b..db9e3a2e1747 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc @@ -1,6 +1,6 @@ ---- chrome/browser/glic/launcher/glic_status_icon.cc.orig 2025-03-09 21:38:10 UTC -+++ chrome/browser/glic/launcher/glic_status_icon.cc -@@ -84,7 +84,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control +--- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-04-15 08:30:07 UTC ++++ chrome/browser/background/glic/glic_status_icon.cc +@@ -83,7 +83,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control if (!status_icon_) { return; } @@ -9,7 +9,7 @@ // Set a vector icon for proper themeing on Linux. status_icon_->SetIcon( GlicVectorIconManager::GetVectorIcon(IDR_GLIC_BUTTON_VECTOR_ICON)); -@@ -108,7 +108,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control +@@ -113,7 +113,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control GlicStatusIcon::~GlicStatusIcon() { context_menu_ = nullptr; if (status_icon_) { @@ -18,7 +18,7 @@ status_icon_->RemoveObserver(this); #endif std::unique_ptr<StatusIcon> removed_icon = -@@ -196,7 +196,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C +@@ -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)); 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 4469c967fbf5..f3e67b642295 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_features.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/browser_features.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/browser_features.cc -@@ -82,7 +82,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode, +@@ -81,7 +81,7 @@ BASE_FEATURE(kContentUsesBrowserThemeColorMode, "ContentUsesBrowserThemeColorMode", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,16 +9,16 @@ // Enables usage of os_crypt_async::SecretPortalKeyProvider. Once // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be // disabled without losing data. -@@ -104,7 +104,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider, +@@ -100,7 +100,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider, + // the browser exits. BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#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_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -237,7 +237,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -233,7 +233,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, "SandboxExternalProtocolBlockedWarning", base::FEATURE_ENABLED_BY_DEFAULT); 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 1c378c77d069..bb0ceeaab926 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,4 +1,4 @@ ---- chrome/browser/browser_process_impl.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/browser_process_impl.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/browser_process_impl.cc @@ -261,7 +261,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" @@ -9,7 +9,16 @@ #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" -@@ -1149,7 +1149,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim +@@ -273,7 +273,7 @@ + #include "chrome/browser/safe_browsing/safe_browsing_service.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // 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 GoogleUpdateSettings::GetCollectStatsConsent()); registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true); @@ -18,21 +27,21 @@ os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry); #endif } -@@ -1416,7 +1416,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1412,7 +1412,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { local_state()))); #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(features::kDbusSecretPortal)) { - providers.emplace_back( - /*precedence=*/10u, -@@ -1683,7 +1683,7 @@ void BrowserProcessImpl::Unpin() { + base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); + if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) != + "basic") { +@@ -1681,7 +1681,7 @@ void BrowserProcessImpl::Unpin() { + } + // Mac is currently not supported. - // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is - // complete. --#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool BrowserProcessImpl::IsRunningInBackground() const { // Check if browser is in the background. 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 7740b41039bd..3da6acfbceb9 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,11 +1,11 @@ ---- chrome/browser/browser_process_impl.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/browser_process_impl.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/browser_process_impl.h -@@ -410,7 +410,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -405,7 +405,7 @@ class BrowserProcessImpl : public BrowserProcess, - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) + std::unique_ptr<BatteryMetrics> battery_metrics_; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::RepeatingTimer autoupdate_timer_; // Gets called by autoupdate timer to see if browser needs restart and can be 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 656c989d3c75..b9c6fa8e6780 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,7 +1,7 @@ ---- chrome/browser/chrome_browser_field_trials.cc.orig 2024-11-16 12:20:41 UTC +--- chrome/browser/chrome_browser_field_trials.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/chrome_browser_field_trials.cc -@@ -49,7 +49,7 @@ - #include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h" +@@ -37,7 +37,7 @@ + #include "chromeos/ash/services/multidevice_setup/public/cpp/first_run_field_trial.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -9,8 +9,8 @@ #include "base/nix/xdg_util.h" #include "ui/base/ui_base_features.h" #endif // BUILDFLAG(IS_LINUX) -@@ -135,7 +135,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials - #endif +@@ -117,7 +117,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials + #endif // BUILDFLAG(IS_ANDROID) } -#if BUILDFLAG(IS_LINUX) 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 f39921d850c7..543f1facd4ef 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,24 +1,15 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -126,7 +126,7 @@ - #endif // BUILDFLAG(FULL_SAFE_BROWSING) +@@ -77,7 +77,7 @@ + #endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" - #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h" - #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" -@@ -135,7 +135,7 @@ - #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" -@@ -810,7 +810,7 @@ void PopulateChromeFrameBinders( +@@ -477,7 +477,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,47 +18,3 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -899,7 +899,7 @@ void PopulateChromeWebUIFrameBinders( - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - RegisterWebUIControllerInterfaceBinder< - connectors_internals::mojom::PageHandler, - enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -910,7 +910,7 @@ void PopulateChromeWebUIFrameBinders( - policy::DlpInternalsUI>(map); - #endif - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - RegisterWebUIControllerInterfaceBinder< - app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); - -@@ -997,14 +997,14 @@ void PopulateChromeWebUIFrameBinders( - page_image_service::mojom::PageImageServiceHandler, HistoryUI, - 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) - RegisterWebUIControllerInterfaceBinder<whats_new::mojom::PageHandlerFactory, - WhatsNewUI>(map); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - - RegisterWebUIControllerInterfaceBinder< - browser_command::mojom::CommandHandlerFactory, --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - WhatsNewUI, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - NewTabPageUI>(map); -@@ -1538,7 +1538,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) - RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider, - DiscardsUI>(map); - 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 new file mode 100644 index 000000000000..02d567d5edd0 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc @@ -0,0 +1,64 @@ +--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-04-15 08:30:07 UTC ++++ chrome/browser/chrome_browser_interface_binders_webui.cc +@@ -46,7 +46,7 @@ + #include "content/public/browser/web_ui_controller_interface_binder.h" + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ 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) ++#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( + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + RegisterWebUIControllerInterfaceBinder< + connectors_internals::mojom::PageHandler, + enterprise_connectors::ConnectorsInternalsUI>(map); +@@ -451,7 +451,7 @@ void PopulateChromeWebUIFrameBinders( + policy::DlpInternalsUI>(map); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + RegisterWebUIControllerInterfaceBinder< + app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); + +@@ -544,14 +544,14 @@ void PopulateChromeWebUIFrameBinders( + page_image_service::mojom::PageImageServiceHandler, HistoryUI, + 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) + RegisterWebUIControllerInterfaceBinder<whats_new::mojom::PageHandlerFactory, + WhatsNewUI>(map); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + + RegisterWebUIControllerInterfaceBinder< + browser_command::mojom::CommandHandlerFactory, +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + WhatsNewUI, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + NewTabPageUI>(map); +@@ -1084,7 +1084,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) + 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 a0a6f01196bf..90623ebf28c8 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,59 +1,56 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -250,15 +250,15 @@ - - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/first_run/upgrade_util_linux.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -149,7 +149,7 @@ + #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "components/crash/core/app/crashpad.h" + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "sql/database.h" #endif +@@ -175,11 +175,11 @@ + #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" + #endif // BUILDFLAG(IS_CHROMEOS) + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/nix/xdg_util.h" + #include "chrome/browser/first_run/upgrade_util_linux.h" #endif -@@ -290,14 +290,14 @@ - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck + #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" - #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" - #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" - #include "ui/base/pointer/touch_ui_controller.h" +@@ -190,7 +190,7 @@ + #include "ui/gfx/switches.h" #endif --#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/headless/headless_mode_metrics.h" // nogncheck - #include "chrome/browser/headless/headless_mode_util.h" // nogncheck - #include "components/headless/select_file_dialog/headless_select_file_dialog.h" -@@ -365,14 +365,14 @@ - #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/first_run/upgrade_util.h" + #endif - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include "sql/database.h" - #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || - // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) +@@ -268,7 +268,7 @@ + #include "chrome/browser/chrome_process_singleton.h" + #include "chrome/browser/ui/startup/startup_browser_creator.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/nix/xdg_util.h" + #endif + #endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON) +@@ -291,7 +291,7 @@ namespace { - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] = FILE_PATH_LITERAL("Media History"); -@@ -537,7 +537,7 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -442,7 +442,7 @@ void ProcessSingletonNotificationCallbackImpl( } #endif @@ -62,57 +59,57 @@ // 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. -@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1017,7 +1017,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // 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 . -@@ -1169,7 +1169,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +@@ -1062,7 +1062,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + + #endif // 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) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1365,7 +1365,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1258,7 +1258,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Delete the media history database if it still exists. // TODO(crbug.com/40177301): Remove this. base::ThreadPool::PostTask( -@@ -1414,7 +1414,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1306,7 +1306,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1523,7 +1523,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1415,7 +1415,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -2069,7 +2069,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -1955,7 +1955,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat // Drop the request if headless mode is in effect or the request is from // a headless Chrome process. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (headless::IsHeadlessMode() || command_line.HasSwitch(switches::kHeadless)) { return false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc index 86c2968cd68f..2bb9a6788b0d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2024-04-23 07:42:17 UTC +--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc -@@ -27,7 +27,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM +@@ -28,7 +28,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM } void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() { --#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // Lacros's `PostMainMessageLoopRun` must be called at the very end of - // `PostMainMessageLoopRun` in - // `ChromeBrowserMainPartsLacros::PostMainMessageLoopRun`. +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); + #endif + } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 5c59ee9f26fa..81d3ddedd772 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -25,7 +25,7 @@ +@@ -24,7 +24,7 @@ #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h" #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif -@@ -70,7 +70,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -65,7 +65,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag #endif // BUILDFLAG(IS_CHROMEOS) #if !BUILDFLAG(IS_CHROMEOS) @@ -19,7 +19,7 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the -@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -91,7 +93,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop(); } @@ -28,7 +28,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); -@@ -134,7 +136,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { +@@ -129,7 +131,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { #endif // BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index ed4e838fed9d..dd0e5ada7d95 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -84,7 +84,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa +@@ -81,7 +81,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa + // ExitHandler takes care of deleting itself. + new ExitHandler(); } else { - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) switch (signal) { case SIGINT: case SIGHUP: 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 798962b9eebe..8718db5d53b0 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-03-09 21:38:10 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -507,7 +507,7 @@ +@@ -503,7 +503,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) -@@ -619,11 +619,11 @@ +@@ -617,11 +617,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 -@@ -634,7 +634,7 @@ +@@ -632,7 +632,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif @@ -32,7 +32,7 @@ #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" -@@ -643,7 +643,7 @@ +@@ -641,7 +641,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -41,7 +41,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS) -@@ -652,7 +652,7 @@ +@@ -650,7 +650,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" -@@ -1540,7 +1540,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1547,7 +1547,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -59,7 +59,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1748,7 +1748,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1755,7 +1755,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS) main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>( is_integration_test, &startup_data_); @@ -68,7 +68,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1777,7 +1777,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1784,7 +1784,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 +77,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1794,7 +1794,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1801,7 +1801,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>()); #endif @@ -86,7 +86,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1813,7 +1813,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1820,7 +1820,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -95,7 +95,7 @@ main_parts->AddParts( std::make_unique< enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2695,7 +2695,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( +@@ -2703,7 +2703,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, int child_process_id) { @@ -105,7 +105,7 @@ #if BUILDFLAG(IS_MAC) std::unique_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -3042,7 +3044,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3054,7 +3056,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -114,7 +114,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4887,7 +4889,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4896,7 +4898,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -123,7 +123,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5402,7 +5404,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5404,7 +5406,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -132,7 +132,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5419,7 +5421,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5421,7 +5423,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 +141,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5450,7 +5452,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5462,7 +5464,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif @@ -150,7 +150,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7304,7 +7306,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7400,7 +7402,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 3ab05f30f8d2..621c7a19d20d 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-03-09 21:38:10 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -550,7 +550,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -552,7 +552,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_component__updater_iwa__key__distribution__component__installer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc new file mode 100644 index 000000000000..1b508ae5b911 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -56,7 +56,7 @@ void OnDemandUpdateCompleted(update_client::Error err) + + namespace component_updater { + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kIwaKeyDistributionComponent, + "IwaKeyDistributionComponent", + #if BUILDFLAG(IS_CHROMEOS) +@@ -81,7 +81,7 @@ bool IwaKeyDistributionComponentInstallerPolicy::IsSup + // the main IWA feature. + #if BUILDFLAG(IS_WIN) + return base::FeatureList::IsEnabled(features::kIsolatedWebApps); +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(kIwaKeyDistributionComponent); + #else + return false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h new file mode 100644 index 000000000000..09bf8ebadac6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h @@ -0,0 +1,11 @@ +--- chrome/browser/component_updater/iwa_key_distribution_component_installer.h.orig 2025-04-15 08:30:07 UTC ++++ chrome/browser/component_updater/iwa_key_distribution_component_installer.h +@@ -27,7 +27,7 @@ class IwaKeyDistributionInfoProvider; + + namespace component_updater { + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kIwaKeyDistributionComponent); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_registration.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_registration.cc index 571c3dd63a38..c8129577a39d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_registration.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_registration.cc @@ -1,4 +1,4 @@ ---- chrome/browser/component_updater/registration.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/component_updater/registration.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/component_updater/registration.cc @@ -99,7 +99,7 @@ #endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) @@ -18,7 +18,7 @@ #include "chrome/browser/component_updater/wasm_tts_engine_component_installer.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -253,12 +253,12 @@ void RegisterComponentsForUpdate() { +@@ -256,12 +256,12 @@ void RegisterComponentsForUpdate() { RegisterCookieReadinessListComponent(cus); #if 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.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc index 88158f648b06..6814afa448e7 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,4 +1,4 @@ ---- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-03-09 21:38:10 UTC +--- 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 @@ -8,7 +8,7 @@ #include "base/functional/callback.h" @@ -8,13 +8,22 @@ +#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 "ui/accessibility/accessibility_features.h" -@@ -69,7 +69,7 @@ void WasmTtsEngineComponentInstallerPolicy::ComponentR + #include "components/crx_file/id_util.h" +@@ -70,7 +70,7 @@ void WasmTtsEngineComponentInstallerPolicy::ComponentR VLOG(1) << "Component ready, version " << version.GetString() << " in " << install_dir.value(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (features::IsWasmTtsComponentUpdaterEnabled()) { + if (features::IsWasmTtsComponentUpdaterEnabled() && + !features::IsWasmTtsEngineAutoInstallDisabled()) { EmbeddedA11yExtensionLoader::GetInstance()->Init(); - EmbeddedA11yExtensionLoader::GetInstance()->InstallExtensionWithIdAndPath( +@@ -121,7 +121,7 @@ void RegisterWasmTtsEngineComponent(ComponentUpdateSer + installer->Register(cus, base::OnceClosure()); + } + +-#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)); + } 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 new file mode 100644 index 000000000000..4656ce0a4bc3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h @@ -0,0 +1,11 @@ +--- 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_component__updater_widevine__cdm__component__installer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc index ad87aafc5e31..23adffabf126 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc @@ -41,7 +41,7 @@ #include "third_party/widevine/cdm/buildflags.h" @@ -27,7 +27,7 @@ // On Linux and ChromeOS the Widevine CDM is loaded at startup before the // zygote is locked down. To locate the Widevine CDM at startup, a hint file // is used. Update the hint file with the new Widevine CDM path. -@@ -394,7 +394,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat +@@ -392,7 +392,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_defaults.cc b/www/ungoogled-chromium/files/patch-chrome_browser_defaults.cc index fd206af7cc16..e42cbc6f4e0b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_defaults.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_defaults.cc @@ -1,6 +1,6 @@ ---- chrome/browser/defaults.cc.orig 2023-10-13 13:20:35 UTC +--- chrome/browser/defaults.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/defaults.cc -@@ -44,7 +44,7 @@ const bool kShowHelpMenuItemIcon = true; +@@ -31,7 +31,7 @@ const bool kAlwaysCreateTabbedBrowserOnSessionRestore const bool kShowHelpMenuItemIcon = false; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc index 1dde478bc8d2..859b5f57eb4d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc -@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform +@@ -26,7 +26,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform + #if BUILDFLAG(IS_CHROMEOS) return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>( local_state); - #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state); #else NOTREACHED(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/ungoogled-chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h index b9af6f6e6c13..a9ee5c11b013 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h @@ -1,6 +1,6 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h -@@ -14,6 +14,8 @@ namespace diagnostics { +@@ -16,6 +16,8 @@ namespace diagnostics { // Console base class used internally. class SimpleConsole; 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 8084556654cf..a19fddf62747 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-03-09 21:38:10 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1829,7 +1829,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1862,7 +1862,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(); } -@@ -1936,7 +1936,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1969,7 +1969,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,3 +18,12 @@ // 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 + DCHECK(download_item->IsSavePackageDownload()); + + #if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC)) && \ ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ + BUILDFLAG(SAFE_BROWSING_AVAILABLE) + std::optional<enterprise_connectors::AnalysisSettings> settings = + safe_browsing::ShouldUploadBinaryForDeepScanning(download_item); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__file__picker.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__file__picker.cc index da95dcdc85c5..77b12517a377 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__file__picker.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__file__picker.cc @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_file_picker.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/download/download_file_picker.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/download/download_file_picker.cc @@ -18,7 +18,7 @@ #include "content/public/browser/web_contents.h" #include "ui/shell_dialogs/selected_file_info.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "ui/aura/window.h" @@ -13,8 +13,8 @@ // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc). // and windows.Here we make owning_window host to browser current active // window if it is null. https://crbug.com/1301898 --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (!owning_window || !owning_window->GetHost()) { owning_window = BrowserList::GetInstance() ->GetLastActive() 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 6e5054cde159..f2f79e408020 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,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/download/download_item_model.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/download/download_item_model.cc -@@ -757,7 +757,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -805,7 +805,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -820,7 +820,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1143,7 +1143,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1215,7 +1215,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc index 87179c1e9020..26c9fb9aa129 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/download/download_prefs.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ #include <vector> @@ -8,8 +8,8 @@ #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/functional/bind.h" -@@ -58,6 +59,10 @@ - #include "chrome/browser/flags/android/chrome_feature_list.h" +@@ -61,6 +62,10 @@ + #include "components/safe_browsing/content/common/file_type_policies.h" #endif +#if BUILDFLAG(IS_BSD) @@ -19,7 +19,7 @@ using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; -@@ -68,7 +73,7 @@ namespace { +@@ -74,7 +79,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -28,8 +28,8 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -174,7 +179,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi + #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) @@ -37,7 +37,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -292,7 +297,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -307,7 +312,7 @@ void DownloadPrefs::RegisterProfilePrefs( registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -455,7 +460,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -480,7 +485,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -55,7 +55,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -481,7 +486,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -506,7 +511,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons void DownloadPrefs::ResetAutoOpenByUser() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -64,7 +64,7 @@ SetShouldOpenPdfInSystemReader(false); #endif auto_open_by_user_.clear(); -@@ -518,7 +523,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -543,7 +548,7 @@ void DownloadPrefs::SaveAutoOpenState() { bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const { #if BUILDFLAG(IS_CHROMEOS) return false; // There is no UI for auto-open on ChromeOS. @@ -73,7 +73,7 @@ return ShouldOpenPdfInSystemReader(); #else return false; -@@ -600,7 +605,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -625,7 +630,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa #else // If the stored download directory is an absolute path, we presume it's // correct; there's not really much more validation we can do here. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc index e480cbfaee91..8df40dbdeee9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2024-10-01 07:26:23 UTC +--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc -@@ -150,7 +150,7 @@ AnalysisServiceSettings::AnalysisServiceSettings( +@@ -151,7 +151,7 @@ AnalysisServiceSettings::AnalysisServiceSettings( const char* verification_key = kKeyWindowsVerification; #elif BUILDFLAG(IS_MAC) const char* verification_key = kKeyMacVerification; 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 e693cfb938f4..11db4ffa0d65 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,7 +1,7 @@ ---- chrome/browser/enterprise/connectors/common.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/enterprise/connectors/common.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/enterprise/connectors/common.cc -@@ -22,7 +22,7 @@ - #include "components/policy/core/common/policy_loader_lacros.h" +@@ -16,7 +16,7 @@ + #include "components/user_manager/user.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/prefs/pref_service.h" #endif -@@ -199,7 +199,7 @@ std::string GetProfileEmail(Profile* profile) { +@@ -191,7 +191,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 47c9f1c4b240..b4749bda167a 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,7 +1,7 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -491,7 +491,7 @@ bool ConnectorsService::ConnectorsEnabled() const { - +@@ -469,7 +469,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope( + bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index 674aa0257f62..7c572987fa46 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc -@@ -23,7 +23,7 @@ +@@ -22,7 +22,7 @@ #include "components/policy/core/common/management/management_service.h" #include "content/public/browser/browser_context.h" @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/browser_attestation_service.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/device_attester.h" -@@ -54,7 +54,7 @@ bool IsProfileManaged(Profile* profile) { +@@ -53,7 +53,7 @@ bool IsProfileManaged(Profile* profile) { return management_service && management_service->IsManaged(); } @@ -18,7 +18,7 @@ policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) { policy::CloudPolicyManager* user_policy_manager = profile->GetCloudPolicyManager(); -@@ -106,7 +106,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() +@@ -105,7 +105,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() DependsOn(DeviceTrustConnectorServiceFactory::GetInstance()); DependsOn(policy::ManagementServiceFactory::GetInstance()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index 234a25f7f9f7..518d49a39bab 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc -@@ -24,7 +24,7 @@ +@@ -23,7 +23,7 @@ #include "chrome/browser/enterprise/connectors/connectors_service.h" #endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) @@ -9,7 +9,7 @@ #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" #include "chrome/browser/enterprise/core/dependency_factory_impl.h" -@@ -64,7 +64,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P +@@ -63,7 +63,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P profile, ConnectorsServiceFactory::GetForBrowserContext(profile)))); #endif // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS) 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 1ee786d0ad4d..5d088d6a641d 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-03-09 21:38:10 UTC +--- 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 -@@ -58,7 +58,7 @@ +@@ -55,7 +55,7 @@ #include "base/strings/utf_string_conversions.h" #endif @@ -9,8 +9,8 @@ #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" -@@ -181,7 +181,7 @@ void RealtimeReportingClient::ReportPastEvent(const st - /*include_profile_user_name=*/false); +@@ -160,7 +160,7 @@ void RealtimeReportingClient::ReportPastEvent(const st + /*include_profile_user_name=*/false); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -18,12 +18,12 @@ void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -262,7 +262,7 @@ std::string RealtimeReportingClient::GetBrowserClientI +@@ -235,7 +235,7 @@ std::string RealtimeReportingClient::GetBrowserClientI return client_id; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void RealtimeReportingClient::MaybeCollectDeviceSignalsAndReportEvent( - base::Value::Dict event, + ::chrome::cros::reporting::proto::Event event, policy::CloudPolicyClient* client, 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 bfb04d8a93d4..055bd798d6f2 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,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-01-25 09:34:31 UTC +--- 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 -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" @@ -9,16 +9,16 @@ #include "components/device_signals/core/browser/signals_types.h" #endif -@@ -112,7 +112,7 @@ class RealtimeReportingClient : public RealtimeReporti +@@ -118,7 +118,7 @@ class RealtimeReportingClient : public RealtimeReporti const std::string& dm_token) override; #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet) - void MaybeCollectDeviceSignalsAndReportEvent( + // DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...). + void MaybeCollectDeviceSignalsAndReportEventDeprecated( base::Value::Dict event, - policy::CloudPolicyClient* client, -@@ -151,7 +151,7 @@ class RealtimeReportingClient : public RealtimeReporti +@@ -168,7 +168,7 @@ class RealtimeReportingClient : public RealtimeReporti base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this}; }; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc index 6837018f20f2..79f5c11fe4de 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc -@@ -92,7 +92,7 @@ void ManagedProfileRequiredPage::CommandReceived(const +@@ -94,7 +94,7 @@ void ManagedProfileRequiredPage::CommandReceived(const switch (cmd) { case security_interstitials::CMD_DONT_PROCEED: 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 368cb783fd5a..7d15d08d5ab8 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,6 +1,6 @@ ---- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/enterprise/util/managed_browser_utils.cc -@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile +@@ -224,7 +224,7 @@ void SetUserAcceptedAccountManagement(Profile* profile .GetProfileAttributesWithPath(profile->GetPath()); if (entry) { entry->SetUserAcceptedAccountManagement(accepted); 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 dd1df7739cbf..cff5d63b8f6b 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-03-09 21:38:10 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1393,6 +1393,10 @@ source_set("extensions") { +@@ -1435,6 +1435,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } 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 index b93c224ba215..3efb2a11c8d0 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2025-02-20 09:59:21 UTC +--- 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 -@@ -408,7 +408,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel +@@ -409,7 +409,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel apps::LaunchContainer launch_container = GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); Profile* profile = Profile::FromBrowserContext(context); 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 3793ad2b4e90..328ae08cde8f 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,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -189,7 +189,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) || \ @@ -9,7 +9,7 @@ (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] = settings_api::PrefType::kBoolean; (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] = -@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -209,7 +209,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 -@@ -220,7 +220,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -221,7 +221,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 6d8918beef3d..2bdadce6fa72 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-03-14 15:54:34 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -909,7 +909,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -931,7 +931,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 9a751aa5591a..fd5b98d600f1 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-03-09 21:38:10 UTC +--- 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 -@@ -906,7 +906,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -904,7 +904,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 ed28e2b72c92..320c677e9aa9 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-01-25 09:34:31 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -790,7 +790,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -795,7 +795,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>( -@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -823,7 +823,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 new file mode 100644 index 000000000000..1b130a5673a2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -38,7 +38,7 @@ + #include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h" + #endif + +@@ -85,7 +85,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content + fetcher->AddSource(std::make_unique<KeyboardInfoLogSource>()); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + fetcher->AddSource(std::make_unique<OzonePlatformStateDumpSource>()); + #endif // BUILDFLAG(IS_LINUX) + 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 new file mode 100644 index 000000000000..321138c478f8 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -45,7 +45,7 @@ + #include "services/network/public/cpp/shared_url_loader_factory.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h" + #endif + +@@ -102,7 +102,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil + fetcher->AddSource(std::make_unique<UiHierarchyLogSource>(scrub_data)); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + fetcher->AddSource(std::make_unique<OzonePlatformStateDumpSource>()); + #endif // BUILDFLAG(IS_LINUX) + 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 47bf1d14fc60..5c889cba40ee 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,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-02-20 09:59:21 UTC +--- 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 -@@ -351,7 +351,7 @@ const struct { +@@ -357,7 +357,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__dialog.h index ab09d44239a0..feb3997d1e56 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__dialog.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -1,11 +1,11 @@ ---- chrome/browser/first_run/first_run_dialog.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/first_run/first_run_dialog.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/first_run/first_run_dialog.h -@@ -12,7 +12,7 @@ +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + // Hide this function on platforms where the dialog does not exist. - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) namespace first_run { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__internal.h index 83476c9f3b49..a65bfdc94cfe 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__internal.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -1,6 +1,6 @@ ---- chrome/browser/first_run/first_run_internal.h.orig 2022-12-02 17:56:32 UTC +--- chrome/browser/first_run/first_run_internal.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/first_run/first_run_internal.h -@@ -54,7 +54,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel +@@ -53,7 +53,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel bool force_first_run, bool no_first_run); 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 35c12b1327fe..9ffda1ce73dc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,24 +1,24 @@ ---- chrome/browser/flag_descriptions.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/flag_descriptions.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/flag_descriptions.cc -@@ -521,7 +521,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB +@@ -562,7 +562,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB "Autofill suggestions on the allowlisted merchant websites."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kAutofillEnableAmountExtractionDesktopName[] = - "Enable checkout amount extraction on Chrome desktop"; - const char kAutofillEnableAmountExtractionDesktopDescription[] = -@@ -530,7 +530,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr - #endif + const char kAutofillEnableAmountExtractionAllowlistDesktopName[] = + "Enable loading and querying the checkout amount extraction allowlist on " + "Chrome Desktop"; +@@ -580,7 +580,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr + // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kAutofillEnableBuyNowPayLaterForAffirmName[] = - "Enable buy now pay later on Autofill for Affirm"; - const char kAutofillEnableBuyNowPayLaterForAffirmDescription[] = -@@ -961,7 +961,7 @@ const char kDevicePostureDescription[] = + const char kAutofillEnableBuyNowPayLaterName[] = + "Enable buy now pay later on Autofill"; + const char kAutofillEnableBuyNowPayLaterDescription[] = +@@ -992,7 +992,7 @@ const char kDevicePostureDescription[] = "Enables Device Posture API (foldable devices)"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -27,7 +27,7 @@ const char kDocumentPictureInPictureAnimateResizeName[] = "Document Picture-in-Picture Animate Resize"; const char kDocumentPictureInPictureAnimateResizeDescription[] = -@@ -1049,7 +1049,7 @@ const char kCompressionDictionaryTransportRequireKnown +@@ -1077,7 +1077,7 @@ const char kCompressionDictionaryTransportRequireKnown "when the connection is using a well known root cert or when the server is " "a localhost."; @@ -36,16 +36,16 @@ const char kContextualCueingName[] = "Contextual cueing"; const char kContextualCueingDescription[] = "Enables the contextual cueing system to support showing actions"; -@@ -2228,7 +2228,7 @@ const char kContextualPageActionsShareModelDescription - "Enables share model data collection."; - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kEnableSearchAggregatorPolicyName[] = - "Enable EnterpriseSearchAggregatorSettings policy"; - const char kEnableSearchAggregatorPolicyDescription[] = -@@ -3524,7 +3524,7 @@ const char kDefaultSiteInstanceGroupsDescription[] = +@@ -1496,7 +1496,7 @@ const char kEnableIsolatedWebAppDevModeName[] = + const char kEnableIsolatedWebAppDevModeDescription[] = + "Enables the installation of unverified Isolated Web Apps"; + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kEnableIwaKeyDistributionComponentName[] = + "Enable the Iwa Key Distribution component"; + const char kEnableIwaKeyDistributionComponentDescription[] = +@@ -3498,7 +3498,7 @@ const char kDefaultSiteInstanceGroupsDescription[] = "SiteInstance."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,7 +54,7 @@ const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing"; const char kPwaNavigationCapturingDescription[] = "Enables opening links from Chrome in an installed PWA. Currently under " -@@ -3762,7 +3762,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ +@@ -3733,7 +3733,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ "Force the Translate Triggering on English pages experiment to be enabled " "with the selected language model active."; @@ -63,7 +63,7 @@ const char kTranslationAPIName[] = "Experimental translation API"; const char kTranslationAPIDescription[] = "Enables the on-device language translation API. " -@@ -5408,7 +5408,7 @@ const char kUserDisplayModeSyncStandaloneMitigationDes +@@ -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."; @@ -72,7 +72,7 @@ const char kWasmTtsComponentUpdaterEnabledName[] = "Enable Wasm TTS Extension Component"; const char kWasmTtsComponentUpdaterEnabledDescription[] = -@@ -7445,7 +7445,7 @@ const char kTetheringExperimentalFunctionalityDescript +@@ -7354,7 +7354,7 @@ const char kTetheringExperimentalFunctionalityDescript #endif // BUILDFLAG(IS_CHROMEOS) @@ -81,7 +81,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7675,7 +7675,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b +@@ -7584,7 +7584,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b // Linux ----------------------------------------------------------------------- @@ -90,7 +90,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7721,6 +7721,18 @@ const char kWaylandUiScalingDescription[] = +@@ -7630,6 +7630,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 +109,7 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -7733,7 +7745,7 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -7642,7 +7654,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,7 +118,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7766,7 +7778,7 @@ const char kTaskManagerDesktopRefreshDescription[] = +@@ -7675,7 +7687,7 @@ const char kTaskManagerDesktopRefreshDescription[] = "Enables a refreshed design for the Task Manager on Desktop platforms."; #endif // BUILDFLAG(IS_ANDROID) @@ -127,25 +127,25 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7798,7 +7810,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7707,7 +7719,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - const char kSkipUndecryptablePasswordsName[] = - "Skip undecryptable passwords to use the available decryptable " - "passwords."; -@@ -7948,7 +7960,7 @@ const char kElementCaptureDescription[] = - - #if BUILDFLAG(IS_WIN) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_PRINTING) + const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend"; + const char kCupsIppPrintingBackendDescription[] = +@@ -7852,7 +7864,7 @@ const char kElementCaptureDescription[] = + "media track into a track capturing just a specific DOM element."; + #endif // !BUILDFLAG(IS_ANDROID) + +-#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 kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8004,7 +8016,7 @@ const char kComposeUpfrontInputModesDescription[] = +@@ -7908,7 +7920,7 @@ const char kComposeUpfrontInputModesDescription[] = "Enables upfront input modes in the Compose dialog"; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -154,7 +154,7 @@ const char kThirdPartyProfileManagementName[] = "Third party profile management"; const char kThirdPartyProfileManagementDescription[] = -@@ -8137,7 +8149,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] = +@@ -8052,7 +8064,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] = "Enable the OS settings for overlay scrollbars on ChromeOS."; #endif // BUILDFLAG(IS_CHROMEOS) 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 1f2420d08a62..ed1e614e231c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,31 +1,33 @@ ---- chrome/browser/flag_descriptions.h.orig 2025-03-14 15:54:34 UTC +--- chrome/browser/flag_descriptions.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/flag_descriptions.h -@@ -332,13 +332,13 @@ extern const char +@@ -356,7 +356,7 @@ extern const char kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[]; + extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[]; extern const char kAutofillEnableAmountExtractionDesktopName[]; - extern const char kAutofillEnableAmountExtractionDesktopDescription[]; - #endif +@@ -365,7 +365,7 @@ extern const char kAutofillEnableAmountExtractionDeskt + // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kAutofillEnableBuyNowPayLaterForAffirmName[]; - extern const char kAutofillEnableBuyNowPayLaterForAffirmDescription[]; + extern const char kAutofillEnableBuyNowPayLaterName[]; + extern const char kAutofillEnableBuyNowPayLaterDescription[]; -@@ -561,7 +561,7 @@ extern const char kCanvasOopRasterizationDescription[] - extern const char kCapturedSurfaceControlName[]; - extern const char kCapturedSurfaceControlDescription[]; +@@ -581,7 +581,7 @@ extern const char kCrossTabRegionCaptureName[]; + extern const char kCrossTabRegionCaptureDescription[]; + #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) -@@ -736,7 +736,7 @@ extern const char kDevicePostureName[]; +@@ -753,7 +753,7 @@ extern const char kDevicePostureName[]; extern const char kDevicePostureDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -34,16 +36,16 @@ extern const char kDocumentPictureInPictureAnimateResizeName[]; extern const char kDocumentPictureInPictureAnimateResizeDescription[]; -@@ -1248,7 +1248,7 @@ extern const char kContextualPageActionsShareModelName - extern const char kContextualPageActionsShareModelDescription[]; +@@ -915,7 +915,7 @@ extern const char kEnableIsolatedWebAppManagedGuestSes + extern const char kEnableIsolatedWebAppDevModeName[]; + extern const char kEnableIsolatedWebAppDevModeDescription[]; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kEnableSearchAggregatorPolicyName[]; - extern const char kEnableSearchAggregatorPolicyDescription[]; - #endif -@@ -2030,7 +2030,7 @@ extern const char kDefaultSiteInstanceGroupsName[]; +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kEnableIwaKeyDistributionComponentName[]; + extern const char kEnableIwaKeyDistributionComponentDescription[]; + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -2020,7 +2020,7 @@ extern const char kDefaultSiteInstanceGroupsName[]; extern const char kDefaultSiteInstanceGroupsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -52,7 +54,7 @@ extern const char kPwaNavigationCapturingName[]; extern const char kPwaNavigationCapturingDescription[]; #endif -@@ -2193,7 +2193,7 @@ extern const char kTouchTextEditingRedesignDescription +@@ -2180,7 +2180,7 @@ extern const char kTouchTextEditingRedesignDescription extern const char kTranslateForceTriggerOnEnglishName[]; extern const char kTranslateForceTriggerOnEnglishDescription[]; @@ -61,7 +63,7 @@ extern const char kTranslationAPIName[]; extern const char kTranslationAPIDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -3160,7 +3160,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio +@@ -3147,7 +3147,7 @@ extern const char kUserDisplayModeSyncBrowserMitigatio extern const char kUserDisplayModeSyncStandaloneMitigationName[]; extern const char kUserDisplayModeSyncStandaloneMitigationDescription[]; @@ -70,7 +72,7 @@ extern const char kWasmTtsComponentUpdaterEnabledName[]; extern const char kWasmTtsComponentUpdaterEnabledDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -4362,7 +4362,7 @@ extern const char kTetheringExperimentalFunctionalityD +@@ -4328,7 +4328,7 @@ extern const char kTetheringExperimentalFunctionalityD #endif // #if BUILDFLAG(IS_CHROMEOS) @@ -79,7 +81,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4497,7 +4497,7 @@ extern const char kEnableArmHwdrmDescription[]; +@@ -4463,7 +4463,7 @@ extern const char kEnableArmHwdrmDescription[]; // Linux --------------------------------------------------------------------- @@ -88,7 +90,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4525,6 +4525,9 @@ extern const char kWaylandTextInputV3Description[]; +@@ -4491,6 +4491,9 @@ extern const char kWaylandTextInputV3Description[]; extern const char kWaylandUiScalingName[]; extern const char kWaylandUiScalingDescription[]; @@ -98,16 +100,16 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -4544,7 +4547,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4510,7 +4513,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - extern const char kSkipUndecryptablePasswordsName[]; - extern const char kSkipUndecryptablePasswordsDescription[]; - -@@ -4560,7 +4563,7 @@ extern const char kScreenlockReauthCardDescription[]; + #if BUILDFLAG(ENABLE_PRINTING) + extern const char kCupsIppPrintingBackendName[]; + extern const char kCupsIppPrintingBackendDescription[]; +@@ -4523,7 +4526,7 @@ extern const char kScreenlockReauthCardDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -116,7 +118,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4574,7 +4577,7 @@ extern const char kTaskManagerDesktopRefreshName[]; +@@ -4537,7 +4540,7 @@ extern const char kTaskManagerDesktopRefreshName[]; extern const char kTaskManagerDesktopRefreshDescription[]; #endif // BUILDFLAG(IS_ANDROID) @@ -125,16 +127,16 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4671,7 +4674,7 @@ extern const char kElementCaptureDescription[]; +@@ -4632,7 +4635,7 @@ extern const char kElementCaptureName[]; + extern const char kElementCaptureDescription[]; + #endif // !BUILDFLAG(IS_ANDROID) - #if BUILDFLAG(IS_WIN) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#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 kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4713,7 +4716,7 @@ extern const char kComposeUpfrontInputModesName[]; +@@ -4674,7 +4677,7 @@ extern const char kComposeUpfrontInputModesName[]; extern const char kComposeUpfrontInputModesDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -143,7 +145,7 @@ extern const char kThirdPartyProfileManagementName[]; extern const char kThirdPartyProfileManagementDescription[]; -@@ -4794,7 +4797,7 @@ extern const char kEnablePolicyPromotionBannerName[]; +@@ -4759,7 +4762,7 @@ extern const char kEnablePolicyPromotionBannerName[]; extern const char kEnablePolicyPromotionBannerDescription[]; #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc index 78bbcec8bb0e..7c9a9ff43cdb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/gcm/gcm_profile_service_factory.cc -@@ -89,7 +89,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle +@@ -110,7 +110,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle // static GCMProfileService* GCMProfileServiceFactory::GetForProfile( content::BrowserContext* profile) { @@ -9,7 +9,7 @@ // On desktop, incognito profiles are checked with IsIncognitoProfile(). // It's possible for non-incognito profiles to also be off-the-record. bool is_profile_supported = -@@ -132,7 +132,7 @@ std::unique_ptr<KeyedService> +@@ -153,7 +153,7 @@ std::unique_ptr<KeyedService> GCMProfileServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); 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 9b62a102023e..e9cc0f7ca963 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-03-09 21:38:10 UTC +--- chrome/browser/global_features.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/global_features.cc @@ -21,7 +21,7 @@ - #include "chrome/browser/glic/launcher/glic_background_mode_manager.h" // nogncheck + #include "chrome/browser/glic/glic_profile_manager.h" // nogncheck #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc index 630e9381ed1d..789b8da2a7a4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2024-11-16 12:20:41 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/headless/headless_mode_util.cc @@ -10,7 +10,7 @@ // New headless mode is available on Linux, Windows and Mac platforms. @@ -9,16 +9,16 @@ #include "base/base_switches.h" #include "base/files/file_path.h" -@@ -19,7 +19,7 @@ - #include "chrome/common/chrome_switches.h" +@@ -20,7 +20,7 @@ #include "content/public/common/content_switches.h" + #include "ui/base/ui_base_switches.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/gl/gl_switches.h" // nogncheck #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -94,7 +94,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand +@@ -95,7 +95,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_audio__service__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_audio__service__util.cc index 3b49bf884b10..a5614598a4a0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_audio__service__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_audio__service__util.cc @@ -1,20 +1,20 @@ ---- chrome/browser/media/audio_service_util.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/media/audio_service_util.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/media/audio_service_util.cc -@@ -21,7 +21,7 @@ +@@ -20,7 +20,7 @@ namespace { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const base::Value* GetPolicy(const char* policy_name) { const policy::PolicyMap& policies = -@@ -43,7 +43,7 @@ bool GetPolicyOrFeature(const char* policy_name, const + g_browser_process->browser_policy_connector() +@@ -39,7 +39,7 @@ bool GetPolicyOrFeature(const char* policy_name, const + } // namespace + bool IsAudioServiceSandboxEnabled() { - // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being - // built with OS_CHROMEOS instead of OS_LINUX. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return GetPolicyOrFeature(policy::key::kAudioSandboxEnabled, features::kAudioServiceSandbox); + #else diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn index 3b43c6498756..987eadf23644 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/discovery/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/media/router/discovery/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/media/router/discovery/BUILD.gn -@@ -82,7 +82,7 @@ static_library("discovery") { +@@ -79,7 +79,7 @@ static_library("discovery") { ] configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc index 1c71afe2b523..a94fb9cedc9c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc @@ -1,11 +1,11 @@ ---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc @@ -21,7 +21,7 @@ - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) #include "ash/shell.h" #include "ui/aura/window.h" --#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/functional/callback.h" #include "content/public/browser/desktop_capture.h" #endif @@ -13,8 +13,8 @@ DestructorAtExit root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER; } // namespace --#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) namespace { base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER; @@ -22,8 +22,8 @@ return stream_devices_set; } --#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) blink::mojom::StreamDevicesSetPtr EnumerateScreens( blink::mojom::MediaStreamType stream_type) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -31,8 +31,8 @@ root_windows_for_testing_.Get() = std::move(root_windows); } --#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void ChromeScreenEnumerator::SetDesktopCapturerForTesting( std::unique_ptr<webrtc::DesktopCapturer> capturer) { g_desktop_capturer_for_testing.Get() = std::move(capturer); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h index 4ea5c93eefff..41ba08b6f089 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h @@ -1,20 +1,20 @@ ---- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/media/webrtc/chrome_screen_enumerator.h -@@ -20,7 +20,7 @@ namespace aura { +@@ -18,7 +18,7 @@ + namespace aura { class Window; } - --#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) namespace webrtc { class DesktopCapturer; } -@@ -42,7 +42,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu - #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -39,7 +39,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu + #if BUILDFLAG(IS_CHROMEOS) static void SetRootWindowsForTesting( std::vector<raw_ptr<aura::Window, VectorExperimental>> root_windows); --#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) static void SetDesktopCapturerForTesting( std::unique_ptr<webrtc::DesktopCapturer> capturer); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 2d55825c8b3e..76d187ba1fb5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,11 +1,11 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -108,7 +108,7 @@ std::string GetLogUploadProduct() { +@@ -105,7 +105,7 @@ std::string GetLogUploadProduct() { + const char product[] = "Chrome"; + #elif BUILDFLAG(IS_MAC) const char product[] = "Chrome_Mac"; - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #if !defined(ADDRESS_SANITIZER) const char product[] = "Chrome_Linux"; #else diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 4f5c0cd2cacb..1c9d10e9e6c0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -25,10 +25,10 @@ #include "components/webrtc_logging/browser/text_log_list.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -288,7 +288,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -304,7 +304,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -334,7 +334,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -350,7 +350,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } 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 f972b3ddfcd0..3c7fe034a111 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,24 +1,33 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-02-20 09:59:21 UTC +--- 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 -@@ -117,7 +117,7 @@ - #include "chromeos/crosapi/cpp/crosapi_constants.h" - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -86,7 +86,7 @@ + #include "chrome/browser/flags/android/chrome_session_state.h" + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if defined(__GLIBC__) + #include <gnu/libc-version.h> + #endif // defined(__GLIBC__) +@@ -111,7 +111,7 @@ + #include "chrome/installer/util/taskbar_util.h" + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -126,7 +126,7 @@ +@@ -120,7 +120,7 @@ #include "components/user_manager/user_manager.h" - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/power_metrics/system_power_monitor.h" #endif -@@ -896,7 +896,7 @@ void RecordStartupMetrics() { +@@ -872,7 +872,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -27,7 +36,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1211,11 +1211,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1183,11 +1183,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 654cfebbe1bf..56f3576638c1 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-03-09 21:38:10 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -201,11 +201,11 @@ +@@ -196,11 +196,11 @@ #include "chrome/browser/metrics/google_update_metrics_provider_mac.h" #endif @@ -10,38 +10,47 @@ #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h" #endif -@@ -219,7 +219,7 @@ - #include "chrome/browser/metrics/power/power_metrics_provider_mac.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/metrics/bluetooth_metrics_provider.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -542,7 +542,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -233,7 +233,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"; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + 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 + #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) metrics::structured::StructuredMetricsService::RegisterPrefs(registry); - #if !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -733,7 +733,7 @@ void ChromeMetricsServiceClient::Initialize() { + #if !BUILDFLAG(IS_CHROMEOS) +@@ -619,7 +619,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. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // 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() { std::make_unique<metrics::dwa::DwaService>(this, local_state); } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( base::SequencedTaskRunner::GetCurrentDefault()); #endif -@@ -791,7 +791,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -50,16 +59,16 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -883,7 +883,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) +@@ -873,7 +873,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + std::make_unique<GoogleUpdateMetricsProviderMac>()); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || -@@ -992,7 +992,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -974,7 +974,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -68,16 +77,16 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1179,7 +1179,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) +@@ -1160,7 +1160,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve + } + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1528,7 +1528,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1509,7 +1509,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 63033b70eeca..f26c88c7059f 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,11 +1,11 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc -@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() { +@@ -145,7 +145,7 @@ CPUIdentity GetCPUIdentity() { result.release = - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) base::SysInfo::KernelVersion(); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::SysInfo::OperatingSystemVersion(); #else #error "Unsupported configuration" 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 029c4c6a4e66..3feab4e1303e 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-03-09 21:38:10 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -134,7 +134,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; -@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -142,7 +142,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) -@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -188,7 +188,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) -@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -203,7 +203,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) -@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -213,7 +213,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 -@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -255,11 +255,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 || -@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -275,7 +275,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) -@@ -520,7 +520,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -519,7 +519,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -77,7 +77,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -578,7 +578,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -577,7 +577,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) -@@ -592,7 +592,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -591,7 +591,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) -@@ -657,7 +657,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -656,7 +656,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) -@@ -682,11 +682,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -681,11 +681,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -118,7 +118,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -739,7 +739,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -738,7 +738,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -127,7 +127,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -958,7 +958,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -957,7 +957,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index 67bb2b631c3d..1b7653f48f39 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/sharing/sharing_notification_handler.h" #endif -@@ -57,7 +57,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer +@@ -60,7 +60,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer // static void NotificationDisplayServiceImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -18,7 +18,7 @@ registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif } -@@ -73,7 +73,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -76,7 +76,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer std::make_unique<PersistentNotificationHandler>()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -27,3 +27,12 @@ AddNotificationHandler( NotificationHandler::Type::SEND_TAB_TO_SELF, std::make_unique<send_tab_to_self::DesktopNotificationHandler>( +@@ -84,7 +84,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer + #endif + + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN)) && \ ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \ + BUILDFLAG(SAFE_BROWSING_AVAILABLE) + AddNotificationHandler( + NotificationHandler::Type::TAILORED_SECURITY, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc index 9ff69869a4ad..e4c4fe3d0de0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2024-10-01 07:26:23 UTC +--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/notifications/notification_platform_bridge_delegator.cc -@@ -56,7 +56,7 @@ bool SystemNotificationsEnabled(Profile* profile) { +@@ -55,7 +55,7 @@ bool SystemNotificationsEnabled(Profile* profile) { #elif BUILDFLAG(IS_WIN) return NotificationPlatformBridgeWin::SystemNotificationEnabled(); #else 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 c5bc23abbd4a..3c7994bac7e1 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-03-09 21:38:10 UTC +--- 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 -@@ -636,7 +636,7 @@ void ChromePasswordManagerClient:: +@@ -642,7 +642,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; } -@@ -914,7 +914,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -920,7 +920,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 1a27765f8407..c0042f8767d5 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,11 +1,11 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-08-26 14:40:28 UTC +--- 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 -@@ -141,7 +141,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr + // Prepare password hash data for reuse detection. + reuse_manager->PreparePasswordHashData(GetSignInStateForMetrics(profile)); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<password_manager::PasswordReuseManagerSigninNotifier> notifier = std::make_unique< password_manager::PasswordReuseManagerSigninNotifierImpl>( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_platform__util__linux.cc index 2d2f20fe018e..b1c28dca15f6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util_linux.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/platform_util_linux.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/platform_util_linux.cc -@@ -303,7 +303,9 @@ void OnLaunchOptionsCreated(const std::string& command +@@ -302,7 +302,9 @@ void OnLaunchOptionsCreated(const std::string& command argv.push_back(command); argv.push_back(arg); options.current_directory = working_directory; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 4e496aff2217..e2583ac99aa9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc @@ -60,7 +60,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" @@ -15,10 +15,10 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/client_certificates/browser_context_delegate.h" + #include "chrome/browser/enterprise/client_certificates/cert_utils.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" - #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -109,7 +109,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -115,7 +115,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if BUILDFLAG(IS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); @@ -27,7 +27,7 @@ storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); #elif BUILDFLAG(IS_WIN) storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); -@@ -280,7 +280,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -286,7 +286,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager> ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { @@ -36,3 +36,12 @@ auto* browser_dm_token_storage = BrowserDMTokenStorage::Get(); auto* device_management_service = GetDeviceManagementService(); auto shared_url_loader_factory = GetSharedURLLoaderFactory(); +@@ -308,7 +308,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateD + std::unique_ptr<client_certificates::CertificateProvisioningService> + ChromeBrowserCloudManagementControllerDesktop:: + CreateCertificateProvisioningService() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (!certificate_store_) { + certificate_store_ = + std::make_unique<client_certificates::PrefsCertificateStore>( 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 00a4f9001109..d56b9ffbfc05 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-03-09 21:38:10 UTC +--- 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 -@@ -251,7 +251,7 @@ +@@ -252,19 +252,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -9,8 +9,7 @@ #include "chrome/browser/enterprise/idle/action.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 -@@ -262,12 +262,12 @@ - #endif // BUILDFLAG(ENABLE_GLIC) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_ANDROID) @@ -24,15 +23,15 @@ #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) -@@ -281,13 +281,13 @@ +@@ -278,13 +278,13 @@ #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #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) #include "chrome/browser/policy/battery_saver_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS_ASH) + // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -40,7 +39,7 @@ #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) || -@@ -573,7 +573,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -577,7 +577,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kDefaultDirectSocketsSetting, prefs::kManagedDefaultDirectSocketsSetting, base::Value::Type::INTEGER }, @@ -49,7 +48,7 @@ { key::kDeletingUndecryptablePasswordsEnabled, password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, base::Value::Type::BOOLEAN }, -@@ -932,13 +932,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -936,13 +936,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -65,16 +64,16 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1778,7 +1778,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1788,7 +1788,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1837,7 +1837,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1847,7 +1847,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -83,7 +82,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1863,12 +1863,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1867,12 +1867,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -98,7 +97,7 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1876,7 +1876,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1880,7 +1880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kLiveTranslateEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -107,7 +106,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1888,7 +1888,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1892,7 +1892,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) \ @@ -116,7 +115,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1986,7 +1986,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1990,7 +1990,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -125,25 +124,25 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2091,7 +2091,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2092,7 +2092,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2165,7 +2165,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2163,7 +2163,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #endif // BUILDFLAG(IS_CHROMEOS) +-#if 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_BSD) { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2194,7 +2194,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2192,7 +2192,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -152,7 +151,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2231,7 +2231,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2229,7 +2229,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -161,7 +160,7 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2257,7 +2257,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2255,7 +2255,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kTabCompareSettings, optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed, base::Value::Type::INTEGER}, @@ -170,25 +169,16 @@ { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2441,7 +2441,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2439,7 +2439,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #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) handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2457,7 +2457,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - // BUILDFLAG(IS_CHROMEOS_ASH) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - handlers->AddHandler( - std::make_unique<SearchAggregatorPolicyHandler>(chrome_schema)); - handlers->AddHandler( -@@ -2656,7 +2656,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2666,7 +2666,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -197,7 +187,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2709,7 +2709,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2719,7 +2719,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -206,7 +196,7 @@ handlers->AddHandler(std::make_unique<GuestModePolicyHandler>()); handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); -@@ -3130,7 +3130,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3145,7 +3145,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -215,7 +205,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -3138,7 +3138,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3153,7 +3153,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -224,7 +214,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -3156,7 +3156,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3171,7 +3171,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -233,21 +223,21 @@ handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3179,7 +3179,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3194,7 +3194,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #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) handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -3197,7 +3197,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + // BUILDFLAG(IS_CHROMEOS) +@@ -3212,7 +3212,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails> gen_ai_default_policies; #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) gen_ai_default_policies.emplace_back( key::kAutofillPredictionSettings, optimization_guide::prefs:: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index 0b5b5522f3ef..b7f4dee82f43 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2024-11-16 12:20:41 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/policy/device_management_service_configuration.cc -@@ -23,7 +23,7 @@ +@@ -22,7 +22,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc index 77ca1eed45b6..76081b1e8bb2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/policy/policy_value_and_status_aggregator.cc -@@ -53,7 +53,7 @@ +@@ -49,7 +49,7 @@ #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h" #endif // BUILDFLAG(ENABLE_EXTENSIONS) 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 9a678cf2daf2..918f475c571a 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,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2025-03-14 15:54:34 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -315,7 +315,7 @@ +@@ -309,7 +309,7 @@ #include "components/ntp_tiles/custom_links_manager_impl.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,29 +9,21 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -485,18 +485,18 @@ +@@ -478,11 +478,11 @@ #endif #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) #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) - #include "chrome/browser/browser_switcher/browser_switcher_prefs.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) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif - -@@ -531,7 +531,7 @@ +@@ -510,7 +510,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -40,7 +32,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1742,7 +1742,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1659,7 +1659,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) on_device_translation::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) @@ -49,7 +41,7 @@ WhatsNewUI::RegisterLocalStatePrefs(registry); #endif -@@ -1910,7 +1910,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1815,7 +1815,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -58,15 +50,15 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2272,12 +2272,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2167,12 +2167,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #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) device_signals::RegisterProfilePrefs(registry); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS_ASH) + // 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) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index e5c567ed6bb7..8134eacfef5d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2025-03-14 15:54:34 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -204,7 +204,7 @@ const char* const kPersistentPrefNames[] = { +@@ -203,7 +203,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif 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 3ec6b03fa0fc..4a51cf65a1c4 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,132 +1,125 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -353,7 +353,7 @@ - #include "chrome/browser/profiles/gaia_info_update_service_factory.h" +@@ -348,7 +348,7 @@ #endif --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/idle/idle_service_factory.h" #endif -@@ -442,18 +442,18 @@ +@@ -390,7 +390,7 @@ #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h" #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h" #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" +@@ -398,7 +398,7 @@ + #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include "chrome/browser/enterprise/idle/idle_service_factory.h" +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" + #endif + +@@ -406,7 +406,7 @@ + #include "chrome/browser/history_embeddings/history_embeddings_service_factory.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) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/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" -@@ -562,7 +562,7 @@ - #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_observer_factory.h" - #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -730,7 +730,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -720,7 +720,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #endif + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -789,7 +789,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -777,7 +777,7 @@ void ChromeBrowserMainExtraPartsProfiles:: commerce::ShoppingServiceFactory::GetInstance(); ConsentAuditorFactory::GetInstance(); ContentIndexProviderFactory::GetInstance(); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) contextual_cueing::ContextualCueingServiceFactory::GetInstance(); #endif CookieControlsServiceFactory::GetInstance(); -@@ -840,7 +840,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -832,31 +832,31 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif enterprise_connectors::ConnectorsServiceFactory::GetInstance(); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif -@@ -848,26 +848,26 @@ void ChromeBrowserMainExtraPartsProfiles:: - enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance(); - enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); - #endif --#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) && \ -+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \ - BUILDFLAG(ENTERPRISE_LOCAL_CONTENT_ANALYSIS) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \ + BUILDFLAG(ENTERPRISE_LOCAL_CONTENT_ANALYSIS) && \ + BUILDFLAG(SAFE_BROWSING_AVAILABLE) enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance(); #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_idle::IdleServiceFactory::GetInstance(); #endif #if !BUILDFLAG(IS_CHROMEOS) enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance(); #endif enterprise_reporting::LegacyTechServiceFactory::GetInstance(); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_signals::SignalsAggregatorFactory::GetInstance(); #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_signals::UserPermissionServiceFactory::GetInstance(); #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -983,7 +983,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_ANDROID) MerchantViewerDataManagerFactory::GetInstance(); #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1107,7 +1107,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1095,7 +1095,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1146,7 +1146,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) +@@ -1134,7 +1134,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) ProfileStatisticsFactory::GetInstance(); #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1166,7 +1166,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1154,7 +1154,7 @@ void ChromeBrowserMainExtraPartsProfiles:: ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance(); @@ -135,7 +128,7 @@ reporting::ManualTestHeartbeatEventFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1328,7 +1328,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1334,7 +1334,7 @@ void ChromeBrowserMainExtraPartsProfiles:: WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__manager.cc deleted file mode 100644 index b1deaf5b5814..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/profiles/profile_manager.cc.orig 2025-03-09 21:38:10 UTC -+++ chrome/browser/profiles/profile_manager.cc -@@ -1495,7 +1495,7 @@ void ProfileManager::DoFinalInitForServices(Profile* p - // Ensure NavigationPredictorKeyedService is started. - NavigationPredictorKeyedServiceFactory::GetForProfile(profile); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - contextual_cueing::ContextualCueingServiceFactory::GetForProfile(profile); - #endif - diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc index e54f216b8f6e..d9592817c67b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc @@ -1,20 +1,11 @@ ---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/screen_ai/screen_ai_install_state.cc -@@ -16,7 +16,7 @@ - #include "services/screen_ai/public/cpp/utilities.h" - #include "ui/accessibility/accessibility_features.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/cpu.h" - #include "base/files/file_util.h" - #endif -@@ -26,7 +26,7 @@ const int kScreenAICleanUpDelayInDays = 30; - const char kMinExpectedVersion[] = "127.9"; - - bool IsDeviceCompatible() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #if defined(ARCH_CPU_X86_FAMILY) - // Check if the CPU has the required instruction set to run the Screen AI - // library. +@@ -30,7 +30,7 @@ bool IsDeviceCompatible() { + // TODO(crbug.com/381256355): Update when ScreenAI library is compatible with + // older CPUs. + static const bool device_compatible = base::CPU().has_sse42(); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux, the library is only built for X86 CPUs. + static constexpr bool device_compatible = false; + #else diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc index c9c7bb55c05b..0c81a4cbf730 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -1,7 +1,7 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/sessions/session_restore.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/sessions/session_restore.cc -@@ -100,7 +100,7 @@ - #include "chrome/browser/web_applications/web_app_registrar.h" +@@ -108,7 +108,7 @@ + #include "ui/wm/core/scoped_animation_disabler.h" #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -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) -@@ -1121,7 +1121,7 @@ class SessionRestoreImpl : public BrowserListObserver +@@ -1117,7 +1117,7 @@ class SessionRestoreImpl : public BrowserListObserver bool is_first_tab = true; for (const auto& startup_tab : startup_tabs) { const GURL& url = startup_tab.url; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index 0710b556642e..eaa39b145408 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,15 +1,15 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc -@@ -22,7 +22,7 @@ +@@ -21,7 +21,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS) -@@ -74,7 +74,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl + #endif + +@@ -72,7 +72,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_signin_accounts__policy__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_signin_accounts__policy__manager.cc index cc93d5df9b90..493160cef712 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_signin_accounts__policy__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_signin_accounts__policy__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/signin/accounts_policy_manager.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/signin/accounts_policy_manager.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/signin/accounts_policy_manager.cc @@ -40,7 +40,7 @@ #include "chrome/browser/ui/webui/profile_helper.h" @@ -27,7 +27,7 @@ profile_pref_change_registrar_.RemoveAll(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) local_state_pref_registrar_.RemoveAll(); -@@ -320,7 +320,7 @@ void AccountsPolicyManager::OnUserConfirmedProfileDele +@@ -311,7 +311,7 @@ void AccountsPolicyManager::OnUserConfirmedProfileDele } #endif // defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc index 1619fdf21059..3ce65ddc0554 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_controller_builder.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/sync/chrome_sync_controller_builder.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/sync/chrome_sync_controller_builder.cc -@@ -273,7 +273,7 @@ ChromeSyncControllerBuilder::Build(syncer::SyncService +@@ -280,7 +280,7 @@ ChromeSyncControllerBuilder::Build(syncer::SyncService #if BUILDFLAG(ENABLE_SPELLCHECK) // Chrome prefers OS provided spell checkers where they exist. So only sync // the custom dictionary on platforms that typically don't provide one. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc index 9be36f19a71c..1bcae6f43878 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc @@ -1,11 +1,11 @@ ---- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/sync/device_info_sync_client_impl.cc -@@ -43,7 +43,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD - // included in lacros-chrome once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +@@ -34,7 +34,7 @@ DeviceInfoSyncClientImpl::~DeviceInfoSyncClientImpl() + std::string DeviceInfoSyncClientImpl::GetSigninScopedDeviceId() const { + // Since the local sync backend is currently only supported on Windows, Mac and + // Linux don't even check the pref on other os-es. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) syncer::SyncPrefs prefs(profile_->GetPrefs()); if (prefs.IsLocalSyncEnabled()) { return "local_device"; 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 0f9dbef3301b..5b92f6b0d67a 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-01-25 09:34:31 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -110,7 +110,7 @@ +@@ -108,7 +108,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" -@@ -137,7 +137,7 @@ namespace { +@@ -135,7 +135,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); -@@ -379,7 +379,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -377,7 +377,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); -@@ -514,7 +514,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -512,7 +512,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_tab__group__sync_tab__group__sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc deleted file mode 100644 index a946a3bdcebf..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2025-02-20 09:59:21 UTC -+++ chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc -@@ -36,7 +36,7 @@ - #include "components/sync_device_info/device_info_sync_service.h" - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_desktop.h" - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || - // BUILDFLAG(IS_WIN) -@@ -102,7 +102,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro - - std::unique_ptr<TabGroupSyncDelegate> delegate; - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (tab_groups::IsTabGroupSyncServiceDesktopMigrationEnabled()) { - delegate = - std::make_unique<TabGroupSyncDelegateDesktop>(service.get(), profile); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__helper.cc index 947a3a7f0e71..ed45e3dd8c3a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__helper.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__helper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_helper.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/themes/theme_helper.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/themes/theme_helper.cc -@@ -17,7 +17,7 @@ +@@ -16,7 +16,7 @@ #include "ui/gfx/image/image.h" #include "ui/native_theme/native_theme.h" diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index e74c8f540fa2..434a0fefaefc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,20 +1,15 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -27,11 +27,11 @@ - - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/themes/theme_service_aura_linux.h" +@@ -24,7 +24,7 @@ + #include "chrome/browser/themes/theme_helper_win.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/themes/theme_service_aura_linux.h" #include "ui/linux/linux_ui_factory.h" #endif - -@@ -109,7 +109,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -103,7 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; std::unique_ptr<KeyedService> ThemeServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* profile) const { @@ -23,15 +18,12 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -123,9 +123,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -115,7 +115,7 @@ ThemeServiceFactory::BuildServiceInstanceForBrowserCon + + void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - ui::SystemTheme default_system_theme = ui::SystemTheme::kDefault; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - default_system_theme = ui::GetDefaultSystemTheme(); - #endif registry->RegisterIntegerPref(prefs::kSystemTheme, + static_cast<int>(ui::GetDefaultSystemTheme())); + #endif 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 9576e6c8e6dc..3374df28fe1c 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-03-09 21:38:10 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -492,7 +492,7 @@ +@@ -495,7 +495,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_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index a0075e966773..8ecd1c9060b0 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,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -125,7 +125,7 @@ +@@ -126,7 +126,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" #endif -@@ -134,7 +134,7 @@ +@@ -135,7 +135,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) -@@ -322,7 +322,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -328,7 +328,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(); -@@ -574,7 +574,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -580,7 +580,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -36,7 +36,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -789,7 +789,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -800,7 +800,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( -@@ -956,7 +956,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -967,7 +967,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 -@@ -1263,7 +1263,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1283,7 +1283,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); -@@ -1614,7 +1614,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1640,7 +1640,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 853c36014ac9..a7b688927243 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-03-09 21:38:10 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -1989,7 +1989,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -1985,7 +1985,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_signin_signin__view__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index 574c8429ea8f..32f5c64e8e9b 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-03-09 21:38:10 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc -@@ -402,7 +402,7 @@ void SigninViewController::ShowModalSyncConfirmationDi +@@ -418,7 +418,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_signin_signin__view__controller__delegate.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h index 759f5b30a1bb..3c99a594be86 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/signin/signin_view_controller_delegate.h @@ -79,7 +79,7 @@ class SigninViewControllerDelegate { - base::OnceCallback<void(ChromeSignoutConfirmationChoice)> callback); + SignoutConfirmationCallback callback); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) 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 f78f46670c68..8e4ca648d30d 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,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2025-02-20 09:59:21 UTC +--- 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 -@@ -77,7 +77,7 @@ +@@ -76,7 +76,7 @@ #include "components/app_restore/full_restore_utils.h" #endif @@ -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) -@@ -208,7 +208,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -207,7 +207,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 -@@ -238,7 +238,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -237,7 +237,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 49bb1ff027d0..b3262346e2c9 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-03-09 21:38:10 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -222,7 +222,7 @@ +@@ -216,7 +216,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" -@@ -646,12 +646,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -689,12 +689,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 ec6ecdd3d46c..e2d47349a50d 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-03-09 21:38:10 UTC +--- chrome/browser/ui/tabs/features.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/tabs/features.cc -@@ -53,7 +53,7 @@ bool CanShowTabSearchPositionSetting() { +@@ -48,7 +48,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_task__manager_task__manager__table__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index e8c0584e36d5..f17d7fefc78c 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,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -527,7 +527,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r +@@ -530,7 +530,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -9,7 +9,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) -@@ -690,7 +690,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, +@@ -693,7 +693,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -18,7 +18,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -895,7 +895,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -935,7 +935,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 df131ecc0038..c49776a877cb 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,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/ui_features.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/ui_features.cc -@@ -74,7 +74,7 @@ bool IsExtensionMenuInRootAppMenu() { +@@ -67,7 +67,7 @@ bool IsExtensionMenuInRootAppMenu() { return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu); } @@ -9,7 +9,7 @@ // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -382,7 +382,7 @@ BASE_FEATURE(kViewsJSAppModalDialog, +@@ -333,7 +333,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 0c134893eb76..38c0f89a3f2f 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,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/ui_features.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/ui_features.h -@@ -52,7 +52,7 @@ extern const base::FeatureParam<int> kMaxPromptCount; +@@ -47,7 +47,7 @@ extern const base::FeatureParam<int> kMaxPromptCount; BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu); bool IsExtensionMenuInRootAppMenu(); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -229,7 +229,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); +@@ -211,7 +211,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); #endif 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 a4c0a0971474..e2787dd09660 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-02-20 09:59:21 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -52,7 +52,7 @@ #include "ui/aura/window.h" @@ -27,7 +27,7 @@ SelectNativeTheme(); #else SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi()); -@@ -369,7 +369,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -368,7 +368,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() -@@ -567,7 +567,7 @@ void BrowserFrame::OnMenuClosed() { +@@ -566,7 +566,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(); -@@ -608,7 +608,7 @@ void BrowserFrame::OnTouchUiChanged() { +@@ -607,7 +607,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__native.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc index 3956cb5dbf1d..4b11e6389be2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc @@ -18,7 +18,7 @@ BrowserFrameViewLayoutLinuxNative::~BrowserFrameViewLa @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const bool tiled = delegate_->IsTiled(); + const bool maximized = delegate_->IsMaximized(); #else - const bool tiled = false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index b5f4ce5fc627..b97f07ec1c8c 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,11 +1,20 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2493,7 +2493,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating +@@ -2523,7 +2523,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating } void BrowserView::TabDraggingStatusChanged(bool is_dragging) { -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - contents_web_view_->SetFastResize(is_dragging); - if (!is_dragging) { - // When tab dragging is ended, we need to make sure the web contents get + GetContentsWebView()->SetFastResize(is_dragging); + if (multi_contents_view_) { + multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging); +@@ -5563,7 +5563,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() { + } + + void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!ShouldShowAvatarToolbarIPH()) { + return; + } 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 70c321604966..76d0bb181d0e 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,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-03-09 21:38:10 UTC +--- 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 @@ -62,7 +62,7 @@ #include "ui/aura/window.h" @@ -27,7 +27,7 @@ // 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()) { -@@ -649,7 +649,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -618,7 +618,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } @@ -36,7 +36,7 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -873,7 +873,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -843,7 +843,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); } @@ -45,7 +45,7 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -962,7 +962,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -932,7 +932,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1253,7 +1253,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1223,7 +1223,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -63,7 +63,7 @@ // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -1408,7 +1408,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1378,7 +1378,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,7 +72,7 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const bool tiled = frame()->tiled(); -@@ -1426,7 +1426,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1396,7 +1396,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif !BUILDFLAG(IS_CHROMEOS) return gfx::Insets(kResizeBorder); -@@ -1447,7 +1447,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1417,7 +1417,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } 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 4cb9b8a6633d..05f6d106478b 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-03-09 21:38:10 UTC +--- 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 -@@ -70,7 +70,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM +@@ -74,7 +74,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); -@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -92,7 +92,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) -@@ -158,7 +158,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -166,7 +166,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 4bd897be897b..63e84db4c660 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-02-20 09:59:21 UTC +--- 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 @@ -20,7 +20,7 @@ #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h" @@ -9,7 +9,7 @@ #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif -@@ -33,7 +33,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( +@@ -39,7 +39,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( SystemMenuModelDelegate::~SystemMenuModelDelegate() = default; bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { @@ -18,7 +18,7 @@ if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); -@@ -53,7 +53,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c +@@ -59,7 +59,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_omnibox_omnibox__view__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index cabc275b8b2a..b07b18b45ff6 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-03-09 21:38:10 UTC +--- 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 -@@ -2063,7 +2063,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -2064,7 +2064,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc index 014e7870984d..082dd6951b75 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc @@ -42,7 +42,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h" #endif -@@ -172,7 +172,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -175,7 +175,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create } else if (model_state == password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) { view = new SharedPasswordsNotificationView(web_contents, anchor_view); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc new file mode 100644 index 000000000000..5da68016aa08 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/profiles/avatar_toolbar_button.cc.orig 2025-04-15 08:30:07 UTC ++++ chrome/browser/ui/views/profiles/avatar_toolbar_button.cc +@@ -346,7 +346,7 @@ void AvatarToolbarButton::MaybeShowProfileSwitchIPH() + } + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void AvatarToolbarButton::MaybeShowSupervisedUserSignInIPH() { + if (!base::FeatureList::IsEnabled( + feature_engagement::kIPHSupervisedUserProfileSigninFeature)) { 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 new file mode 100644 index 000000000000..adac57190842 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h @@ -0,0 +1,11 @@ +--- 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 +@@ -84,7 +84,7 @@ class AvatarToolbarButton : public ToolbarButton { + // Attempts showing the In-Produce-Help for profile Switching. + void MaybeShowProfileSwitchIPH(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Attempts showing the In-Produce-Help when a supervised user signs-in in a + // profile. + void MaybeShowSupervisedUserSignInIPH(); 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 new file mode 100644 index 000000000000..24516caa8538 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -50,7 +50,7 @@ void ProfileMenuCoordinator::Show(bool is_source_accel + browser.window()->NotifyFeaturePromoFeatureUsed( + feature_engagement::kIPHProfileSwitchFeature, + FeaturePromoFeatureUsedAction::kClosePromoIfPresent); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + browser.window()->NotifyFeaturePromoFeatureUsed( + feature_engagement::kIPHSupervisedUserProfileSigninFeature, + 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 37815eebdb24..93c0be38c612 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,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-03-09 21:38:10 UTC +--- 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 @@ -90,7 +90,7 @@ #include "ui/strings/grit/ui_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -563,7 +563,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { +@@ -549,7 +549,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 7f38b4306ad3..642737a16d19 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,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -642,7 +642,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -650,7 +650,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder, /*has_dotted_ring=*/false); 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 4f73a6c3b849..14b3a5264b3e 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-03-09 21:38:10 UTC +--- 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 -@@ -64,7 +64,7 @@ +@@ -65,7 +65,7 @@ namespace { const int kModalDialogWidth = 448; @@ -9,7 +9,7 @@ const int kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 780; -@@ -191,7 +191,7 @@ SigninViewControllerDelegateViews::CreateSignoutConfir +@@ -197,7 +197,7 @@ SigninViewControllerDelegateViews::CreateSignoutConfir } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -370,7 +370,7 @@ SigninViewControllerDelegateViews::SigninViewControlle +@@ -382,7 +382,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) { -@@ -460,7 +460,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -472,7 +472,7 @@ void SigninViewControllerDelegateViews::DisplayModal() content_view_->RequestFocus(); } @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -536,7 +536,7 @@ SigninViewControllerDelegate::CreateSignoutConfirmatio +@@ -553,7 +553,7 @@ SigninViewControllerDelegate::CreateSignoutConfirmatio } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index 30b0d3daeaee..92def2388a27 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h @@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews - base::OnceCallback<void(ChromeSignoutConfirmationChoice)> callback); + SignoutConfirmationCallback callback); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ static std::unique_ptr<views::WebView> CreateManagedUserNoticeConfirmationWebView( Browser* browser, -@@ -141,7 +141,7 @@ class SigninViewControllerDelegateViews +@@ -144,7 +144,7 @@ class SigninViewControllerDelegateViews std::optional<int> dialog_width, InitializeSigninWebDialogUI initialize_signin_web_dialog_ui); 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 e63200429fb0..70debee602ea 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-03-09 21:38:10 UTC +--- 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 -@@ -212,7 +212,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -189,7 +189,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(); -@@ -415,7 +415,7 @@ TabDragController::Liveness TabDragController::Init( +@@ -392,7 +392,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -18,8 +18,8 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -1004,7 +1004,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon - SetCapture(target_context); +@@ -954,7 +954,7 @@ TabDragController::Liveness TabDragController::DragBro + CHECK_EQ(SetCapture(target_context), Liveness::ALIVE); } -#if !BUILDFLAG(IS_LINUX) @@ -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. -@@ -2137,7 +2137,7 @@ void TabDragController::CompleteDrag() { +@@ -2097,7 +2097,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 -@@ -2616,7 +2616,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2527,7 +2527,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 945837bca76f..d979fec9c712 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-03-09 21:38:10 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -633,7 +633,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -644,7 +644,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 f1ff0e3401d6..cebfab21257b 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-02-20 09:59:21 UTC +--- 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 -@@ -378,7 +378,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -379,7 +379,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__style__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc index 7d747a4a0496..9ff5a9530999 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-03-09 21:38:10 UTC +--- 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 -@@ -528,7 +528,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con +@@ -511,7 +511,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 dfcf4bd9ab02..a84148d9b910 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,7 +1,7 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -889,7 +889,7 @@ void MaybeRegisterChromeFeaturePromos( - "defaulted to saved for the first time."))); +@@ -917,7 +917,7 @@ void MaybeRegisterChromeFeaturePromos( + "Triggered when a shared tab becomes the active tab."))); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ // kIPHSupervisedUserProfileSigninFeature registry.RegisterFeature(std::move( FeaturePromoSpecification::CreateForCustomAction( -@@ -1143,7 +1143,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -1171,7 +1171,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_views_web__apps_web__app__integration__test__driver.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index 4769a9f0271b..4d9a90862e5d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc @@ -510,7 +510,7 @@ std::string GetFileExtension(FileExtension file_extens } @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4242,7 +4242,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4243,7 +4243,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const webapps::AppId& app_id) { @@ -63,7 +63,7 @@ return override_registration_->test_override().GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4442,7 +4442,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4443,7 +4443,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const webapps::AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -72,7 +72,7 @@ bool is_shortcut_correct = override_registration_->test_override().IsShortcutCreated(profile, id, name); -@@ -4486,7 +4486,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4487,7 +4487,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h index 59266db262bd..32a270775c5d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h -@@ -224,7 +224,7 @@ class WebAppUiManagerImpl : public BrowserListObserver +@@ -225,7 +225,7 @@ class WebAppUiManagerImpl : public BrowserListObserver UninstallCompleteCallback uninstall_complete_callback, webapps::UninstallResultCode uninstall_code); 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 9c7658393c99..53a75d1aeda1 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-03-09 21:38:10 UTC +--- 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 -@@ -138,26 +138,26 @@ +@@ -137,26 +137,26 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif // BUILDFLAG(IS_WIN) @@ -31,7 +31,7 @@ #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -185,7 +185,7 @@ +@@ -184,7 +184,7 @@ #include "chrome/browser/ui/webui/signin/signin_error_ui.h" #endif // !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) @@ -40,7 +40,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) -@@ -318,7 +318,7 @@ void RegisterChromeWebUIConfigs() { +@@ -322,7 +322,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>()); #endif // BUILDFLAG(IS_ANDROID) @@ -49,7 +49,7 @@ map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_OPENBSD) -@@ -343,7 +343,7 @@ void RegisterChromeWebUIConfigs() { +@@ -347,7 +347,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>()); #endif // BUILDFLAG(IS_WIN) @@ -58,7 +58,7 @@ map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>()); map.AddWebUIConfig(std::make_unique<WebAppSettingsUIConfig>()); map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>()); -@@ -351,13 +351,13 @@ void RegisterChromeWebUIConfigs() { +@@ -355,13 +355,13 @@ void RegisterChromeWebUIConfigs() { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 0a1b16da1546..d2026c6ee834 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,4 +1,4 @@ ---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -74,7 +74,7 @@ #include "components/security_interstitials/content/captive_portal_blocking_page.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" -@@ -407,7 +407,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa +@@ -420,7 +420,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa } #endif @@ -18,7 +18,7 @@ std::unique_ptr<SupervisedUserVerificationPageForYouTube> CreateSupervisedUserVerificationPageForYouTube( content::WebContents* web_contents, -@@ -634,7 +634,7 @@ void InterstitialHTMLSource::StartDataRequest( +@@ -647,7 +647,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_settings_appearance__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index 39ea42a50161..9e1b4ffa68e7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -33,7 +33,7 @@ void AppearanceHandler::RegisterMessages() { +@@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", base::BindRepeating(&AppearanceHandler::HandleUseTheme, base::Unretained(this), ui::SystemTheme::kDefault)); 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 95c77c545f3d..4ea2b5adf418 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-03-09 21:38:10 UTC +--- 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 -@@ -136,7 +136,7 @@ +@@ -137,7 +137,7 @@ #include "chrome/browser/ui/webui/settings/system_handler.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -155,7 +155,7 @@ +@@ -156,7 +156,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -280,7 +280,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -281,7 +281,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"focusHighlightLabel", IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif @@ -27,7 +27,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -580,7 +580,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -570,7 +570,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}, -@@ -588,7 +588,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -578,7 +578,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif @@ -45,12 +45,21 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -612,7 +612,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - html_source->AddBoolean("toolbarPinningEnabled", - features::IsToolbarPinningEnabled()); +@@ -600,7 +600,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + html_source->AddBoolean("tabSearchIsRightAlignedAtStartup", + tabs::GetTabSearchTrailingTabstrip(profile)); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations; +@@ -1478,7 +1478,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource* + g_browser_process->GetApplicationLocale()) + .spec(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + html_source->AddString( + "syncDisconnectManagedProfileExplanation", + l10n_util::GetStringFUTF8( 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 new file mode 100644 index 000000000000..d26cf46b6892 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_upgrade__detector_version__history__client.cc @@ -0,0 +1,11 @@ +--- chrome/browser/upgrade_detector/version_history_client.cc.orig 2025-04-15 08:30:07 UTC ++++ chrome/browser/upgrade_detector/version_history_client.cc +@@ -50,7 +50,7 @@ GURL GetVersionReleasesUrl(base::Version version) { + #define CURRENT_PLATFORM "win" + #endif + +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + #define CURRENT_PLATFORM "linux" + diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc index d6e822590429..1b118cfd9da8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/commands/launch_web_app_command.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/web_applications/commands/launch_web_app_command.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/web_applications/commands/launch_web_app_command.cc -@@ -98,7 +98,7 @@ void LaunchWebAppCommand::StartWithLock(std::unique_pt +@@ -101,7 +101,7 @@ void LaunchWebAppCommand::StartWithLock(std::unique_pt // OsIntegrationTestOverride can use the xdg install command to detect // install. SynchronizeOsOptions options; 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 5c5bf9637483..e971b5f826a8 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-03-09 21:38:10 UTC +--- 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 -@@ -657,7 +657,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu +@@ -660,7 +660,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu } } 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 705ac959d85c..18867498ec0e 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-03-09 21:38:10 UTC +--- 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 -@@ -107,7 +107,7 @@ namespace web_app { +@@ -105,7 +105,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 055408e0ceeb..c00447aea71d 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,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -636,7 +636,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -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 165ce56c65aa..81c8f174a3b4 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,6 +1,6 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -710,7 +710,7 @@ base::flat_set<GaiaId> GetGaiaIDs( +@@ -711,7 +711,7 @@ base::flat_set<GaiaId> GetGaiaIDs( std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ return label; #else return std::string("placeholder"); -@@ -720,7 +720,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer +@@ -721,7 +721,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) || \ 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 57770e80faed..4c8958afc45a 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,6 +1,6 @@ ---- chrome/browser/webauthn/unexportable_key_utils.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/webauthn/unexportable_key_utils.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/browser/webauthn/unexportable_key_utils.cc -@@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() { +@@ -34,7 +34,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 = diff --git a/www/ungoogled-chromium/files/patch-chrome_common_channel__info.h b/www/ungoogled-chromium/files/patch-chrome_common_channel__info.h index 5be4fa1f1657..24d5d187bfbb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_channel__info.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_channel__info.h @@ -1,15 +1,15 @@ ---- chrome/common/channel_info.h.orig 2024-06-22 08:49:42 UTC +--- chrome/common/channel_info.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/channel_info.h -@@ -12,7 +12,7 @@ +@@ -11,7 +11,7 @@ + #include "build/branding_buildflags.h" #include "build/build_config.h" - #include "build/chromeos_buildflags.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) namespace base { class Environment; } -@@ -100,7 +100,7 @@ void ClearChannelIdForTesting(); +@@ -99,7 +99,7 @@ void ClearChannelIdForTesting(); std::string GetChannelSuffixForDataDir(); #endif 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 2818e45c3508..07eb8b4c647d 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 2024-10-27 06:40:35 UTC +--- chrome/common/channel_info_posix.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/common/channel_info_posix.cc -@@ -95,7 +95,7 @@ std::string GetChannelSuffixForDataDir() { +@@ -94,7 +94,7 @@ std::string GetChannelSuffixForDataDir() { } } @@ -9,12 +9,12 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) const auto channel_state = GetChannelImpl(); -@@ -123,7 +123,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() +@@ -120,7 +120,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() + } + #endif // BUILDFLAG(IS_LINUX) - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string GetDesktopName(base::Environment* env) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) // Google Chrome packaged as a snap is a special case: the application name 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 d4ed4b4f4437..2716f1a091b0 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-03-09 21:38:10 UTC +--- chrome/common/chrome_features.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/common/chrome_features.cc -@@ -75,7 +75,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, +@@ -80,7 +80,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, -@@ -93,7 +93,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -98,7 +98,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. -@@ -220,7 +220,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -233,7 +233,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -246,7 +246,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -259,7 +259,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); @@ -36,7 +36,7 @@ // 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. -@@ -817,7 +817,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -834,7 +834,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -830,7 +830,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -847,7 +847,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 d009dbc92ec3..ad55aa5943fe 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2025-03-09 21:38:10 UTC +--- chrome/common/chrome_features.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/chrome_features.h -@@ -55,13 +55,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); +@@ -50,13 +50,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -153,7 +153,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -146,7 +146,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); -@@ -500,7 +500,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -494,7 +494,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; -@@ -508,7 +508,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -502,7 +502,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 bd89b3cb7a8f..d7d651300121 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/common/chrome_paths.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/common/chrome_paths.cc @@ -30,7 +30,7 @@ #include "base/apple/foundation_util.h" @@ -9,7 +9,7 @@ #include "components/policy/core/common/policy_paths.h" #endif -@@ -52,14 +52,14 @@ +@@ -44,14 +44,14 @@ namespace { @@ -27,7 +27,7 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -221,7 +221,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -208,7 +208,7 @@ bool PathProvider(int key, base::FilePath* result) { } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -36,7 +36,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -527,7 +527,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -500,13 +500,13 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -45,16 +45,14 @@ case chrome::DIR_POLICY_FILES: { cur = base::FilePath(policy::kPolicyPath); break; -@@ -538,7 +538,7 @@ bool PathProvider(int key, base::FilePath* result) { - #if BUILDFLAG(IS_CHROMEOS_ASH) || \ - ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ - BUILDFLAG(CHROMIUM_BRANDING)) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + } + #endif +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { - return false; -@@ -547,7 +547,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -516,7 +516,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -63,7 +61,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -585,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -554,7 +554,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #if BUILDFLAG(ENABLE_EXTENSIONS) && \ @@ -72,7 +70,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -599,9 +599,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -568,9 +568,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.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.h index 402fa6beba31..f7013dc2b79f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.h @@ -1,15 +1,15 @@ ---- chrome/common/chrome_paths.h.orig 2025-01-25 09:34:31 UTC +--- chrome/common/chrome_paths.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/chrome_paths.h -@@ -62,7 +62,7 @@ enum { - #if BUILDFLAG(IS_CHROMEOS_ASH) || \ - ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ - BUILDFLAG(CHROMIUM_BRANDING)) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +@@ -56,7 +56,7 @@ enum { + // to set policies for chrome. This directory + // contains subdirectories. + #endif +-#if BUILDFLAG(IS_CHROMEOS) || \ ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || BUILDFLAG(IS_MAC) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. - // On Chrome OS, this path is used for OEM -@@ -70,7 +70,7 @@ enum { +@@ -65,7 +65,7 @@ enum { // create it. #endif @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -117,7 +117,7 @@ enum { +@@ -112,7 +112,7 @@ enum { #endif #if BUILDFLAG(ENABLE_EXTENSIONS) && \ 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 a9142cc43a95..261e8700538b 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 2023-10-13 13:20:35 UTC +--- chrome/common/chrome_paths_linux.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/common/chrome_paths_linux.cc -@@ -94,7 +94,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul +@@ -93,7 +93,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 8873b1ef9c32..241fc6dd06b7 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-03-09 21:38:10 UTC +--- chrome/common/chrome_switches.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/common/chrome_switches.cc -@@ -888,7 +888,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -874,7 +874,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. -@@ -906,7 +906,7 @@ const char kGlicAlwaysOpenFre[] = "glic-always-open-fr - const char kGlicFreURL[] = "glic-fre-url"; +@@ -897,7 +897,7 @@ const char kGlicAllowedOrigins[] = "glic-webui-allowed + const char kGlicDev[] = "glic-dev"; #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 f52d88da2700..d6b22f9c3fa2 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-03-09 21:38:10 UTC +--- chrome/common/chrome_switches.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/chrome_switches.h -@@ -275,7 +275,7 @@ extern const char kAllowNaClSocketAPI[]; +@@ -271,7 +271,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[]; -@@ -288,7 +288,7 @@ extern const char kGlicAlwaysOpenFre[]; - extern const char kGlicFreURL[]; +@@ -286,7 +286,7 @@ extern const char kGlicAllowedOrigins[]; + extern const char kGlicDev[]; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_crash__keys.cc b/www/ungoogled-chromium/files/patch-chrome_common_crash__keys.cc index b9a763c196ca..69c3ef665408 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_crash__keys.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_crash__keys.cc @@ -1,6 +1,6 @@ ---- chrome/common/crash_keys.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/common/crash_keys.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/common/crash_keys.cc -@@ -52,7 +52,9 @@ class CrashKeyWithName { +@@ -51,7 +51,9 @@ class CrashKeyWithName { ~CrashKeyWithName() = delete; std::string_view Name() const { return name_; } @@ -10,7 +10,7 @@ void Clear() { crash_key_.Clear(); } void Set(std::string_view value) { crash_key_.Set(value); } -@@ -197,6 +199,7 @@ void AllocateCrashKeyInBrowserAndChildren(std::string_ +@@ -196,6 +198,7 @@ void AllocateCrashKeyInBrowserAndChildren(std::string_ GetCommandLineStringAnnotations().emplace_back(std::string(key)).Set(value); } @@ -18,7 +18,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::CommandLine* command_line) { std::string string_annotations; for (const auto& crash_key : GetCommandLineStringAnnotations()) { -@@ -211,6 +214,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::Co +@@ -210,6 +213,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::Co } command_line->AppendSwitchASCII(kStringAnnotationsSwitch, string_annotations); } diff --git a/www/ungoogled-chromium/files/patch-chrome_common_extensions_extension__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_extensions_extension__constants.cc index 654b8d2f08b3..47aaa5a518b1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_extensions_extension__constants.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_extensions_extension__constants.cc @@ -1,9 +1,9 @@ ---- chrome/common/extensions/extension_constants.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/common/extensions/extension_constants.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/common/extensions/extension_constants.cc -@@ -46,7 +46,7 @@ const char* const kBuiltInFirstPartyExtensionIds[] = { - #if !BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -38,7 +38,7 @@ const char* const kBuiltInFirstPartyExtensionIds[] = { + kGoogleSpeechSynthesisExtensionId, + #endif // BUILDFLAG(IS_CHROMEOS) kReadingModeGDocsHelperExtensionId, - #endif // !BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) kTTSEngineExtensionId, diff --git a/www/ungoogled-chromium/files/patch-chrome_common_extensions_extension__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_extensions_extension__constants.h index 5a1010c076ea..8e46a74a17c2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_extensions_extension__constants.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_extensions_extension__constants.h @@ -1,9 +1,9 @@ ---- chrome/common/extensions/extension_constants.h.orig 2025-02-20 09:59:21 UTC +--- chrome/common/extensions/extension_constants.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/extensions/extension_constants.h -@@ -332,7 +332,7 @@ inline constexpr base::FilePath::CharType +@@ -310,7 +310,7 @@ inline constexpr char kReadingModeGDocsHelperExtension + inline constexpr base::FilePath::CharType kReadingModeGDocsHelperManifestFilename[] = FILE_PATH_LITERAL("reading_mode_gdocs_helper_manifest.json"); - #endif // !BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // The extension id of the google tts engine extension to use on-device natural diff --git a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc index b5862fc44037..1256550f4c70 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_registration.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/common/media/cdm_registration.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/common/media/cdm_registration.cc -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #if BUILDFLAG(ENABLE_WIDEVINE) #include "components/cdm/common/cdm_manifest.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck @@ -9,7 +9,7 @@ #include "base/native_library.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" -@@ -52,7 +52,7 @@ using Robustness = content::CdmInfo::Robustness; +@@ -51,7 +51,7 @@ using Robustness = content::CdmInfo::Robustness; #if BUILDFLAG(ENABLE_WIDEVINE) #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \ @@ -18,7 +18,7 @@ // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and // |capability|. std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo( -@@ -97,7 +97,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid +@@ -93,7 +93,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid // BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \ @@ -27,7 +27,7 @@ // On Linux/ChromeOS we have to preload the CDM since it uses the zygote // sandbox. On Windows and Mac, CDM registration is handled by Component // Update (as the CDM can be loaded only when needed). -@@ -121,7 +121,7 @@ std::unique_ptr<content::CdmInfo> GetBundledWidevine() +@@ -117,7 +117,7 @@ std::unique_ptr<content::CdmInfo> GetBundledWidevine() // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) #if (BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ @@ -36,16 +36,16 @@ // This code checks to see if Component Updater picked a version of the Widevine // CDM to be used last time it ran. (Component Updater may choose the bundled // CDM if there is not a new version available for download.) If there is one -@@ -163,7 +163,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd +@@ -159,7 +159,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName, - kWidevineCdmType, base::Version(), base::FilePath()); + kWidevineCdmType, base::FilePath()); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The Widevine CDM on Linux/ChromeOS needs to be registered (and loaded) // before the zygote is locked down. The CDM can be found from the version // bundled with Chrome (if BUNDLE_WIDEVINE_CDM = true) and/or the version -@@ -388,7 +388,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd +@@ -385,7 +385,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd } #if BUILDFLAG(ENABLE_WIDEVINE) && \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h index 699569a10c26..9b9a14c78329 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h @@ -1,11 +1,11 @@ ---- chrome/common/media/cdm_registration.h.orig 2024-07-31 14:19:23 UTC +--- chrome/common/media/cdm_registration.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/media/cdm_registration.h -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cdms); #if BUILDFLAG(ENABLE_WIDEVINE) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) // Returns the software secure Widevine CDM, if one exists. std::vector<content::CdmInfo> GetSoftwareSecureWidevine(); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h index b656296c38c9..64c937f7c779 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h @@ -1,9 +1,9 @@ ---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2024-06-22 08:49:42 UTC +--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/media/component_widevine_cdm_hint_file_linux.h -@@ -17,7 +17,7 @@ +@@ -14,7 +14,7 @@ + #error "This file only applies when Widevine used." + #endif - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) #error "This file only applies to desktop Linux and ChromeOS." 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 7379945490b0..bc65a2c65055 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h @@ -1,15 +1,15 @@ ---- chrome/common/pref_names.h.orig 2025-03-09 21:38:10 UTC +--- chrome/common/pref_names.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/pref_names.h -@@ -1340,7 +1340,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1325,7 +1325,7 @@ inline constexpr char kGeminiSettings[] = "browser.gem + inline constexpr char kAllowedDomainsForApps[] = + "settings.allowed_domains_for_apps"; - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1517,7 +1517,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1502,7 +1502,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -2135,7 +2135,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2120,7 +2120,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2630,14 +2630,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2613,14 +2613,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2729,7 +2729,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ +@@ -2712,7 +2712,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ inline constexpr char kIsolatedWebAppPendingInitializationCount[] = "profile.isolated_web_app.install.pending_initialization_count"; @@ -53,7 +53,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3253,7 +3253,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3236,7 +3236,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -62,7 +62,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3845,7 +3845,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo +@@ -3764,7 +3764,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,7 +71,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -4041,7 +4041,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = +@@ -3960,7 +3960,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = "policy.lens_desktop_ntp_search_enabled"; #endif @@ -80,7 +80,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 -@@ -4135,7 +4135,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4057,7 +4057,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 a20db5a0bc9f..e0dc0f0f735d 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-03-09 21:38:10 UTC +--- chrome/common/url_constants.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/url_constants.h -@@ -978,7 +978,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -981,7 +981,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.h b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h index 9fa8ecdf735f..a46f2331ca38 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-03-09 21:38:10 UTC +--- chrome/common/webui_url_constants.h.orig 2025-04-15 08:30:07 UTC +++ chrome/common/webui_url_constants.h -@@ -508,18 +508,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome +@@ -509,18 +509,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,7 +22,7 @@ inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; -@@ -531,11 +531,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] +@@ -532,11 +532,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -36,7 +36,7 @@ inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser"; -@@ -557,7 +557,7 @@ inline constexpr char kChromeUIProfilePickerGlicQuery[ +@@ -558,7 +558,7 @@ inline constexpr char kChromeUIProfilePickerGlicQuery[ inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc index bb096af138df..394e35e8f2b0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc +++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc @@ -1,20 +1,20 @@ ---- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc -@@ -67,7 +67,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo +@@ -64,7 +64,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + } // namespace + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Fails on bots: crbug.com/174962 #define MAYBE_KeyCodeToText DISABLED_KeyCodeToText #else -@@ -104,7 +104,7 @@ TEST(KeycodeTextConversionTest, MAYBE_KeyCodeToText) { +@@ -98,7 +98,7 @@ TEST(KeycodeTextConversionTest, MAYBE_KeyCodeToText) { + ConvertKeyCodeToTextNoError(ui::VKEY_SHIFT, kShiftKeyModifierMask)); + } - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Fails on bots: crbug.com/174962 #define MAYBE_CharToKeyCode DISABLED_CharToKeyCode #else diff --git a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc index 19e1a6d4bfce..d90eaa0770fe 100644 --- a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc @@ -1,4 +1,4 @@ ---- chrome/utility/services.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/utility/services.cc.orig 2025-04-15 08:30:07 UTC +++ chrome/utility/services.cc @@ -49,7 +49,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" @@ -9,7 +9,7 @@ #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -205,7 +205,7 @@ auto RunMacNotificationService( +@@ -207,7 +207,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -472,7 +472,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -476,7 +476,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 new file mode 100644 index 000000000000..bb60ef7b091c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_BUILD.gn @@ -0,0 +1,28 @@ +--- components/BUILD.gn.orig 2025-04-15 08:30:07 UTC ++++ components/BUILD.gn +@@ -208,7 +208,6 @@ test("components_unittests") { + "//components/content_settings/core/browser:unit_tests", + "//components/content_settings/core/common:unit_tests", + "//components/country_codes:unit_tests", +- "//components/crash/core/common:unit_tests", + "//components/cross_device/logging:unit_tests", + "//components/crx_file:unit_tests", + "//components/data_sharing:unit_tests", +@@ -607,7 +606,7 @@ test("components_unittests") { + deps += [ "//components/cast:unit_tests" ] + } + +- if (!is_fuchsia) { #!iOS and!Fuchsia ++ if (!is_fuchsia && !is_bsd) { #!iOS and!Fuchsia + deps += [ + "//components/crash/content/browser:unit_tests", + "//components/crash/core/app:unit_tests", +@@ -765,7 +764,7 @@ test("components_unittests") { + deps += [ "//components/constrained_window:unit_tests" ] + } + +- if (is_win || is_linux || is_chromeos || is_mac) { ++ if (is_win || (is_linux && !is_bsd) || is_chromeos || is_mac) { + deps += [ "//components/stability_report: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 d161be96652e..2826767e2dd6 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,15 @@ ---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -1168,7 +1168,7 @@ bool PaymentsDataManager::IsServerCard(const CreditCar +@@ -1003,7 +1003,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() { + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + 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) || \ @@ -9,12 +18,12 @@ // 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 -@@ -2021,7 +2021,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( +@@ -2026,7 +2026,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 base::FeatureList::IsEnabled( - features::kAutofillEnableBuyNowPayLaterSyncing); - #else + return app_locale_ == "en-US" && + base::FeatureList::IsEnabled( + features::kAutofillEnableBuyNowPayLaterSyncing); 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 new file mode 100644 index 000000000000..cd82b447e235 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h @@ -0,0 +1,11 @@ +--- 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 +@@ -354,7 +354,7 @@ class PaymentsDataManager : public AutofillWebDataServ + void SetAutofillHasSeenIban(); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Returns the value of the kAutofillHasSeenBnpl pref. + bool IsAutofillHasSeenBnplPrefEnabled() const; + 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 index 9d7d7b6d8330..a518053e21a9 100644 --- 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 @@ -1,11 +1,11 @@ ---- components/autofill/core/browser/integrators/autofill_optimization_guide.cc.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -211,7 +211,7 @@ void AutofillOptimizationGuide::OnDidParseForm( +@@ -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) - if (!server_cards.empty() && - base::FeatureList::IsEnabled( - features::kAutofillEnableAmountExtractionDesktop)) { + 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_payments_bnpl__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc new file mode 100644 index 000000000000..35ef522509ff --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc @@ -0,0 +1,20 @@ +--- components/autofill/core/browser/payments/bnpl_manager.cc.orig 2025-04-15 08:30:07 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); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + payments_autofill_client().GetPaymentsDataManager().SetAutofillHasSeenBnpl(); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) 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 17be4216e8b7..92ac14a5d76d 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-03-09 21:38:10 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2025-04-15 08:30:07 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -292,7 +292,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -269,7 +269,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 080857371f05..652d9742ed54 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,4 +1,4 @@ ---- components/autofill/core/common/autofill_prefs.cc.orig 2025-03-09 21:38:10 UTC +--- components/autofill/core/common/autofill_prefs.cc.orig 2025-04-15 08:30:07 UTC +++ components/autofill/core/common/autofill_prefs.cc @@ -102,7 +102,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif @@ -9,7 +9,7 @@ registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled, false); registry->RegisterBooleanPref( -@@ -294,7 +294,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer +@@ -297,7 +297,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); } -@@ -303,7 +303,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v +@@ -306,7 +306,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v bool IsAutofillBnplEnabled(const PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,3 +27,12 @@ return prefs->GetBoolean(kAutofillBnplEnabled); #else return false; +@@ -315,7 +315,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) { + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // If called, always sets the pref to true, and once true, it will follow the + // user around forever. + void SetAutofillHasSeenBnpl(PrefService* prefs) { 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 b91dc2dc3c2c..7dd2765ac095 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,4 +1,4 @@ ---- components/autofill/core/common/autofill_prefs.h.orig 2025-03-09 21:38:10 UTC +--- components/autofill/core/common/autofill_prefs.h.orig 2025-04-15 08:30:07 UTC +++ components/autofill/core/common/autofill_prefs.h @@ -26,7 +26,7 @@ namespace autofill::prefs { inline constexpr std::string_view kAutofillAblationSeedPref = @@ -8,8 +8,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Boolean that is true if BNPL on Autofill is enabled. inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled"; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -80,7 +80,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] = + // 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) || \ @@ -18,7 +18,7 @@ // 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 -@@ -235,7 +235,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs, +@@ -237,7 +237,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs, bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,3 +27,12 @@ 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 + bool IsAutofillBnplEnabled(const PrefService* prefs); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void SetAutofillHasSeenBnpl(PrefService* prefs); + + bool HasSeenBnpl(const PrefService* prefs); 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 85fff23d3e98..88d7a271dac3 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,15 +1,15 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2025-03-09 21:38:10 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2025-04-15 08:30:07 UTC +++ components/commerce/core/commerce_feature_list.cc -@@ -157,7 +157,7 @@ BASE_FEATURE(kPriceInsights, +@@ -156,7 +156,7 @@ BASE_FEATURE(kPriceAnnotationsRegionLaunched, + BASE_FEATURE(kPriceInsights, "PriceInsights", base::FEATURE_DISABLED_BY_DEFAULT); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) +-#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) BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -218,7 +218,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, +@@ -222,7 +222,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true}; #else -@@ -227,7 +227,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ +@@ -231,7 +231,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, "EnableDiscountInfoApiRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -242,7 +242,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi +@@ -246,7 +246,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting, "DiscountDialogAutoPopupBehaviorSetting", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -283,7 +283,8 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl +@@ -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) || \ diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h index dde6febc9db2..1d94f509c270 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h @@ -1,6 +1,6 @@ ---- components/device_signals/core/browser/signals_aggregator_impl.h.orig 2023-07-21 09:49:17 UTC +--- components/device_signals/core/browser/signals_aggregator_impl.h.orig 2025-04-15 08:30:07 UTC +++ components/device_signals/core/browser/signals_aggregator_impl.h -@@ -29,7 +29,7 @@ class SignalsAggregatorImpl : public SignalsAggregator +@@ -30,7 +30,7 @@ class SignalsAggregatorImpl : public SignalsAggregator ~SignalsAggregatorImpl() override; // SignalsAggregator: 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 d56801b7dc6f..45d04b6d186d 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,7 +1,7 @@ ---- components/device_signals/core/common/signals_features.cc.orig 2025-03-09 21:38:10 UTC +--- components/device_signals/core/common/signals_features.cc.orig 2025-04-15 08:30:07 UTC +++ components/device_signals/core/common/signals_features.cc -@@ -11,7 +11,7 @@ BASE_FEATURE(kAllowClientCertificateReportingForUsers, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -31,7 +31,7 @@ bool IsBrowserSignalsReportingEnabled() { + } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) 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 1016b194d65d..03487a4a22f1 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,7 +1,7 @@ ---- components/device_signals/core/common/signals_features.h.orig 2025-03-09 21:38:10 UTC +--- components/device_signals/core/common/signals_features.h.orig 2025-04-15 08:30:07 UTC +++ components/device_signals/core/common/signals_features.h -@@ -14,7 +14,7 @@ namespace enterprise_signals::features { - BASE_DECLARE_FEATURE(kAllowClientCertificateReportingForUsers); +@@ -24,7 +24,7 @@ bool IsProfileSignalsReportingEnabled(); + bool IsBrowserSignalsReportingEnabled(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc b/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc index 3bd131f2ada3..fc8bcc102c01 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc +++ b/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc @@ -1,11 +1,11 @@ ---- components/device_signals/test/signals_contract.cc.orig 2023-09-17 07:59:53 UTC +--- components/device_signals/test/signals_contract.cc.orig 2025-04-15 08:30:07 UTC +++ components/device_signals/test/signals_contract.cc -@@ -212,7 +212,7 @@ GetSignalsContract() { +@@ -221,7 +221,7 @@ GetSignalsContract(bool is_av_signal_enabled) { base::BindRepeating(VerifyUnset, names::kCrowdStrike); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUIDLFLAG(IS_BSD) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) contract[names::kAllowScreenLock] = base::BindRepeating(VerifyUnset, names::kAllowScreenLock); contract[names::kImei] = base::BindRepeating(VerifyUnset, names::kImei); 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 68e883f5fc87..f37b6c2c755b 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,6 +1,6 @@ ---- components/embedder_support/user_agent_utils.cc.orig 2025-03-09 21:38:10 UTC +--- components/embedder_support/user_agent_utils.cc.orig 2025-04-15 08:30:07 UTC +++ components/embedder_support/user_agent_utils.cc -@@ -455,6 +455,9 @@ std::string GetPlatformForUAMetadata() { +@@ -439,6 +439,9 @@ std::string GetPlatformForUAMetadata() { # else return "Chromium OS"; # endif 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 6dc6a4f6e4c2..ec3584ad0dd4 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,15 +1,6 @@ ---- components/embedder_support/user_agent_utils_unittest.cc.orig 2025-03-09 21:38:10 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2025-04-15 08:30:07 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -71,7 +71,7 @@ const char kDesktop[] = - "X11; CrOS x86_64 14541.0.0" - #elif BUILDFLAG(IS_FUCHSIA) - "Fuchsia" --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - "X11; Linux x86_64" - #elif BUILDFLAG(IS_MAC) - "Macintosh; Intel Mac OS X 10_15_7" -@@ -171,7 +171,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -151,7 +151,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) ASSERT_EQ("CrOS", pieces[0]); ASSERT_EQ("x86_64", pieces[1]); ASSERT_EQ("14541.0.0", pieces[2]); @@ -18,7 +9,16 @@ // Post-UA Reduction there is a single <unifiedPlatform> value for Linux: // X11; Linux x86_64 ASSERT_EQ(2u, pieces.size()); -@@ -703,7 +703,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) { +@@ -339,7 +339,7 @@ class UserAgentUtilsTest : public testing::Test, + "X11; CrOS x86_64 14541.0.0"; + #elif BUILDFLAG(IS_FUCHSIA) + "Fuchsia"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + "X11; Linux x86_64"; + #elif BUILDFLAG(IS_MAC) + "Macintosh; Intel Mac OS X 10_15_7"; +@@ -699,7 +699,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 new file mode 100644 index 000000000000..19b3c1bdbf2e --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -190,7 +190,7 @@ void RealtimeReportingClientBase::ReportEvent( + event.mutable_time()->set_nanos((timestamp_millis % 1000) * 1000000); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet) + 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 + if (include_profile_user_name) { + event.Set(kKeyProfileUserName, GetProfileUserName()); + } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet) + MaybeCollectDeviceSignalsAndReportEventDeprecated(std::move(event), client, + name, settings, time); + #else 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 440db47d76f7..01610238afd1 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-03-09 21:38:10 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2025-04-15 08:30:07 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -100,7 +100,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro @@ -16,9 +16,9 @@ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { - std::optional<FeatureConfig> config = FeatureConfig(); - config->valid = true; -@@ -1724,7 +1724,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi + FeatureConfig config; + config.valid = true; +@@ -1722,7 +1722,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc index f0a7b8291bef..2f7a14c43b69 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-03-09 21:38:10 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2025-04-15 08:30:07 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,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", -@@ -667,7 +667,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -682,7 +682,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) BASE_FEATURE(kIPHAutofillCardInfoRetrievalSuggestionFeature, "IPH_AutofillCardInfoRetrievalSuggestion", -@@ -811,7 +811,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -823,7 +823,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 98ea3d7ac05e..aadb775060b4 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-03-09 21:38:10 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2025-04-15 08:30:07 UTC +++ components/feature_engagement/public/feature_constants.h @@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode); FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature); @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); #endif -@@ -295,7 +295,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg +@@ -303,7 +303,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg #endif // BUILDFLAG(IS_IOS) @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) FEATURE_CONSTANTS_DECLARE_FEATURE( kIPHAutofillCardInfoRetrievalSuggestionFeature); -@@ -353,7 +353,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA +@@ -359,7 +359,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif @@ -26,4 +26,4 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch); FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunchAppInTab); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHSupervisedUserProfileSigninFeature); 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 9546c545a98c..7df2bb1f757e 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-03-09 21:38:10 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2025-04-15 08:30:07 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -165,7 +165,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSReminderNotificationsOverflowMenuBubbleFeature, +@@ -170,7 +170,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) &kEsbDownloadRowPromoFeature, #endif -@@ -236,7 +236,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -241,7 +241,7 @@ const base::Feature* const kAllFeatures[] = { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) &kIPHAutofillCardInfoRetrievalSuggestionFeature, &kIPHAutofillCreditCardBenefitFeature, -@@ -290,7 +290,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -294,7 +294,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS) @@ -26,4 +26,4 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) &kIPHDesktopPWAsLinkCapturingLaunch, &kIPHDesktopPWAsLinkCapturingLaunchAppInTab, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + &kIPHSupervisedUserProfileSigninFeature, 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 1d2a812e9b66..ecadc91dd219 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-03-09 21:38:10 UTC +--- components/feature_engagement/public/feature_list.h.orig 2025-04-15 08:30:07 UTC +++ components/feature_engagement/public/feature_list.h -@@ -291,7 +291,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSReminderNotificationsOve +@@ -302,7 +302,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDownloadAutoDeletionFeat #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); #endif -@@ -402,7 +402,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe +@@ -415,7 +415,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit"); -@@ -496,7 +497,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -509,7 +510,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS) @@ -28,16 +28,16 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab, -@@ -662,7 +663,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat - VARIATION_ENTRY(kIPHiOSDefaultBrowserBannerPromoFeature), - VARIATION_ENTRY(kIPHiOSReminderNotificationsOverflowMenuBubbleFeature), +@@ -682,7 +683,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat + kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature), + VARIATION_ENTRY(kIPHiOSDownloadAutoDeletionFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -722,7 +723,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -743,7 +744,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -47,7 +47,7 @@ VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature), VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature), -@@ -774,7 +776,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -795,7 +797,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS) @@ -55,4 +55,4 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunch), VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunchAppInTab), - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + VARIATION_ENTRY(kIPHSupervisedUserProfileSigninFeature), 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 new file mode 100644 index 000000000000..ece4723996c3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_buildflags_buildflags.gni @@ -0,0 +1,14 @@ +--- components/gwp_asan/buildflags/buildflags.gni.orig 2025-04-15 08:30:07 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_win && (current_cpu == "x64" || current_cpu == "arm64")) || +- (is_android && !is_component_build && enable_frame_pointers) ++supported_platform = false + + declare_args() { + # Is GWP-ASan malloc/PartitionAlloc hooking enabled for chrome/ on a given diff --git a/www/ungoogled-chromium/files/patch-components_metrics_dwa_dwa__service.cc b/www/ungoogled-chromium/files/patch-components_metrics_dwa_dwa__service.cc index 35084f1bccd0..04a8a5f8cf8d 100644 --- a/www/ungoogled-chromium/files/patch-components_metrics_dwa_dwa__service.cc +++ b/www/ungoogled-chromium/files/patch-components_metrics_dwa_dwa__service.cc @@ -1,6 +1,6 @@ ---- components/metrics/dwa/dwa_service.cc.orig 2025-01-25 09:34:31 UTC +--- components/metrics/dwa/dwa_service.cc.orig 2025-04-15 08:30:07 UTC +++ components/metrics/dwa/dwa_service.cc -@@ -161,7 +161,7 @@ void DwaService::RecordCoarseSystemInformation( +@@ -162,7 +162,7 @@ void DwaService::RecordCoarseSystemInformation( coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_WINDOWS); #elif BUILDFLAG(IS_MAC) coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_MACOS); 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 a66d27cc950a..01c74febb710 100644 --- a/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc @@ -1,4 +1,4 @@ ---- components/metrics/metrics_log.cc.orig 2025-03-09 21:38:10 UTC +--- components/metrics/metrics_log.cc.orig 2025-04-15 08:30:07 UTC +++ components/metrics/metrics_log.cc @@ -61,7 +61,7 @@ #include "base/win/current_module.h" @@ -18,7 +18,7 @@ metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { -@@ -435,7 +435,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -441,7 +441,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); @@ -27,7 +27,7 @@ // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); -@@ -452,7 +452,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -458,7 +458,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif diff --git a/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h b/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h index 49f6e8405174..cfc3ee44a6fd 100644 --- a/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h +++ b/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h @@ -1,20 +1,23 @@ ---- components/named_mojo_ipc_server/connection_info.h.orig 2024-10-01 07:26:23 UTC +--- components/named_mojo_ipc_server/connection_info.h.orig 2025-04-15 08:30:07 UTC +++ components/named_mojo_ipc_server/connection_info.h -@@ -12,7 +12,7 @@ +@@ -12,7 +12,10 @@ #include "base/win/scoped_handle.h" #elif BUILDFLAG(IS_MAC) #include <bsm/libbsm.h> -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_OPENBSD) ++#include <sys/ucred.h> ++#endif #include <sys/socket.h> #endif -@@ -29,7 +29,7 @@ struct ConnectionInfo { +@@ -29,7 +32,7 @@ struct ConnectionInfo { base::ProcessId pid{}; #if BUILDFLAG(IS_MAC) audit_token_t audit_token{}; -#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) ucred credentials{}; #endif }; diff --git a/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc b/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc new file mode 100644 index 000000000000..159761eb3724 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc @@ -0,0 +1,12 @@ +--- components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc.orig 2025-04-15 08:30:07 UTC ++++ components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc +@@ -89,7 +89,9 @@ void NamedMojoServerEndpointConnectorLinux::OnSocketRe + PLOG(ERROR) << "getsockopt failed."; + return; + } ++#if !BUILDFLAG(IS_OPENBSD) + info->pid = info->credentials.pid; ++#endif + + mojo::PlatformChannelEndpoint endpoint( + mojo::PlatformHandle(std::move(connection_fd))); diff --git a/www/ungoogled-chromium/files/patch-components_named__system__lock_BUILD.gn b/www/ungoogled-chromium/files/patch-components_named__system__lock_BUILD.gn new file mode 100644 index 000000000000..908945425832 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_named__system__lock_BUILD.gn @@ -0,0 +1,20 @@ +--- components/named_system_lock/BUILD.gn.orig 2025-04-15 08:30:07 UTC ++++ components/named_system_lock/BUILD.gn +@@ -5,7 +5,7 @@ + static_library("named_system_lock") { + sources = [ "lock.h" ] + deps = [ "//base" ] +- if (is_linux) { ++ if (!is_bsd && is_linux) { + sources += [ "lock_linux.cc" ] + } else if (is_mac) { + sources += [ "lock_mac.mm" ] +@@ -20,7 +20,7 @@ source_set("unit_tests") { + sources = [] + + # Disable NamedSystemLockTest on unsupported platforms. +- if (is_linux || is_win || is_mac) { ++ if (!is_bsd && (is_linux || is_win || is_mac)) { + sources += [ "lock_unittest.cc" ] + } + diff --git a/www/ungoogled-chromium/files/patch-components_named__system__lock_lock__unittest.cc b/www/ungoogled-chromium/files/patch-components_named__system__lock_lock__unittest.cc new file mode 100644 index 000000000000..902236bdcf08 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_named__system__lock_lock__unittest.cc @@ -0,0 +1,29 @@ +--- components/named_system_lock/lock_unittest.cc.orig 2025-04-15 08:30:07 UTC ++++ components/named_system_lock/lock_unittest.cc +@@ -18,7 +18,7 @@ + #include "build/build_config.h" + #include "testing/gtest/include/gtest/gtest.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <fcntl.h> + #include <sys/mman.h> + +@@ -45,7 +45,7 @@ class NamedSystemLockTest : public ::testing::Test { + const std::string lock_name_ = base::UnguessableToken::Create().ToString(); + + std::unique_ptr<ScopedLock> CreateLock() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + return ScopedLock::Create(lock_name_, base::Seconds(0)); + #else + CSecurityAttributes sa; +@@ -95,7 +95,7 @@ TEST_F(NamedSystemLockTest, TryLockInThreadSuccess) { + EXPECT_TRUE(CreateLock()); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + TEST_F(NamedSystemLockTest, SharedMemoryWrongPermissions) { + // Create a shared memory region with overpermissive perms. + int shm_fd = shm_open(lock_name_.c_str(), O_RDWR | O_CREAT | O_EXCL, diff --git a/www/ungoogled-chromium/files/patch-components_os__crypt_sync_os__crypt.h b/www/ungoogled-chromium/files/patch-components_os__crypt_sync_os__crypt.h index a12464af0928..7da6ac5a80f9 100644 --- a/www/ungoogled-chromium/files/patch-components_os__crypt_sync_os__crypt.h +++ b/www/ungoogled-chromium/files/patch-components_os__crypt_sync_os__crypt.h @@ -1,4 +1,4 @@ ---- components/os_crypt/sync/os_crypt.h.orig 2025-03-09 21:38:10 UTC +--- components/os_crypt/sync/os_crypt.h.orig 2025-04-15 08:30:07 UTC +++ components/os_crypt/sync/os_crypt.h @@ -16,7 +16,7 @@ #include "build/chromecast_buildflags.h" @@ -27,15 +27,6 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyStorageForTesting( base::OnceCallback<std::unique_ptr<KeyStorageLinux>()> -@@ -86,7 +86,7 @@ COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting() - COMPONENT_EXPORT(OS_CRYPT) - void SetEncryptionPasswordForTesting(const std::string& password); - #endif // (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && \ -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ - !(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ - BUILDFLAG(IS_FUCHSIA) - COMPONENT_EXPORT(OS_CRYPT) @@ -111,7 +111,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { // Returns singleton instance of OSCryptImpl. static OSCryptImpl* GetInstance(); @@ -45,7 +36,7 @@ // Set the configuration of OSCryptImpl. // This method, or SetRawEncryptionKey(), must be called before using // EncryptString() and DecryptString(). -@@ -203,7 +203,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -207,7 +207,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { void ResetStateForTesting(); #endif @@ -54,7 +45,7 @@ // For unit testing purposes, inject methods to be used. // |storage_provider_factory| provides the desired |KeyStorage| // implementation. If the provider returns |nullptr|, a hardcoded password -@@ -227,13 +227,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -231,13 +231,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { bool DeriveKey(); #endif // BUILDFLAG(IS_APPLE) 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 baf6feec60c1..9726f6009fde 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,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -35,7 +35,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, +@@ -40,7 +40,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ @@ -9,9 +9,9 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -107,7 +107,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, +@@ -112,7 +112,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, "ReuseDetectionBasedOnPasswordHashes", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 d5c33e149b7e..fcde0596a03d 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,4 +1,4 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2025-02-20 09:59:21 UTC +--- 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 @@ -63,7 +63,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" @@ -18,7 +18,7 @@ bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -897,7 +897,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -898,7 +898,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 ed30f3d693ae..3d4eb29b30ef 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,6 +1,6 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2025-03-09 21:38:10 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2025-04-15 08:30:07 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -471,7 +471,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -492,7 +492,7 @@ void PasswordManager::RegisterProfilePrefs( false); #endif registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); @@ -9,7 +9,7 @@ registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif -@@ -484,7 +484,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -505,7 +505,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 016bec434b48..3a4f0c0f9f62 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-03-09 21:38:10 UTC +--- 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 @@ -31,7 +31,7 @@ #include "net/cert/cert_status_flags.h" @@ -9,7 +9,7 @@ #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" -@@ -539,7 +539,7 @@ class PasswordManagerClient { +@@ -550,7 +550,7 @@ class PasswordManagerClient { CredentialsCallback callback); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ 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 01590b137ae6..85739afd5ff0 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-03-09 21:38:10 UTC +--- 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 -@@ -199,7 +199,7 @@ version_info::Channel StubPasswordManagerClient::GetCh +@@ -201,7 +201,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ 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 e947501f6d63..83460e7f493f 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,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -50,7 +50,7 @@ inline constexpr char kCredentialProviderEnabledOnStar +@@ -59,7 +59,7 @@ inline constexpr char kCredentialProviderEnabledOnStar #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -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. -@@ -359,7 +359,7 @@ inline constexpr char kPasswordChangeFlowNoticeAgreeme +@@ -357,7 +357,7 @@ inline constexpr char kPasswordChangeFlowNoticeAgreeme inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/ungoogled-chromium/files/patch-components_permissions_prediction__service_prediction__common.cc b/www/ungoogled-chromium/files/patch-components_permissions_prediction__service_prediction__common.cc index f974a41e5449..236d3b74a381 100644 --- a/www/ungoogled-chromium/files/patch-components_permissions_prediction__service_prediction__common.cc +++ b/www/ungoogled-chromium/files/patch-components_permissions_prediction__service_prediction__common.cc @@ -1,6 +1,6 @@ ---- components/permissions/prediction_service/prediction_common.cc.orig 2025-02-20 09:59:21 UTC +--- components/permissions/prediction_service/prediction_common.cc.orig 2025-04-15 08:30:07 UTC +++ components/permissions/prediction_service/prediction_common.cc -@@ -32,7 +32,7 @@ int BucketizeValue(int count) { +@@ -34,7 +34,7 @@ int BucketizeValue(int count) { ClientFeatures_Platform GetCurrentPlatformProto() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ return permissions::ClientFeatures_Platform_PLATFORM_DESKTOP; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) return permissions::ClientFeatures_Platform_PLATFORM_MOBILE; -@@ -43,7 +43,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() { +@@ -45,7 +45,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() { ClientFeatures_PlatformEnum GetCurrentPlatformEnumProto() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 1fa1c41f540d..826c86ecac53 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,6 +1,6 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2025-02-20 09:59:21 UTC +--- 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 -@@ -408,7 +408,7 @@ class PolicyTestCase { +@@ -413,7 +413,7 @@ class PolicyTestCase { const std::string os("chromeos_ash"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); 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 19a329d4266f..225fa85225f4 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-02-20 09:59:21 UTC +--- 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 -@@ -739,7 +739,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -741,7 +741,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } 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 c439f8e732af..5759e53f23cd 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 2024-10-27 06:40:35 UTC +--- 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 -@@ -109,7 +109,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { +@@ -110,7 +110,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 4b971e44befd..2e99678dc7d1 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-03-09 21:38:10 UTC +--- components/search_engines/template_url_service.cc.orig 2025-04-15 08:30:07 UTC +++ components/search_engines/template_url_service.cc -@@ -3244,7 +3244,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3426,7 +3426,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_supervised__user_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc index 4a8aca669c2a..740dfb6cfa24 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,15 @@ ---- components/supervised_user/core/common/features.cc.orig 2025-03-09 21:38:10 UTC +--- components/supervised_user/core/common/features.cc.orig 2025-04-15 08:30:07 UTC +++ components/supervised_user/core/common/features.cc -@@ -68,7 +68,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt +@@ -36,7 +36,7 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals, + #endif + + #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000; + + const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs{ +@@ -83,7 +83,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt "UpdatedSupervisedUserExtensionApprovalStrings", base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +18,7 @@ BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -83,7 +83,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens +@@ -98,7 +98,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens #if BUILDFLAG(IS_CHROMEOS) return base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); @@ -18,16 +27,16 @@ bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); bool permissionExtensionsForSupervisedUsersEnabled = -@@ -104,7 +104,7 @@ BASE_FEATURE(kCustomProfileStringsForSupervisedUsers, - "CustomProfileStringsForSupervisedUsers", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -115,7 +115,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens + } + #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(kShowKiteForSupervisedUsers, - "ShowKiteForSupervisedUsers", -@@ -113,13 +113,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, + BASE_FEATURE(kCustomProfileStringsForSupervisedUsers, + "CustomProfileStringsForSupervisedUsers", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -127,13 +127,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers, "ForceSafeSearchForUnauthenticatedSupervisedUsers", @@ -43,7 +52,7 @@ BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog, "EnableSupervisedUserVersionSignOutDialog", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -141,7 +141,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking, +@@ -155,7 +155,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking, // 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 3dbc448aef5e..e7cebb7bd825 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,15 @@ ---- components/supervised_user/core/common/features.h.orig 2025-03-09 21:38:10 UTC +--- components/supervised_user/core/common/features.h.orig 2025-04-15 08:30:07 UTC +++ components/supervised_user/core/common/features.h -@@ -30,7 +30,7 @@ BASE_DECLARE_FEATURE( +@@ -19,7 +19,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals); + BASE_DECLARE_FEATURE(kAllowSubframeLocalWebApprovals); + + #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + 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); @@ -9,16 +18,16 @@ BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #endif -@@ -60,7 +60,7 @@ BASE_DECLARE_FEATURE(kCustomProfileStringsForSupervise +@@ -54,7 +54,7 @@ BASE_DECLARE_FEATURE(kExposedParentalControlNeededForE + bool IsSupervisedUserSkipParentApprovalToInstallExtensionsEnabled(); + #endif // BUILDFLAG(ENABLE_EXTENSIONS) - // Displays a Family Link kite badge on the supervised user avatar in various - // surfaces. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); - #endif - -@@ -68,7 +68,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); + // 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); // unauthenticated (e.g. signed out of the content area) account. BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); 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 b2599af68c68..6b4433b74202 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-03-09 21:38:10 UTC +--- components/sync_preferences/common_syncable_prefs_database.cc.orig 2025-04-15 08:30:07 UTC +++ components/sync_preferences/common_syncable_prefs_database.cc -@@ -314,7 +314,7 @@ constexpr auto kCommonSyncablePrefsAllowlist = +@@ -319,7 +319,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_user__education_views_help__bubble__view.cc b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc index 88f3f9025191..4ec2e6084eef 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,4 +1,4 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2025-02-20 09:59:21 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2025-04-15 08:30:07 UTC +++ components/user_education/views/help_bubble_view.cc @@ -299,7 +299,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, // TODO(https://crbug.com/382611284): Temporarily handle the case when the @@ -9,7 +9,7 @@ class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver { public: explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble) -@@ -772,7 +772,7 @@ HelpBubbleView::HelpBubbleView( +@@ -774,7 +774,7 @@ HelpBubbleView::HelpBubbleView( event_relay_->Init(this); } 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 44acf9a1b4f9..fcff9d467d4d 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-03-09 21:38:10 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2025-04-15 08:30:07 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1376,7 +1376,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1383,7 +1383,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 0975cc63e023..d49f4b3322aa 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-03-09 21:38:10 UTC +--- 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 -@@ -122,7 +122,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -123,7 +123,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); -@@ -812,7 +812,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -858,7 +858,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_flags__ui_flags__state.cc b/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc index 01db2763dfc5..5c4f3c3b75d4 100644 --- a/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/ungoogled-chromium/files/patch-components_webui_flags_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2025-03-09 21:38:10 UTC -+++ components/flags_ui/flags_state.cc -@@ -770,7 +770,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +--- components/webui/flags/flags_state.cc.orig 2025-04-15 08:30:07 UTC ++++ components/webui/flags/flags_state.cc +@@ -787,7 +787,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsWin; #elif BUILDFLAG(IS_CHROMEOS) return kOsCrOS; diff --git a/www/ungoogled-chromium/files/patch-content_app_content__main.cc b/www/ungoogled-chromium/files/patch-content_app_content__main.cc index 17209767ddf5..7a5dad6e534b 100644 --- a/www/ungoogled-chromium/files/patch-content_app_content__main.cc +++ b/www/ungoogled-chromium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2025-03-09 21:38:10 UTC +--- content/app/content_main.cc.orig 2025-04-15 08:30:07 UTC +++ content/app/content_main.cc -@@ -226,7 +226,7 @@ NO_STACK_PROTECTOR int RunContentProcess( +@@ -227,7 +227,7 @@ NO_STACK_PROTECTOR int RunContentProcess( base::EnableTerminationOnOutOfMemory(); logging::RegisterAbslAbortHook(); @@ -9,8 +9,8 @@ // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client -@@ -311,7 +311,7 @@ NO_STACK_PROTECTOR int RunContentProcess( - command_line->AppendSwitch(switches::kUseMobileUserAgent); +@@ -317,7 +317,7 @@ NO_STACK_PROTECTOR int RunContentProcess( + #endif #endif -#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD) 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 3a18b791bde7..f4cfef4e90d3 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-03-09 21:38:10 UTC +--- content/app/content_main_runner_impl.cc.orig 2025-04-15 08:30:07 UTC +++ content/app/content_main_runner_impl.cc -@@ -142,18 +142,20 @@ +@@ -144,18 +144,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 -@@ -182,6 +184,10 @@ +@@ -184,6 +186,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" -@@ -380,7 +386,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -382,7 +388,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 -@@ -418,7 +424,10 @@ void PreloadLibraryCdms() { +@@ -420,7 +426,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. -@@ -430,9 +439,16 @@ void PreSandboxInit() { +@@ -432,9 +441,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. -@@ -742,7 +758,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( +@@ -748,7 +764,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. -@@ -855,11 +871,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -861,11 +877,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -94,12 +94,14 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1040,8 +1055,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1046,10 +1061,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } +#elif BUILDFLAG(IS_BSD) + PreSandboxInit(); + #elif BUILDFLAG(IS_IOS) + ChildProcessEnterSandbox(); #endif +#if BUILDFLAG(IS_BSD) @@ -115,7 +117,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1138,6 +1165,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { +@@ -1146,6 +1173,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 9043134ba252..0af3aa1f1e01 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-03-09 21:38:10 UTC +--- content/browser/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ content/browser/BUILD.gn -@@ -2524,6 +2524,14 @@ source_set("browser") { +@@ -2543,6 +2543,14 @@ source_set("browser") { ] } @@ -15,7 +15,7 @@ if (is_linux || is_chromeos) { sources -= [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ] -@@ -2569,6 +2577,15 @@ source_set("browser") { +@@ -2588,6 +2596,15 @@ source_set("browser") { if (allow_oop_video_decoder) { sources += [ "media/stable_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] 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 new file mode 100644 index 000000000000..35a04d276f0c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc @@ -0,0 +1,11 @@ +--- content/browser/accessibility/browser_accessibility_state_impl.cc.orig 2025-04-15 08:30:07 UTC ++++ content/browser/accessibility/browser_accessibility_state_impl.cc +@@ -192,7 +192,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta + + // On Android, Mac, Windows and Linux there are platform-specific subclasses. + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_MAC) && \ +- !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++ !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) + // static + std::unique_ptr<BrowserAccessibilityStateImpl> + BrowserAccessibilityStateImpl::Create() { 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 new file mode 100644 index 000000000000..0f0945fde500 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc @@ -0,0 +1,33 @@ +--- 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 +@@ -31,7 +31,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al + std::string cmdline; + std::stringstream ss(cmdline_all); + while (std::getline(ss, cmdline, '\0')) { ++#if BUILDFLAG(IS_BSD) ++ re2::RE2 orca_regex(R"((^|/)(usr/)?(local/)?bin/orca(\s|$))"); ++#else + re2::RE2 orca_regex(R"((^|/)(usr/)?bin/orca(\s|$))"); ++#endif + if (re2::RE2::PartialMatch(cmdline, orca_regex)) { + return true; // Orca was found + } +@@ -57,7 +61,9 @@ class BrowserAccessibilityStateImplAuralinux + + void BrowserAccessibilityStateImplAuralinux::UpdateHistogramsOnOtherThread() { + BrowserAccessibilityStateImpl::UpdateHistogramsOnOtherThread(); +- ++#if BUILDFLAG(IS_BSD) ++ NOTIMPLEMENTED(); ++#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); + } ++#endif + } + + void BrowserAccessibilityStateImplAuralinux::UpdateUniqueUserHistograms() { diff --git a/www/ungoogled-chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc b/www/ungoogled-chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc index 5a13eb1aeab5..54be1a55c441 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/child_thread_type_switcher_linux.cc.orig 2024-10-27 06:40:35 UTC +--- content/browser/child_thread_type_switcher_linux.cc.orig 2025-04-15 08:30:07 UTC +++ content/browser/child_thread_type_switcher_linux.cc @@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee base::ThreadType thread_type) { @@ -8,13 +8,22 @@ + NOTIMPLEMENTED(); +#else bool ns_pid_supported = false; - pid_t peer_tid = base::FindThreadID(peer_pid, ns_tid, &ns_pid_supported); - if (peer_tid == -1) { -@@ -39,6 +42,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee - - base::PlatformThread::SetThreadType(peer_pid, peer_tid, thread_type, - base::IsViaIPC(true)); + pid_t peer_tid = + base::FindThreadID(peer_pid, ns_tid.raw(), &ns_pid_supported); +@@ -41,6 +44,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee + base::PlatformThread::SetThreadType(peer_pid, + base::PlatformThreadId(peer_tid), + thread_type, base::IsViaIPC(true)); +#endif } } // namespace +@@ -69,7 +73,7 @@ void ChildThreadTypeSwitcher::SetPid(base::ProcessId c + } + } + +-void ChildThreadTypeSwitcher::SetThreadType(int32_t ns_tid, ++void ChildThreadTypeSwitcher::SetThreadType(uint64_t ns_tid, + base::ThreadType thread_type) { + // This function is only used on platforms with 32-bit thread ids. + static_assert(sizeof(ns_tid) == sizeof(base::PlatformThreadId)); diff --git a/www/ungoogled-chromium/files/patch-content_browser_child__thread__type__switcher__linux.h b/www/ungoogled-chromium/files/patch-content_browser_child__thread__type__switcher__linux.h new file mode 100644 index 000000000000..df67bddf828d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_child__thread__type__switcher__linux.h @@ -0,0 +1,11 @@ +--- content/browser/child_thread_type_switcher_linux.h.orig 2025-04-15 08:30:07 UTC ++++ content/browser/child_thread_type_switcher_linux.h +@@ -36,7 +36,7 @@ class ChildThreadTypeSwitcher : public mojom::ThreadTy + void SetPid(base::ProcessId child_pid); + + // mojom::ThreadTypeSwitcher: +- void SetThreadType(int32_t ns_tid, base::ThreadType thread_type) override; ++ void SetThreadType(uint64_t ns_tid, base::ThreadType thread_type) override; + + private: + base::ProcessId child_pid_ = base::kNullProcessHandle; 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 83f7817ca56f..12aa03618c88 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-02-20 09:59:21 UTC +--- content/browser/gpu/compositor_util.cc.orig 2025-04-15 08:30:07 UTC +++ content/browser/gpu/compositor_util.cc -@@ -152,7 +152,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -147,7 +147,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)), -@@ -164,7 +164,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -159,7 +159,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__private.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index 9094e52bb92b..3dedba683db4 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-03-09 21:38:10 UTC +--- 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 -@@ -1672,7 +1672,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1667,7 +1667,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } 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 763cf86a10ea..56736c71b6f7 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-02-20 09:59:21 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2025-04-15 08:30:07 UTC +++ content/browser/gpu/gpu_process_host.cc @@ -275,6 +275,7 @@ static const char* const kSwitchNames[] = { switches::kDisableSkiaGraphite, @@ -8,9 +8,9 @@ switches::kProfilingAtStart, switches::kProfilingFile, switches::kProfilingFlush, -@@ -303,7 +304,7 @@ static const char* const kSwitchNames[] = { - switches::kOzoneDumpFile, +@@ -304,7 +305,7 @@ static const char* const kSwitchNames[] = { switches::kEnableNativeGpuMemoryBuffers, + switches::kRenderNodeOverride, #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 843868f083d2..fb0d4b229e59 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-03-09 21:38:10 UTC +--- 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 -@@ -222,7 +222,7 @@ +@@ -225,7 +225,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 -@@ -1087,7 +1087,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1090,7 +1090,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; -@@ -1255,7 +1255,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost +@@ -1258,7 +1258,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost void RenderProcessHostImpl::IOThreadHostImpl::SetPid( base::ProcessId child_pid) { @@ -44,7 +44,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -5233,7 +5234,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr +@@ -5224,7 +5225,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 55bc986b837b..4cd9a115ca2f 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-03-09 21:38:10 UTC +--- 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 -@@ -101,7 +101,7 @@ +@@ -102,7 +102,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 -@@ -989,7 +989,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -988,7 +988,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_; -@@ -1238,7 +1238,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1237,7 +1237,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_utility__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc index f98d81140137..d4b09fc10209 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host.cc.orig 2025-03-09 21:38:10 UTC -+++ content/browser/utility_process_host.cc -@@ -63,7 +63,7 @@ +--- content/browser/service_host/utility_process_host.cc.orig 2025-04-15 08:30:07 UTC ++++ content/browser/service_host/utility_process_host.cc +@@ -67,7 +67,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" -@@ -91,7 +91,7 @@ namespace content { +@@ -95,7 +95,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector<base::FilePath> network_context_parent_dirs) { base::Pickle pickle; -@@ -413,7 +413,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -425,7 +425,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) { -@@ -430,7 +430,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -442,7 +442,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_utility__process__host__receiver__bindings.cc b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc index e2408a12be88..5b8230e4b89e 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc @@ -1,5 +1,5 @@ ---- content/browser/utility_process_host_receiver_bindings.cc.orig 2025-01-25 09:34:31 UTC -+++ content/browser/utility_process_host_receiver_bindings.cc +--- content/browser/service_host/utility_process_host_receiver_bindings.cc.orig 2025-04-15 08:30:07 UTC ++++ content/browser/service_host/utility_process_host_receiver_bindings.cc @@ -10,7 +10,7 @@ #include "content/public/common/content_client.h" #include "media/media_buildflags.h" diff --git a/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc index c670d7061354..60cfaa1eb9fe 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc @@ -1,5 +1,5 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2025-02-20 09:59:21 UTC -+++ content/browser/utility_sandbox_delegate.cc +--- content/browser/service_host/utility_sandbox_delegate.cc.orig 2025-04-15 08:30:07 UTC ++++ content/browser/service_host/utility_sandbox_delegate.cc @@ -77,7 +77,7 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(IS_FUCHSIA) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || @@ -27,7 +27,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation || #endif sandbox_type_ == sandbox::mojom::Sandbox::kAudio || -@@ -143,7 +143,7 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -144,7 +144,7 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || @@ -36,7 +36,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -157,11 +157,11 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -158,11 +158,11 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe #endif // BUILDFLAG(IS_CHROMEOS) sandbox_type_ == sandbox::mojom::Sandbox::kAudio || #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc b/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc new file mode 100644 index 000000000000..8fde5cd4c320 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc @@ -0,0 +1,74 @@ +--- content/browser/web_contents/web_contents_view_aura_unittest.cc.orig 2025-04-15 08:30:07 UTC ++++ content/browser/web_contents/web_contents_view_aura_unittest.cc +@@ -40,7 +40,7 @@ + #include "ui/base/dragdrop/os_exchange_data_provider_win.h" + #endif + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + #include "ui/base/x/selection_utils.h" + #include "ui/base/x/x11_os_exchange_data_provider.h" + #include "ui/gfx/x/atom_cache.h" +@@ -96,7 +96,7 @@ class TestDragDropClient : public aura::client::DragDr + drag_drop_data_ = std::move(data); + return DragOperation::kCopy; + } +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void UpdateDragImage(const gfx::ImageSkia& image, + const gfx::Vector2d& offset) override {} + #endif +@@ -231,7 +231,7 @@ TEST_F(WebContentsViewAuraTest, WebContentsDestroyedDu + ui::EF_LEFT_MOUSE_BUTTON, 0); + ui::EventHandler* event_handler = GetView(); + event_handler->OnMouseEvent(&mouse_event); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // The web-content is not activated during mouse-press on Linux. + // See comment in WebContentsViewAura::OnMouseEvent() for more details. + EXPECT_NE(web_contents(), nullptr); +@@ -297,7 +297,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropFiles) { + view->OnDragEntered(event); + ASSERT_NE(nullptr, view->current_drag_data_); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // By design, Linux implementations return an empty string if file data + // is also present. + EXPECT_TRUE(!view->current_drag_data_->text || +@@ -337,7 +337,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropFiles) { + + CheckDropData(view); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // By design, Linux implementations returns an empty string if file data + // is also present. + EXPECT_TRUE(!drop_complete_data_->drop_data.text || +@@ -395,7 +395,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropFilesOri + view->OnDragEntered(event); + ASSERT_NE(nullptr, view->current_drag_data_); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // By design, Linux implementations return an empty string if file data + // is also present. + EXPECT_TRUE(!view->current_drag_data_->text || +@@ -427,7 +427,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropFilesOri + + CheckDropData(view); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // By design, Linux implementations returns an empty string if file data is + // also present. + EXPECT_TRUE(!drop_complete_data_->drop_data.text || +@@ -458,7 +458,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropImageFro + + auto data = std::make_unique<ui::OSExchangeData>(); + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + // FileContents drag-drop in X relies on XDragDropClient::InitDrag() setting + // window property 'XdndDirectSave0' to filename. Since XDragDropClient is not + // created in this unittest, we will set this property manually to allow diff --git a/www/ungoogled-chromium/files/patch-content_child_BUILD.gn b/www/ungoogled-chromium/files/patch-content_child_BUILD.gn index 3f2642db6bac..9343f32ce731 100644 --- a/www/ungoogled-chromium/files/patch-content_child_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_child_BUILD.gn @@ -1,6 +1,6 @@ ---- content/child/BUILD.gn.orig 2025-03-09 21:38:10 UTC +--- content/child/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ content/child/BUILD.gn -@@ -135,6 +135,13 @@ target(link_target_type, "child") { +@@ -136,6 +136,13 @@ target(link_target_type, "child") { ] } diff --git a/www/ungoogled-chromium/files/patch-content_child_child__process.cc b/www/ungoogled-chromium/files/patch-content_child_child__process.cc index 78a499a17bbd..3345e5f33128 100644 --- a/www/ungoogled-chromium/files/patch-content_child_child__process.cc +++ b/www/ungoogled-chromium/files/patch-content_child_child__process.cc @@ -1,4 +1,4 @@ ---- content/child/child_process.cc.orig 2024-11-16 12:20:41 UTC +--- content/child/child_process.cc.orig 2025-04-15 08:30:07 UTC +++ content/child/child_process.cc @@ -31,7 +31,7 @@ #include "content/common/android/cpu_time_metrics.h" @@ -9,7 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -178,7 +178,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th +@@ -177,7 +177,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th main_thread_.reset(thread); } diff --git a/www/ungoogled-chromium/files/patch-content_common_thread__type__switcher.mojom b/www/ungoogled-chromium/files/patch-content_common_thread__type__switcher.mojom new file mode 100644 index 000000000000..0d91925507b2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_common_thread__type__switcher.mojom @@ -0,0 +1,10 @@ +--- content/common/thread_type_switcher.mojom.orig 2025-04-15 08:30:07 UTC ++++ content/common/thread_type_switcher.mojom +@@ -10,6 +10,6 @@ import "mojo/public/mojom/base/thread_type.mojom"; + // occur in a child process due to its sandbox, e.g. on Linux and ChromeOS. + interface ThreadTypeSwitcher { + // Asks the browser to change the type of thread. +- SetThreadType(int32 platform_thread_id, ++ SetThreadType(uint64 platform_thread_id, + mojo_base.mojom.ThreadType thread_type); + }; diff --git a/www/ungoogled-chromium/files/patch-content_common_user__agent.cc b/www/ungoogled-chromium/files/patch-content_common_user__agent.cc index 43a1f18be687..c4cee4be8d64 100644 --- a/www/ungoogled-chromium/files/patch-content_common_user__agent.cc +++ b/www/ungoogled-chromium/files/patch-content_common_user__agent.cc @@ -1,4 +1,4 @@ ---- content/common/user_agent.cc.orig 2025-03-09 21:38:10 UTC +--- 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 ""; @@ -18,7 +18,7 @@ return "X11; Linux x86_64"; #elif BUILDFLAG(IS_IOS) if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { -@@ -301,6 +301,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons +@@ -305,6 +305,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons "Android %s", os_version.c_str() #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia" 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 9ba653b6cd4d..c236e7de6f5c 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-03-09 21:38:10 UTC +--- content/gpu/gpu_main.cc.orig 2025-04-15 08:30:07 UTC +++ content/gpu/gpu_main.cc @@ -95,10 +95,14 @@ #include "sandbox/win/src/sandbox.h" @@ -34,7 +34,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -298,7 +302,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -303,7 +307,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 -@@ -324,7 +328,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -329,7 +333,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. -@@ -457,7 +462,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -462,7 +467,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) { -@@ -497,7 +502,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -502,7 +507,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 8e2207fc0435..79dbdf6e4c5d 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-03-09 21:38:10 UTC +--- content/public/browser/content_browser_client.cc.orig 2025-04-15 08:30:07 UTC +++ content/public/browser/content_browser_client.cc -@@ -1377,7 +1377,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1376,7 +1376,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 77392040e04d..dda59592dbda 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-03-09 21:38:10 UTC +--- content/public/common/content_features.cc.orig 2025-04-15 08:30:07 UTC +++ content/public/common/content_features.cc -@@ -74,7 +74,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, +@@ -75,7 +75,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 -@@ -1207,9 +1207,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1274,9 +1274,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 -@@ -1262,7 +1262,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, +@@ -1329,7 +1329,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 a0e958b860bf..286963208eb9 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,4 +1,4 @@ ---- content/public/common/content_switches.cc.orig 2025-03-09 21:38:10 UTC +--- content/public/common/content_switches.cc.orig 2025-04-15 08:30:07 UTC +++ content/public/common/content_switches.cc @@ -342,6 +342,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. @@ -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. -@@ -954,7 +956,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -949,7 +951,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 f7f9eb7335b7..6fc2b1d1a865 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-03-09 21:38:10 UTC +--- content/public/common/content_switches.h.orig 2025-04-15 08:30:07 UTC +++ content/public/common/content_switches.h @@ -108,6 +108,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -262,7 +263,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -259,7 +260,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD CONTENT_EXPORT extern const char kPreventResizingContentsForTesting[]; #endif 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 d877619d47dc..e2c953494f32 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-03-09 21:38:10 UTC +--- content/renderer/render_thread_impl.cc.orig 2025-04-15 08:30:07 UTC +++ content/renderer/render_thread_impl.cc -@@ -211,6 +211,8 @@ +@@ -212,6 +212,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1043,7 +1045,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1050,7 +1052,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) && -@@ -1052,7 +1054,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1059,7 +1061,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) && -@@ -1845,7 +1847,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory( +@@ -1855,7 +1857,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 acbf2bbdf262..98d7a34e32a9 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,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2025-03-09 21:38:10 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2025-04-15 08:30:07 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -129,7 +129,7 @@ @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -224,7 +224,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -228,7 +228,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>(); -@@ -288,7 +288,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -292,7 +292,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { #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 547654d9c2cc..8b16760558d8 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-03-09 21:38:10 UTC +--- content/shell/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ content/shell/BUILD.gn -@@ -1079,7 +1079,7 @@ group("content_shell_crash_test") { +@@ -1089,7 +1089,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__browser__main__parts.cc b/www/ungoogled-chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index fe63bfddb7c7..d8e6d28f0cea 100644 --- a/www/ungoogled-chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/ungoogled-chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,11 +1,11 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2025-02-20 09:59:21 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2025-04-15 08:30:07 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -50,7 +50,7 @@ #include "net/base/network_change_notifier.h" #endif -#if BUILDFLAG(IS_LINUX) && defined(USE_AURA) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(USE_AURA) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_AURA) #include "ui/base/ime/init/input_method_initializer.h" #endif diff --git a/www/ungoogled-chromium/files/patch-device_gamepad_BUILD.gn b/www/ungoogled-chromium/files/patch-device_gamepad_BUILD.gn index 0669e506fbb1..114775f7f926 100644 --- a/www/ungoogled-chromium/files/patch-device_gamepad_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-device_gamepad_BUILD.gn @@ -1,6 +1,6 @@ ---- device/gamepad/BUILD.gn.orig 2023-11-04 07:08:51 UTC +--- device/gamepad/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ device/gamepad/BUILD.gn -@@ -99,7 +99,7 @@ component("gamepad") { +@@ -98,7 +98,7 @@ component("gamepad") { "hid_writer_linux.cc", "hid_writer_linux.h", ] 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 aeede5637620..ff235bc82fff 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,4 +1,4 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2025-03-09 21:38:10 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2025-04-15 08:30:07 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -77,7 +77,7 @@ namespace { const char kReceivingEndDoesntExistError[] = @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -643,7 +643,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -667,7 +667,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-extensions_common_api___permission__features.json b/www/ungoogled-chromium/files/patch-extensions_common_api___permission__features.json index c30c13bc22ed..d649e1f098ed 100644 --- a/www/ungoogled-chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/ungoogled-chromium/files/patch-extensions_common_api___permission__features.json @@ -1,6 +1,6 @@ ---- extensions/common/api/_permission_features.json.orig 2025-02-20 09:59:21 UTC +--- extensions/common/api/_permission_features.json.orig 2025-04-15 08:30:07 UTC +++ extensions/common/api/_permission_features.json -@@ -138,7 +138,7 @@ +@@ -134,7 +134,7 @@ { "channel": "stable", "extension_types": ["platform_app"], @@ -9,7 +9,7 @@ "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -423,7 +423,7 @@ +@@ -419,7 +419,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -467,7 +467,7 @@ +@@ -463,7 +463,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/ungoogled-chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/ungoogled-chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc index c6bd22eb01c4..cac8c1882221 100644 --- a/www/ungoogled-chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc +++ b/www/ungoogled-chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc @@ -1,29 +1,29 @@ ---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2023-05-05 12:12:41 UTC +--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2025-04-15 08:30:07 UTC +++ google_apis/gcm/engine/heartbeat_manager.cc -@@ -32,7 +32,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; +@@ -31,7 +31,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; // Minimum time spent sleeping before we force a new heartbeat. const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The period at which to check if the heartbeat time has passed. Used to // protect against platforms where the timer is delayed by the system being // suspended. Only needed on linux because the other OSes provide a standard -@@ -191,7 +191,7 @@ void HeartbeatManager::RestartTimer() { +@@ -190,7 +190,7 @@ void HeartbeatManager::RestartTimer() { base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered, weak_ptr_factory_.GetWeakPtr())); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified // when the system is suspending or resuming. The only one that does not is // Linux so we need to poll to check for missed heartbeats. -@@ -214,7 +214,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() { +@@ -213,7 +213,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() { return; } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Otherwise check again later. io_task_runner_->PostDelayedTask( FROM_HERE, diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc new file mode 100644 index 000000000000..2eb70eaf4604 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc @@ -0,0 +1,21 @@ +--- gpu/command_buffer/service/raster_decoder_unittest_context_lost.cc.orig 2025-04-15 08:30:07 UTC ++++ gpu/command_buffer/service/raster_decoder_unittest_context_lost.cc +@@ -15,6 +15,18 @@ using ::testing::Return; + using ::testing::SaveArg; + using ::testing::SetArrayArgument; + ++#ifndef GL_CONTEXT_LOST_KHR ++#define GL_CONTEXT_LOST_KHR 0x0507 ++#endif ++ ++#ifndef GL_GUILTY_CONTEXT_RESET_KHR ++#define GL_GUILTY_CONTEXT_RESET_KHR 0x8253 ++#endif ++ ++#ifndef GL_INNOCENT_CONTEXT_RESET_KHR ++#define GL_INNOCENT_CONTEXT_RESET_KHR 0x8254 ++#endif ++ + namespace gpu { + namespace raster { + 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 76e0b250f707..e4d7b15855c0 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-03-09 21:38:10 UTC +--- gpu/command_buffer/service/shared_context_state.cc.orig 2025-04-15 08:30:07 UTC +++ gpu/command_buffer/service/shared_context_state.cc -@@ -67,7 +67,7 @@ +@@ -65,7 +65,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 -@@ -393,7 +393,7 @@ SharedContextState::SharedContextState( +@@ -334,7 +334,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; -@@ -430,7 +430,7 @@ SharedContextState::~SharedContextState() { +@@ -371,7 +371,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 90a644a70652..182a0253ca6e 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-02-20 09:59:21 UTC +--- gpu/command_buffer/service/shared_context_state.h.orig 2025-04-15 08:30:07 UTC +++ gpu/command_buffer/service/shared_context_state.h -@@ -235,7 +235,7 @@ class GPU_GLES2_EXPORT SharedContextState +@@ -236,7 +236,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(); } -@@ -448,7 +448,7 @@ class GPU_GLES2_EXPORT SharedContextState +@@ -449,7 +449,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_external__vk__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index a850d2d20932..d5f6205b271e 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2025-03-09 21:38:10 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2025-04-15 08:30:07 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -168,7 +168,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, +@@ -143,7 +143,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, SharedImageUsageSet SupportedUsage() { SharedImageUsageSet supported_usage = 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 152e5beb4523..e9163798d689 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,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-03-09 21:38:10 UTC +--- 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 -@@ -49,7 +49,7 @@ +@@ -48,7 +48,7 @@ #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h" #include "gpu/vulkan/vulkan_device_queue.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" #endif -@@ -113,7 +113,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; @@ -18,7 +18,7 @@ return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; -@@ -317,7 +317,7 @@ SharedImageFactory::SharedImageFactory( +@@ -315,7 +315,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_shared__image_shared__image__manager.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc index 8db045097dd5..e5fcd4ac7527 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2025-03-09 21:38:10 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2025-04-15 08:30:07 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc @@ -756,7 +756,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; @@ -6,6 +6,6 @@ return base::AndroidHardwareBufferCompat::IsSupportAvailable(); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // We are in the process of tightening scanout support on Ozone to be guarded - // by overlays being supported rather than merely native pixmaps being - // supported, as native pixmap support doesn't always imply that those native + return supports_overlays_on_ozone_; + #elif BUILDFLAG(IS_WIN) + return gl::DirectCompositionTextureSupported(); diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc index 05d69286534b..b56a5c4cedb5 100644 --- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc +++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_finch_features.cc.orig 2025-02-20 09:59:21 UTC +--- gpu/config/gpu_finch_features.cc.orig 2025-04-15 08:30:07 UTC +++ gpu/config/gpu_finch_features.cc -@@ -156,7 +156,8 @@ BASE_FEATURE(kAllowHardwareBufferUsageFlagsFromVulkanF +@@ -155,7 +155,8 @@ BASE_FEATURE(kAllowHardwareBufferUsageFlagsFromVulkanF BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ 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 dc0586bfa5c4..b09f99361b61 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-02-20 09:59:21 UTC +--- gpu/config/gpu_info_collector.cc.orig 2025-04-15 08:30:07 UTC +++ gpu/config/gpu_info_collector.cc -@@ -360,7 +360,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance +@@ -347,7 +347,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_config_gpu__test__config.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__test__config.cc index 5de6859f26b6..4ca897a384f9 100644 --- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__test__config.cc +++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__test__config.cc @@ -1,11 +1,11 @@ ---- gpu/config/gpu_test_config.cc.orig 2022-10-01 07:40:07 UTC +--- gpu/config/gpu_test_config.cc.orig 2025-04-15 08:30:07 UTC +++ gpu/config/gpu_test_config.cc -@@ -29,7 +29,7 @@ GPUTestConfig::OS GetCurrentOS() { - #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -27,7 +27,7 @@ namespace { + GPUTestConfig::OS GetCurrentOS() { + #if BUILDFLAG(IS_CHROMEOS) return GPUTestConfig::kOsChromeOS; - #elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_OPENBSD) -+ BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return GPUTestConfig::kOsLinux; #elif BUILDFLAG(IS_WIN) int32_t major_version = 0; 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 2005b264a24f..1dcd87c967dd 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,5 +1,14 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2025-03-09 21:38:10 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2025-04-15 08:30:07 UTC +++ gpu/ipc/service/gpu_init.cc +@@ -153,7 +153,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in + + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CASTOS) + bool CanAccessDeviceFile(const GPUInfo& gpu_info) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + 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 enable_watchdog = false; #endif @@ -18,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. -@@ -531,7 +531,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,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 -@@ -613,7 +613,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -590,7 +590,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,16 +45,16 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -783,7 +783,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - - InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); +@@ -758,7 +758,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + ->GetSupportedFormatsForGLNativePixmapImport(); + #endif // BUILDFLAG(IS_OZONE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. -@@ -835,7 +835,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -810,7 +810,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,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 -@@ -1032,7 +1032,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1014,7 +1014,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -63,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 -@@ -1087,7 +1087,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1069,7 +1069,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__util.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__util.cc index 8315d21259bd..3623665b7a34 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__util.cc +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__util.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_util.cc.orig 2025-03-09 21:38:10 UTC +--- gpu/vulkan/vulkan_util.cc.orig 2025-04-15 08:30:07 UTC +++ gpu/vulkan/vulkan_util.cc -@@ -468,7 +468,7 @@ bool CheckVulkanCompatibilities( +@@ -467,7 +467,7 @@ bool CheckVulkanCompatibilities( } } diff --git a/www/ungoogled-chromium/files/patch-headless_BUILD.gn b/www/ungoogled-chromium/files/patch-headless_BUILD.gn new file mode 100644 index 000000000000..322d21d524db --- /dev/null +++ b/www/ungoogled-chromium/files/patch-headless_BUILD.gn @@ -0,0 +1,11 @@ +--- headless/BUILD.gn.orig 2025-04-15 08:30:07 UTC ++++ headless/BUILD.gn +@@ -474,7 +474,7 @@ component("headless_non_renderer") { + } + } + +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + deps += [ + "//components/crash/content/browser", + "//components/crash/core/app", diff --git a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc index 1be4478230b2..ec49ddb3a72d 100644 --- a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc +++ b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2025-03-09 21:38:10 UTC +--- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2025-04-15 08:30:07 UTC +++ headless/lib/browser/headless_browser_main_parts_posix.cc -@@ -27,13 +27,13 @@ +@@ -26,13 +26,13 @@ #include "content/public/browser/browser_thread.h" #include "headless/lib/browser/headless_browser_impl.h" @@ -16,7 +16,7 @@ #include "device/bluetooth/dbus/bluez_dbus_manager.h" #endif -@@ -167,7 +167,7 @@ class BrowserShutdownHandler { +@@ -166,7 +166,7 @@ class BrowserShutdownHandler { } // namespace @@ -25,7 +25,7 @@ constexpr char kProductName[] = "HeadlessChrome"; #endif -@@ -175,9 +175,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo +@@ -174,9 +174,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo BrowserShutdownHandler::Install(base::BindOnce( &HeadlessBrowserImpl::ShutdownWithExitCode, browser_->GetWeakPtr())); diff --git a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index f642778ccb7f..5312fbc0f53f 100644 --- a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2025-03-09 21:38:10 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2025-04-15 08:30:07 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -56,7 +56,7 @@ +@@ -58,7 +58,7 @@ #include "content/public/common/content_descriptors.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" // nogncheck #include "content/public/browser/network_service_util.h" #endif -@@ -518,7 +518,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll +@@ -520,7 +520,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll void HeadlessContentBrowserClient::SetEncryptionKey( ::network::mojom::NetworkService* network_service) { diff --git a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__content__browser__client.h index b38d8e2523ff..aaf72971ac06 100644 --- a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__content__browser__client.h @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2025-03-09 21:38:10 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2025-04-15 08:30:07 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -46,7 +46,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -47,7 +47,7 @@ class HeadlessContentBrowserClient : public content::C CreateDevToolsManagerDelegate() override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; diff --git a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc index 389abfd8a799..236895b1f839 100644 --- a/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc +++ b/www/ungoogled-chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_web_contents_impl.cc.orig 2025-02-20 09:59:21 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2025-04-15 08:30:07 UTC +++ headless/lib/browser/headless_web_contents_impl.cc -@@ -71,7 +71,7 @@ BASE_FEATURE(kPrerender2InHeadlessMode, +@@ -70,7 +70,7 @@ BASE_FEATURE(kPrerender2InHeadlessMode, namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) content::UpdateFontRendererPreferencesFromSystemSettings(prefs); #endif diff --git a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn index 4666f6c7b418..bffce70d8e9c 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-03-09 21:38:10 UTC +--- media/audio/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ media/audio/BUILD.gn -@@ -273,9 +273,23 @@ source_set("audio") { +@@ -271,9 +271,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } diff --git a/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc b/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc index fcc62a268813..7f5f10923dd8 100644 --- a/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc +++ b/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc @@ -1,6 +1,6 @@ ---- media/base/audio_latency.cc.orig 2024-10-01 07:26:23 UTC +--- media/base/audio_latency.cc.orig 2025-04-15 08:30:07 UTC +++ media/base/audio_latency.cc -@@ -148,7 +148,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in +@@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ 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 1ea91c1ecfc6..938b3b65e9d4 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc @@ -1,6 +1,6 @@ ---- media/base/media_switches.cc.orig 2025-03-09 21:38:10 UTC +--- media/base/media_switches.cc.orig 2025-04-15 08:30:07 UTC +++ media/base/media_switches.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #include "ui/gl/gl_features.h" #include "ui/gl/gl_utils.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -371,8 +371,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, +@@ -358,8 +358,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", -@@ -382,6 +382,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, +@@ -369,6 +369,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 -@@ -624,7 +646,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, +@@ -611,7 +633,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 -@@ -647,7 +669,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -634,7 +656,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -67,16 +67,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -659,7 +681,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -646,7 +668,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -688,7 +710,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -675,7 +697,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, -@@ -791,7 +813,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, +@@ -775,7 +797,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, "VSyncMjpegDecoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -94,7 +94,7 @@ // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS. BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding, "V4L2H264TemporalLayerHWEncoding", -@@ -1357,7 +1379,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1347,7 +1369,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -103,7 +103,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1439,7 +1461,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1429,7 +1451,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 9c788dab8b6e..93ccd40ee936 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-03-09 21:38:10 UTC +--- media/base/media_switches.h.orig 2025-04-15 08:30:07 UTC +++ media/base/media_switches.h -@@ -324,13 +324,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu +@@ -321,13 +321,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); -@@ -344,7 +356,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); +@@ -341,7 +353,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); -@@ -366,7 +378,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay +@@ -363,7 +375,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,7 +46,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); -@@ -497,7 +509,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide +@@ -493,7 +505,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) 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 c2897525619b..ebea8bbd7f10 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-03-09 21:38:10 UTC +--- media/base/video_frame.cc.orig 2025-04-15 08:30:07 UTC +++ media/base/video_frame.cc @@ -92,7 +92,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -36,7 +36,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1598,7 +1598,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1600,7 +1600,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 e3a305d9d780..c8d77b76b7e1 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-03-09 21:38:10 UTC +--- media/base/video_frame.h.orig 2025-04-15 08:30:07 UTC +++ media/base/video_frame.h @@ -42,7 +42,7 @@ #include "ui/gfx/geometry/size.h" @@ -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 -@@ -734,7 +734,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -737,7 +737,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. -@@ -963,7 +963,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -977,7 +977,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_create__video__capture__device__factory.cc b/www/ungoogled-chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc index 6c00318d7c2b..d7c238e7c584 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc @@ -1,20 +1,20 @@ ---- media/capture/video/create_video_capture_device_factory.cc.orig 2023-03-10 11:01:21 UTC +--- media/capture/video/create_video_capture_device_factory.cc.orig 2025-04-15 08:30:07 UTC +++ media/capture/video/create_video_capture_device_factory.cc -@@ -13,7 +13,7 @@ +@@ -12,7 +12,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" #include "media/capture/video/file_video_capture_device_factory.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "media/capture/video/linux/video_capture_device_factory_linux.h" - #elif BUILDFLAG(IS_CHROMEOS_ASH) + #elif BUILDFLAG(IS_CHROMEOS) #include "media/capture/video/chromeos/public/cros_features.h" -@@ -56,7 +56,7 @@ CreateFakeVideoCaptureDeviceFactory() { +@@ -55,7 +55,7 @@ CreateFakeVideoCaptureDeviceFactory() { std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner); - #elif BUILDFLAG(IS_CHROMEOS_ASH) + #elif BUILDFLAG(IS_CHROMEOS) if (base::SysInfo::IsRunningOnChromeOS()) diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc index 5313324008ed..c1e806e3430b 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig 2023-12-23 12:33:28 UTC +--- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig 2025-04-15 08:30:07 UTC +++ media/capture/video/video_capture_buffer_tracker_factory_impl.cc -@@ -14,7 +14,7 @@ +@@ -13,7 +13,7 @@ #include "media/capture/video/chromeos/gpu_memory_buffer_tracker_cros.h" #elif BUILDFLAG(IS_APPLE) #include "media/capture/video/apple/gpu_memory_buffer_tracker_apple.h" @@ -9,7 +9,7 @@ #include "media/capture/video/linux/v4l2_gpu_memory_buffer_tracker.h" #elif BUILDFLAG(IS_WIN) #include "media/capture/video/win/gpu_memory_buffer_tracker_win.h" -@@ -42,7 +42,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker( +@@ -41,7 +41,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker( return std::make_unique<GpuMemoryBufferTrackerCros>(); #elif BUILDFLAG(IS_APPLE) return std::make_unique<GpuMemoryBufferTrackerApple>(); diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc index 43ca4cd80f63..8125498cd84f 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2025-02-20 09:59:21 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2025-04-15 08:30:07 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -173,7 +173,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( +@@ -172,7 +172,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( CHECK(!is_width_odd && !is_height_odd); return {libyuv::FOURCC_UYVY}; case media::PIXEL_FORMAT_RGB24: diff --git a/www/ungoogled-chromium/files/patch-media_cdm_cdm__paths__unittest.cc b/www/ungoogled-chromium/files/patch-media_cdm_cdm__paths__unittest.cc index 2045d63bfb33..f420213c8f69 100644 --- a/www/ungoogled-chromium/files/patch-media_cdm_cdm__paths__unittest.cc +++ b/www/ungoogled-chromium/files/patch-media_cdm_cdm__paths__unittest.cc @@ -1,6 +1,6 @@ ---- media/cdm/cdm_paths_unittest.cc.orig 2022-10-29 17:50:56 UTC +--- media/cdm/cdm_paths_unittest.cc.orig 2025-04-15 08:30:07 UTC +++ media/cdm/cdm_paths_unittest.cc -@@ -27,7 +27,7 @@ const char kComponentPlatform[] = +@@ -26,7 +26,7 @@ const char kComponentPlatform[] = "win"; #elif BUILDFLAG(IS_CHROMEOS) "cros"; diff --git a/www/ungoogled-chromium/files/patch-media_cdm_library__cdm_cdm__paths.gni b/www/ungoogled-chromium/files/patch-media_cdm_library__cdm_cdm__paths.gni index 47d6cff8b85d..8f0d02b120a5 100644 --- a/www/ungoogled-chromium/files/patch-media_cdm_library__cdm_cdm__paths.gni +++ b/www/ungoogled-chromium/files/patch-media_cdm_library__cdm_cdm__paths.gni @@ -1,6 +1,6 @@ ---- media/cdm/library_cdm/cdm_paths.gni.orig 2023-10-13 13:20:35 UTC +--- media/cdm/library_cdm/cdm_paths.gni.orig 2025-04-15 08:30:07 UTC +++ media/cdm/library_cdm/cdm_paths.gni -@@ -15,7 +15,7 @@ assert(enable_library_cdms) +@@ -14,7 +14,7 @@ assert(enable_library_cdms) # Explicitly define what we use to avoid confusion. if (is_chromeos) { component_os = "cros" diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc index d7fca55ad4c4..c6195d6838cd 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-11-16 12:20:41 UTC +--- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2025-04-15 08:30:07 UTC +++ media/gpu/chromeos/platform_video_frame_utils.cc -@@ -67,7 +67,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice( +@@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice( const base::FilePath dev_path(FILE_PATH_LITERAL( base::StrCat({drm_node_file_prefix, base::NumberToString(i)}))); @@ -9,3 +9,12 @@ const bool is_render_node = base::Contains(drm_node_file_prefix, "render"); // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind +@@ -193,7 +193,7 @@ class GbmDeviceWrapper { + const base::FilePath dev_path( + base::CommandLine::ForCurrentProcess()->GetSwitchValuePath( + switches::kRenderNodeOverride)); +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC) + const bool is_render_node = base::Contains(dev_path.value(), "render"); + + // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind 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 40531681fdae..52f906ef3ce2 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-02-20 09:59:21 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2025-04-15 08:30:07 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1159,7 +1159,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1121,7 +1121,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()); -@@ -1168,7 +1168,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1130,7 +1130,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 -@@ -1350,7 +1350,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1304,7 +1304,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 new file mode 100644 index 000000000000..6b017f5c4f57 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__decode__accelerator__factory.cc @@ -0,0 +1,20 @@ +--- media/gpu/gpu_video_decode_accelerator_factory.cc.orig 2025-04-15 08:30:07 UTC ++++ media/gpu/gpu_video_decode_accelerator_factory.cc +@@ -12,7 +12,7 @@ + #include "media/gpu/media_gpu_export.h" + #include "media/media_buildflags.h" + +-#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) + #include "media/gpu/v4l2/legacy/v4l2_video_decode_accelerator.h" + #include "media/gpu/v4l2/v4l2_device.h" + #endif +@@ -28,7 +28,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA( + if (gpu_preferences.disable_accelerated_video_decode) + return nullptr; + +-#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#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())); 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 81b5380cf778..1dc87aad9a5e 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,6 +1,6 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2024-11-16 12:20:41 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2025-04-15 08:30:07 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -118,7 +118,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -150,7 +150,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) @@ -9,7 +9,7 @@ if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA)); } -@@ -126,7 +126,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -158,7 +158,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA)); #endif #elif BUILDFLAG(USE_V4L2_CODEC) diff --git a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index 5d8fd2a01060..7fbe38c2344e 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-10-27 06:40:35 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2025-04-15 08:30:07 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc -@@ -16,7 +16,9 @@ +@@ -17,7 +17,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" #endif @@ -10,7 +10,7 @@ // TODO(b/195769334): the hardware video decoding sandbox is really only useful // when building with VA-API or V4L2 (otherwise, we're not really doing hardware -@@ -32,6 +34,7 @@ using sandbox::syscall_broker::BrokerFilePermission; +@@ -33,6 +35,7 @@ using sandbox::syscall_broker::BrokerFilePermission; namespace media { namespace { @@ -18,7 +18,7 @@ void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, bool include_sys_dev_char, bool read_write) { -@@ -188,6 +191,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -189,6 +192,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( NOTREACHED(); #endif // BUILDFLAG(USE_V4L2_CODEC) } @@ -26,7 +26,7 @@ } // namespace -@@ -203,6 +207,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -204,6 +208,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,7 +34,7 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -248,6 +253,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -249,6 +254,7 @@ bool HardwareVideoDecodingPreSandboxHook( // |permissions| is empty? sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( command_set, permissions, options); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__file__writer.cc b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__file__writer.cc index b878de19e50e..df071568a932 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__file__writer.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__file__writer.cc @@ -1,6 +1,6 @@ ---- media/gpu/test/video_frame_file_writer.cc.orig 2024-10-01 07:26:23 UTC +--- media/gpu/test/video_frame_file_writer.cc.orig 2025-04-15 08:30:07 UTC +++ media/gpu/test/video_frame_file_writer.cc -@@ -26,7 +26,7 @@ +@@ -25,7 +25,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/codec/png_codec.h" diff --git a/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__helpers.cc b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__helpers.cc index 1dcb32954acb..36f7a3850591 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__helpers.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__helpers.cc @@ -1,6 +1,6 @@ ---- media/gpu/test/video_frame_helpers.cc.orig 2024-10-01 07:26:23 UTC +--- media/gpu/test/video_frame_helpers.cc.orig 2025-04-15 08:30:07 UTC +++ media/gpu/test/video_frame_helpers.cc -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "ui/gfx/buffer_format_util.h" #include "ui/gfx/gpu_memory_buffer.h" diff --git a/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__validator.cc b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__validator.cc index 085c59122d60..c7d7e0e085b2 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__validator.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__validator.cc @@ -1,6 +1,6 @@ ---- media/gpu/test/video_frame_validator.cc.orig 2024-10-01 07:26:23 UTC +--- media/gpu/test/video_frame_validator.cc.orig 2025-04-15 08:30:07 UTC +++ media/gpu/test/video_frame_validator.cc -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/gpu_memory_buffer.h" 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 fe210b980ed8..ee76795c144a 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-02-20 09:59:21 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2025-04-15 08:30:07 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -784,7 +784,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -780,7 +780,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 019233cefb41..400b3176bcc8 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-01-25 09:34:31 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2025-04-15 08:30:07 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -78,7 +78,7 @@ +@@ -79,7 +79,7 @@ using media_gpu_vaapi::kModuleVa_prot; #endif diff --git a/www/ungoogled-chromium/files/patch-media_media__options.gni b/www/ungoogled-chromium/files/patch-media_media__options.gni index e547dc7b7d24..7e8ecb3acf54 100644 --- a/www/ungoogled-chromium/files/patch-media_media__options.gni +++ b/www/ungoogled-chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2025-03-09 21:38:10 UTC +--- media/media_options.gni.orig 2025-04-15 08:30:07 UTC +++ media/media_options.gni -@@ -202,12 +202,15 @@ declare_args() { +@@ -201,12 +201,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false 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 new file mode 100644 index 000000000000..0cb7e98ca652 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_BUILD.gn @@ -0,0 +1,11 @@ +--- 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_video__frame__mojom__traits.cc b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 01a7b0831b39..db711494f7db 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,6 +1,6 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2025-01-25 09:34:31 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2025-04-15 08:30:07 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc -@@ -22,7 +22,7 @@ +@@ -24,7 +24,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" 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 1b55a554714f..726ea8e45117 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,4 +1,4 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2024-11-16 12:20:41 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2025-04-15 08:30:07 UTC +++ media/video/fake_gpu_memory_buffer.cc @@ -14,7 +14,7 @@ #include "media/base/format_utils.h" @@ -9,25 +9,25 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -63,7 +63,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB +@@ -29,7 +29,7 @@ namespace media { - } // namespace + namespace { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -102,7 +102,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si +@@ -84,7 +84,7 @@ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTestin static base::AtomicSequenceNumber buffer_id_generator; - handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); + handle.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); -#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++) { + 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_); -@@ -176,7 +176,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH + 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; 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 new file mode 100644 index 000000000000..5b51515e4933 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.h @@ -0,0 +1,11 @@ +--- media/video/fake_gpu_memory_buffer.h.orig 2025-04-15 08:30:07 UTC ++++ media/video/fake_gpu_memory_buffer.h +@@ -13,7 +13,7 @@ + + namespace media { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // This method is used by tests to create a fake pixmap handle instead of + // creating a FakeGpuMemoryBuffer. Once all tests are converted to use it, + // FakeGpuMemoryBuffer will be removed and this file will be renamed 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 c4b55777eb6b..0c5a1249586f 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc @@ -1,11 +1,11 @@ ---- media/webrtc/audio_processor.cc.orig 2025-03-09 21:38:10 UTC +--- media/webrtc/audio_processor.cc.orig 2025-04-15 08:30:07 UTC +++ media/webrtc/audio_processor.cc -@@ -509,7 +509,7 @@ std::optional<double> AudioProcessor::ProcessData( +@@ -507,7 +507,7 @@ std::optional<double> AudioProcessor::ProcessData( + // controller. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_OPENBSD) -+ BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // We have a special situation on Linux where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that 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 a9b6a98b284c..0fc591191cb0 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-03-09 21:38:10 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2025-04-15 08:30:07 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -787,6 +787,16 @@ template("mojom") { +@@ -782,6 +782,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 2a35efbae2e5..bcb5a0d9716b 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-03-09 21:38:10 UTC +--- net/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ net/BUILD.gn -@@ -126,7 +126,7 @@ net_configs = [ +@@ -125,7 +125,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1311,6 +1311,19 @@ component("net") { +@@ -1314,6 +1314,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1474,7 +1487,7 @@ component("net") { +@@ -1477,7 +1490,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,24 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2991,7 +3004,7 @@ target(_test_target_type, "net_unittests") { +@@ -2176,7 +2189,7 @@ static_library("test_support") { + ] + } + +- if (is_linux || is_chromeos || is_android) { ++ if (!is_bsd && (is_linux || is_chromeos || is_android)) { + 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") { + ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + sources += [ + "base/network_change_notifier_linux_unittest.cc", + "proxy_resolution/proxy_config_service_linux_unittest.cc", ] } @@ -47,7 +64,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -3085,6 +3098,10 @@ target(_test_target_type, "net_unittests") { +@@ -3088,6 +3101,10 @@ target(_test_target_type, "net_unittests") { ] } @@ -58,7 +75,7 @@ if (enable_websockets) { sources += [ "server/http_connection_unittest.cc", -@@ -3151,7 +3168,7 @@ target(_test_target_type, "net_unittests") { +@@ -3154,7 +3171,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -67,7 +84,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3290,7 +3307,7 @@ target(_test_target_type, "net_unittests") { +@@ -3293,7 +3310,7 @@ target(_test_target_type, "net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/files/patch-net_base_mock__network__change__notifier.cc b/www/ungoogled-chromium/files/patch-net_base_mock__network__change__notifier.cc deleted file mode 100644 index 20d3e8d72e2d..000000000000 --- a/www/ungoogled-chromium/files/patch-net_base_mock__network__change__notifier.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/base/mock_network_change_notifier.cc.orig 2023-08-18 10:26:52 UTC -+++ net/base/mock_network_change_notifier.cc -@@ -103,7 +103,7 @@ MockNetworkChangeNotifier::GetCurrentConnectionCost() - return connection_cost_; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - AddressMapOwnerLinux* MockNetworkChangeNotifier::GetAddressMapOwnerInternal() { - return address_map_owner_; - } diff --git a/www/ungoogled-chromium/files/patch-net_base_mock__network__change__notifier.h b/www/ungoogled-chromium/files/patch-net_base_mock__network__change__notifier.h deleted file mode 100644 index f0a28e1f1f2d..000000000000 --- a/www/ungoogled-chromium/files/patch-net_base_mock__network__change__notifier.h +++ /dev/null @@ -1,20 +0,0 @@ ---- net/base/mock_network_change_notifier.h.orig 2023-08-18 10:26:52 UTC -+++ net/base/mock_network_change_notifier.h -@@ -84,7 +84,7 @@ class MockNetworkChangeNotifier : public NetworkChange - // use_default_connection_cost_implementation is set to true. - ConnectionCost GetCurrentConnectionCost() override; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void SetAddressMapOwnerLinux(AddressMapOwnerLinux* address_map_owner) { - address_map_owner_ = address_map_owner; - } -@@ -104,7 +104,7 @@ class MockNetworkChangeNotifier : public NetworkChange - bool use_default_connection_cost_implementation_ = false; - NetworkChangeNotifier::NetworkList connected_networks_; - std::unique_ptr<SystemDnsConfigChangeNotifier> dns_config_notifier_; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - raw_ptr<AddressMapOwnerLinux> address_map_owner_ = nullptr; - #endif - }; 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 30fcdf8553dc..aee7a1b15bac 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 2024-10-01 07:26:23 UTC +--- net/base/network_change_notifier.cc.orig 2025-04-15 08:30:07 UTC +++ net/base/network_change_notifier.cc -@@ -37,7 +37,7 @@ +@@ -36,7 +36,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" -@@ -324,6 +324,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -323,6 +323,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 bac4c9341817..f74fe5b2b169 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 2023-06-05 19:39:05 UTC +--- net/base/network_change_notifier_passive.cc.orig 2025-04-15 08:30:07 UTC +++ net/base/network_change_notifier_passive.cc -@@ -107,7 +107,7 @@ NetworkChangeNotifierPassive::GetAddressMapOwnerIntern +@@ -106,7 +106,7 @@ NetworkChangeNotifierPassive::GetAddressMapOwnerIntern NetworkChangeNotifier::NetworkChangeCalculatorParams NetworkChangeNotifierPassive::NetworkChangeCalculatorParamsPassive() { NetworkChangeCalculatorParams params; diff --git a/www/ungoogled-chromium/files/patch-net_http_http__auth__handler__negotiate.cc b/www/ungoogled-chromium/files/patch-net_http_http__auth__handler__negotiate.cc index 06db20e4ec0b..bebb9f1eb1a5 100644 --- a/www/ungoogled-chromium/files/patch-net_http_http__auth__handler__negotiate.cc +++ b/www/ungoogled-chromium/files/patch-net_http_http__auth__handler__negotiate.cc @@ -1,6 +1,6 @@ ---- net/http/http_auth_handler_negotiate.cc.orig 2024-03-22 14:16:19 UTC +--- net/http/http_auth_handler_negotiate.cc.orig 2025-04-15 08:30:07 UTC +++ net/http/http_auth_handler_negotiate.cc -@@ -120,7 +120,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl +@@ -119,7 +119,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl #elif BUILDFLAG(IS_POSIX) if (is_unsupported_) return ERR_UNSUPPORTED_AUTH_SCHEME; diff --git a/www/ungoogled-chromium/files/patch-net_http_http__auth__preferences.cc b/www/ungoogled-chromium/files/patch-net_http_http__auth__preferences.cc index da8cd8641bfc..059cb6be2f7e 100644 --- a/www/ungoogled-chromium/files/patch-net_http_http__auth__preferences.cc +++ b/www/ungoogled-chromium/files/patch-net_http_http__auth__preferences.cc @@ -1,6 +1,6 @@ ---- net/http/http_auth_preferences.cc.orig 2023-10-13 13:20:35 UTC +--- net/http/http_auth_preferences.cc.orig 2025-04-15 08:30:07 UTC +++ net/http/http_auth_preferences.cc -@@ -39,7 +39,7 @@ std::string HttpAuthPreferences::AuthAndroidNegotiateA +@@ -38,7 +38,7 @@ std::string HttpAuthPreferences::AuthAndroidNegotiateA } #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-net_http_http__auth__preferences.h b/www/ungoogled-chromium/files/patch-net_http_http__auth__preferences.h index fd836a0c11a5..bcc60bce5135 100644 --- a/www/ungoogled-chromium/files/patch-net_http_http__auth__preferences.h +++ b/www/ungoogled-chromium/files/patch-net_http_http__auth__preferences.h @@ -1,6 +1,6 @@ ---- net/http/http_auth_preferences.h.orig 2023-10-13 13:20:35 UTC +--- net/http/http_auth_preferences.h.orig 2025-04-15 08:30:07 UTC +++ net/http/http_auth_preferences.h -@@ -50,7 +50,7 @@ class NET_EXPORT HttpAuthPreferences { +@@ -49,7 +49,7 @@ class NET_EXPORT HttpAuthPreferences { #if BUILDFLAG(IS_ANDROID) virtual std::string AuthAndroidNegotiateAccountType() const; #endif @@ -9,7 +9,7 @@ virtual bool AllowGssapiLibraryLoad() const; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) virtual bool CanUseDefaultCredentials( -@@ -86,7 +86,7 @@ class NET_EXPORT HttpAuthPreferences { +@@ -85,7 +85,7 @@ class NET_EXPORT HttpAuthPreferences { } #endif // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -18,7 +18,7 @@ void set_allow_gssapi_library_load(bool allow_gssapi_library_load) { allow_gssapi_library_load_ = allow_gssapi_library_load; } -@@ -137,7 +137,7 @@ class NET_EXPORT HttpAuthPreferences { +@@ -136,7 +136,7 @@ class NET_EXPORT HttpAuthPreferences { std::string auth_android_negotiate_account_type_; #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-net_quic_quic__network__transaction__unittest.cc b/www/ungoogled-chromium/files/patch-net_quic_quic__network__transaction__unittest.cc new file mode 100644 index 000000000000..84acd771d657 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-net_quic_quic__network__transaction__unittest.cc @@ -0,0 +1,28 @@ +--- net/quic/quic_network_transaction_unittest.cc.orig 2025-04-15 08:30:07 UTC ++++ net/quic/quic_network_transaction_unittest.cc +@@ -5202,10 +5202,10 @@ TEST_P(QuicNetworkTransactionTest, RstStreamBeforeHead + + TEST_P(QuicNetworkTransactionTest, BrokenAlternateProtocol) { + // Alternate-protocol job +- std::unique_ptr<quic::QuicEncryptedPacket> close( ++ std::unique_ptr<quic::QuicEncryptedPacket> test_close( + ConstructServerConnectionClosePacket(1)); + MockRead quic_reads[] = { +- MockRead(ASYNC, close->data(), close->length()), ++ MockRead(ASYNC, test_close->data(), test_close->length()), + MockRead(ASYNC, ERR_IO_PENDING), // No more data to read + MockRead(ASYNC, OK), // EOF + }; +@@ -5248,10 +5248,10 @@ TEST_P(QuicNetworkTransactionTest, + http_server_properties_ = std::make_unique<HttpServerProperties>(); + + // Alternate-protocol job +- std::unique_ptr<quic::QuicEncryptedPacket> close( ++ std::unique_ptr<quic::QuicEncryptedPacket> test_close( + ConstructServerConnectionClosePacket(1)); + MockRead quic_reads[] = { +- MockRead(ASYNC, close->data(), close->length()), ++ MockRead(ASYNC, test_close->data(), test_close->length()), + MockRead(ASYNC, ERR_IO_PENDING), // No more data to read + MockRead(ASYNC, OK), // EOF + }; diff --git a/www/ungoogled-chromium/files/patch-net_socket_socks5__client__socket.cc b/www/ungoogled-chromium/files/patch-net_socket_socks5__client__socket.cc index 96c5d39fea79..a33b9554b42e 100644 --- a/www/ungoogled-chromium/files/patch-net_socket_socks5__client__socket.cc +++ b/www/ungoogled-chromium/files/patch-net_socket_socks5__client__socket.cc @@ -1,6 +1,6 @@ ---- net/socket/socks5_client_socket.cc.orig 2024-07-31 14:19:23 UTC +--- net/socket/socks5_client_socket.cc.orig 2025-04-15 08:30:07 UTC +++ net/socket/socks5_client_socket.cc -@@ -24,6 +24,9 @@ +@@ -23,6 +23,9 @@ #include "net/log/net_log_event_type.h" #include "net/traffic_annotation/network_traffic_annotation.h" 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 8d253551f18c..5b4d48cdfec6 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-02-20 09:59:21 UTC +--- net/socket/udp_socket_posix.cc.orig 2025-04-15 08:30:07 UTC +++ net/socket/udp_socket_posix.cc -@@ -528,12 +528,17 @@ int UDPSocketPosix::SetRecvTos() { +@@ -527,12 +527,17 @@ int UDPSocketPosix::SetRecvTos() { #endif // BUILDFLAG(IS_APPLE) } @@ -19,7 +19,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -554,7 +559,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -553,7 +558,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -28,8 +28,8 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -892,7 +897,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) - #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -891,7 +896,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) + #if BUILDFLAG(IS_CHROMEOS) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; -#elif BUILDFLAG(IS_APPLE) 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 1feae8761e6d..49e3cbc54705 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 2024-10-01 07:26:23 UTC +--- net/socket/udp_socket_unittest.cc.orig 2025-04-15 08:30:07 UTC +++ net/socket/udp_socket_unittest.cc -@@ -372,7 +372,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -371,7 +371,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). -@@ -683,7 +683,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -682,7 +682,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 -@@ -705,7 +705,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { +@@ -704,7 +704,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 -@@ -764,7 +764,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -763,7 +763,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,12 +36,12 @@ #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -818,7 +818,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -817,7 +817,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); --#if !BUILDFLAG(IS_CHROMEOS_ASH) -+#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) // Send a message via the multicast group. That message is expected be be // received by both receving sockets. // diff --git a/www/ungoogled-chromium/files/patch-net_third__party_quiche_BUILD.gn b/www/ungoogled-chromium/files/patch-net_third__party_quiche_BUILD.gn index 8343348d714a..93f6755d5289 100644 --- a/www/ungoogled-chromium/files/patch-net_third__party_quiche_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_third__party_quiche_BUILD.gn @@ -1,6 +1,6 @@ ---- net/third_party/quiche/BUILD.gn.orig 2023-11-04 07:08:51 UTC +--- net/third_party/quiche/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ net/third_party/quiche/BUILD.gn -@@ -29,7 +29,7 @@ import("//net/third_party/quiche/src/build/source_list +@@ -28,7 +28,7 @@ import("//net/third_party/quiche/src/build/source_list import("//testing/libfuzzer/fuzzer_test.gni") import("//third_party/protobuf/proto_library.gni") diff --git a/www/ungoogled-chromium/files/patch-net_tools_net__watcher_net__watcher.cc b/www/ungoogled-chromium/files/patch-net_tools_net__watcher_net__watcher.cc index 1bfb112efb0c..660f6d4efadc 100644 --- a/www/ungoogled-chromium/files/patch-net_tools_net__watcher_net__watcher.cc +++ b/www/ungoogled-chromium/files/patch-net_tools_net__watcher_net__watcher.cc @@ -1,6 +1,6 @@ ---- net/tools/net_watcher/net_watcher.cc.orig 2024-06-22 08:49:42 UTC +--- net/tools/net_watcher/net_watcher.cc.orig 2025-04-15 08:30:07 UTC +++ net/tools/net_watcher/net_watcher.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ #include "net/proxy_resolution/proxy_config_service.h" #include "net/proxy_resolution/proxy_config_with_annotation.h" @@ -9,16 +9,25 @@ #include "net/base/network_change_notifier_linux.h" #endif -@@ -44,7 +44,7 @@ namespace { +@@ -41,7 +41,7 @@ + + namespace { - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Flag to specifies which network interfaces to ignore. Interfaces should // follow as a comma seperated list. const char kIgnoreNetifFlag[] = "ignore-netif"; -@@ -163,7 +163,7 @@ int main(int argc, char* argv[]) { +@@ -143,7 +143,7 @@ class NetWatcher : + } // namespace + + int main(int argc, char* argv[]) { +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::apple::ScopedNSAutoreleasePool pool; + #endif + base::AtExitManager exit_manager; +@@ -160,7 +160,7 @@ int main(int argc, char* argv[]) { NetWatcher net_watcher; diff --git a/www/ungoogled-chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/ungoogled-chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h index aec426076c05..71b923694bfe 100644 --- a/www/ungoogled-chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h +++ b/www/ungoogled-chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -1,6 +1,6 @@ ---- net/traffic_annotation/network_traffic_annotation.h.orig 2025-01-25 09:34:31 UTC +--- net/traffic_annotation/network_traffic_annotation.h.orig 2025-04-15 08:30:07 UTC +++ net/traffic_annotation/network_traffic_annotation.h -@@ -375,7 +375,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -374,7 +374,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -9,12 +9,12 @@ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif -@@ -389,7 +389,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { - // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is - // complete. - #if !BUILDFLAG(IS_WIN) && \ -- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +@@ -385,7 +385,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { + // + // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or + // TRAFFIC_ANNOTATION_FOR_TESTS. +-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) #define NO_TRAFFIC_ANNOTATION_YET \ net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.") diff --git a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.cc b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.cc index 97fc24e82ee5..3237f09ad08b 100644 --- a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.cc +++ b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.cc @@ -1,11 +1,11 @@ ---- net/url_request/url_request_context.cc.orig 2025-02-20 09:59:21 UTC +--- net/url_request/url_request_context.cc.orig 2025-04-15 08:30:07 UTC +++ net/url_request/url_request_context.cc -@@ -123,7 +123,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge - // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is - // complete. - #if !BUILDFLAG(IS_WIN) && \ -- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +@@ -119,7 +119,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge + return &network_session->context(); + } + +-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) std::unique_ptr<URLRequest> URLRequestContext::CreateRequest( const GURL& url, RequestPriority priority, diff --git a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.h b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.h index bb58047c4d19..458217763353 100644 --- a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.h +++ b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.h @@ -1,11 +1,11 @@ ---- net/url_request/url_request_context.h.orig 2025-02-20 09:59:21 UTC +--- net/url_request/url_request_context.h.orig 2025-04-15 08:30:07 UTC +++ net/url_request/url_request_context.h -@@ -90,7 +90,7 @@ class NET_EXPORT URLRequestContext final { - // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is - // complete. - #if !BUILDFLAG(IS_WIN) && \ -- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +@@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext final { + // session. + const HttpNetworkSessionContext* GetNetworkSessionContext() const; + +-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // This function should not be used in Chromium, please use the version with // NetworkTrafficAnnotationTag in the future. // 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 101223e02d91..6ad47778f738 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-01-25 09:34:31 UTC +--- net/url_request/url_request_context_builder.cc.orig 2025-04-15 08:30:07 UTC +++ net/url_request/url_request_context_builder.cc -@@ -448,7 +448,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -441,7 +441,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/ungoogled-chromium/files/patch-net_websockets_websocket__basic__stream__adapters__test.cc b/www/ungoogled-chromium/files/patch-net_websockets_websocket__basic__stream__adapters__test.cc new file mode 100644 index 000000000000..6deb7b046172 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-net_websockets_websocket__basic__stream__adapters__test.cc @@ -0,0 +1,15 @@ +--- net/websockets/websocket_basic_stream_adapters_test.cc.orig 2025-04-15 08:30:07 UTC ++++ net/websockets/websocket_basic_stream_adapters_test.cc +@@ -1098,10 +1098,10 @@ TEST_F(WebSocketSpdyStreamAdapterTest, + OnCloseOkShouldBeTranslatedToConnectionClose) { + spdy::SpdySerializedFrame response_headers( + spdy_util_.ConstructSpdyResponseHeaders(1, ResponseHeaders(), false)); +- spdy::SpdySerializedFrame close( ++ spdy::SpdySerializedFrame test_close( + spdy_util_.ConstructSpdyRstStream(1, spdy::ERROR_CODE_NO_ERROR)); + MockRead reads[] = {CreateMockRead(response_headers, 1), +- CreateMockRead(close, 2), MockRead(ASYNC, 0, 3)}; ++ CreateMockRead(test_close, 2), MockRead(ASYNC, 0, 3)}; + spdy::SpdySerializedFrame request_headers(spdy_util_.ConstructSpdyHeaders( + 1, RequestHeaders(), DEFAULT_PRIORITY, false)); + MockWrite writes[] = {CreateMockWrite(request_headers, 0)}; 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 037437cb371d..00a25f5e45a4 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-03-09 21:38:10 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2025-04-15 08:30:07 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -108,7 +108,7 @@ +@@ -109,7 +109,7 @@ #include "ui/accessibility/ax_features.mojom-features.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -541,7 +541,7 @@ void InitializeSDK(bool enable_v8, +@@ -565,7 +565,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc index c3b105463b39..61760741f669 100644 --- a/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc +++ b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc @@ -1,4 +1,4 @@ ---- printing/backend/print_backend_cups.cc.orig 2025-02-20 09:59:21 UTC +--- printing/backend/print_backend_cups.cc.orig 2025-04-15 08:30:07 UTC +++ printing/backend/print_backend_cups.cc @@ -29,7 +29,7 @@ #include "printing/mojom/print.mojom.h" @@ -18,7 +18,7 @@ // This may be removed when Amazon Linux 2 reaches EOL (30 Jun 2025). bool AreNewerCupsFunctionsAvailable() { return cupsFindDestDefault && cupsFindDestSupported && cupsUserAgent && -@@ -292,7 +292,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin +@@ -286,7 +286,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin #if !BUILDFLAG(IS_CHROMEOS) scoped_refptr<PrintBackend> PrintBackend::CreateInstanceImpl( const std::string& locale) { 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 new file mode 100644 index 000000000000..d1a5ac68beb9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc @@ -0,0 +1,65 @@ +--- printing/mojom/printing_context_mojom_traits_unittest.cc.orig 2025-04-15 08:30:07 UTC ++++ printing/mojom/printing_context_mojom_traits_unittest.cc +@@ -79,7 +79,7 @@ base::Value::Dict GenerateSampleSystemPrintDialogData( + data.Set(kMacSystemPrintDialogDataDestinationLocation, "/foo/bar.pdf"); + } + +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + 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); + +-#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() { + settings.set_device_name(kPrintSettingsDeviceName); + settings.set_requested_media(kPrintSettingsRequestedMedia); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + PrintSettings::AdvancedSettings& advanced_settings = + settings.advanced_settings(); + for (const auto& item : kPrintSettingsAdvancedSettings) +@@ -545,7 +545,7 @@ TEST(PrintingContextMojomTraitsTest, + + EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet1); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings); + #endif + +@@ -598,7 +598,7 @@ TEST(PrintingContextMojomTraitsTest, + kPrintSettingsCustomMarginsInPoints)); + EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet2); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings); + #endif + +@@ -637,7 +637,7 @@ TEST(PrintingContextMojomTraitsTest, + EXPECT_EQ(output.page_setup_device_units(), kInput.page_setup_device_units()); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + TEST(PrintingContextMojomTraitsTest, + TestSerializeAndDeserializePrintSettingsEmptyAdvancedSettings) { + PrintSettings input = GenerateSamplePrintSettingsDefaultMargins(); +@@ -835,7 +835,7 @@ TEST( + } + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + TEST( + PrintingContextMojomTraitsTest, + TestSerializeAndDeserializePrintSettingsSystemPrintDialogPrinterInvalidDataType) { diff --git a/www/ungoogled-chromium/files/patch-remoting_host_basic__desktop__environment.cc b/www/ungoogled-chromium/files/patch-remoting_host_basic__desktop__environment.cc deleted file mode 100644 index 8dcf4c1d0d6e..000000000000 --- a/www/ungoogled-chromium/files/patch-remoting_host_basic__desktop__environment.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- remoting/host/basic_desktop_environment.cc.orig 2025-03-09 21:38:10 UTC -+++ remoting/host/basic_desktop_environment.cc -@@ -195,7 +195,7 @@ std::unique_ptr<DesktopCapturer> BasicDesktopEnvironme - scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; - #if BUILDFLAG(IS_CHROMEOS) - capture_task_runner = ui_task_runner_; --#elif BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_WAYLAND) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_WAYLAND) - // Each capturer instance should get its own thread so the capturers don't - // compete with each other in multistream mode. - capture_task_runner = base::ThreadPool::CreateSingleThreadTaskRunner( diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__context.cc b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__context.cc index 85a56bef579b..ba0362533005 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__context.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__context.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host_context.cc.orig 2025-03-09 21:38:10 UTC +--- remoting/host/chromoting_host_context.cc.orig 2025-04-15 08:30:07 UTC +++ remoting/host/chromoting_host_context.cc -@@ -292,7 +292,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC +@@ -335,7 +335,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC // on a UI thread. scoped_refptr<AutoThreadTaskRunner> input_task_runner = AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner, 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 cfd5cf0d7cdd..25d25b22d1db 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-01-25 09:34:31 UTC +--- remoting/host/client_session.cc.orig 2025-04-15 08:30:07 UTC +++ remoting/host/client_session.cc -@@ -161,7 +161,7 @@ void ClientSession::NotifyClientResolution( +@@ -187,7 +187,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_desktop__and__cursor__conditional__composer.cc b/www/ungoogled-chromium/files/patch-remoting_host_desktop__and__cursor__conditional__composer.cc deleted file mode 100644 index ab3937597195..000000000000 --- a/www/ungoogled-chromium/files/patch-remoting_host_desktop__and__cursor__conditional__composer.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- remoting/host/desktop_and_cursor_conditional_composer.cc.orig 2023-04-08 11:38:38 UTC -+++ remoting/host/desktop_and_cursor_conditional_composer.cc -@@ -7,7 +7,7 @@ - #include "base/functional/bind.h" - #include "build/build_config.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "remoting/host/linux/wayland_utils.h" - #endif - -@@ -96,7 +96,7 @@ bool DesktopAndCursorConditionalComposer::IsOccluded( - } - - bool DesktopAndCursorConditionalComposer::SupportsFrameCallbacks() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return IsRunningWayland(); - #else - return false; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__proxy.cc b/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__proxy.cc deleted file mode 100644 index 3e30671072b9..000000000000 --- a/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__proxy.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- remoting/host/desktop_capturer_proxy.cc.orig 2025-03-09 21:38:10 UTC -+++ remoting/host/desktop_capturer_proxy.cc -@@ -25,7 +25,7 @@ - #include "remoting/host/chromeos/frame_sink_desktop_capturer.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/environment.h" - #include "base/nix/xdg_util.h" - #include "remoting/host/linux/wayland_desktop_capturer.h" -@@ -90,7 +90,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( - - #if BUILDFLAG(IS_CHROMEOS) - capturer_ = std::make_unique<FrameSinkDesktopCapturer>(); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - static base::nix::SessionType session_type = base::nix::SessionType::kUnset; - if (session_type == base::nix::SessionType::kUnset) { - std::unique_ptr<base::Environment> env = base::Environment::Create(); -@@ -297,7 +297,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC - bool DesktopCapturerProxy::SupportsFrameCallbacks() { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return IsRunningWayland(); - #else - return false; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc b/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc deleted file mode 100644 index ee9fc9523952..000000000000 --- a/www/ungoogled-chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- remoting/host/desktop_capturer_wrapper.cc.orig 2024-04-23 07:42:17 UTC -+++ remoting/host/desktop_capturer_wrapper.cc -@@ -13,7 +13,7 @@ - #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" - #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "remoting/host/linux/wayland_desktop_capturer.h" - #include "remoting/host/linux/wayland_utils.h" - #endif -@@ -33,7 +33,7 @@ void DesktopCapturerWrapper::CreateCapturer( - SourceId id) { - DCHECK(!capturer_); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (IsRunningWayland()) { - capturer_ = std::make_unique<WaylandDesktopCapturer>(options); - } else { -@@ -112,7 +112,7 @@ void DesktopCapturerWrapper::OnCaptureResult( - bool DesktopCapturerWrapper::SupportsFrameCallbacks() { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return capturer_ && IsRunningWayland(); - #else - return false; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc deleted file mode 100644 index 0970668bca3d..000000000000 --- a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- remoting/host/it2me/it2me_host.cc.orig 2025-03-09 21:38:10 UTC -+++ remoting/host/it2me/it2me_host.cc -@@ -61,7 +61,7 @@ - #include "remoting/host/chromeos/features.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "remoting/host/linux/wayland_manager.h" - #include "remoting/host/linux/wayland_utils.h" - #endif // BUILDFLAG(IS_LINUX) -@@ -224,7 +224,7 @@ void It2MeHost::Connect( - - OnPolicyUpdate(std::move(policies)); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (IsRunningWayland()) { - WaylandManager::Get()->Init(host_context_->ui_task_runner()); - } -@@ -376,7 +376,7 @@ void It2MeHost::ConnectOnNetworkThread( - - // Set up the desktop environment options. - DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (IsRunningWayland()) { - options.desktop_capture_options()->set_prefer_cursor_embedded(true); - } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index 6d05afecb017..ff469567ab8c 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2025-02-20 09:59:21 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2025-04-15 08:30:07 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -30,7 +30,7 @@ #include "remoting/host/resources.h" @@ -9,16 +9,16 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -77,7 +77,7 @@ bool CurrentProcessHasUiAccess() { +@@ -75,7 +75,7 @@ bool CurrentProcessHasUiAccess() { // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and // runs the task executor until It2MeNativeMessagingHost signals shutdown. int It2MeNativeMessagingHostMain(int argc, char** argv) { -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) - if (!IsRunningWayland()) { - // Initialize Xlib for multi-threaded use, allowing non-Chromium code to - // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -125,7 +125,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // Initialize Xlib for multi-threaded use, allowing non-Chromium code to + // use X11 safely (such as the WebRTC capturer, GTK ...) + x11::InitXlib(); +@@ -121,7 +121,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); @@ -27,21 +27,21 @@ // Required for any calls into GTK functions, such as the Disconnect and // Continue windows. Calling with nullptr arguments because we don't have // any command line arguments for gtk to consume. -@@ -251,7 +251,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -249,7 +249,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(), context->management_service()); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) scoped_refptr<AutoThreadTaskRunner> input_task_runner; - if (!IsRunningWayland()) { - // Create an X11EventSource on all UI threads, so the global X11 connection -@@ -278,7 +278,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // Create an X11EventSource on all UI threads, so the global X11 connection + // (x11::Connection::Get()) can dispatch X events. +@@ -273,7 +273,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Run the loop until channel is alive. run_loop.Run(); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) - if (!IsRunningWayland()) { - input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { - delete ui::X11EventSource::GetInstance(); + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + delete ui::X11EventSource::GetInstance(); + })); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_legacy__interaction__strategy.cc b/www/ungoogled-chromium/files/patch-remoting_host_legacy__interaction__strategy.cc deleted file mode 100644 index 76fb580ba598..000000000000 --- a/www/ungoogled-chromium/files/patch-remoting_host_legacy__interaction__strategy.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- remoting/host/legacy_interaction_strategy.cc.orig 2025-03-09 21:38:10 UTC -+++ remoting/host/legacy_interaction_strategy.cc -@@ -43,7 +43,7 @@ - #include "remoting/host/chromeos/mouse_cursor_monitor_aura.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "remoting/host/linux/wayland_utils.h" - #endif - -@@ -88,7 +88,7 @@ std::unique_ptr<DesktopCapturer> LegacyInteractionStra - scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; - #if BUILDFLAG(IS_CHROMEOS) - capture_task_runner = ui_task_runner_; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (IsRunningWayland()) { - // Each capturer instance should get its own thread so the capturers don't - // compete with each other in multistream mode. diff --git a/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc index f05a43ea2902..11271c2f5dff 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,14 +1,14 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2024-10-27 06:40:35 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2025-04-15 08:30:07 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -108,7 +108,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() +@@ -112,7 +112,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() capabilities += protocol::kRemoteWebAuthnCapability; } -#if BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) - if (!IsRunningWayland()) { - capabilities += " "; - capabilities += protocol::kMultiStreamCapability; + capabilities += " "; + capabilities += protocol::kMultiStreamCapability; + @@ -150,7 +150,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( // properly under Xvfb. mutable_desktop_capture_options()->set_use_update_notifications(true); @@ -18,16 +18,7 @@ // Setting this option to false means that the capture differ wrapper will not // be used when the X11 capturer is selected. This reduces the X11 capture // time by a few milliseconds per frame and is safe because we can rely on -@@ -159,7 +159,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( - mutable_desktop_capture_options()->set_detect_updated_region(false); - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (IsRunningWayland()) { - mutable_desktop_capture_options()->set_prefer_cursor_embedded(false); - } -@@ -184,7 +184,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -178,7 +178,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. 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 a0b6c61dcc38..f2657a35e653 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,4 +1,4 @@ ---- remoting/host/mojo_caller_security_checker.cc.orig 2024-11-16 12:20:41 UTC +--- remoting/host/mojo_caller_security_checker.cc.orig 2025-04-15 08:30:07 UTC +++ remoting/host/mojo_caller_security_checker.cc @@ -37,7 +37,7 @@ namespace remoting { @@ -7,7 +7,7 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) constexpr auto kAllowedCallerProgramNames = - base::MakeFixedFlatSet<base::FilePath::StringPieceType>({ + base::MakeFixedFlatSet<base::FilePath::StringViewType>({ "remote-open-url", @@ -98,7 +98,7 @@ bool IsTrustedMojoEndpoint( return true; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc b/www/ungoogled-chromium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc deleted file mode 100644 index ef2ee965bbe4..000000000000 --- a/www/ungoogled-chromium/files/patch-remoting_host_mouse__cursor__monitor__proxy.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- remoting/host/mouse_cursor_monitor_proxy.cc.orig 2025-03-09 21:38:10 UTC -+++ remoting/host/mouse_cursor_monitor_proxy.cc -@@ -73,7 +73,7 @@ void MouseCursorMonitorProxy::Core::CreateMouseCursorM - - #if BUILDFLAG(IS_CHROMEOS) - mouse_cursor_monitor_ = std::make_unique<MouseCursorMonitorAura>(); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (IsRunningWayland()) { - mouse_cursor_monitor_ = webrtc::MouseCursorMonitor::Create(options); - } else { 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 390ad06ec168..835e5d878401 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-02-20 09:59:21 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2025-04-15 08:30:07 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -145,7 +145,7 @@ +@@ -138,7 +138,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -8,8 +8,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> - #endif // defined(REMOTING_USE_X11) -@@ -156,13 +156,13 @@ + +@@ -148,7 +148,7 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -18,23 +18,16 @@ #include "base/linux_util.h" #include "remoting/host/linux/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "remoting/host/host_utmp_logger.h" - #endif - -@@ -176,7 +176,7 @@ - #include "remoting/host/win/session_desktop_environment.h" +@@ -163,7 +163,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/linux/wayland_manager.h" - #include "remoting/host/linux/wayland_utils.h" + #include "remoting/host/host_utmp_logger.h" #endif // BUILDFLAG(IS_LINUX) -@@ -204,7 +204,7 @@ const char kApplicationName[] = "chromoting"; + +@@ -196,7 +196,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -43,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"; -@@ -448,7 +448,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -440,7 +440,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_; #endif @@ -52,7 +45,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -510,7 +510,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -505,7 +505,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -61,7 +54,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -828,7 +828,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -824,7 +824,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,32 +63,25 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -899,7 +899,7 @@ void HostProcess::CreateAuthenticatorFactory() { - context_->url_loader_factory(), service_account_email_, - oauth_refresh_token_)); +@@ -901,7 +901,7 @@ void HostProcess::CreateAuthenticatorFactory() { + context_->create_client_cert_store_callback(), + service_account_email_, oauth_refresh_token_)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -1041,13 +1041,13 @@ void HostProcess::StartOnUiThread() { +@@ -1043,7 +1043,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (IsRunningWayland()) { - WaylandManager::Get()->Init(context_->ui_task_runner()); - } - #endif // BUILDFLAG(IS_LINUX) - -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1124,7 +1124,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1122,7 +1122,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -104,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. -@@ -1132,7 +1132,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1130,7 +1130,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -113,7 +99,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1844,7 +1844,7 @@ void HostProcess::StartHost() { +@@ -1864,7 +1864,7 @@ void HostProcess::StartHost() { corp_host_status_logger_->StartObserving(*session_manager); } @@ -122,7 +108,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_); #endif #if BUILDFLAG(IS_WIN) -@@ -1871,7 +1871,7 @@ void HostProcess::StartHost() { +@@ -1891,7 +1891,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); @@ -131,7 +117,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1907,7 +1907,7 @@ void HostProcess::StartHost() { +@@ -1927,7 +1927,7 @@ void HostProcess::StartHost() { // addresses. host_->Start(*host_owner_emails_.begin()); @@ -140,7 +126,7 @@ // For Windows, ChromotingHostServices connections are handled by the daemon // process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2051,7 +2051,7 @@ int HostProcessMain() { +@@ -2072,7 +2072,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -149,7 +135,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 ...) -@@ -2100,7 +2100,7 @@ int HostProcessMain() { +@@ -2135,7 +2135,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_setup_start__host__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_setup_start__host__main.cc index 5fa9c331a691..e6efc2e185b5 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/setup/start_host_main.cc.orig 2025-03-09 21:38:10 UTC +--- remoting/host/setup/start_host_main.cc.orig 2025-04-15 08:30:07 UTC +++ remoting/host/setup/start_host_main.cc -@@ -43,7 +43,7 @@ +@@ -45,7 +45,7 @@ #include <unistd.h> #endif // BUILDFLAG(IS_POSIX) @@ -9,7 +9,7 @@ #include "remoting/host/setup/daemon_controller_delegate_linux.h" #include "remoting/host/setup/start_host_as_root.h" #endif // BUILDFLAG(IS_LINUX) -@@ -374,7 +374,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& +@@ -369,7 +369,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& } // namespace int StartHostMain(int argc, char** argv) { @@ -18,7 +18,7 @@ // Minimize the amount of code that runs as root on Posix systems. if (getuid() == 0) { return remoting::StartHostAsRoot(argc, argv); -@@ -399,7 +399,7 @@ int StartHostMain(int argc, char** argv) { +@@ -394,7 +394,7 @@ int StartHostMain(int argc, char** argv) { mojo::core::Init(); 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 c261237850d6..e726cf62fdb5 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,4 +1,4 @@ ---- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2025-02-20 09:59:21 UTC +--- 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 @@ -10,7 +10,7 @@ #include "base/strings/utf_string_conversions.h" @@ -17,7 +17,7 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) constexpr auto kAllowedCallerPrograms = - base::MakeFixedFlatSet<base::FilePath::StringPieceType>({ + base::MakeFixedFlatSet<base::FilePath::StringViewType>({ @@ -83,7 +83,7 @@ bool IsLaunchedByTrustedProcess() { #if !defined(NDEBUG) // Just return true on debug builds for the convenience of development. diff --git a/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn index d0af815ee467..5191f3b3a910 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 2024-11-16 12:20:41 UTC +--- sandbox/linux/BUILD.gn.orig 2025-04-15 08:30:07 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 -@@ -386,6 +386,17 @@ component("sandbox_services") { +@@ -384,6 +384,17 @@ component("sandbox_services") { "services/libc_interceptor.h", ] } diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn index 9bf90dd90ef7..f2b067c7c290 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/policy/BUILD.gn.orig 2025-02-20 09:59:21 UTC +--- sandbox/policy/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ sandbox/policy/BUILD.gn -@@ -45,7 +45,7 @@ component("policy") { +@@ -43,7 +43,7 @@ component("policy") { "//third_party/jni_zero", ] } @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -114,6 +114,27 @@ component("policy") { +@@ -112,6 +112,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", @@ -36,4 +36,4 @@ + "//ui/gfx/x", ] } - if (is_chromeos_ash) { + if (is_chromeos) { diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc index 5122ca0c94f7..3ba283ffe553 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/features.cc.orig 2025-02-20 09:59:21 UTC +--- sandbox/policy/features.cc.orig 2025-04-15 08:30:07 UTC +++ sandbox/policy/features.cc -@@ -20,7 +20,11 @@ namespace sandbox::policy::features { +@@ -19,7 +19,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) BASE_FEATURE(kNetworkServiceSandbox, "NetworkServiceSandbox", diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc index 91c437dfc28e..bdbc1a453723 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/sandbox_type.cc.orig 2025-02-20 09:59:21 UTC +--- sandbox/policy/sandbox_type.cc.orig 2025-04-15 08:30:07 UTC +++ sandbox/policy/sandbox_type.cc -@@ -39,7 +39,7 @@ constexpr char kPpapiSandbox[] = "ppapi"; +@@ -38,7 +38,7 @@ constexpr char kPpapiSandbox[] = "ppapi"; #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ constexpr char kPrintBackendSandbox[] = "print_backend"; constexpr char kScreenAISandbox[] = "screen_ai"; #endif -@@ -57,18 +57,18 @@ constexpr char kWindowsSystemProxyResolverSandbox[] = +@@ -56,15 +56,15 @@ constexpr char kWindowsSystemProxyResolverSandbox[] = constexpr char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -23,25 +23,21 @@ constexpr char kVideoCaptureSandbox[] = "video_capture"; #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - constexpr char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding"; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding"; constexpr char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -81,7 +81,7 @@ constexpr char kLibassistantSandbox[] = "libassistant" +@@ -78,7 +78,7 @@ constexpr char kLibassistantSandbox[] = "libassistant" #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) constexpr char kOnDeviceTranslationSandbox[] = "on_device_translation"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -143,7 +143,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -140,7 +140,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kCdm: case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -50,20 +46,16 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -154,10 +154,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -151,7 +151,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - case Sandbox::kHardwareVideoDecoding: - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kHardwareVideoDecoding: case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -172,15 +172,15 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -167,15 +167,15 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMirroring: #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -82,7 +74,7 @@ case Sandbox::kOnDeviceTranslation: #endif DCHECK(command_line->GetSwitchValueASCII(switches::kProcessType) == -@@ -190,7 +190,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -185,7 +185,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi switches::kServiceSandboxType, StringFromUtilitySandboxType(sandbox_type)); break; @@ -91,7 +83,7 @@ case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -230,7 +230,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( +@@ -225,7 +225,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( return Sandbox::kUtility; } @@ -100,7 +92,7 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -272,7 +272,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -267,7 +267,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return kUtilitySandbox; case Sandbox::kAudio: return kAudioSandbox; @@ -109,7 +101,7 @@ case Sandbox::kVideoCapture: return kVideoCaptureSandbox; #endif -@@ -283,17 +283,17 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -278,17 +278,17 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kSpeechRecognition: return kSpeechRecognitionSandbox; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -130,21 +122,16 @@ case Sandbox::kOnDeviceTranslation: return kOnDeviceTranslationSandbox; #endif -@@ -313,11 +313,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -308,7 +308,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return kMirroringSandbox; #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - case Sandbox::kHardwareVideoDecoding: - return kHardwareVideoDecodingSandbox; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kHardwareVideoDecoding: + return kHardwareVideoDecodingSandbox; case Sandbox::kHardwareVideoEncoding: - return kHardwareVideoEncodingSandbox; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -336,7 +336,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -329,7 +329,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb // The following are not utility processes so should not occur. case Sandbox::kRenderer: case Sandbox::kGpu: @@ -153,7 +140,7 @@ case Sandbox::kZygoteIntermediateSandbox: #endif NOTREACHED(); -@@ -414,7 +414,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -407,7 +407,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( return Sandbox::kSpeechRecognition; } #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -162,7 +149,7 @@ if (sandbox_string == kPrintBackendSandbox) { return Sandbox::kPrintBackend; } -@@ -422,27 +422,27 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -415,7 +415,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( return Sandbox::kScreenAI; } #endif @@ -171,10 +158,7 @@ if (sandbox_string == kVideoEffectsSandbox) { return Sandbox::kVideoEffects; } - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (sandbox_string == kOnDeviceTranslationSandbox) { +@@ -425,12 +425,12 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( return Sandbox::kOnDeviceTranslation; } #endif @@ -184,14 +168,8 @@ return Sandbox::kVideoCapture; } #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - if (sandbox_string == kHardwareVideoDecodingSandbox) { - return Sandbox::kHardwareVideoDecoding; - } - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (sandbox_string == kHardwareVideoEncodingSandbox) { - return Sandbox::kHardwareVideoEncoding; + if (sandbox_string == kHardwareVideoDecodingSandbox) { + return Sandbox::kHardwareVideoDecoding; } diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc index e2ee70ce3434..012920b6f181 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2025-02-20 09:59:21 UTC +--- sandbox/policy/switches.cc.orig 2025-04-15 08:30:07 UTC +++ sandbox/policy/switches.cc -@@ -38,7 +38,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -37,7 +37,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/ungoogled-chromium/files/patch-services_device_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_BUILD.gn index de63ed844392..e876d1fdb20c 100644 --- a/www/ungoogled-chromium/files/patch-services_device_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_BUILD.gn @@ -1,11 +1,11 @@ ---- services/device/BUILD.gn.orig 2025-02-20 09:59:21 UTC +--- services/device/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ services/device/BUILD.gn @@ -13,7 +13,7 @@ if (is_android) { } is_serial_enabled_platform = -- is_win || ((is_linux || is_chromeos) && use_udev) || is_mac -+ is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac +- is_win || ((is_linux || is_chromeos) && use_udev) || is_mac || is_android ++ is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac || is_android source_set("lib") { # This should be visible only to embedders of the Device Service, and the 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 44a90e024637..7550313ddcfc 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-03-09 21:38:10 UTC +--- services/device/public/cpp/device_features.cc.orig 2025-04-15 08:30:07 UTC +++ services/device/public/cpp/device_features.cc -@@ -114,7 +114,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { +@@ -120,7 +120,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_cpp_device__features.h b/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.h index 651e9d52cffe..f16bc1c70f0c 100644 --- a/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.h +++ b/www/ungoogled-chromium/files/patch-services_device_public_cpp_device__features.h @@ -1,6 +1,6 @@ ---- services/device/public/cpp/device_features.h.orig 2025-03-09 21:38:10 UTC +--- services/device/public/cpp/device_features.h.orig 2025-04-15 08:30:07 UTC +++ services/device/public/cpp/device_features.h -@@ -51,7 +51,7 @@ extern const DEVICE_FEATURES_EXPORT +@@ -53,7 +53,7 @@ extern const DEVICE_FEATURES_EXPORT DEVICE_FEATURES_EXPORT bool IsOsLevelGeolocationPermissionSupportEnabled(); 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 ac3202dfaeec..05875dceb601 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-02-20 09:59:21 UTC +--- services/device/public/mojom/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ services/device/public/mojom/BUILD.gn -@@ -97,7 +97,7 @@ mojom("device_service") { +@@ -96,7 +96,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/ungoogled-chromium/files/patch-services_device_serial_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_serial_BUILD.gn index eba58d8bfdef..de079cffeb08 100644 --- a/www/ungoogled-chromium/files/patch-services_device_serial_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_serial_BUILD.gn @@ -1,11 +1,11 @@ ---- services/device/serial/BUILD.gn.orig 2025-02-20 09:59:21 UTC +--- services/device/serial/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ services/device/serial/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/features.gni") --if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac) { -+if (is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac) { +-if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac || is_android) { ++if (is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac || is_android) { config("platform_support") { visibility = [ ":serial" ] if (is_win) { diff --git a/www/ungoogled-chromium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/ungoogled-chromium/files/patch-services_device_serial_serial__device__enumerator.cc index d25cce144290..c915c335b250 100644 --- a/www/ungoogled-chromium/files/patch-services_device_serial_serial__device__enumerator.cc +++ b/www/ungoogled-chromium/files/patch-services_device_serial_serial__device__enumerator.cc @@ -1,4 +1,4 @@ ---- services/device/serial/serial_device_enumerator.cc.orig 2024-08-26 14:40:28 UTC +--- services/device/serial/serial_device_enumerator.cc.orig 2025-04-15 08:30:07 UTC +++ services/device/serial/serial_device_enumerator.cc @@ -13,7 +13,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "services/device/serial/serial_device_enumerator_linux.h" #elif BUILDFLAG(IS_MAC) #include "services/device/serial/serial_device_enumerator_mac.h" -@@ -26,7 +26,7 @@ namespace device { +@@ -28,7 +28,7 @@ namespace device { // static std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index dfe01c57560b..bf3918999620 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-02-20 09:59:21 UTC +--- services/network/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ services/network/BUILD.gn -@@ -396,7 +396,6 @@ if (is_linux || is_chromeos) { +@@ -397,7 +397,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 a726a13e795d..61ae73cbeea2 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.cc @@ -1,4 +1,4 @@ ---- services/network/network_context.cc.orig 2025-03-09 21:38:10 UTC +--- services/network/network_context.cc.orig 2025-04-15 08:30:07 UTC +++ services/network/network_context.cc @@ -611,7 +611,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2508,7 +2508,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2552,7 +2552,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 7ecdcd88cc6a..0f20619fe638 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-03-09 21:38:10 UTC +--- services/network/network_context.h.orig 2025-04-15 08:30:07 UTC +++ services/network/network_context.h -@@ -704,7 +704,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -709,7 +709,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 ebaaba53870f..0219fb2ad8e2 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-03-09 21:38:10 UTC +--- services/network/network_service.cc.orig 2025-04-15 08:30:07 UTC +++ services/network/network_service.cc -@@ -98,11 +98,11 @@ +@@ -102,11 +102,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 -@@ -981,7 +981,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -999,7 +999,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -23,7 +23,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1063,7 +1063,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1081,7 +1081,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 c58976fe1d6f..2c6fe41a7536 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-03-09 21:38:10 UTC +--- services/network/network_service.h.orig 2025-04-15 08:30:07 UTC +++ services/network/network_service.h -@@ -237,7 +237,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -249,7 +249,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; -@@ -263,7 +263,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -275,7 +275,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) -@@ -509,7 +509,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -531,7 +531,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 1296ffebfb50..92a4c5cec80c 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-03-09 21:38:10 UTC +--- services/network/public/cpp/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ services/network/public/cpp/BUILD.gn -@@ -509,7 +509,7 @@ component("cpp_base") { +@@ -572,7 +572,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } 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 ccbb5a2f755e..7888baf8c686 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-03-09 21:38:10 UTC +--- services/network/public/mojom/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ services/network/public/mojom/BUILD.gn -@@ -550,11 +550,11 @@ mojom("url_loader_base") { +@@ -600,11 +600,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" ] -@@ -1594,7 +1594,7 @@ mojom("mojom") { +@@ -1672,7 +1672,7 @@ mojom("mojom") { } } 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 new file mode 100644 index 000000000000..db9c058f440c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_viz_public_mojom_BUILD.gn @@ -0,0 +1,11 @@ +--- services/viz/public/mojom/BUILD.gn.orig 2025-04-15 08:30:07 UTC ++++ services/viz/public/mojom/BUILD.gn +@@ -56,7 +56,7 @@ mojom("mojom") { + + # Used in thread.mojom + enabled_features = [] +- if (is_fuchsia || is_apple) { ++ if (is_fuchsia || is_apple || is_bsd) { + enabled_features += [ "thread_id_is_64_bit" ] + } else { + enabled_features += [ "thread_id_is_32_bit" ] 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 1254732cafb9..61bb212fccf0 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 2024-02-25 20:22:18 UTC +--- skia/ext/font_utils.cc.orig 2025-04-15 08:30:07 UTC +++ skia/ext/font_utils.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h" #endif @@ -8,13 +8,13 @@ +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "third_party/skia/include/ports/SkFontConfigInterface.h" #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h" - #endif -@@ -60,7 +60,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() { + #include "third_party/skia/include/ports/SkFontScanner_Fontations.h" +@@ -62,7 +62,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() { return SkFontMgr_New_Android(nullptr); #elif BUILDFLAG(IS_APPLE) return SkFontMgr_New_CoreText(nullptr); -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal()); - return fci ? SkFontMgr_New_FCI(std::move(fci)) : nullptr; - #elif BUILDFLAG(IS_FUCHSIA) + if (base::FeatureList::IsEnabled(skia::kFontationsLinuxSystemFonts)) { + return fci ? SkFontMgr_New_FCI(std::move(fci), 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 befbe7b774af..f3190efef5a6 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 2024-07-31 14:19:23 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2025-04-15 08:30:07 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -412,7 +412,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -411,7 +411,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 -@@ -427,7 +427,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -426,7 +426,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_util_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_angle_util_BUILD.gn index a390d871f53c..d6af1c857327 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_util_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_angle_util_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/util/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- third_party/angle/util/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ third_party/angle/util/BUILD.gn -@@ -311,7 +311,7 @@ foreach(is_shared_library, +@@ -332,7 +332,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h index 504b76c4b0ce..f4ffc42900b4 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/public/platform/platform.h.orig 2025-04-15 08:30:07 UTC +++ third_party/blink/public/platform/platform.h -@@ -371,7 +371,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -372,7 +372,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index 16d675ec53cb..bfc59b23709b 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,6 +1,6 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2025-04-15 08:30:07 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -81,12 +81,12 @@ +@@ -82,12 +82,12 @@ #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h" #endif @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -256,7 +256,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -24,7 +24,7 @@ binders.Add<mojom::blink::MemoryUsageMonitorLinux>( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -302,7 +302,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform +@@ -305,7 +305,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ 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 16b1130a9b96..87b0b2290830 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-02-20 09:59:21 UTC +--- 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 -@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDelay(const String +@@ -427,7 +427,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' -@@ -3430,7 +3430,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3426,7 +3426,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_frame_web__frame__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 60715268bb29..e7a1aa1ded10 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2025-03-09 21:38:10 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2025-04-15 08:30:07 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6470,7 +6470,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6471,7 +6471,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { } #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable. // TODO(crbug.com/1317375): Build these tests on all platforms. #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \ -@@ -6879,7 +6879,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6880,7 +6880,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_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 d838a453df6e..a971301a28e8 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 2024-08-26 14:40:28 UTC +--- 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 -@@ -55,7 +55,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -50,7 +50,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_origin__trials_origin__trial__context.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc index f08c40257f8a..bde62193348a 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig 2025-03-09 21:38:10 UTC +--- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig 2025-04-15 08:30:07 UTC +++ third_party/blink/renderer/core/origin_trials/origin_trial_context.cc -@@ -566,7 +566,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const +@@ -573,7 +573,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const } if (trial_name == "TranslationAPI") { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index e2247d52cc86..077e934eef3b 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2025-03-09 21:38:10 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2025-04-15 08:30:07 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -147,7 +147,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -146,7 +146,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // Disable snapback on desktop Linux to better integrate with the desktop // behavior. Typically, Linux apps do not implement scrollbar snapback (this // is true for at least GTK and QT apps). @@ -9,7 +9,7 @@ return false; #else return true; -@@ -424,7 +424,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT +@@ -423,7 +423,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) const { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc index f10ace0729cb..baaf5911e2a9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2025-04-15 08:30:07 UTC +++ third_party/blink/renderer/modules/media/audio/audio_device_factory.cc -@@ -34,7 +34,7 @@ namespace { +@@ -33,7 +33,7 @@ namespace { // Set when the default factory is overridden. AudioDeviceFactory* g_factory_override = nullptr; 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 9761c1020b66..d45d23ab2bec 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,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-03-14 15:54:34 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-04-15 08:30:07 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6338,7 +6338,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6337,7 +6337,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif 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 c7564c9b7151..2f480ca53b68 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-03-09 21:38:10 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -2029,7 +2029,7 @@ static_library("test_support") { +@@ -2037,7 +2037,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 3339b1bc58a0..917cb6aa6876 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-03-09 21:38:10 UTC +--- 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 -@@ -45,7 +45,7 @@ +@@ -40,7 +40,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 -@@ -284,7 +284,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -279,7 +279,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_peerconnection_rtc__video__encoder__factory.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc index 7d450035bb02..ed7f7b80a934 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-02-20 09:59:21 UTC +--- 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 -@@ -334,12 +334,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -329,12 +329,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 bac170cf7824..683bf416a01d 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-03-23 13:10:20 UTC +--- 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 -@@ -427,7 +427,7 @@ +@@ -424,7 +424,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1602,7 +1602,7 @@ +@@ -1683,7 +1683,7 @@ name: "DocumentIsolationPolicy", status: "experimental", origin_trial_feature_name: "DocumentIsolationPolicy", @@ -18,7 +18,7 @@ base_feature: "none", }, { -@@ -1898,7 +1898,7 @@ +@@ -1932,7 +1932,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -27,7 +27,7 @@ origin_trial_allows_third_party: true, }, { -@@ -3297,7 +3297,7 @@ +@@ -3344,7 +3344,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", -@@ -3434,7 +3434,7 @@ +@@ -3468,7 +3468,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -45,7 +45,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4494,7 +4494,7 @@ +@@ -4589,7 +4589,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 -@@ -4681,7 +4681,7 @@ +@@ -4762,7 +4762,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -63,7 +63,7 @@ status: "experimental", base_feature: "none", }, -@@ -4950,7 +4950,7 @@ +@@ -5030,7 +5030,7 @@ { name: "WebIdentityDigitalCredentials", origin_trial_feature_name: "WebIdentityDigitalCredentials", diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h index d4183857325b..e582db43725f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2022-10-01 07:40:07 UTC +--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2025-04-15 08:30:07 UTC +++ third_party/blink/renderer/platform/wtf/container_annotations.h -@@ -12,7 +12,7 @@ +@@ -11,7 +11,7 @@ // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86 // once the crashes there have been fixed: http://crbug.com/461406 #if defined(ADDRESS_SANITIZER) && \ diff --git a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn index a3c102fe1e5b..fe3415491ac3 100644 --- a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2023-09-17 07:59:53 UTC +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -137,6 +137,13 @@ static_library("common") { +@@ -134,6 +134,13 @@ static_library("common") { if (crashpad_is_win) { sources += [ "crash_report_database_win.cc" ] } diff --git a/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h b/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h index 553f4c200915..d859fb165f9e 100644 --- a/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h +++ b/www/ungoogled-chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h @@ -1,6 +1,6 @@ ---- third_party/dawn/src/dawn/common/Platform.h.orig 2023-12-23 12:33:28 UTC +--- third_party/dawn/src/dawn/common/Platform.h.orig 2025-04-15 08:30:07 UTC +++ third_party/dawn/src/dawn/common/Platform.h -@@ -59,6 +59,11 @@ +@@ -60,6 +60,11 @@ #error "Unsupported Windows platform." #endif 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 2284acb6df67..7cd3cc1b9434 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 2024-02-25 20:22:18 UTC +--- 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 -@@ -56,7 +56,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha +@@ -57,7 +57,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha #endif #if DAWN_PLATFORM_IS(LINUX) diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure index f02e71df4477..366734c08d37 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-02-20 09:59:21 UTC +--- third_party/ffmpeg/configure.orig 2025-04-15 08:30:07 UTC +++ third_party/ffmpeg/configure -@@ -6850,8 +6850,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en +@@ -6855,8 +6855,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_ipcz_src_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_ipcz_src_BUILD.gn new file mode 100644 index 000000000000..ad180f0d627b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_ipcz_src_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/ipcz/src/BUILD.gn.orig 2025-04-15 08:30:07 UTC ++++ third_party/ipcz/src/BUILD.gn +@@ -7,7 +7,7 @@ import("//build_overrides/ipcz.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + import("//testing/test.gni") + +-enable_multiprocess_tests = is_linux ++enable_multiprocess_tests = is_linux && !is_bsd + + buildflag_header("test_buildflags") { + header = "test_buildflags.h" diff --git a/www/ungoogled-chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc b/www/ungoogled-chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc index b43915076431..eaa561e5bd99 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc +++ b/www/ungoogled-chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc @@ -1,20 +1,20 @@ ---- third_party/ipcz/src/reference_drivers/random.cc.orig 2023-09-17 07:59:53 UTC +--- third_party/ipcz/src/reference_drivers/random.cc.orig 2025-04-15 08:30:07 UTC +++ third_party/ipcz/src/reference_drivers/random.cc -@@ -14,7 +14,7 @@ - #include <windows.h> - #elif BUILDFLAG(IS_FUCHSIA) - #include <zircon/syscalls.h> --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include <asm/unistd.h> - #include <sys/syscall.h> - #include <unistd.h> -@@ -86,7 +86,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { - process_prng_fn(destination.data(), destination.size()); - #elif BUILDFLAG(IS_FUCHSIA) - zx_cprng_draw(destination.data(), destination.size()); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - while (!destination.empty()) { - ssize_t result = - syscall(__NR_getrandom, destination.data(), destination.size(), 0); +@@ -55,7 +55,7 @@ decltype(&ProcessPrng) GetProcessPrng() { + } + #endif + +-#if defined(OS_POSIX) && !BUILDFLAG(IS_MAC) ++#if defined(OS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) + void RandomBytesFromDevUrandom(absl::Span<uint8_t> destination) { + static int urandom_fd = [] { + for (;;) { +@@ -99,7 +99,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { + return; + } + } +-#elif BUILDFLAG(IS_MAC) ++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + const bool ok = getentropy(destination.data(), destination.size()) == 0; + ABSL_ASSERT(ok); + #elif BUILDFLAG(IS_IOS) diff --git a/www/ungoogled-chromium/files/patch-third__party_node_node.py b/www/ungoogled-chromium/files/patch-third__party_node_node.py index 025e06da4663..65f5e657f5e9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_node_node.py +++ b/www/ungoogled-chromium/files/patch-third__party_node_node.py @@ -1,6 +1,6 @@ ---- third_party/node/node.py.orig 2024-11-16 12:20:41 UTC +--- third_party/node/node.py.orig 2025-04-15 08:30:07 UTC +++ third_party/node/node.py -@@ -21,6 +21,8 @@ def GetBinaryPath(): +@@ -20,6 +20,8 @@ def GetBinaryPath(): return os_path.join(os_path.dirname(__file__), *{ 'Darwin': (darwin_path, darwin_name, 'bin', 'node'), 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h b/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h index ae9ee9352719..9b61325db908 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h @@ -1,4 +1,4 @@ ---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2025-02-20 09:59:21 UTC +--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2025-04-15 08:30:07 UTC +++ third_party/perfetto/include/perfetto/base/build_config.h @@ -27,6 +27,7 @@ #if defined(__ANDROID__) @@ -8,7 +8,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 -@@ -40,6 +41,7 @@ +@@ -41,6 +42,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -16,9 +16,9 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 -@@ -55,9 +57,10 @@ - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 1 +@@ -62,9 +64,10 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE_TVOS() 0 #endif -#elif defined(__linux__) +#elif defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) @@ -28,7 +28,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 -@@ -70,6 +73,7 @@ +@@ -78,6 +81,7 @@ #elif defined(__QNXNTO__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 @@ -36,7 +36,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 -@@ -82,6 +86,7 @@ +@@ -91,6 +95,7 @@ #elif defined(_WIN32) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -44,7 +44,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 -@@ -94,6 +99,7 @@ +@@ -104,6 +109,7 @@ #elif defined(__EMSCRIPTEN__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -52,7 +52,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 -@@ -109,6 +115,7 @@ +@@ -120,6 +126,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -60,7 +60,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 -@@ -118,6 +125,7 @@ +@@ -130,6 +137,7 @@ #elif defined(__native_client__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 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 5183d9015233..a8768ffb411e 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-03-09 21:38:10 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2025-04-15 08:30:07 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 -@@ -976,9 +976,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -977,9 +977,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_base_utils.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_utils.cc index 002d63bd3fb4..bc3d7085c858 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_utils.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_utils.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/utils.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/perfetto/src/base/utils.cc.orig 2025-04-15 08:30:07 UTC +++ third_party/perfetto/src/base/utils.cc @@ -38,7 +38,8 @@ #include <mach/vm_page_size.h> @@ -10,7 +10,7 @@ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) #include <sys/prctl.h> -@@ -278,14 +279,22 @@ void Daemonize(std::function<int()> parent_cb) { +@@ -279,14 +280,22 @@ void Daemonize(std::function<int()> parent_cb) { std::string GetCurExecutablePath() { std::string self_path; @@ -35,7 +35,7 @@ #elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) uint32_t size = 0; PERFETTO_CHECK(_NSGetExecutablePath(nullptr, &size)); -@@ -337,7 +346,8 @@ void AlignedFree(void* ptr) { +@@ -338,7 +347,8 @@ void AlignedFree(void* ptr) { } bool IsSyncMemoryTaggingEnabled() { diff --git a/www/ungoogled-chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/ungoogled-chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h index 102ff5b46939..b3a7f98346df 100644 --- a/www/ungoogled-chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h +++ b/www/ungoogled-chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -1,6 +1,6 @@ ---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2024-05-23 20:04:36 UTC +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2025-04-15 08:30:07 UTC +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h -@@ -122,7 +122,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR +@@ -99,7 +99,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #undef GOOGLE_PROTOBUF_PLATFORM_ERROR 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 aaba0a6379da..e49548bbb117 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-03-09 21:38:10 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2025-04-15 08:30:07 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.15 2025/03/09 21:23:21 robert Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.16 2025/04/15 06:38:26 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn index 73720789cb59..e4aeaf44c537 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2024-10-27 06:40:35 UTC +--- third_party/webrtc/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ third_party/webrtc/BUILD.gn -@@ -218,6 +218,9 @@ config("common_inherited_config") { +@@ -219,6 +219,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc deleted file mode 100644 index b75985948d7a..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- third_party/webrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc.orig 2024-10-27 06:40:35 UTC -+++ third_party/webrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc -@@ -299,7 +299,9 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* cod - SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_PALETTE, 0); - } - -+#ifdef notyet - SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_AUTO_TILES, 1); -+#endif - SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ROW_MT, 1); - SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_OBMC, 0); - SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_NOISE_SENSITIVITY, 0); -@@ -332,8 +334,10 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* cod - SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_REFERENCE_FRAMES, 3); - - if (adaptive_max_consec_drops_) { -+#ifdef notyet - SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR, - 250); -+#endif - } - - return WEBRTC_VIDEO_CODEC_OK; 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 23e8ac587604..9604b09959d6 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-03-09 21:38:10 UTC +--- tools/grit/grit/node/base.py.orig 2025-04-15 08:30:07 UTC +++ tools/grit/grit/node/base.py -@@ -499,7 +499,8 @@ class Node: +@@ -496,7 +496,8 @@ class Node: value = defs elif name == 'is_linux': diff --git a/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py b/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py index 15b201749075..74adab888556 100644 --- a/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py +++ b/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py @@ -1,8 +1,8 @@ ---- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2025-02-20 09:59:21 UTC +--- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2025-04-15 08:30:07 UTC +++ tools/json_schema_compiler/cpp_bundle_generator.py -@@ -144,7 +144,7 @@ class CppBundleGenerator(object): - # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). - ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)') +@@ -140,7 +140,7 @@ class CppBundleGenerator(object): + elif platform == Platforms.FUCHSIA: + ifdefs.append('BUILDFLAG(IS_FUCHSIA)') elif platform == Platforms.LINUX: - ifdefs.append('BUILDFLAG(IS_LINUX)') + ifdefs.append('BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)') diff --git a/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_feature__compiler.py index 0def241379b4..9505d469427d 100644 --- a/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2025-02-20 09:59:21 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2025-04-15 08:30:07 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -290,6 +290,8 @@ FEATURE_GRAMMAR = ({ +@@ -289,6 +289,8 @@ FEATURE_GRAMMAR = ({ 'linux': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', 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 ef2ef12230b3..d865475d5a7a 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,4 +1,4 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2025-03-09 21:38:10 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn @@ -61,7 +61,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 -@@ -212,7 +212,7 @@ group("telemetry_chrome_test_without_chrome") { +@@ -215,7 +215,7 @@ group("telemetry_chrome_test_without_chrome") { ] # Cr-Fuchsia doesn't support breakpad. 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 e8511348f80e..6def30e4a5ff 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-03-09 21:38:10 UTC +--- ui/accessibility/accessibility_features.cc.orig 2025-04-15 08:30:07 UTC +++ ui/accessibility/accessibility_features.cc -@@ -401,7 +401,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled +@@ -440,7 +440,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled } #endif // BUILDFLAG(IS_MAC) 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 ac61506e5257..dd799847960b 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-03-09 21:38:10 UTC +--- ui/accessibility/accessibility_features.h.orig 2025-04-15 08:30:07 UTC +++ ui/accessibility/accessibility_features.h -@@ -277,7 +277,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc +@@ -306,7 +306,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_base_accelerators_accelerator.cc b/www/ungoogled-chromium/files/patch-ui_base_accelerators_accelerator.cc index ab32f1dcc2f3..578675b84082 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_accelerators_accelerator.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_accelerators_accelerator.cc @@ -1,6 +1,6 @@ ---- ui/base/accelerators/accelerator.cc.orig 2025-02-20 09:59:21 UTC +--- ui/base/accelerators/accelerator.cc.orig 2025-04-15 08:30:07 UTC +++ ui/base/accelerators/accelerator.cc -@@ -335,7 +335,7 @@ std::u16string Accelerator::ApplyLongFormModifiers( +@@ -336,7 +336,7 @@ std::u16string Accelerator::ApplyLongFormModifiers( result = ApplyModifierToAcceleratorString(result, IDS_APP_SEARCH_KEY); #elif BUILDFLAG(IS_WIN) result = ApplyModifierToAcceleratorString(result, IDS_APP_WINDOWS_KEY); diff --git a/www/ungoogled-chromium/files/patch-ui_base_accelerators_command.cc b/www/ungoogled-chromium/files/patch-ui_base_accelerators_command.cc index b14d6d581695..373399b39eb0 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_accelerators_command.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_accelerators_command.cc @@ -1,6 +1,6 @@ ---- ui/base/accelerators/command.cc.orig 2025-03-09 21:38:10 UTC +--- ui/base/accelerators/command.cc.orig 2025-04-15 08:30:07 UTC +++ ui/base/accelerators/command.cc -@@ -49,7 +49,7 @@ std::string Command::CommandPlatform() { +@@ -81,7 +81,7 @@ std::string Command::CommandPlatform() { return ui::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return ui::kKeybindingPlatformChromeOs; 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 1f32d655c3b9..b157bfb90fba 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-01-25 09:34:31 UTC +--- 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 -@@ -98,7 +98,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( +@@ -99,7 +99,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 ead450c9a8b7..7bb896c6d1bd 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-01-25 09:34:31 UTC +--- ui/base/resource/resource_bundle.cc.orig 2025-04-15 08:30:07 UTC +++ ui/base/resource/resource_bundle.cc -@@ -924,7 +924,7 @@ void ResourceBundle::ReloadFonts() { +@@ -930,7 +930,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { 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 eab12440d926..8dabb0898783 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,6 +1,15 @@ ---- ui/base/ui_base_features.cc.orig 2025-03-09 21:38:10 UTC +--- ui/base/ui_base_features.cc.orig 2025-04-15 08:30:07 UTC +++ ui/base/ui_base_features.cc -@@ -133,7 +133,7 @@ BASE_FEATURE(kWaylandUiScale, +@@ -119,7 +119,7 @@ BASE_FEATURE(kWaylandLinuxDrmSyncobj, + // Controls whether support for Wayland's per-surface scaling is enabled. + BASE_FEATURE(kWaylandPerSurfaceScale, + "WaylandPerSurfaceScale", +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -138,7 +138,7 @@ BASE_FEATURE(kWaylandUiScale, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_OZONE) @@ -9,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) -@@ -215,7 +215,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists, +@@ -220,7 +220,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists, // native apps on Windows. BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", @@ -18,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -291,7 +291,7 @@ bool IsForcedColorsEnabled() { +@@ -296,7 +296,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_x_x11__cursor__loader.cc b/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc index 6648abfb7122..1a257f37105b 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,6 +1,6 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2025-03-09 21:38:10 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2025-04-15 08:30:07 UTC +++ ui/base/x/x11_cursor_loader.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "ui/gfx/x/connection.h" #include "ui/gfx/x/xproto.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -86,7 +86,11 @@ std::string CursorPathFromLibXcursor() { +@@ -87,7 +87,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -215,7 +219,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( +@@ -232,7 +236,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(), -@@ -405,7 +409,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -422,7 +426,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 97cb809d5eb8..7a73ecff6f4d 100644 --- a/www/ungoogled-chromium/files/patch-ui_color_color__id.h +++ b/www/ungoogled-chromium/files/patch-ui_color_color__id.h @@ -1,9 +1,9 @@ ---- ui/color/color_id.h.orig 2025-03-09 21:38:10 UTC +--- ui/color/color_id.h.orig 2025-04-15 08:30:07 UTC +++ ui/color/color_id.h -@@ -620,7 +620,7 @@ - \ +@@ -622,7 +622,7 @@ E_CPONLY(kColorCrosSysPositive) \ - E_CPONLY(kColorCrosSysComplementVariant) + E_CPONLY(kColorCrosSysComplementVariant) \ + E_CPONLY(kColorCrosSysInputFieldOnBase) -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define PLATFORM_SPECIFIC_COLOR_IDS \ diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc index 6ab68a57a13f..a0714c622634 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-03-09 21:38:10 UTC +--- ui/compositor/compositor.cc.orig 2025-04-15 08:30:07 UTC +++ ui/compositor/compositor.cc -@@ -929,7 +929,7 @@ void Compositor::OnResume() { +@@ -940,7 +940,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 8a0319446aeb..8361cc8af4c3 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-03-09 21:38:10 UTC +--- ui/compositor/compositor.h.orig 2025-04-15 08:30:07 UTC +++ ui/compositor/compositor.h -@@ -458,7 +458,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -467,7 +467,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // base::PowerSuspendObserver: void OnResume() override; diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn index c29ae6789e69..dd668bc501e6 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-03-09 21:38:10 UTC +--- ui/gfx/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ ui/gfx/BUILD.gn -@@ -656,7 +656,7 @@ source_set("memory_buffer_sources") { +@@ -658,7 +658,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_canvas__skia.cc b/www/ungoogled-chromium/files/patch-ui_gfx_canvas__skia.cc index b9eab0bf3836..ee8bcedb477d 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/canvas_skia.cc.orig 2025-03-09 21:38:10 UTC +--- ui/gfx/canvas_skia.cc.orig 2025-04-15 08:30:07 UTC +++ ui/gfx/canvas_skia.cc -@@ -218,7 +218,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str +@@ -219,7 +219,7 @@ void Canvas::DrawStringRectWithFlags(std::u16string_vi Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); 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 2fb95e8286e5..b4f192e5b8fb 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-01-25 09:34:31 UTC +--- ui/gfx/x/atom_cache.cc.orig 2025-04-15 08:30:07 UTC +++ ui/gfx/x/atom_cache.cc -@@ -155,6 +155,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha +@@ -156,6 +156,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_gtk_gtk__compat.cc b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc index d57c8e29e0be..cf75423fda7f 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 2023-09-17 07:59:53 UTC +--- ui/gtk/gtk_compat.cc.orig 2025-04-15 08:30:07 UTC +++ ui/gtk/gtk_compat.cc -@@ -62,27 +62,47 @@ auto DlCast(void* symbol) { +@@ -64,27 +64,47 @@ auto DlCast(void* symbol) { } void* GetLibGio() { diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc index f465ee1da0a9..f344c475e8ec 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2025-03-09 21:38:10 UTC +--- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2025-04-15 08:30:07 UTC +++ ui/ozone/platform/wayland/common/wayland_util.cc -@@ -420,6 +420,7 @@ void RecordConnectionMetrics(wl_display* display) { +@@ -424,6 +424,7 @@ void RecordConnectionMetrics(wl_display* display) { {"weston", WaylandCompositor::kWeston}, }; @@ -8,7 +8,7 @@ const int fd = wl_display_get_fd(display); if (fd == -1) { return WaylandCompositor::kUnknown; -@@ -445,6 +446,7 @@ void RecordConnectionMetrics(wl_display* display) { +@@ -449,6 +450,7 @@ void RecordConnectionMetrics(wl_display* display) { return compositor; } } 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 25e2e0f5beb3..80425fe259c6 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-03-09 21:38:10 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2025-04-15 08:30:07 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1502,7 +1502,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1472,7 +1472,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_ozone_public_ozone__ui__controls__test__helper.h b/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__ui__controls__test__helper.h new file mode 100644 index 000000000000..072ab056d0d6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__ui__controls__test__helper.h @@ -0,0 +1,11 @@ +--- ui/ozone/public/ozone_ui_controls_test_helper.h.orig 2025-04-15 08:30:07 UTC ++++ ui/ozone/public/ozone_ui_controls_test_helper.h +@@ -62,7 +62,7 @@ class OzoneUIControlsTestHelper { + // aura::Window. + virtual bool MustUseUiControlsForMoveCursorTo() = 0; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + virtual void ForceUseScreenCoordinatesOnce(); + #endif + }; diff --git a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc index 6ebdd0c9291a..cb2d85c63b00 100644 --- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc +++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.cc.orig 2025-02-20 09:59:21 UTC +--- ui/platform_window/platform_window_delegate.cc.orig 2025-04-15 08:30:07 UTC +++ ui/platform_window/platform_window_delegate.cc -@@ -57,7 +57,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD +@@ -56,7 +56,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD return gfx::Insets(); } 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 b158bd113ebb..66f7d1855559 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-02-20 09:59:21 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2025-04-15 08:30:07 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -140,7 +140,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_views_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn new file mode 100644 index 000000000000..5c866c1e8ebf --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn @@ -0,0 +1,10 @@ +--- ui/views/BUILD.gn.orig 2025-04-15 08:30:07 UTC ++++ ui/views/BUILD.gn +@@ -836,7 +836,6 @@ component("views") { + sources += [ "accessibility/widget_ax_tree_id_map.cc" ] + } + deps += [ +- "//components/crash/core/common:crash_key", + "//ui/aura", + "//ui/base/cursor/mojom:cursor_type_shared", + "//ui/events", 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 new file mode 100644 index 000000000000..1fd5efc6f2ee --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_views_accessibility_view__accessibility.cc @@ -0,0 +1,20 @@ +--- ui/views/accessibility/view_accessibility.cc.orig 2025-04-15 08:30:07 UTC ++++ ui/views/accessibility/view_accessibility.cc +@@ -33,7 +33,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" +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/views/accessibility/view_ax_platform_node_delegate_auralinux.h" + #endif + +@@ -100,7 +100,7 @@ std::unique_ptr<ViewAccessibility> ViewAccessibility:: + return ViewAXPlatformNodeDelegateWin::CreatePlatformSpecific(view); + #elif BUILDFLAG(IS_MAC) + return ViewAXPlatformNodeDelegateMac::CreatePlatformSpecific(view); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return ViewAXPlatformNodeDelegateAuraLinux::CreatePlatformSpecific(view); + #endif + } 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 b91e34964f90..2e1f3839002a 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-03-09 21:38:10 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2025-04-15 08:30:07 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -85,7 +85,7 @@ +@@ -86,7 +86,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" -@@ -182,7 +182,7 @@ bool IsControlKeyModifier(int flags) { +@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -789,7 +789,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -790,7 +790,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event return handled; } @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -974,7 +974,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -975,7 +975,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -2065,7 +2065,7 @@ bool Textfield::ShouldDoLearning() { +@@ -2066,7 +2066,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( -@@ -2583,7 +2583,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2584,7 +2584,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; -@@ -2591,7 +2591,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2592,7 +2592,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_controls_textfield_textfield.h b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h index e221186a3a67..78b09db1bdca 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.h.orig 2025-02-20 09:59:21 UTC +--- ui/views/controls/textfield/textfield.h.orig 2025-04-15 08:30:07 UTC +++ ui/views/controls/textfield/textfield.h -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #include "ui/views/view_observer.h" #include "ui/views/word_lookup_client.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -474,7 +474,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -475,7 +475,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc b/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc index f781a10ec40f..74bf971a36ef 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2025-03-09 21:38:10 UTC +--- ui/views/focus/focus_manager.cc.orig 2025-04-15 08:30:07 UTC +++ ui/views/focus/focus_manager.cc -@@ -604,7 +604,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -606,7 +606,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi return false; } @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -619,7 +619,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -621,7 +621,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi const bool accelerator_processed = focus_manager->ProcessAccelerator(accelerator); diff --git a/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.cc b/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.cc index cfbecc036973..131614863eb7 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.cc @@ -1,6 +1,6 @@ ---- ui/views/style/platform_style.cc.orig 2025-02-20 09:59:21 UTC +--- ui/views/style/platform_style.cc.orig 2025-04-15 08:30:07 UTC +++ ui/views/style/platform_style.cc -@@ -16,7 +16,7 @@ +@@ -23,7 +23,7 @@ #include "ui/views/controls/focusable_border.h" #include "ui/views/controls/scrollbar/scroll_bar_views.h" @@ -8,8 +8,8 @@ +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" #endif - -@@ -27,7 +27,7 @@ namespace views { + #endif +@@ -35,7 +35,7 @@ namespace views { // static std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar( ScrollBar::Orientation orientation) { diff --git a/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.h b/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.h new file mode 100644 index 000000000000..bf3b3fd0608c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.h @@ -0,0 +1,11 @@ +--- ui/views/style/platform_style.h.orig 2025-04-15 08:30:07 UTC ++++ ui/views/style/platform_style.h +@@ -84,7 +84,7 @@ class VIEWS_EXPORT PlatformStyle { + // Default setting at bubble creation time for whether arrow will be adjusted + // for bubbles going off-screen to bring more bubble area into view. Linux + // clips bubble windows that extend outside their parent window bounds. +- static constexpr bool kAdjustBubbleIfOffscreen = !BUILDFLAG(IS_LINUX); ++ static constexpr bool kAdjustBubbleIfOffscreen = (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)); + + // Default focus behavior on the platform. + static constexpr View::FocusBehavior kDefaultFocusBehavior = 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 efab3b399e4d..c18b63469ca7 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-01-25 09:34:31 UTC +--- ui/views/views_delegate.cc.orig 2025-04-15 08:30:07 UTC +++ ui/views/views_delegate.cc -@@ -89,7 +89,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow +@@ -101,7 +101,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow return false; } #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 d694b99af6d4..e18d9376ffb3 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-02-20 09:59:21 UTC +--- 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 @@ -50,7 +50,7 @@ #include "ui/wm/core/window_util.h" @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1174,7 +1174,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1179,7 +1179,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 b2fe02c54fe3..83dc7d0b5004 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-03-09 21:38:10 UTC +--- ui/views/widget/widget.cc.orig 2025-04-15 08:30:07 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 -@@ -2444,7 +2444,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2452,7 +2452,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const return parent_->GetNativeTheme(); } diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn index a1ddb21968f4..59723a44d331 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-03-09 21:38:10 UTC +--- v8/BUILD.gn.orig 2025-04-15 08:30:07 UTC +++ v8/BUILD.gn -@@ -960,6 +960,8 @@ external_v8_defines = [ +@@ -974,6 +974,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -9,7 +9,7 @@ ] enabled_external_v8_defines = [ -@@ -1039,6 +1041,12 @@ if (target_os == "android") { +@@ -1053,6 +1055,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 -@@ -2465,6 +2473,12 @@ template("run_mksnapshot") { +@@ -2479,6 +2487,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) { -@@ -6546,7 +6560,7 @@ v8_component("v8_libbase") { +@@ -6565,7 +6579,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6557,6 +6571,18 @@ v8_component("v8_libbase") { +@@ -6576,6 +6590,18 @@ v8_component("v8_libbase") { "dl", "rt", ] 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 7952dd6c8be7..6826cc3a20bd 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2025-03-09 21:38:10 UTC +--- v8/src/api/api.cc.orig 2025-04-15 08:30:07 UTC +++ v8/src/api/api.cc @@ -153,7 +153,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6614,7 +6614,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6476,7 +6476,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc index 54cbb7ef60f6..21e9c0934722 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,6 +1,6 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2024-11-16 12:20:41 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2025-04-15 08:30:07 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -75,7 +75,7 @@ +@@ -76,7 +76,7 @@ #include <sys/syscall.h> #endif @@ -9,7 +9,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -314,8 +314,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -315,8 +315,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -25,7 +25,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -412,6 +419,7 @@ void* OS::GetRandomMmapAddr() { +@@ -413,6 +420,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -33,7 +33,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -700,7 +708,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -701,7 +709,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor #if !V8_OS_ZOS // static bool OS::HasLazyCommits() { 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 24663cdb70e2..a92bea7568fd 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc @@ -1,4 +1,4 @@ ---- v8/src/execution/isolate.cc.orig 2025-03-09 21:38:10 UTC +--- v8/src/execution/isolate.cc.orig 2025-04-15 08:30:07 UTC +++ v8/src/execution/isolate.cc @@ -172,6 +172,10 @@ #include "src/execution/simulator-base.h" @@ -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_[]; -@@ -5048,6 +5052,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -5062,6 +5066,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); @@ -24,4 +24,4 @@ +#endif if (StickyEmbeddedBlobCode() != nullptr) { - base::SpinningMutexGuard guard( + base::MutexGuard guard(current_embedded_blob_refcount_mutex_.Pointer()); diff --git a/www/ungoogled-chromium/files/patch-v8_src_libsampler_sampler.cc b/www/ungoogled-chromium/files/patch-v8_src_libsampler_sampler.cc index 4c3444238c7d..748d99235f5c 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_libsampler_sampler.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_libsampler_sampler.cc @@ -1,6 +1,6 @@ ---- v8/src/libsampler/sampler.cc.orig 2025-01-25 09:34:31 UTC +--- v8/src/libsampler/sampler.cc.orig 2025-04-15 08:30:07 UTC +++ v8/src/libsampler/sampler.cc -@@ -519,6 +519,16 @@ void SignalHandler::FillRegisterState(void* context, R +@@ -520,6 +520,16 @@ void SignalHandler::FillRegisterState(void* context, R state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]); state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]); state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]); 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 9a6abc4c355c..a400ad9e7ae2 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-02-20 09:59:21 UTC +--- 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 -@@ -578,7 +578,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -575,7 +575,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) { -@@ -658,7 +658,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -655,7 +655,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 */) { -@@ -737,7 +737,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -734,7 +734,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) { -@@ -755,7 +755,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -752,7 +752,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()); -@@ -825,7 +825,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -822,7 +822,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); -@@ -893,7 +893,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -890,7 +890,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); -@@ -1008,7 +1008,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -1005,7 +1005,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 -@@ -1104,7 +1104,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1101,7 +1101,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) { -@@ -1118,7 +1118,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1115,7 +1115,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) { -@@ -1131,7 +1131,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1128,7 +1128,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) { -@@ -1145,7 +1145,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1142,7 +1142,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) { -@@ -1159,7 +1159,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1156,7 +1156,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) { -@@ -1173,7 +1173,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1170,7 +1170,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 */) { -@@ -1188,7 +1188,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1185,7 +1185,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( |